Merge branch 'dev_xzeq' of http://47.92.108.28/changchao/founder_vue into dev_new

src/api/fzjc.js

@@ -50,3 +50,6 @@ export const getTbYwMxclzx = params =>
 //查询模型策略基本信息
 export const wjpjwszxGetTbYwMxclzx = params =>
   post(`${base.alyIP}/wjpjwszx/getTbYwMxclzx`, params);
+//wjpjDwfxdb
+export const wjpjDwfxdb = params =>
+  post(`${base.alyIP}/wjpjwszx/wjpjDwfxdb`, params);

src/api/zdxx/zdcyryxx.js

@@ -32,8 +32,8 @@ export const getZdryTqByZjhm = params =>
   postform(`${base.alyIP}/zdryxx/getZdryTqByZjhm`, params);
   
 //阵地从业人员推送至刑嫌调控
-export const updateZdryxxTxxtk = params =>
-  postform(`${base.alyIP}/zdryxx/updateZdryxx`, params);
+// export const updateZdryxxTxxtk = params =>
+//   postform(`${base.alyIP}/zdryxx/updateZdryxx`, params);
 //阵地从业人员信息推送
 export const getryxxtsByZjhm = params =>
   postform(`${base.alyIP}/zdryxx/getryxxtsByZjhm`, params);

src/components/ajbz/bshChildrenQuery.vue

@@ -628,6 +628,7 @@ export default {
       );
       post(this.childrenUrl, formData).then((response) => {
         if (response.code == 200) {
+          debugger
           self.tableData[index].children = response.data.data;
           self.closeLoading();
         } else {

src/components/form.vue

@@ -1575,6 +1575,14 @@ export default {
           ) {
             this.$message.error("请填写线索提供者及可疑人员");
             return;
+          } else if(self.pageBs && self.pageBs == 'adjustZdxxgl' && self.formLabelAlign.zdryxxgl[0].xm == "") {
+            this.$message.error("请填写阵地管理人员");
+            return;
+          } else if(self.pageBs && self.pageBs == 'addzdcyryxx' && self.formLabelAlign.ryjl[0].dwmc == "") {
+            this.$message.error("请填写从业人员及人员经历");
+          } else if(self.pageBs && self.pageBs == 'adjustZdxsxx' && (self.formLabelAlign.tgz[0].xm == "" || self.formLabelAlign.kyry[0].xm == "")) {
+            this.$message.error("请填写线索提供者及可疑人员");
+            return;
           } else {
             //另一种状态保存
             if (flag === "draft") {

src/components/ptCxForm_components.vue

@@ -489,9 +489,8 @@
                   pageBs != 'dswtzxxlbxx' &&
                   pageBs != 'gzzkyxs' &&
                   pageBs != 'rwgl' &&
-                  pageBs != 'querySdtdyp' && 
+                  pageBs != 'querySdtdyp' &&
                   pageBs != 'queryXshbZd'
-                  
                 "
               >
                 <i class="el-icon-plus"></i> 新增
@@ -754,7 +753,7 @@
           <template slot-scope="props">
             <el-table
               v-loading="loadingZxzjlList"
-              :data="tableData1"
+              :data="props.row.children"
               stripe
               style="width: 100%"
             >
@@ -769,7 +768,7 @@
                   <!-- <el-button type="success" @click="sprops(scope)">
                     可视化分析
                   </el-button> -->
-                   <el-button type="success" @click="sprops(scope)">
+                  <el-button type="success" @click="sprops(scope)">
                     跳转脑图
                   </el-button>
                 </template>
@@ -807,7 +806,6 @@
             pageBs == 'queryRole' ||
             pageBs == 'queryFzth' ||
             pageBs == 'queryZdjyhd' ||
-            pageBs == 'zdxxgl' ||
             pageBs == 'zdryGl' ||
             pageBs == 'queryGnxnpg' ||
             pageBs == 'queryXsxx' ||
@@ -1379,7 +1377,6 @@
               pageBs == 'queryCheckBj' ||
               pageBs == 'queryWl' ||
               pageBs == 'queryDna' ||
-              pageBs == 'queryZj' ||
               pageBs == 'queryZw' ||
               pageBs == 'wfqdzczl' ||
               pageBs == 'xywspdzczl' ||
@@ -1518,6 +1515,7 @@
                   pageBs == 'queryZdssww' ||
                   pageBs == 'queryZdsszj' ||
                   pageBs == 'querySdtdyp' ||
+                  pageBs == 'queryZj' ||
                   pageBs == 'queryZdssydtxsb' ||
                   pageBs == 'qyeryrlqbxsGl'
                 )
@@ -1724,6 +1722,7 @@
                 pageBs != 'querySdtdyp' &&
                 pageBs != 'queryThxs' &&
                 pageBs != 'queryZdssydtxsb' &&
+                pageBs != 'queryZj' &&
                 pageBs != 'qyeryrlqbxsGl'
               "
               >删除</span
@@ -2189,6 +2188,7 @@ import SelectTreeDialog from "@c/treeCode_components.vue";
 import LazySelectTreeDialog from "@c/lazy_treeCode_components.vue";
 import Http from "@/utils/http.js";
 import axios from "axios";
+import { post } from "@/utils/http.js";
 import url from "@/api/base";
 import qs from "qs";
 import {
@@ -2247,6 +2247,7 @@ export default {
       type: Array,
       default: () => [],
     }, //信息列表图片
+    childrenUrl: String,
     tableData1: {
       type: Array,
       default: () => [],
@@ -2355,7 +2356,24 @@ export default {
       return dt.split(",");
     },
     rowExpand(row, expandedRows) {
-      this.$emit("rowExpand", row);
+      // this.$emit("rowExpand", row);
+      var self = this;
+      self.showLoading();
+      let formData = {};
+      formData.ssrwbh = row.xxzjbh;
+      var index = self.tableData.findIndex((item) => item.xxzjbh == row.xxzjbh);
+      post(this.childrenUrl, formData).then((response) => {
+        if (response.code == 200) {
+          self.tableData[index].children = response.data.rows;
+          self.closeLoading();
+        } else {
+          /*self.$message({
+              type: "error",
+              message: response.data.message
+            });*/
+          self.closeLoading();
+        }
+      });
     },
     switchingConditions() {
       this.toggleZd = !this.toggleZd;
@@ -3118,6 +3136,10 @@ export default {
             postform(`${url.alyIP}${this.cxUrl}`, formDatas).then(
               (response) => {
                 if (response.success === true) {
+                  let result = response.data.data || response.data.rows;
+                  result.forEach((item) => {
+                    item.children = [];
+                  });
                   self.tableData = response.data.rows;
                   self.tableDataLength = response.data.total;
                   self.tPage = Math.ceil(response.data.total / self.page_size);
@@ -3142,6 +3164,10 @@ export default {
             form.append("jsonStr", JSON.stringify(jsonStr));
             postform(`${url.alyIP2}${this.cxUrl}`, form).then((response) => {
               if (response.success === true) {
+                let result = response.data.data || response.data.rows;
+                result.forEach((item) => {
+                  item.children = [];
+                });
                 self.tableData = response.data.rows;
                 self.tableDataLength = response.data.total;
                 self.tPage = Math.ceil(response.data.total / self.page_size);
@@ -3256,6 +3282,10 @@ export default {
                   //   }
                   // }
                 });
+                let result = response.data.data || response.data.rows;
+                result.forEach((item) => {
+                  item.children = [];
+                });
                 self.yqyhz = response.data.yh;
                 self.sfkjs = response.data.sfkjs;
                 self.tableData = response.data.rows;

src/router/index.js

@@ -79,13 +79,13 @@ const mainRouters = [
   ...xxtkRoutes,
   hxgcRoutes,
   kyxsRoutes,
-  bbkwtxxRoutes,
+  ...bbkwtxxRoutes,
   gnxnpgRoutes,
   zdxsxxRoutes,
   zdryRoutes,
   ...rlqbxsRoutes,
   xsjsdbRoutes,
-  zjclRoutes,
+  ...zjclRoutes,
   userAuthRoutes,
   grxnpgRoutes,
   dwxnpgRoutes,

src/router/modules/bbkwtxx.js

@@ -16,28 +16,31 @@ const menuLayouts = [
     },
     component: () => import("@/views/zdxx/bbkwpxx/queryBbkwpxx.vue")
   },
-  {
-    path: "/adjustBbkwpxx",
-    name: "adjustBbkwpxx",
-    meta: {
-      isAdd: true,
-      title: '被布控物品信息'
-    },
-    component: () => import("@/views/zdxx/bbkwpxx/adjustBbkwpxx.vue")
-  },
-  {
-    path: "/bbkwpxxDetail",
-    name: "bbkwpxxDetail",
-    meta: {
-      title: '被布控物品信息详情'
-    },
-    component: () => import("@/views/zdxx/bbkwpxx/bbkwpxxDetail.vue")
-  },
+
+
 
 ];
 
-export default {
+export default [{
   path: "/right",
   component: menuLayout,
   children: [...menuLayouts]
-};
\ No newline at end of file
+},
+{
+  path: "/adjustBbkwpxx",
+  name: "adjustBbkwpxx",
+  meta: {
+    isAdd: true,
+    title: '被布控物品信息'
+  },
+  component: () => import("@/views/zdxx/bbkwpxx/adjustBbkwpxx.vue")
+},
+{
+  path: "/bbkwpxxDetail",
+  name: "bbkwpxxDetail",
+  meta: {
+    title: '被布控物品信息详情'
+  },
+  component: () => import("@/views/zdxx/bbkwpxx/bbkwpxxDetail.vue")
+},
+];
\ No newline at end of file

src/router/modules/rlqbxs.js

@@ -49,14 +49,7 @@ const menuLayouts = [
     },
     component: () => import("@/views/rlqbxsxx/shrzList.vue")
   },
-  {
-    path: "/detailRlqbxs",
-    name: "detailRlqbxs",
-    meta: {
-      title: '人力情报线索信息详情'
-    },
-    component: () => import("@/views/rlqbxsxx/detailRlqbxs.vue")
-  },
+
   {
     path: "/rlqbtj",
     name: "rlqbtj",
@@ -81,5 +74,12 @@ export default [{
   },
   component: () => import("@/views/rlqbxsxx/adjustRlqbxs.vue")
 },
-
+{
+  path: "/detailRlqbxs",
+  name: "detailRlqbxs",
+  meta: {
+    title: '人力情报线索信息详情'
+  },
+  component: () => import("@/views/rlqbxsxx/detailRlqbxs.vue")
+},
 ];
\ No newline at end of file

src/router/modules/zdsswp.js

 import menuLayout from "@/layout/menuLayout.vue";
 const menuLayouts = [
-  {
-    path: "/addZdssdy",
-    name: "addZdssdy",
-    meta: {
-      title: '损失弹药'
-    },
-    component: () => import("@/views/zdxx/zdxxgl/sswp/ssdy/addZdssdy.vue")
-  },
-  
-  {
-    path: "/addZdssfjdc",
-    name: "addZdssfjdc",
-    meta: {
-      title: '损失非机动车'
-    },
-    component: () => import("@/views/zdxx/zdxxgl/sswp/ssfjdc/addZdssfjdc.vue")
-  },
-  
-  {
-    path: "/addZdssjdc",
-    name: "addZdssjdc",
-    meta: {
-      title: '损失机动车'
-    },
-    component: () => import("@/views/zdxx/zdxxgl/sswp/ssjdc/addZdssjdc.vue")
-  },
-  
-  {
-    path: "/addZdsskl",
-    name: "addZdsskl",
-    meta: {
-      title: '损失卡类'
-    },
-    component: () => import("@/views/zdxx/zdxxgl/sswp/sskl/addZdsskl.vue")
-  },
-  
-  {
-    path: "/addZdssqtwp",
-    name: "addZdssqtwp",
-    meta: {
-      title: '损失其他物品'
-    },
-    component: () => import("@/views/zdxx/zdxxgl/sswp/ssqtwp/addZdssqtwp.vue")
-  },
-  
-  {
-    path: "/addZdssqz",
-    name: "addZdssqz",
-    meta: {
-      title: '损失枪支'
-    },
-    component: () => import("@/views/zdxx/zdxxgl/sswp/ssqz/addZdssqz.vue")
-  },
-  
-  {
-    path: "/addZdssww",
-    name: "addZdssww",
-    meta: {
-      title: '损失文物'
-    },
-    component: () => import("@/views/zdxx/zdxxgl/sswp/ssww/addZdssww.vue")
-  },
-  
-  {
-    path: "/addZdssydtxsb",
-    name: "addZdssydtxsb",
-    meta: {
-      title: '损失移动通讯设备'
-    },
-    component: () => import("@/views/zdxx/zdxxgl/sswp/ssydtxsb/addZdssydtxsb.vue")
-  },
   
-  {
-    path: "/addZdsszj",
-    name: "addZdsszj",
-    meta: {
-      title: '损失证件'
-    },
-    component: () => import("@/views/zdxx/zdxxgl/sswp/sszj/addZdsszj.vue")
-  },
   
 ];
 
@@ -160,4 +81,84 @@ export default [{
   },
   component: () => import("@/views/zdxx/zdxxgl/sswp/sszj/detailZdsszj.vue")
 },
+{
+  path: "/addZdssdy",
+  name: "addZdssdy",
+  meta: {
+    title: '损失弹药'
+  },
+  component: () => import("@/views/zdxx/zdxxgl/sswp/ssdy/addZdssdy.vue")
+},
+
+{
+  path: "/addZdssfjdc",
+  name: "addZdssfjdc",
+  meta: {
+    title: '损失非机动车'
+  },
+  component: () => import("@/views/zdxx/zdxxgl/sswp/ssfjdc/addZdssfjdc.vue")
+},
+
+{
+  path: "/addZdssjdc",
+  name: "addZdssjdc",
+  meta: {
+    title: '损失机动车'
+  },
+  component: () => import("@/views/zdxx/zdxxgl/sswp/ssjdc/addZdssjdc.vue")
+},
+
+{
+  path: "/addZdsskl",
+  name: "addZdsskl",
+  meta: {
+    title: '损失卡类'
+  },
+  component: () => import("@/views/zdxx/zdxxgl/sswp/sskl/addZdsskl.vue")
+},
+
+{
+  path: "/addZdssqtwp",
+  name: "addZdssqtwp",
+  meta: {
+    title: '损失其他物品'
+  },
+  component: () => import("@/views/zdxx/zdxxgl/sswp/ssqtwp/addZdssqtwp.vue")
+},
+
+{
+  path: "/addZdssqz",
+  name: "addZdssqz",
+  meta: {
+    title: '损失枪支'
+  },
+  component: () => import("@/views/zdxx/zdxxgl/sswp/ssqz/addZdssqz.vue")
+},
+
+{
+  path: "/addZdssww",
+  name: "addZdssww",
+  meta: {
+    title: '损失文物'
+  },
+  component: () => import("@/views/zdxx/zdxxgl/sswp/ssww/addZdssww.vue")
+},
+
+{
+  path: "/addZdssydtxsb",
+  name: "addZdssydtxsb",
+  meta: {
+    title: '损失移动通讯设备'
+  },
+  component: () => import("@/views/zdxx/zdxxgl/sswp/ssydtxsb/addZdssydtxsb.vue")
+},
+
+{
+  path: "/addZdsszj",
+  name: "addZdsszj",
+  meta: {
+    title: '损失证件'
+  },
+  component: () => import("@/views/zdxx/zdxxgl/sswp/sszj/addZdsszj.vue")
+},
 ];
\ No newline at end of file

src/router/modules/zjcl.js

@@ -84,18 +84,20 @@ const menuLayouts = [
     },
     component: () => import("@/views/zjcl/jcgz/detailJcgz.vue")
   },
-  {
-    path: "/zjclcj",
-    name: "zjclcj",
-    meta: {
-      title: '证物材料上传',
-    },
-    component: () => import("@/views/zjcl/zjclcj.vue")
-  },
+ 
 ];
 
-export default {
+export default [{
   path: "/right",
   component: menuLayout,
   children: [...menuLayouts]
-};
+},
+{
+  path: "/zjclcj",
+  name: "zjclcj",
+  meta: {
+    title: '证物材料上传',
+  },
+  component: () => import("@/views/zjcl/zjclcj.vue")
+},
+];

src/utils/params.js

@@ -24,11 +24,11 @@ const zdjbxx = [
   {
     name: "阵地名称:",
     id: "zdmc",
-    type: "textarea",
+    type: "text",
     disabled: false,
     value: "",
     placeholder: "请输入",
-    col: "18",
+    col: "2",
   },
   {
     name: "阵地基本情况:",
@@ -12420,15 +12420,6 @@ const zbfzxyr_flws = [
 //损失枪支基本信息
 const zdssqzxx_jbxx = [
   {
-    name: "物品编号:",
-    id: "ssqzSawpbh",
-    type: "text",
-    value: "",
-    placeholder: "请输入",
-    col: "2",
-    prop: "wpNumbers",
-  },
-  {
     name: "枪支型号:",
     id: "ssqzQzxhdm",
     type: "codeTree",
@@ -12558,15 +12549,6 @@ const zdssqzxx_syrxx = [
 
 //损失机动车信息基本信息
 const zdssjdc_jbxx = [
-  {
-    name: "物品编号:",
-    id: "ssjdcSawpbh",
-    type: "text",
-    value: "",
-    placeholder: "请输入",
-    col: "2",
-    prop: "wpNumbers",
-  },
 ]
 //损失机动车损失车辆
 const zdssjdc_sscl = [
@@ -12791,15 +12773,7 @@ const zdssjdc_syr = [
 ]
 //损失弹药基本信息
 const zdssdy_jbxx = [
-  {
-    name: "物品编号:",
-    id: "ssdySawpbh",
-    type: "text",
-    value: "",
-    placeholder: "请输入",
-    col: "2",
-    prop: "wpNumbers",
-  },
+  
 ]
 //损失弹药弹药信息
 const zdssdy_dyxx = [
@@ -12886,15 +12860,7 @@ const zdssdy_syrxx = [
 ]
 //损失文物基本信息
 const zdssww_jbxx = [
-  {
-    name: "物品编号:",
-    id: "sswwSawpbh",
-    type: "text",
-    value: "",
-    placeholder: "请输入",
-    col: "2",
-    prop: "wpNumbers",
-  },
+  
   {
     name: "文物名称:",
     id: "sswwWpmc",
@@ -13100,15 +13066,7 @@ const zdssww_syrxx = [
 ]
 //损失卡类基本信息
 const zdsskl_jbxx = [
-  {
-    name: "物品编号:",
-    id: "ssklSawpbh",
-    type: "text",
-    value: "",
-    placeholder: "请输入",
-    col: "2",
-    prop: "wpNumbers",
-  },
+  
   {
     name: "物品类型:",
     id: "ssklSawpSawpdm",
@@ -13229,15 +13187,7 @@ const zdsskl_jbxx = [
 ]
 //损失证件基本信息
 const zdsszj_jbxx = [
-  {
-    name: "物品编号:",
-    id: "sszjSawpbh",
-    type: "text",
-    value: "",
-    placeholder: "请输入",
-    col: "2",
-    prop: "wpNumbers",
-  },
+  
   {
     name: "常用证件:",
     id: "sszjCyzjCyzjdm",
@@ -13331,15 +13281,7 @@ const zdsszj_jbxx = [
 ]
 //损失非机动车基本信息
 const zdssfjdc_jbxx = [
-  {
-    name: "物品编号:",
-    id: "ssddfjdcSawpbh",
-    type: "text",
-    value: "",
-    placeholder: "请输入",
-    col: "2",
-    prop: "wpNumbers",
-  },
+  
 ]
 //损失非机动车信息
 const zdssfjdc_fjdcxx = [
@@ -13483,15 +13425,7 @@ const zdssfjdc_syrxx = [
 ]
 //损失移动通讯设备基本信息
 const zdssydtxsb_jbxx = [
-  {
-    name: "涉案物品编号:",
-    id: "ssydtxsbSawpbh",
-    type: "text",
-    // disabled: true,
-    value: "",
-    placeholder: "请输入",
-    col: "2",
-  },
+  
   {
     name: "手机使用状态:",
     id: "sjsyzt",
@@ -13642,15 +13576,7 @@ const zdssydtxsb_syrxx = [
 ]
 //损失其他物品基本信息
 const zdssqtwp_jbxx = [
-  {
-    name: "物品编号:",
-    id: "sswpSawpbh",
-    type: "text",
-    value: "",
-    placeholder: "请输入",
-    col: "2",
-    prop: "wpNumbers",
-  },
+  
 ]
 //损失其他物品信息
 const zdssqtwp_wpxx = [

src/views/ajzcgzxnpg/ajzcgzxnpg.vue

@@ -545,14 +545,14 @@ export default {
               className: "iconfont icongongnengfuwu",
               disabled: false,
             },
-            {
-              id: "zdfxcdtj",
-              label: "阵地风险程度统计",
-              index: "zdfxcdtj",
-              auth: "M0102",
-              className: "iconfont icongongnengfuwu",
-              disabled: false,
-            },
+            // {
+            //   id: "zdfxcdtj",
+            //   label: "阵地风险程度统计",
+            //   index: "zdfxcdtj",
+            //   auth: "M0102",
+            //   className: "iconfont icongongnengfuwu",
+            //   disabled: false,
+            // },
             {
               id: "zdjywptjt",
               label: "阵地交易物品统计",

src/views/ajzcgzxnpg/hjwzgzgl.vue

@@ -147,7 +147,7 @@
           });
       },
       edit(obj) {
-        this.$router.push({
+        this.$router.pushToTab({
           path: "/insertHjwzgzgl",
           query: {
             ruleid: obj.row.ruleid,

src/views/ajzcgzxnpg/queryZjcljcqk.vue

@@ -344,7 +344,7 @@ export default {
         });
     },
     toInfor(obj) {
-      this.$router.push({
+      this.$router.pushToTab({
         path: "/zjclcj",
         query: {
           asjbh: obj.asjbh,
@@ -352,7 +352,7 @@ export default {
       });
     },
     edit(obj) {
-      this.$router.push({
+      this.$router.pushToTab({
         path: "/zjclcj",
         query: {
           asjbh: obj.row.asjbh,

src/views/mxgl/mxclydy/fzjcgxlfx.vue

@@ -83,7 +83,7 @@
 
 <script>
   import rightContent from "@c/ptCxForm_components.vue";
-  import { pageTbYwWjpjckxq,queryJdswjpj } from "@/api/fzjc.js";
+  import { pageTbYwWjpjckxq,queryJdswjpj,wjpjDwfxdb } from "@/api/fzjc.js";
   export default {
     name: "queryHbyp",
     components: {
@@ -290,79 +290,109 @@
         let kssj,jssj,xxzjbhList;
         if(this.value1){kssj=this.value1[0];jssj=this.value1[1];}
         if(this.selectedId.length){xxzjbhList = this.selectedId.toString()}
-        queryJdswjpj({
-          pflx:this.cxFormData.pflx,
-          fxFlag:fxFlag,kssj,jssj,xxzjbhList})
-          .then(res=>{
-         if( res.code===200){
-           let rows  = res.data.rows;
-           let jdPjf = [];
-           let mxmc = [];
-           rows.find((v)=>{
-             jdPjf.push(v['jdPjf']);
-             mxmc.push(v['mxmc'])
-           })
-           let myChart = this.$echarts.init(this.$refs.charts);
-           let option = {
-             tooltip: {
-               trigger: 'axis'
-             },
-             legend: {
-               data: ['Email', 'Union Ads', 'Video Ads', 'Direct', 'Search Engine']
-             },
-             grid: {
-               left: '3%',
-               right: '4%',
-               bottom: '3%',
-               containLabel: true
-             },
-             xAxis: {
-               type: 'category',
-               boundaryGap: false,
-               data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
-             },
-             yAxis: {
-               type: 'value'
-             },
-             series: [
-               {
-                 name: 'Email',
-                 type: 'line',
-                 stack: 'Total',
-                 data: [120, 132, 101, 134, 90, 230, 210]
-               },
-               {
-                 name: 'Union Ads',
-                 type: 'line',
-                 stack: 'Total',
-                 data: [220, 182, 191, 234, 290, 330, 310]
-               },
-               {
-                 name: 'Video Ads',
-                 type: 'line',
-                 stack: 'Total',
-                 data: [150, 232, 201, 154, 190, 330, 410]
-               },
-               {
-                 name: 'Direct',
-                 type: 'line',
-                 stack: 'Total',
-                 data: [320, 332, 301, 334, 390, 330, 320]
-               },
-               {
-                 name: 'Search Engine',
-                 type: 'line',
-                 stack: 'Total',
-                 data: [820, 932, 901, 934, 1290, 1330, 1320]
-               }
-             ]
-           };
-           myChart.setOption(option)
+        if(fxFlag==1){
+          queryJdswjpj({
+            pflx:2,
+            kssj,jssj,xxzjbhList})
+            .then(res=>{
+              if( res.code===200){
+                let rows  = res.data.rows;
+                let jqtRq = rows[0]['jqtRq'];
+                let mxPjf = rows[1]['mxPjf'][0];
+                let mc  =[];
+                let seriesList = []
+                for(let i in mxPjf.valueOf()){
+                  mc.push(i)
+                  seriesList.push({
+                    name: i,
+                    type: 'line',
+                    stack: 'Total',
+                    data:mxPjf[i]
+                  })
+                }
+                let myChart = this.$echarts.init(this.$refs.charts);
+                let option = {
+                  tooltip: {
+                    trigger: 'axis'
+                  },
+                  legend: {
+                    data:mc
+                  },
+                  grid: {
+                    left: '3%',
+                    right: '4%',
+                    bottom: '3%',
+                    containLabel: true
+                  },
+                  xAxis: {
+                    type: 'category',
+                    boundaryGap: false,
+                    data: jqtRq
+                  },
+                  yAxis: {
+                    type: 'value'
+                  },
+                  series: seriesList
+                };
+                myChart.setOption(option)
 
-         }
+              }
 
-        })
+            })
 
+        }
+        else {
+          wjpjDwfxdb({
+            pflx:2,
+            kssj,jssj,xxzjbhList})
+            .then(res=>{
+              if( res.code===200){
+                let rows  = res.data.rows;
+                let dwStrList = rows[1]['dwStrList'];
+                let mxPfList = rows[0]['mxPfList'];
+                let mc  =[];
+                let seriesList = [];
+                for(let i in mxPfList.valueOf()){
+                  mc.push(Reflect.ownKeys(mxPfList[i])[0]);
+                  seriesList.push({
+                    name: Reflect.ownKeys(mxPfList[i])[0],
+                    type: 'line',
+                    stack: 'Total',
+                    data:mxPfList[i][Reflect.ownKeys(mxPfList[i])[0]]
+                  })
+                }
+                let myChart = this.$echarts.init(this.$refs.charts);
+                let option = {
+                  tooltip: {
+                    trigger: 'axis'
+                  },
+                  legend: {data:mc},
+                  grid: {
+                    left: '3%',
+                    right: '4%',
+                    bottom: '3%',
+                    containLabel: true
+                  },
+                  xAxis: {
+                    type: 'category',
+                    boundaryGap: false,
+                    data: dwStrList,
+                    axisLabel: {
+                      interval:0,
+                      rotate:10
+                    }
+                  },
+                  yAxis: {
+                    type: 'value'
+                  },
+                  series: seriesList
+                };
+                myChart.setOption(option)
+
+              }
+
+            })
+        }
       },
       handleSizeChange(val) {
         this.limit = val;

src/views/mxgl/mxclydy/ywgxlfx.vue

@@ -84,7 +84,7 @@
 
 <script>
   import rightContent from "@c/ptCxForm_components.vue";
-  import { pageTbYwWjpjckxq,queryJdswjpj } from "@/api/fzjc.js";
+  import { pageTbYwWjpjckxq,queryJdswjpj,wjpjDwfxdb } from "@/api/fzjc.js";
   export default {
     name: "queryHbyp",
     components: {
@@ -292,79 +292,107 @@
         let kssj,jssj,xxzjbhList;
         if(this.value1){kssj=this.value1[0];jssj=this.value1[1];}
         if(this.selectedId.length){xxzjbhList = this.selectedId.toString()}
-        queryJdswjpj({
-          pflx:this.cxFormData.pflx,
-          fxFlag:fxFlag,kssj,jssj,xxzjbhList})
-          .then(res=>{
-            if( res.code===200){
-              let rows  = res.data.rows;
-              let jdPjf = [];
-              let mxmc = [];
-              rows.find((v)=>{
-                jdPjf.push(v['jdPjf']);
-                mxmc.push(v['mxmc'])
-              })
-              let myChart = this.$echarts.init(this.$refs.charts);
-              let option = {
-                tooltip: {
-                  trigger: 'axis'
-                },
-                legend: {
-                  data: ['Email', 'Union Ads', 'Video Ads', 'Direct', 'Search Engine']
-                },
-                grid: {
-                  left: '3%',
-                  right: '4%',
-                  bottom: '3%',
-                  containLabel: true
-                },
-                xAxis: {
-                  type: 'category',
-                  boundaryGap: false,
-                  data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
-                },
-                yAxis: {
-                  type: 'value'
-                },
-                series: [
-                  {
-                    name: 'Email',
+        if(fxFlag==1){
+          queryJdswjpj({
+            pflx:1,
+            kssj,jssj,xxzjbhList})
+            .then(res=>{
+              if( res.code===200){
+                let rows  = res.data.rows;
+                let jqtRq = rows[0]['jqtRq'];
+                let mxPjf = rows[1]['mxPjf'][0];
+                let mc  =[];
+                let seriesList = []
+                for(let i in mxPjf.valueOf()){
+                  mc.push(i)
+                  seriesList.push({
+                    name: i,
                     type: 'line',
                     stack: 'Total',
-                    data: [120, 132, 101, 134, 90, 230, 210]
+                    data:mxPjf[i]
+                  })
+                }
+                let myChart = this.$echarts.init(this.$refs.charts);
+                let option = {
+                  tooltip: {
+                    trigger: 'axis'
                   },
-                  {
-                    name: 'Union Ads',
-                    type: 'line',
-                    stack: 'Total',
-                    data: [220, 182, 191, 234, 290, 330, 310]
+                  legend: {
+                    data:mc
                   },
-                  {
-                    name: 'Video Ads',
-                    type: 'line',
-                    stack: 'Total',
-                    data: [150, 232, 201, 154, 190, 330, 410]
+                  grid: {
+                    left: '3%',
+                    right: '4%',
+                    bottom: '3%',
+                    containLabel: true
                   },
-                  {
-                    name: 'Direct',
-                    type: 'line',
-                    stack: 'Total',
-                    data: [320, 332, 301, 334, 390, 330, 320]
+                  xAxis: {
+                    type: 'category',
+                    boundaryGap: false,
+                    data: jqtRq
                   },
-                  {
-                    name: 'Search Engine',
+                  yAxis: {
+                    type: 'value'
+                  },
+                  series: seriesList
+                };
+                myChart.setOption(option)
+
+              }
+
+            })
+        } else {
+          wjpjDwfxdb({
+            pflx:1,
+            kssj,jssj,xxzjbhList})
+            .then(res=>{
+              if( res.code===200){
+                let rows  = res.data.rows;
+                let dwStrList = rows[1]['dwStrList'];
+                let mxPfList = rows[0]['mxPfList'];
+                let mc  =[];
+                let seriesList = [];
+                for(let i in mxPfList.valueOf()){
+                  mc.push(Reflect.ownKeys(mxPfList[i])[0]);
+                  seriesList.push({
+                    name: Reflect.ownKeys(mxPfList[i])[0],
                     type: 'line',
                     stack: 'Total',
-                    data: [820, 932, 901, 934, 1290, 1330, 1320]
-                  }
-                ]
-              };
-              myChart.setOption(option)
-
-            }
+                    data:mxPfList[i][Reflect.ownKeys(mxPfList[i])[0]]
+                  })
+                }
+                let myChart = this.$echarts.init(this.$refs.charts);
+                let option = {
+                  tooltip: {
+                    trigger: 'axis'
+                  },
+                  legend: {data:mc},
+                  grid: {
+                    left: '3%',
+                    right: '4%',
+                    bottom: '3%',
+                    containLabel: true
+                  },
+                  xAxis: {
+                    type: 'category',
+                    boundaryGap: false,
+                    data: dwStrList,
+                    axisLabel: {
+                      interval:0,
+                      rotate:10
+                    }
+                  },
+                  yAxis: {
+                    type: 'value'
+                  },
+                  series: seriesList
+                };
+                myChart.setOption(option)
 
-          })
+              }
 
+            })
+        }
       },
       handleSizeChange(val) {
         this.limit = val;

src/views/rlqbxsxx/adjustRlqbxs.vue

@@ -421,10 +421,15 @@ export default {
           zjhm: item[0]
         }).then((res) => {
           if (res.success && res.code == 200) {
-            this.$message.success("提取成功");
+            if(res.data.rows == []) {
+              this.$message.success("未发现相关信息");
+            } else {
+              this.$message.success("提取成功");
+            }
             var result = res.data.rows;
             debugger;
             console.log(result);
+            
             self.formField.forEach((i, iIndex) => {
               console.log(i);
               if (i.data && i.data.length > 0) {

src/views/xshb/queryXshb/queryXshb.vue

@@ -1126,7 +1126,7 @@ export default {
         } else if (val.xslx == "3") {
           var self = this;
           self.xg = "";
-          self.cxUrl = "/xshb/getXsList";
+          self.cxUrl = "/zdxsxx/selectZdyrxx";
           var arreyTj = [
             {
               name: "线索类型",

src/views/zdxx/bbkwpxx/queryBbkwpxx.vue

@@ -8,6 +8,7 @@
       :cxQueryField="cxQueryField"
       :cxDefaultFormThead="cxDefaultFormThead"
       :cxUrl="cxUrl"
+      @toInfor='toInfor'
     >
       <template #btnGroup="scope">
         <span class="hbyp" @click="edit(scope.scope)">修改</span>

src/views/zdxx/zdcyryxx/addZdcyryxx.vue

 <template>
   <div>
     <form-compontent
+      :pageBs="pageBs"
       :formField="propFormField"
       :formLabelAligns="formLabelAlign"
       @ajtq="ajtq"
@@ -12,11 +13,7 @@
     >
     </form-compontent>
 
-    <el-dialog
-      title="发送信息"
-      :visible.sync="dialogVisiableM"
-      width="43%"
-    >
+    <el-dialog title="发送信息" :visible.sync="dialogVisiableM" width="43%">
       <el-table
         element-loading-text="拼命加载中"
         ref="itemDataTable"
@@ -82,7 +79,7 @@
         </el-table-column>
       </el-table>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="searchDialogVisiable = false">关闭</el-button>
+        <el-button @click="dialogVisiableM = false">关闭</el-button>
       </span>
     </el-dialog>
   </div>
@@ -106,12 +103,13 @@ export default {
   data() {
     return {
       title: "新增阵地从业人员信息",
+      pageBs: "addzdcyryxx",
       propFormField: [
         //基本信息
         {
           title: "",
           id: 1,
-          objStr: "",
+          objStr: "zdry",
           index: 0,
           data: [
             {
@@ -133,11 +131,10 @@ export default {
               col: "2",
             },
             {
-              name: "联系电话:",
-              id: "lxdh",
-              type: "text",
+              name: "出生日期:",
+              id: "csrq",
+              type: "dates",
               value: "",
-              prop: "checkEmpty",
               placeholder: "请输入",
               col: "2",
             },
@@ -162,6 +159,14 @@ export default {
               col: "2",
             },
             {
+              name: "户籍地名称:",
+              id: "hjdmc",
+              type: "text",
+              value: "",
+              placeholder: "请输入",
+              col: "2",
+            },
+            {
               name: "现住址:",
               id: "xzzdm",
               type: "codeTree",
@@ -180,33 +185,26 @@ export default {
               col: "2",
             },
             {
-              name: "特殊身份:",
-              id: "tssf",
+              name: "婚姻:",
+              id: "hyzkdm",
               type: "codeTree",
-              codeTree: "CODE_SF",
-              codeOptions: [],
               value: "",
+              codeTree: "CODE_HYZK",
+              codeOptions: [],
               placeholder: "请输入",
               col: "2",
               prop: "checkEmpty",
             },
             {
-              name: "出生地:",
-              id: "csdXzqhdm",
+              name: "涉及行业:",
+              id: "hyhfdm",
               type: "codeTree",
               value: "",
-              codeTree: "CODE_XZQH",
+              codeTree: "CODE_HYLB",
               codeOptions: [],
               placeholder: "请输入",
               col: "2",
-            },
-            {
-              name: "出生地名称:",
-              id: "csdDzmc",
-              type: "text",
-              value: "",
-              placeholder: "请输入",
-              col: "2",
+              prop: "checkEmpty",
             },
             {
               name: "学历:",
@@ -218,34 +216,57 @@ export default {
               placeholder: "请输入",
               col: "2",
               prop: "checkEmpty",
-            },
-            {
-              name: "婚姻:",
-              id: "hyzkdm",
-              type: "codeTree",
-              value: "",
-              codeTree: "CODE_HYZK",
-              codeOptions: [],
-              placeholder: "请输入",
-              col: "2",
               prop: "checkEmpty",
             },
             {
-              name: "出生日期:",
-              id: "csrq",
+              name: "入职时间:",
+              id: "cysj",
               type: "dates",
               value: "",
               placeholder: "请输入",
               col: "2",
+              prop: "checkEmpty",
             },
             {
-              name: "从业时间:",
-              id: "cysj",
-              type: "dates",
+              name: "司龄:",
+              id: "rysl",
+              type: "text",
               value: "",
               placeholder: "请输入",
               col: "2",
+              prop: "checkEmpty",
             },
+
+            // {
+            //   name: "特殊身份:",
+            //   id: "tssf",
+            //   type: "codeTree",
+            //   codeTree: "CODE_SF",
+            //   codeOptions: [],
+            //   value: "",
+            //   placeholder: "请输入",
+            //   col: "2",
+            //   prop: "checkEmpty",
+            // },
+            // {
+            //   name: "出生地:",
+            //   id: "csdXzqhdm",
+            //   type: "codeTree",
+            //   value: "",
+            //   codeTree: "CODE_XZQH",
+            //   codeOptions: [],
+            //   placeholder: "请输入",
+            //   col: "2",
+            // },
+            // {
+            //   name: "出生地名称:",
+            //   id: "csdDzmc",
+            //   type: "text",
+            //   value: "",
+            //   placeholder: "请输入",
+            //   col: "2",
+            // },
+
             // {
             //   name: "是否换岗:",
             //   id: "sfhgPdbz",
@@ -258,16 +279,106 @@ export default {
             //     { name: "否", value: "0" },
             //   ],
             // },
+            // {
+            //   name: "是否换岗:",
+            //   id: "sfhgPdbz",
+            //   type: "codeTree",
+            //   codeTree: "CODE_IF",
+            //   codeOptions: [],
+            //   value: "0",
+            //   placeholder: "请输入",
+            //   col: "2",
+            //   prop: "checkEmpty",
+            // },
+          ],
+        },
+        {
+          title: "从业经历",
+          id: 2,
+          objStr: "",
+          index: 1,
+          data: [
             {
-              name: "是否换岗:",
-              id: "sfhgPdbz",
-              type: "codeTree",
-              codeTree: "CODE_IF",
-              codeOptions: [],
-              value: "0",
-              placeholder: "请输入",
-              col: "2",
-              prop: "checkEmpty",
+              name: "从业经历:",
+              col: "1",
+              childrenAsAdd: [
+                {
+                  name: "从业经历:",
+                  id: "ryjl",
+                  flag: false,
+                  list: [
+                    {
+                      name: [
+                        {
+                          name: "单位名称:",
+                          id: "dwmc",
+                          type: "text",
+                          value: "",
+                          placeholder: "请输入",
+                          col: "2",
+                          prop: "checkEmpty",
+                        },
+                        {
+                          name: "单位地址:",
+                          id: "dwdz",
+                          type: "text",
+                          value: "",
+                          placeholder: "请输入",
+                          col: "2",
+                        },
+                        {
+                          name: "涉及行业:",
+                          id: "sjhydm",
+                          type: "codeTree",
+                          codeTree: "CODE_HYLB",
+                          codeOptions: [],
+                          value: "",
+                          placeholder: "请输入",
+                          col: "2",
+                          prop: "checkEmpty",
+                        },
+                        {
+                          name: "从业开始时间:",
+                          id: "cykssj",
+                          type: "dates",
+                          value: "",
+                          placeholder: "请输入",
+                          col: "2",
+                          prop: "checkEmpty",
+                        },
+                        {
+                          name: "从业结束时间:",
+                          id: "cyjssj",
+                          type: "dates",
+                          value: "",
+                          placeholder: "请输入",
+                          col: "2",
+                          prop: "checkEmpty",
+                        },
+                        {
+                          name: "人员司龄:",
+                          id: "rysl",
+                          type: "text",
+                          value: "",
+                          placeholder: "请输入",
+                          col: "2",
+                          prop: "checkEmpty",
+                        },
+                        {
+                          name: "工作内容描述:",
+                          id: "gznrms",
+                          type: "textarea",
+                          value: "",
+                          placeholder: "请输入",
+                          col: "18",
+                          prop: "checkEmpty",
+                        },
+                      ],
+                    },
+                  ],
+                  iconClass: "el-icon-close",
+                },
+              ],
             },
           ],
         },
@@ -311,20 +422,20 @@ export default {
       messageGet: {
         cxDefaultFormThead: [
           {
-          label: "阵地规模",
-          prop: "zdgm",
+            label: "阵地规模",
+            prop: "zdgm",
           },
           {
-          label: "分线程度",
-          prop: "fxcd",
+            label: "分线程度",
+            prop: "fxcd",
           },
           {
-          label: "阵地名称",
-          prop: "zdmc",
+            label: "阵地名称",
+            prop: "zdmc",
           },
           {
-          label: "阵地联系电话",
-          prop: "zdlxdh",
+            label: "阵地联系电话",
+            prop: "zdlxdh",
           },
         ],
       },
@@ -346,7 +457,7 @@ export default {
       }
     },
     addSubmit(params, loading) {
-      params.append("glzdxxzjbh", this.glxxzjbh);
+      params.append("zdry.glzdxxzjbh", this.glxxzjbh);
       insertZdcyryxx(params).then((res) => {
         if (res.success && res.code == 200) {
           this.$alert("保存成功!", "提示", {
@@ -404,54 +515,62 @@ export default {
       return "";
     },
     ajtq(item) {
-      debugger
+      debugger;
       let self = this;
-      var params = new FormData()
-      params.append('zjhm',item)
-        getZdryTqByZjhm(params).then((res) => {
+      var params = new FormData();
+      params.append("zjhm", item);
+      getZdryTqByZjhm(params).then((res) => {
+        if (res.code == "200" && res.success == true) {
           var result = res.data.rows;
-        self.propFormField.forEach((i, iIndex) => {
-          if (i.data && i.data.length > 0) {
-            i.data.forEach((j, jIndex) => {
-              if (j.childrenAsAdd) {
-                j.childrenAsAdd.forEach((m, mIndex) => {
-                  self.$set(self.formLabelAlign, m.id, result[m.id] || []);
-                  if (result[m.id].length > 0) {
-                    //如果集合有值，则让显示
-                    self.$set(
-                      self.propFormField[iIndex].data[jIndex].childrenAsAdd[
-                        mIndex
-                      ],
-                      "flag",
-                      true
-                    );
-                  }
-                });
-              } else {
-                self.$set(
-                  self.formLabelAlign,
-                  j.id,
-                  i.objStr ? result[i.objStr][j.id] : result[j.id]
-                );
-              }
-            });
+          if (res.data && res.data.rows && res.data.rows == []) {
+            this.$message.success("未发现相关信息");
+          } else {
+            this.$message.success("提取成功");
           }
-        });
-        self.$forceUpdate();
-        })
-      // }
+          self.propFormField.forEach((i, iIndex) => {
+            if (i.data && i.data.length > 0) {
+              i.data.forEach((j, jIndex) => {
+                if (j.childrenAsAdd) {
+                  j.childrenAsAdd.forEach((m, mIndex) => {
+                    self.$set(self.formLabelAlign, m.id, result[m.id] || []);
+                    if (result[m.id].length > 0) {
+                      //如果集合有值，则让显示
+                      self.$set(
+                        self.propFormField[iIndex].data[jIndex].childrenAsAdd[
+                          mIndex
+                        ],
+                        "flag",
+                        true
+                      );
+                    }
+                  });
+                } else {
+                  self.$set(
+                    self.formLabelAlign,
+                    j.id,
+                    i.objStr ? result[i.objStr][j.id] : result[j.id]
+                  );
+                }
+              });
+            }
+          });
+          self.$forceUpdate();
+        }else {
+          this.$message.error("未发现相关信息");
+        }
+      });
     },
     queryDatasMain(item) {
       console.log(item);
-      var params = new FormData()
-      params.append('zjhm',item[0])
-      params.append('page','1')
-      params.append('limit','10')
+      var params = new FormData();
+      params.append("zjhm", item[0]);
+      params.append("page", "1");
+      params.append("limit", "10");
       getryxxtsByZjhm(params).then((res) => {
         console.log(res.data.rows);
-        this.propQueryMain = [ ...res.data.rows ]
+        this.propQueryMain = [...res.data.rows];
         console.log(this.propQueryMain);
-      })
+      });
     },
     showDatasMain(item) {
       console.log(item);

src/views/zdxx/zdcyryxx/detailZdcyryxx.vue

@@ -32,8 +32,8 @@ export default {
       cxQueryField: [
         {
           title: "阵地从业人员", //如果不分小模块就删除title
-          id: 2,
-          objStr: "", //对象中的对应字段
+          id: 1,
+          objStr: "zdry", //对象中的对应字段
           data: [
             {
               label: "姓名:",
@@ -46,8 +46,8 @@ export default {
               col: "3",
             },
             {
-              label: "联系电话:",
-              prop: "lxdh",
+              label: "出生日期:",
+              prop: "csrq",
               col: "3",
             },
             {
@@ -61,6 +61,11 @@ export default {
               col: "3",
             },
             {
+              label: "户籍地名称:",
+              prop: "hjdmc",
+              col: "3",
+            },
+            {
               label: "现住址:",
               prop: "xzzdmStr",
               col: "3",
@@ -71,45 +76,73 @@ export default {
               col: "3",
             },
             {
-              label: "特殊身份:",
-              prop: "tssfStr",
+              label: "婚姻:",
+              prop: "hyzkdm",
               col: "3",
             },
             {
-              label: "出生地:",
-              prop: "csdXzqhdmStr",
+              label: "涉及行业:",
+              prop: "hyhfdmStr",
               col: "3",
             },
             {
-              label: "出生地名称:",
-              prop: "csdDzmc",
+              label: "学历:",
+              prop: "xldmStr",
               col: "3",
             },
             {
-              label: "学历:",
-              prop: "xldmStr",
+              label: "入职时间:",
+              prop: "cysj",
               col: "3",
             },
             {
-              label: "婚姻:",
-              prop: "hyzkdmStr",
+              label: "司龄:",
+              prop: "rysl",
+              col: "3",
+            },
+          ],
+        },
+        {
+          title: "从业经历", //如果不分小模块就删除title
+          id: 2,
+          objStr: "ryjl", //对象中的对应字段
+          applyType: "list",
+          data: [
+            {
+              label: "单位名称:",
+              prop: "dwmc",
               col: "3",
             },
             {
-              label: "出生日期:",
-              prop: "csrq",
+              label: "单位地址:",
+              prop: "dwdz",
               col: "3",
             },
             {
-              label: "从业时间:",
-              prop: "cysj",
+              label: "涉及行业:",
+              prop: "sjhydmStr",
               col: "3",
             },
             {
-              label: "是否换岗:",
-              prop: "sfhgPdbzStr",
+              label: "从业开始时间:",
+              prop: "cykssj",
               col: "3",
             },
+            {
+              label: "从业结束时间:",
+              prop: "cyjssj",
+              col: "3",
+            },
+            {
+              label: "人员司龄:",
+              prop: "rysl",
+              col: "3",
+            },
+            {
+              label: "工作内容描述:",
+              prop: "gznrms",
+              col: "10",
+            },
           ],
         },
       ],

src/views/zdxx/zdjyhd/addZdjyhd.vue

 <template>
   <div>
     <form-compontent
+      :pageBs="pageBs"
       :formField="propFormField"
       :formLabelAligns="formLabelAlign"
       @submit="submit"
@@ -382,6 +383,7 @@ export default {
   data() {
     return {
       title: "新增阵地交易活动",
+      pageBs: "addzdjyhd",
       propFormField: [
         //基本信息
         {
@@ -452,6 +454,7 @@ export default {
               codeOptions: [],
               value: "",
               placeholder: "请输入",
+              prop: 'checkEmpty',
               col: "2",
             },
             {
@@ -461,6 +464,7 @@ export default {
               value: "",
               placeholder: "请输入",
               col: "2",
+              prop: 'checkEmpty',
             },
             {
               name: "交易简要情况:",
@@ -469,13 +473,14 @@ export default {
               value: "",
               placeholder: "请输入",
               col: "18",
+              prop: 'checkEmpty',
             },
           ],
         },
         {
           title: "阵地交易活动相关人员",
           id: 1,
-          objStr: "xgry",
+          objStr: "",
           index: 1,
           data: [
             {
@@ -700,14 +705,16 @@ export default {
                           type: "text",
                           value: "",
                           placeholder: "请输入",
-                          col: "2",
+                          col: "3",
                         },
                         {
-                          name: "交易物品:",
+                          name: "图片:",
                           id: "zpflwsfj",
                           type: "file",
                           value: "",
                           placeholder: "请输入",
+                          requestUrl: "/flwsFj/tbstasjflwsCj/save",
+                          acceptType: "image/jpeg,image/gif,image/png",
                           col: "2",
                         },
                       ],
@@ -750,14 +757,16 @@ export default {
                           type: "text",
                           value: "",
                           placeholder: "请输入",
-                          col: "2",
+                          col: "3",
                         },
                         {
-                          name: "交易物品:",
+                          name: "视频:",
                           id: "spflwsfj",
                           type: "file",
                           value: "",
                           placeholder: "请输入",
+                          requestUrl: "/flwsFj/tbstasjflwsCj/save",
+                          acceptType: "video/mp4,video/flv,video/avi,video/wmv",
                           col: "2",
                         },
                       ],
@@ -814,7 +823,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.xxzjbh,
+          glzdxxzjbh: this.glzdxxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -847,7 +856,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.xxzjbh,
+          glzdxxzjbh: this.glzdxxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -884,7 +893,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.xxzjbh,
+          glzdxxzjbh: this.glzdxxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -925,7 +934,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.xxzjbh,
+          glzdxxzjbh: this.glzdxxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -966,7 +975,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.xxzjbh,
+          glzdxxzjbh: this.glzdxxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -1007,7 +1016,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.xxzjbh,
+          glzdxxzjbh: this.glzdxxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -1044,7 +1053,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.xxzjbh,
+          glzdxxzjbh: this.glzdxxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -1081,7 +1090,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.xxzjbh,
+          glzdxxzjbh: this.glzdxxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -1122,7 +1131,7 @@ export default {
         cxFormData: {
           limit: 10,
           page: 1,
-          glzdxxzjbh: this.xxzjbh,
+          glzdxxzjbh: this.glzdxxzjbh,
         },
         cxDefaultFormThead: [
           {
@@ -1334,7 +1343,11 @@ export default {
           zjhm: item[0]
         }).then((res) => {
           if (res.success && res.code == 200) {
-            this.$message.success("提取成功");
+            if(res.data.rows == []) {
+              this.$message.success("未发现相关信息");
+            } else {
+              this.$message.success("提取成功");
+            }
             var result = res.data.rows;
             debugger;
             console.log(result);
@@ -2022,8 +2035,19 @@ export default {
   },
   created() {
     this.$store.commit("user/SET_Breadcrumb", this.Menu);
+    console.log(this.$route.query);
     if (this.$route.query.glzdxxzjbh) {
       this.glzdxxzjbh = this.$route.query.glzdxxzjbh;
+      this.ssdy.cxFormData.glzdxxzjbh = this.glzdxxzjbh
+      this.ssfjdc.cxFormData.glzdxxzjbh = this.glzdxxzjbh
+      this.ssjdc.cxFormData.glzdxxzjbh = this.glzdxxzjbh
+      this.sskl.cxFormData.glzdxxzjbh = this.glzdxxzjbh
+      this.ssqtwp.cxFormData.glzdxxzjbh = this.glzdxxzjbh
+      this.ssqz.cxFormData.glzdxxzjbh = this.glzdxxzjbh
+      this.ssww.cxFormData.glzdxxzjbh = this.glzdxxzjbh
+      this.ssydtxsb.cxFormData.glzdxxzjbh = this.glzdxxzjbh
+      this.sszj.cxFormData.glzdxxzjbh = this.glzdxxzjbh
+      console.log(this.glzdxxzjbh);
     }
     if (this.$route.query.xxzjbh) {
       // this.$set(this.propFormField[0], "title", "修改阵地交易活动信息");

src/views/zdxx/zdjyhd/detailZdjyhd.vue

@@ -8,28 +8,377 @@
 -->
 <template>
   <div class="Content" id="hmxsDetail">
-    <right-content
-      :cxQueryField="cxQueryField"
+    <right-content-detail
+      :cxQueryField="cxQueryFieldDetail"
       :pageObject="pageObject"
       labelWidth="140px"
       title="阵地交易活动详情"
     >
-    </right-content>
+    </right-content-detail>
+
+    <el-card
+      class="box-card"
+      style="margin-bottom: 70px; margin: -50px auto 50px;width: 1200px"
+      v-if="!!this.xxzjbh && this.xxzjbh != ''"
+    >
+      <div slot="header" class="clearfix">
+        <span>物品</span>
+        <el-button
+          style="float: right; padding: 3px 0"
+          type="text"
+          v-show="!showBK"
+          @click="showBK = true"
+          >展开</el-button
+        >
+        <el-button
+          style="float: right; padding: 3px 0"
+          type="text"
+          v-show="showBK"
+          @click="showBK = false"
+          >收起</el-button
+        >
+      </div>
+      <div class="text item" v-show="showBK">
+        <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+          <el-tab-pane label="弹药" name="first">
+            <right-content
+              :pageBs="ssdy.pageBs"
+              :cxFormData="ssdy.cxFormData"
+              :cxQueryField="cxQueryField"
+              :cxDefaultFormThead="ssdy.cxDefaultFormThead"
+              :cxUrl="ssdy.cxUrl"
+              ref="rightContentSSWP"
+              @toInfor="toInforSswp"
+              @showDialogA="showDialogA"
+            >
+              <template #listOperation="scope">
+                <span class="hbyps" @click="addSswp(scope.scope)">
+                  <i class="el-icon-plus"></i>新增</span
+                >
+              </template>
+              <template #btnGroup="scope">
+                <span class="hbyp" @click="editSswp(scope.scope)">修改</span>
+                <span class="hbyp" @click="deleSswp(scope.scope)">删除</span>
+                <span class="hbyp" @click="giveInstructions(scope.scope)"
+                  >下达指令</span
+                >
+              </template>
+            </right-content>
+          </el-tab-pane>
+          <el-tab-pane label="非机动车" name="second">
+            <right-content
+              :pageBs="ssfjdc.pageBs"
+              :cxFormData="ssfjdc.cxFormData"
+              :cxQueryField="cxQueryField"
+              :cxDefaultFormThead="ssfjdc.cxDefaultFormThead"
+              :cxUrl="ssfjdc.cxUrl"
+              ref="rightContentSSWP"
+              @toInfor="toInforSswp"
+              @showDialogA="showDialogA"
+            >
+              <template #listOperation="scope">
+                <span class="hbyps" @click="addSswp(scope.scope)">
+                  <i class="el-icon-plus"></i>新增</span
+                >
+              </template>
+              <template #btnGroup="scope">
+                <span class="hbyp" @click="editSswp(scope.scope)">修改</span>
+                <span class="hbyp" @click="deleSswp(scope.scope)">删除</span>
+                <span class="hbyp" @click="giveInstructions(scope.scope)"
+                  >下达指令</span
+                >
+              </template>
+            </right-content>
+          </el-tab-pane>
+          <el-tab-pane label="机动车" name="third">
+            <right-content
+              :pageBs="ssjdc.pageBs"
+              :cxFormData="ssjdc.cxFormData"
+              :cxQueryField="cxQueryField"
+              :cxDefaultFormThead="ssjdc.cxDefaultFormThead"
+              :cxUrl="ssjdc.cxUrl"
+              ref="rightContentSSWP"
+              @toInfor="toInforSswp"
+              @showDialogA="showDialogA"
+            >
+              <template #listOperation="scope">
+                <span class="hbyps" @click="addSswp(scope.scope)">
+                  <i class="el-icon-plus"></i>新增</span
+                >
+              </template>
+              <template #btnGroup="scope">
+                <span class="hbyp" @click="editSswp(scope.scope)">修改</span>
+                <span class="hbyp" @click="deleSswp(scope.scope)">删除</span>
+                <span class="hbyp" @click="giveInstructions(scope.scope)"
+                  >下达指令</span
+                >
+              </template>
+            </right-content>
+          </el-tab-pane>
+          <el-tab-pane label="卡类" name="fourth">
+            <right-content
+              :pageBs="sskl.pageBs"
+              :cxFormData="sskl.cxFormData"
+              :cxQueryField="cxQueryField"
+              :cxDefaultFormThead="sskl.cxDefaultFormThead"
+              :cxUrl="sskl.cxUrl"
+              ref="rightContentSSWP"
+              @toInfor="toInforSswp"
+              @showDialogA="showDialogA"
+            >
+              <template #listOperation="scope">
+                <span class="hbyps" @click="addSswp(scope.scope)">
+                  <i class="el-icon-plus"></i>新增</span
+                >
+              </template>
+              <template #btnGroup="scope">
+                <span class="hbyp" @click="editSswp(scope.scope)">修改</span>
+                <span class="hbyp" @click="deleSswp(scope.scope)">删除</span>
+                <span class="hbyp" @click="giveInstructions(scope.scope)"
+                  >下达指令</span
+                >
+              </template>
+            </right-content>
+          </el-tab-pane>
+          <el-tab-pane label="其他物品" name="fifth">
+            <right-content
+              :pageBs="ssqtwp.pageBs"
+              :cxFormData="ssqtwp.cxFormData"
+              :cxQueryField="cxQueryField"
+              :cxDefaultFormThead="ssqtwp.cxDefaultFormThead"
+              :cxUrl="ssqtwp.cxUrl"
+              ref="rightContentSSWP"
+              @toInfor="toInforSswp"
+              @showDialogA="showDialogA"
+            >
+              <template #listOperation="scope">
+                <span class="hbyps" @click="addSswp(scope.scope)">
+                  <i class="el-icon-plus"></i>新增</span
+                >
+              </template>
+              <template #btnGroup="scope">
+                <span class="hbyp" @click="editSswp(scope.scope)">修改</span>
+                <span class="hbyp" @click="deleSswp(scope.scope)">删除</span>
+                <span class="hbyp" @click="giveInstructions(scope.scope)"
+                  >下达指令</span
+                >
+              </template>
+            </right-content>
+          </el-tab-pane>
+          <el-tab-pane label="枪支" name="sixth">
+            <right-content
+              :pageBs="ssqz.pageBs"
+              :cxFormData="ssqz.cxFormData"
+              :cxQueryField="cxQueryField"
+              :cxDefaultFormThead="ssqz.cxDefaultFormThead"
+              :cxUrl="ssqz.cxUrl"
+              ref="rightContentSSWP"
+              @toInfor="toInforSswp"
+              @showDialogA="showDialogA"
+            >
+              <template #listOperation="scope">
+                <span class="hbyps" @click="addSswp(scope.scope)">
+                  <i class="el-icon-plus"></i>新增</span
+                >
+              </template>
+              <template #btnGroup="scope">
+                <span class="hbyp" @click="editSswp(scope.scope)">修改</span>
+                <span class="hbyp" @click="deleSswp(scope.scope)">删除</span>
+                <span class="hbyp" @click="giveInstructions(scope.scope)"
+                  >下达指令</span
+                >
+              </template>
+            </right-content>
+          </el-tab-pane>
+          <el-tab-pane label="文物" name="seventh">
+            <right-content
+              :pageBs="ssww.pageBs"
+              :cxFormData="ssww.cxFormData"
+              :cxQueryField="cxQueryField"
+              :cxDefaultFormThead="ssww.cxDefaultFormThead"
+              :cxUrl="ssww.cxUrl"
+              ref="rightContentSSWP"
+              @toInfor="toInforSswp"
+              @showDialogA="showDialogA"
+            >
+              <template #listOperation="scope">
+                <span class="hbyps" @click="addSswp(scope.scope)">
+                  <i class="el-icon-plus"></i>新增</span
+                >
+              </template>
+              <template #btnGroup="scope">
+                <span class="hbyp" @click="editSswp(scope.scope)">修改</span>
+                <span class="hbyp" @click="deleSswp(scope.scope)">删除</span>
+                <span class="hbyp" @click="giveInstructions(scope.scope)"
+                  >下达指令</span
+                >
+              </template>
+            </right-content>
+          </el-tab-pane>
+          <el-tab-pane label="移动通讯设备" name="eighth">
+            <right-content
+              :pageBs="ssydtxsb.pageBs"
+              :cxFormData="ssydtxsb.cxFormData"
+              :cxQueryField="cxQueryField"
+              :cxDefaultFormThead="ssydtxsb.cxDefaultFormThead"
+              :cxUrl="ssydtxsb.cxUrl"
+              ref="rightContentSSWP"
+              @toInfor="toInforSswp"
+              @showDialogA="showDialogA"
+            >
+              <template #listOperation="scope">
+                <span class="hbyps" @click="addSswp(scope.scope)">
+                  <i class="el-icon-plus"></i>新增</span
+                >
+              </template>
+              <template #btnGroup="scope">
+                <span class="hbyp" @click="editSswp(scope.scope)">修改</span>
+                <span class="hbyp" @click="deleSswp(scope.scope)">删除</span>
+                <span class="hbyp" @click="giveInstructions(scope.scope)"
+                  >下达指令</span
+                >
+              </template>
+            </right-content>
+          </el-tab-pane>
+          <el-tab-pane label="证件" name="ninth">
+            <right-content
+              :pageBs="sszj.pageBs"
+              :cxFormData="sszj.cxFormData"
+              :cxQueryField="cxQueryField"
+              :cxDefaultFormThead="sszj.cxDefaultFormThead"
+              :cxUrl="sszj.cxUrl"
+              ref="rightContentSSWP"
+              @toInfor="toInforSswp"
+              @showDialogA="showDialogA"
+            >
+              <template #listOperation="scope">
+                <span class="hbyps" @click="addSswp(scope.scope)">
+                  <i class="el-icon-plus"></i>新增</span
+                >
+              </template>
+              <template #btnGroup="scope">
+                <span class="hbyp" @click="editSswp(scope.scope)">修改</span>
+                <span class="hbyp" @click="deleSswp(scope.scope)">删除</span>
+                <span class="hbyp" @click="giveInstructions(scope.scope)"
+                  >下达指令</span
+                >
+              </template>
+            </right-content>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </el-card>
+
+    <el-dialog
+      title="发送信息"
+      :visible.sync="dialogVisiableM"
+      width="43%"
+    >
+      <el-table
+        element-loading-text="拼命加载中"
+        ref="itemDataTable"
+        :data="propQuery"
+        tooltip-effect="dark"
+        max-height="600"
+        style="margin: 0 auto"
+        width="100%"
+        size="small"
+      >
+        <el-table-column
+          align="center"
+          v-for="(columnTitle, index) in messageGet.cxDefaultFormThead"
+          :key="index"
+          :label="columnTitle.label"
+          width="200"
+          :prop="columnTitle.prop"
+        >
+          <template slot-scope="scope">
+            <div v-if="columnTitle.prop == 'jyaq'">
+              <div class="ajxq_s">
+                <span class="none" v-html="scope.row[columnTitle.prop]"></span
+                ><a
+                  href="javascript:void(0);"
+                  onclick='javascript:this.parentNode.style.display="none";this.parentNode.nextSibling.style.display="block"'
+                  style="
+                    display: inline-block;
+                    width: 100%;
+                    text-align: right;
+                    color: #3692c6;
+                    font-weight: 600;
+                  "
+                  id="open"
+                  v-show="
+                    scope.row[columnTitle.prop] != '' &&
+                    scope.row[columnTitle.prop] != null
+                  "
+                  >展开</a
+                >
+              </div>
+              <div class="ajxq_n" style="display: none">
+                <span
+                  style="display: block"
+                  v-html="scope.row[columnTitle.prop]"
+                ></span
+                ><a
+                  href="javascript:void(0);"
+                  onclick='javascript:this.parentNode.style.display="none";this.parentNode.previousSibling.style.display="block"'
+                  style="float: right; color: #3692c6; font-weight: 600"
+                  id="stop"
+                  v-show="
+                    scope.row[columnTitle.prop] != '' &&
+                    scope.row[columnTitle.prop] != null
+                  "
+                  >收起</a
+                >
+              </div>
+            </div>
+            <div v-else>
+              {{ scope.row[columnTitle.prop] }}
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisiableM = false">关闭</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import rightContent from "@c/PersonInfor.vue";
+import rightContentDetail from "@c/PersonInfor.vue";
+import rightContent from "@c/ptCxForm_components.vue";
 import { infoZdjyhd } from "@/api/zdxx/zdjyhd.js";
 import { get, post, postform, postJson } from "@/utils/http.js";
+import {
+  deleteSsdyxx,
+  getSnajByssdy,
+  deleteFjdcxx,
+  getSnajByfjdc,
+  deleteJdcxx,
+  getSajByjdc,
+  deleteSsklxx,
+  getSajByKlxx,
+  deleteSsqtwpxx,
+  getSajBySsqtwp,
+  deleteSsqzxx,
+  getSajBySsqz,
+  deleteSswwxx,
+  getSajBySsww,
+  deleteSsydtxxx,
+  getSajBySsydtx,
+  deleteSszjxx,
+  getSajBySszjxx,
+} from "@/api/zdxx/zdsswp.js";
 export default {
   name: "queryAj",
   components: {
     rightContent,
+    rightContentDetail,
   },
   data() {
     return {
-      cxQueryField: [
+      cxQueryFieldDetail: [
         {
           title: "阵地交易活动", //如果不分小模块就删除title
           id: 1,
@@ -164,6 +513,426 @@ export default {
 
       pageObject: {},
       xxzjbh: "",
+      glzdxxzjbh: "",
+      //损失物品相关
+      activeName: "first",
+      tabIndex: "0",
+      showBK: false,
+      cxQueryField: [],
+      ssdy: {
+        pageBs: "queryZdssdy",
+        cxFormData: {
+          limit: 10,
+          page: 1,
+          glzdxxzjbh: this.glzdxxzjbh,
+        },
+        cxDefaultFormThead: [
+          {
+            label: "弹药类型",
+            prop: "ssdyDylxdmStr",
+            toInfor: true,
+          },
+          {
+            label: "特征描述",
+            prop: "ssdyWptzms",
+          },
+          {
+            label: "弹药数量",
+            prop: "ssdyWpsl",
+          },
+          {
+            label: "关联线索",
+            prop: "sfzdwp",
+            isShowDialog: true,
+          },
+          {
+            label: "是否损失物品",
+            prop: "sfzdwp",
+          },
+        ],
+        cxUrl: "/ssdyxx/selectSsdywp",
+      },
+      ssfjdc: {
+        pageBs: "queryZdssfjdc",
+        cxFormData: {
+          limit: 10,
+          page: 1,
+          glzdxxzjbh: this.glzdxxzjbh,
+        },
+        cxDefaultFormThead: [
+          {
+            label: "物品名称",
+            prop: "ssddfjdcPpxh",
+            toInfor: true,
+          },
+          {
+            label: "品牌型号",
+            prop: "ssddfjdcSawpdmStr",
+          },
+          {
+            label: "车牌照号",
+            prop: "ssddfjdcDdfjdcpzhWpbzh",
+          },
+          {
+            label: "物品价值（元）",
+            prop: "ssddfjdcWpjzrmby",
+          },
+          {
+            label: "关联线索",
+            prop: "sfzdwp",
+            isShowDialog: true,
+          },
+          {
+            label: "是否损失物品",
+            prop: "sfzdwp",
+          },
+        ],
+        cxUrl: "/ssfjdcxx/selectFjdcwp",
+      },
+      ssjdc: {
+        pageBs: "queryZdssjdc",
+        cxFormData: {
+          limit: 10,
+          page: 1,
+          glzdxxzjbh: this.glzdxxzjbh,
+        },
+        cxDefaultFormThead: [
+          {
+            label: "物品类型",
+            prop: "ssjdcSawpdmStr",
+            toInfor: true,
+          },
+          {
+            label: "品牌类型",
+            prop: "ssjdcPpxh",
+          },
+          {
+            label: "使用性质",
+            prop: "ssjdcJdcsyxzdmStr",
+          },
+          {
+            label: "号牌是否为真",
+            prop: "ssjdcJdchphmzwPdbz",
+          },
+          {
+            label: "车辆识别号",
+            prop: "ssjdcClsbdh",
+          },
+          {
+            label: "关联线索",
+            prop: "sfzdwp",
+            isShowDialog: true,
+          },
+          {
+            label: "是否损失物品",
+            prop: "sfzdwp",
+          },
+        ],
+        cxUrl: "/ssjdcxx/selectJdcwp",
+      },
+      sskl: {
+        pageBs: "queryZdsskl",
+        cxFormData: {
+          limit: 10,
+          page: 1,
+          glzdxxzjbh: this.glzdxxzjbh,
+        },
+        cxDefaultFormThead: [
+          {
+            label: "物品类型",
+            prop: "ssklSawpSawpdmStr",
+            toInfor: true,
+          },
+          {
+            label: "卡号",
+            prop: "ssklKhWpbzh",
+          },
+          {
+            label: "所有人名称",
+            prop: "ssklKsyrmc",
+          },
+          {
+            label: "发卡单位名称",
+            prop: "ssklFkdwDwmc",
+          },
+          {
+            label: "核发日期",
+            prop: "ssklHfrq",
+          },
+          {
+            label: "关联线索",
+            prop: "sfzdwp",
+            isShowDialog: true,
+          },
+          {
+            label: "是否损失物品",
+            prop: "sfzdwp",
+          },
+        ],
+        cxUrl: "/ssklwpxx/selectSsklxx",
+      },
+      ssqtwp: {
+        pageBs: "queryZdssqtwp",
+        cxFormData: {
+          limit: 10,
+          page: 1,
+          glzdxxzjbh: this.glzdxxzjbh,
+        },
+        cxDefaultFormThead: [
+          {
+            label: "物品类型",
+            prop: "sswpSawpSawpdmStr",
+            toInfor: true,
+          },
+          {
+            label: "物品名称",
+            prop: "sswpWpmc",
+          },
+          {
+            label: "物品规格",
+            prop: "sswpWpgg",
+          },
+          {
+            label: "物品标识号",
+            prop: "sswpWpbzhWpbzhlbdm",
+          },
+          {
+            label: "物品价值（元）",
+            prop: "sswpWpjzrmby",
+          },
+          {
+            label: "关联线索",
+            prop: "sfzdwp",
+            isShowDialog: true,
+          },
+          {
+            label: "是否损失物品",
+            prop: "sfzdwp",
+          },
+        ],
+        cxUrl: "/ssqtwpxx/selectSsqtwpxx",
+      },
+      ssqz: {
+        pageBs: "queryZdssqz",
+        cxFormData: {
+          limit: 10,
+          page: 1,
+          glzdxxzjbh: this.glzdxxzjbh,
+        },
+        cxDefaultFormThead: [
+          {
+            label: "枪支类型",
+            prop: "ssqzQzlxdmStr",
+            toInfor: true,
+          },
+          {
+            label: "特征描述",
+            prop: "ssqzWptzms",
+          },
+          {
+            label: "物品数量",
+            prop: "ssqzWpsl",
+          },
+          {
+            label: "物品标识号",
+            prop: "ssqzQhWpbzh",
+          },
+          {
+            label: "关联线索",
+            prop: "sfzdwp",
+            isShowDialog: true,
+          },
+          {
+            label: "是否损失物品",
+            prop: "sfzdwp",
+          },
+        ],
+        cxUrl: "/ssqzwpxx/selectSsqzxx",
+      },
+      ssww: {
+        pageBs: "queryZdssww",
+        cxFormData: {
+          limit: 10,
+          page: 1,
+          glzdxxzjbh: this.glzdxxzjbh,
+        },
+        cxDefaultFormThead: [
+          {
+            label: "物品名称",
+            prop: "sswwWpmc",
+            toInfor: true,
+          },
+          {
+            label: "特征描述",
+            prop: "sswwWptzms",
+          },
+          {
+            label: "文物等级描述",
+            prop: "sswwWwdjms",
+          },
+          {
+            label: "文物价值",
+            prop: "sswwWpjzrmby",
+          },
+          {
+            label: "关联线索",
+            prop: "sfzdwp",
+            isShowDialog: true,
+          },
+          {
+            label: "是否损失物品",
+            prop: "sfzdwp",
+          },
+        ],
+        cxUrl: "/sswwjtxx/selectSswwxx",
+      },
+      ssydtxsb: {
+        pageBs: "queryZdssydtxsb",
+        cxFormData: {
+          limit: 10,
+          page: 1,
+          glzdxxzjbh: this.glzdxxzjbh,
+        },
+        cxDefaultFormThead: [
+          {
+            label: "品牌型号",
+            prop: "ssydtxsbPpxh",
+            toInfor: true,
+          },
+          {
+            label: "移动电话",
+            prop: "ssydtxsbYddh",
+          },
+          {
+            label: "IMEI(设备码)",
+            prop: "ssydtxsbImeiWpbzh",
+          },
+          {
+            label: "物品价值",
+            prop: "ssydtxsbWpjzrmby",
+          },
+          {
+            label: "特征描述",
+            prop: "ssydtxsbWptzms",
+          },
+          {
+            label: "关联线索",
+            prop: "sfzdwp",
+            isShowDialog: true,
+          },
+          {
+            label: "是否损失物品",
+            prop: "sfzdwp",
+          },
+        ],
+        cxUrl: "/ssydtxxx/selectSsydtxxx",
+      },
+      sszj: {
+        pageBs: "queryZdsszj",
+        cxFormData: {
+          limit: 10,
+          page: 1,
+          glzdxxzjbh: this.glzdxxzjbh,
+        },
+        cxDefaultFormThead: [
+          {
+            label: "证件类型",
+            prop: "sszjCyzjCyzjdmStr",
+            toInfor: true,
+          },
+          {
+            label: "证件号码",
+            prop: "sszjCyzjZjhm",
+          },
+          {
+            label: "证件所有人名称",
+            prop: "sszjZjsyrmc",
+          },
+          {
+            label: "核发日期",
+            prop: "sszjHfrq",
+          },
+          {
+            label: "发证单位",
+            prop: "sszjFzdwDwmc",
+          },
+          {
+            label: "关联线索",
+            prop: "sfzdwp",
+            isShowDialog: true,
+          },
+          {
+            label: "是否损失物品",
+            prop: "sfzdwp",
+          },
+        ],
+        cxUrl: "/sszjjtxx/selectSszjxx",
+      },
+      dialogA: false,
+      pagesize: 5,
+      tableDataALength: "",
+      pageShowA: false,
+      currentPage1A: 1,
+      tableDataA: [],
+      bshglajA: {
+        pageBs: "adjustZdxxgl",
+        cxFormData: {
+          page: 1,
+          limit: 5,
+        },
+        cxQueryField: [],
+        cxDefaultFormThead: [
+          {
+            label: "案事件编号",
+            prop: "asjbh",
+            toInforDa: true,
+          },
+          {
+            label: "案件名称",
+            prop: "ajmc",
+          },
+          {
+            label: "案件类别",
+            prop: "ajlbdm",
+          },
+          {
+            label: "立案日期",
+            prop: "larq",
+          },
+          {
+            label: "立案单位",
+            prop: "ladwGajgmc",
+          },
+          {
+            label: "简要案情",
+            prop: "jyaq",
+          },
+        ],
+        cxUrl: "/rlqb/getAjListByS",
+      },
+      //消息推送
+      propQuery: [],
+      dialogVisiableM: false,
+      messageGet: {
+        cxDefaultFormThead: [
+          {
+          label: "阵地规模",
+          prop: "zdgm",
+          },
+          {
+          label: "分线程度",
+          prop: "fxcd",
+          },
+          {
+          label: "阵地名称",
+          prop: "zdmc",
+          },
+          {
+          label: "阵地联系电话",
+          prop: "zdlxdh",
+          },
+        ],
+      },
     };
   },
   mounted() {},
@@ -182,12 +951,682 @@ export default {
         }
       });
     },
+    //损失物品方法
+    handleClick(tab, event) {
+      // console.log(tab, event);
+      this.tabIndex = tab.index;
+    },
+    addSswp() {
+      if (this.tabIndex == "0") {
+        // this.$router.pushToTab("addZdssdy");
+        this.$router.pushToTab({
+          path: "/addZdssdy",
+          query: {
+            glzdxxzjbh: this.glzdxxzjbh,
+            gljyhdxxzjbh: this.xxzjbh,
+          },
+        });
+      } else if (this.tabIndex == "1") {
+        // this.$router.pushToTab("addZdssfjdc");
+        this.$router.pushToTab({
+          path: "/addZdssfjdc",
+          query: {
+            glzdxxzjbh: this.glzdxxzjbh,
+            gljyhdxxzjbh: this.xxzjbh,
+          },
+        });
+      } else if (this.tabIndex == "2") {
+        // this.$router.pushToTab("addZdssjdc");
+        this.$router.pushToTab({
+          path: "/addZdssjdc",
+          query: {
+            glzdxxzjbh: this.glzdxxzjbh,
+            gljyhdxxzjbh: this.xxzjbh,
+          },
+        });
+      } else if (this.tabIndex == "3") {
+        // this.$router.pushToTab("addZdsskl");
+        this.$router.pushToTab({
+          path: "/addZdsskl",
+          query: {
+            glzdxxzjbh: this.glzdxxzjbh,
+            gljyhdxxzjbh: this.xxzjbh,
+          },
+        });
+      } else if (this.tabIndex == "4") {
+        // this.$router.pushToTab("addZdssqtwp");
+        this.$router.pushToTab({
+          path: "/addZdssqtwp",
+          query: {
+            glzdxxzjbh: this.glzdxxzjbh,
+            gljyhdxxzjbh: this.xxzjbh,
+          },
+        });
+      } else if (this.tabIndex == "5") {
+        // this.$router.pushToTab("addZdssqz");
+        this.$router.pushToTab({
+          path: "/addZdssqz",
+          query: {
+            glzdxxzjbh: this.glzdxxzjbh,
+            gljyhdxxzjbh: this.xxzjbh,
+          },
+        });
+      } else if (this.tabIndex == "6") {
+        // this.$router.pushToTab("addZdssww");
+        this.$router.pushToTab({
+          path: "/addZdssww",
+          query: {
+            glzdxxzjbh: this.glzdxxzjbh,
+            gljyhdxxzjbh: this.xxzjbh,
+          },
+        });
+      } else if (this.tabIndex == "7") {
+        // this.$router.pushToTab("addZdssydtxsb");
+        this.$router.pushToTab({
+          path: "/addZdssydtxsb",
+          query: {
+            glzdxxzjbh: this.glzdxxzjbh,
+            gljyhdxxzjbh: this.xxzjbh,
+          },
+        });
+      } else if (this.tabIndex == "8") {
+        // this.$router.pushToTab("addZdsszj");
+        this.$router.pushToTab({
+          path: "/addZdsszj",
+          query: {
+            glzdxxzjbh: this.glzdxxzjbh,
+            gljyhdxxzjbh: this.xxzjbh,
+          },
+        });
+      }
+    },
+    editSswp(scope) {
+      if (this.tabIndex == "0") {
+        // this.$router.pushToTab("addZdssdy");
+        this.$router.pushToTab({
+          path: "/addZdssdy",
+          query: {
+            glzdxxzjbh: this.glzdxxzjbh,
+            xxzjbh: scope.row.xxzjbh,
+          },
+        });
+      } else if (this.tabIndex == "1") {
+        // this.$router.pushToTab("addZdssfjdc");
+        this.$router.pushToTab({
+          path: "/addZdssfjdc",
+          query: {
+            glzdxxzjbh: this.glzdxxzjbh,
+            xxzjbh: scope.row.xxzjbh,
+          },
+        });
+      } else if (this.tabIndex == "2") {
+        // this.$router.pushToTab("addZdssjdc");
+        this.$router.pushToTab({
+          path: "/addZdssjdc",
+          query: {
+            glzdxxzjbh: this.glzdxxzjbh,
+            xxzjbh: scope.row.xxzjbh,
+          },
+        });
+      } else if (this.tabIndex == "3") {
+        // this.$router.pushToTab("addZdsskl");
+        this.$router.pushToTab({
+          path: "/addZdsskl",
+          query: {
+            glzdxxzjbh: this.glzdxxzjbh,
+            xxzjbh: scope.row.xxzjbh,
+          },
+        });
+      } else if (this.tabIndex == "4") {
+        // this.$router.pushToTab("addZdssqtwp");
+        this.$router.pushToTab({
+          path: "/addZdssqtwp",
+          query: {
+            glzdxxzjbh: this.glzdxxzjbh,
+            xxzjbh: scope.row.xxzjbh,
+          },
+        });
+      } else if (this.tabIndex == "5") {
+        // this.$router.pushToTab("addZdssqz");
+        this.$router.pushToTab({
+          path: "/addZdssqz",
+          query: {
+            glzdxxzjbh: this.glzdxxzjbh,
+            xxzjbh: scope.row.xxzjbh,
+          },
+        });
+      } else if (this.tabIndex == "6") {
+        // this.$router.pushToTab("addZdssww");
+        this.$router.pushToTab({
+          path: "/addZdssww",
+          query: {
+            glzdxxzjbh: this.glzdxxzjbh,
+            xxzjbh: scope.row.xxzjbh,
+          },
+        });
+      } else if (this.tabIndex == "7") {
+        // this.$router.pushToTab("addZdssydtxsb");
+        this.$router.pushToTab({
+          path: "/addZdssydtxsb",
+          query: {
+            glzdxxzjbh: this.glzdxxzjbh,
+            xxzjbh: scope.row.xxzjbh,
+          },
+        });
+      } else if (this.tabIndex == "8") {
+        // this.$router.pushToTab("addZdsszj");
+        this.$router.pushToTab({
+          path: "/addZdsszj",
+          query: {
+            glzdxxzjbh: this.glzdxxzjbh,
+            xxzjbh: scope.row.xxzjbh,
+          },
+        });
+      }
+    },
+    deleSswp(scope) {
+      if (this.tabIndex == "0") {
+        // debugger;
+        this.$confirm("此操作将永久删除该用户, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            // debugger;
+            deleteSsdyxx({
+              xxzjbh: scope.row.xxzjbh,
+            }).then((res) => {
+              if (res.success && res.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功",
+                });
+                location.reload();
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            });
+          });
+      } else if (this.tabIndex == "1") {
+        // this.$router.pushToTab({
+        //   path: "addZdssfjdc",
+        //   query: { xxzjbh: scope.row.xxzjbh },
+        // });
+        this.$confirm("此操作将永久删除该用户, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            deleteFjdcxx({
+              xxzjbh: scope.row.xxzjbh,
+            }).then((res) => {
+              if (res.success && res.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功",
+                });
+                location.reload();
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            });
+          });
+      } else if (this.tabIndex == "2") {
+        // this.$router.pushToTab({
+        //   path: "addZdssjdc",
+        //   query: { xxzjbh: scope.row.xxzjbh },
+        // });
+        this.$confirm("此操作将永久删除该用户, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            deleteJdcxx({
+              xxzjbh: scope.row.xxzjbh,
+            }).then((res) => {
+              if (res.success && res.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功",
+                });
+                location.reload();
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            });
+          });
+      } else if (this.tabIndex == "3") {
+        // this.$router.pushToTab({
+        //   path: "addZdsskl",
+        //   query: { xxzjbh: scope.row.xxzjbh },
+        // });
+        this.$confirm("此操作将永久删除该用户, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            deleteSsklxx({
+              xxzjbh: scope.row.xxzjbh,
+            }).then((res) => {
+              if (res.success && res.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功",
+                });
+                location.reload();
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            });
+          });
+      } else if (this.tabIndex == "4") {
+        // this.$router.pushToTab({
+        //   path: "addZdssqtwp",
+        //   query: { xxzjbh: scope.row.xxzjbh },
+        // });
+        this.$confirm("此操作将永久删除该用户, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            deleteSsqtwpxx({
+              xxzjbh: scope.row.xxzjbh,
+            }).then((res) => {
+              if (res.success && res.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功",
+                });
+                location.reload();
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            });
+          });
+      } else if (this.tabIndex == "5") {
+        // this.$router.pushToTab({
+        //   path: "addZdssqz",
+        //   query: { xxzjbh: scope.row.xxzjbh },
+        // });
+        this.$confirm("此操作将永久删除该用户, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            deleteSsqzxx({
+              xxzjbh: scope.row.xxzjbh,
+            }).then((res) => {
+              if (res.success && res.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功",
+                });
+                location.reload();
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            });
+          });
+      } else if (this.tabIndex == "6") {
+        // this.$router.pushToTab({
+        //   path: "addZdssww",
+        //   query: { xxzjbh: scope.row.xxzjbh },
+        // });
+        this.$confirm("此操作将永久删除该用户, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            deleteSswwxx({
+              xxzjbh: scope.row.xxzjbh,
+            }).then((res) => {
+              if (res.success && res.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功",
+                });
+                location.reload();
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            });
+          });
+      } else if (this.tabIndex == "7") {
+        // this.$router.pushToTab({
+        //   path: "addZdssydtxsb",
+        //   query: { xxzjbh: scope.row.xxzjbh },
+        // });
+        this.$confirm("此操作将永久删除该用户, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            deleteSsydtxxx({
+              xxzjbh: scope.row.xxzjbh,
+            }).then((res) => {
+              if (res.success && res.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功",
+                });
+                location.reload();
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            });
+          });
+      } else if (this.tabIndex == "8") {
+        // this.$router.pushToTab({
+        //   path: "addZdsszj",
+        //   query: { xxzjbh: scope.row.xxzjbh },
+        // });
+        this.$confirm("此操作将永久删除该用户, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            deleteSszjxx({
+              xxzjbh: scope.row.xxzjbh,
+            }).then((res) => {
+              if (res.success && res.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功",
+                });
+                location.reload();
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            });
+          });
+      }
+    },
+    toInforSswp(scope) {
+      if (this.tabIndex == "0") {
+        this.$router.pushToTab({
+          path: "/detailZdssdy",
+          query: {
+            xxzjbh: scope.xxzjbh,
+          },
+        });
+      } else if (this.tabIndex == "1") {
+        this.$router.pushToTab({
+          path: "/detailZdssfjdc",
+          query: {
+            xxzjbh: scope.xxzjbh,
+          },
+        });
+      } else if (this.tabIndex == "2") {
+        this.$router.pushToTab({
+          path: "/detailZdssjdc",
+          query: {
+            xxzjbh: scope.xxzjbh,
+          },
+        });
+      } else if (this.tabIndex == "3") {
+        this.$router.pushToTab({
+          path: "/detailZdsskl",
+          query: {
+            xxzjbh: scope.xxzjbh,
+          },
+        });
+      } else if (this.tabIndex == "4") {
+        this.$router.pushToTab({
+          path: "/detailZdssqtwp",
+          query: {
+            xxzjbh: scope.xxzjbh,
+          },
+        });
+      } else if (this.tabIndex == "5") {
+        this.$router.pushToTab({
+          path: "/detailZdssqz",
+          query: {
+            xxzjbh: scope.xxzjbh,
+          },
+        });
+      } else if (this.tabIndex == "6") {
+        this.$router.pushToTab({
+          path: "/detailZdssww",
+          query: {
+            xxzjbh: scope.xxzjbh,
+          },
+        });
+      } else if (this.tabIndex == "7") {
+        this.$router.pushToTab({
+          path: "/detailZdssydtxsb",
+          query: {
+            xxzjbh: scope.xxzjbh,
+          },
+        });
+      } else if (this.tabIndex == "8") {
+        this.$router.pushToTab({
+          path: "/detailZdsszj",
+          query: {
+            xxzjbh: scope.xxzjbh,
+          },
+        });
+      }
+    },
+    showDialogA(scope) {
+      // debugger;
+      var params = new FormData();
+      params.append("page", 1);
+      params.append("limit", 10);
+      console.log(scope.row);
+      if (this.tabIndex == "0") {
+        params.append("ssdyDylxdm", scope.row.ssdyDylxdm);
+        params.append("ssdyDyxhdm", scope.row.ssdyDyxhdm);
+        getSnajByssdy(params).then((res) => {
+          if (res.success && res.code == 200) {
+            this.tableDataA = [...res.data.rows];
+            this.tableDataALength = res.data.total;
+            if (this.tableDataALength >= 5) {
+              this.pageShowA = true;
+            } else {
+              this.pageShowA = false;
+            }
+          }
+        });
+      } else if (this.tabIndex == "1") {
+        params.append(
+          "ssddfjdcDdfjdcpzhWpbzh",
+          scope.row.ssddfjdcDdfjdcpzhWpbzh
+        );
+        getSnajByfjdc(params).then((res) => {
+          if (res.success && res.code == 200) {
+            this.tableDataA = [...res.data.rows];
+            this.tableDataALength = res.data.total;
+            if (this.tableDataALength >= 5) {
+              this.pageShowA = true;
+            } else {
+              this.pageShowA = false;
+            }
+          }
+        });
+      } else if (this.tabIndex == "2") {
+        params.append("ssjdcJdchphm", scope.row.ssjdcJdchphm);
+        getSajByjdc(params).then((res) => {
+          if (res.success && res.code == 200) {
+            this.tableDataA = [...res.data.rows];
+            this.tableDataALength = res.data.total;
+            if (this.tableDataALength >= 5) {
+              this.pageShowA = true;
+            } else {
+              this.pageShowA = false;
+            }
+          }
+        });
+      } else if (this.tabIndex == "3") {
+        params.append("ssklKhWpbzh", scope.row.ssklKhWpbzh);
+        getSajByKlxx(params).then((res) => {
+          if (res.success && res.code == 200) {
+            this.tableDataA = [...res.data.rows];
+            this.tableDataALength = res.data.total;
+            if (this.tableDataALength >= 5) {
+              this.pageShowA = true;
+            } else {
+              this.pageShowA = false;
+            }
+          }
+        });
+      } else if (this.tabIndex == "4") {
+        params.append("sswpPpxh", scope.row.sswpPpxh);
+        getSajBySsqtwp(params).then((res) => {
+          if (res.success && res.code == 200) {
+            this.tableDataA = [...res.data.rows];
+            this.tableDataALength = res.data.total;
+            if (this.tableDataALength >= 5) {
+              this.pageShowA = true;
+            } else {
+              this.pageShowA = false;
+            }
+          }
+        });
+      } else if (this.tabIndex == "5") {
+        params.append("ssqzQzlxdm", scope.row.ssqzQzlxdm);
+        params.append("ssqzQzxhdm", scope.row.ssqzQzxhdm);
+        params.append("ssqzQzkj", scope.row.ssqzQzkj);
+        getSajBySsqz(params).then((res) => {
+          if (res.success && res.code == 200) {
+            this.tableDataA = [...res.data.rows];
+            this.tableDataALength = res.data.total;
+            if (this.tableDataALength >= 5) {
+              this.pageShowA = true;
+            } else {
+              this.pageShowA = false;
+            }
+          }
+        });
+      } else if (this.tabIndex == "6") {
+        params.append("sswwWpmc", scope.row.sswwWpmc);
+        getSajBySsww(params).then((res) => {
+          if (res.success && res.code == 200) {
+            this.tableDataA = [...res.data.rows];
+            this.tableDataALength = res.data.total;
+            if (this.tableDataALength >= 5) {
+              this.pageShowA = true;
+            } else {
+              this.pageShowA = false;
+            }
+          }
+        });
+      } else if (this.tabIndex == "7") {
+        params.append("ssydtxsbIccidWpbzh", scope.row.ssydtxsbIccidWpbzh);
+        params.append("ssydtxsbImeiWpbzh", scope.row.ssydtxsbImeiWpbzh);
+        params.append("ssydtxsbImsiFwbzh", scope.row.ssydtxsbImsiFwbzh);
+        getSajBySsydtx(params).then((res) => {
+          if (res.success && res.code == 200) {
+            // debugger;
+            this.tableDataA = [...res.data.rows];
+            this.tableDataALength = res.data.total;
+            // debugger;
+
+            if (this.tableDataALength >= 5) {
+              this.pageShowA = true;
+            } else {
+              this.pageShowA = false;
+            }
+          }
+        });
+      } else if (this.tabIndex == "8") {
+        params.append("sszjCyzjZjhm", scope.row.sszjCyzjZjhm);
+        params.append("sszjCyzjCyzjdm", scope.row.sszjCyzjCyzjdm);
+        getSajBySszjxx(params).then((res) => {
+          if (res.success && res.code == 200) {
+            this.tableDataA = [...res.data.rows];
+            this.tableDataALength = res.data.total;
+            if (this.tableDataALength >= 5) {
+              this.pageShowA = true;
+            } else {
+              this.pageShowA = false;
+            }
+          }
+        });
+      }
+      this.dialogA = true;
+    },
   },
   created() {
     this.xxzjbh = this.$route.query.xxzjbh;
+    this.glzdxxzjbh = this.$route.query.glzdxxzjbh;
     this.getInfor();
   },
 };
 </script>
 <style scoped lang="scss">
+@import "@/assets/styles/rightContent.scss";
+.box-card {
+   width: 1150px !important;
+  margin: 0 auto;
+  margin-top: -50px;
+}
+.hbyp {
+  font-size: 14px;
+  font-family: Source Han Sans CN;
+  font-weight: 400;
+  line-height: 22px;
+  color: #007aff;
+  margin-right: 16px;
+  cursor: pointer;
+}
+.hbyps {
+  width: 64px;
+  height: 24px;
+  background: #ffffff;
+  border: 1px solid #007aff;
+  opacity: 1;
+  border-radius: 4px;
+  text-align: center;
+  align-items: center;
+  display: inline-block;
+  font-size: 12px !important;
+  font-weight: 400 !important;
+  color: #007aff !important;
+  cursor: pointer;
+}
 </style>

src/views/zdxx/zdxsxx/adjustZdxsxx.vue

 <template>
   <div>
     <form-compontent
+      :pageBs="pageBs"
       :formField="formField"
       :formLabelAligns="formLabelAlign"
       @submit="submit"
@@ -22,6 +23,7 @@ export default {
   data() {
     return {
       title: "新增阵地线索信息",
+      pageBs: 'adjustZdxsxx',
       formField: [
         //基本信息
         {

src/views/zdxx/zdxsxx/zdxsxxDetail.vue

@@ -36,196 +36,158 @@ export default {
           objStr: "tbXwZdxsxx",
           data: [
             {
-              label: "线索简要情况:",
-              prop: "jyqk",
-              col: "10",
-            },
-            {
-              label: "涉及地区:",
-              prop: "sjdqStr",
-              col: "3",
-            },
-            {
-              label: "提供人姓名:",
-              prop: "tgxsrXm",
-              col: "3",
-            },
-            {
-              label: "提供人身份证:",
-              prop: "tgxsrSfzhm",
-              col: "3",
-            },
-            {
-              label: "提供人性别:",
-              prop: "tgxsrXbStr",
+              label: "情报线索名称:",
+              prop: "qbxsmc",
               col: "3",
             },
             {
-              label: "提供人电话:",
-              prop: "tgxsrLxdh",
-              col: "3",
-            },
-            {
-              label: "提供人工作地:",
-              prop: "tgxsrGzdwmc",
-              col: "3",
-            },
-            {
-              label: "提供人民族:",
-              prop: "tgxsrMzdmStr",
-              col: "3",
-            },
-            {
-              label: "提供人国籍:",
-              prop: "tgxsrGjdmStr",
-              col: "3",
-            },
-            {
-              label: "提供人户籍:",
-              prop: "tgxsrHjdzXzqhdmStr",
-              col: "3",
-            },
-            {
-              label: "提供人现住址:",
-              prop: "tgxsrXzzXzqhdmStr",
-              col: "3",
+              label: "情报线索内容:",
+              prop: "qbxsnr",
+              col: "10",
             },
             {
-              label: "提供人地址:",
-              prop: "tgxsrXzzDzmc",
-              col: "3",
+              label: "线索类型:",
+              prop: "zdxsrlqbxs",
+              col: "10",
             },
-            // {
-            //   label: "阵地主键编号:",
-            //   prop: "zdxxzjbh",
-            //   col: "3",
-            // },
           ],
         },
         {
-          title: "可疑枪支",
+          title: "提供者信息",
           id: 2,
-          objStr: "tbXwFxkyqzs",
+          objStr: "tgz",
           applyType: "list",
           data: [
             {
-              label: "枪支口径:",
-              prop: "kyqzQzkj",
+              label: "姓名:",
+              prop: "xm",
               col: "3",
             },
             {
-              label: "物品标识号:",
-              prop: "kyqzQhWpbzh",
+              label: "证件号码:",
+              prop: "zjhm",
               col: "3",
             },
             {
-              label: "枪支是否完整:",
-              prop: "kyqzQzsfwzPdbzStr",
+              label: "联系电话:",
+              prop: "lxdh",
               col: "3",
             },
             {
-              label: "简要情况:",
-              prop: "kyqzQzsfwzJyqk",
+              label: "国籍:",
+              prop: "gjdmStr",
               col: "10",
             },
             {
-              label: "物品特征描述:",
-              prop: "kyqzWptzms",
-              col: "3",
-            },
-            {
-              label: "物品来源描述:",
-              prop: "kyqzWplyms",
+              label: "户籍地:",
+              prop: "hjddmStr",
               col: "3",
             },
             {
-              label: "物品去向:",
-              prop: "kyqzWpqxJyqk",
+              label: "现住址:",
+              prop: "xzzdmStr",
               col: "3",
             },
             {
-              label: "藏匿方式:",
-              prop: "kyqzCnfsJyqk",
+              label: "现住址名称:",
+              prop: "xzzmc",
               col: "3",
             },
             {
-              label: "交易方式:",
-              prop: "kyqzJyfsJyqk",
+              label: "出生地:",
+              prop: "csdXzqhdmStr",
               col: "3",
             },
             {
-              label: "交易地点:",
-              prop: "kyqzJyddXzqhdmStr",
+              label: "出生地名称:",
+              prop: "csdDzmc",
               col: "3",
             },
             {
-              label: "详细地址:",
-              prop: "kyqzJyddDzmc",
+              label: "婚姻状况:",
+              prop: "hyzkdmStr",
               col: "3",
             },
             {
-              label: "运输方式:",
-              prop: "kyqzYsfsJyqk",
+              label: "学历:",
+              prop: "xldmStr",
               col: "3",
             },
             {
-              label: "运输路线:",
-              prop: "kyqzYslxJyqk",
+              label: "出生日期:",
+              prop: "csrq",
               col: "3",
             },
           ],
         },
         {
-          title: "可疑设备",
+          title: "可疑人员信息",
           id: 3,
-          objStr: "tbXwFxkydtxsbxsxxes",
+          objStr: "kyry",
           applyType: "list",
           data: [
             {
-              label: "简要情况:",
-              prop: "keyyjJyqk",
-              col: "10",
+              label: "姓名:",
+              prop: "xm",
+              col: "3",
+            },
+            {
+              label: "证件号码:",
+              prop: "zjhm",
+              col: "3",
+            },
+            {
+              label: "联系电话:",
+              prop: "lxdh",
+              col: "3",
+            },
+            {
+              label: "国籍:",
+              prop: "gjdmStr",
+              col: "3",
             },
             {
-              label: "涉案物品编号:",
-              prop: "keyydtxsbSawpbh",
+              label: "户籍地:",
+              prop: "hjddmStr",
               col: "3",
             },
             {
-              label: "警综物品编号:",
-              prop: "keyydtxsbJzwpbh",
+              label: "现住址:",
+              prop: "xzzdmStr",
               col: "3",
             },
             {
-              label: "品牌型号:",
-              prop: "keyydtxsbPpxh",
+              label: "现住址名称:",
+              prop: "xzzmc",
               col: "3",
             },
             {
-              label: "ICCID:",
-              prop: "keyydtxsbIccidWpbzh",
+              label: "出生地:",
+              prop: "csdXzqhdmStr",
               col: "3",
             },
             {
-              label: "IMEI:",
-              prop: "keyydtxsbImeiWpbzh",
+              label: "出生地名称:",
+              prop: "csdDzmc",
               col: "3",
             },
             {
-              label: "移动电话:",
-              prop: "keyydtxsbYddh",
+              label: "婚姻状况:",
+              prop: "hyzkdmStr",
               col: "3",
             },
             {
-              label: "物品特征描述:",
-              prop: "keyydtxsbWptzms",
+              label: "学历:",
+              prop: "xldmStr",
               col: "3",
             },
             {
-              label: "物品价值:",
-              prop: "keyydtxsbWpjzrmby",
+              label: "出生日期:",
+              prop: "csrq",
               col: "3",
             },
+            
+            
           ],
         },
       ],

src/views/zdxx/zdxxgl/adjustZdxxgl.vue

 <template>
   <div>
     <form-compontent
+      :pageBs="pageBs"
       :formField="propFormField"
       :formLabelAligns="formLabelAlign"
       @submit="submit"
@@ -498,6 +499,7 @@ export default {
         limit: 10,
         page: 1,
         glzdxxzjbh: "",
+        sfglry: 0,
       },
       cxFormDataJY: {
         limit: 10,
@@ -573,14 +575,14 @@ export default {
       cxUrlCY: "/zdryxx/selectZdyrxx",
       cxDefaultFormTheadJY: [
         {
-          label: "交易地点",
-          prop: "jyddXzqhdm",
-          toInfor: true,
+          label: "交易地点名称",
+          prop: "jyddXzqhmc",
           width: "220",
+          toInfor: true,
         },
         {
-          label: "交易地点名称",
-          prop: "jyddXzqhmc",
+          label: "交易地点",
+          prop: "jyddXzqhdmStr",
           width: "220",
         },
         {
@@ -591,27 +593,10 @@ export default {
       ],
       cxUrlJY: "/zdjyhdxx/selectZdjyhd",
       cxDefaultFormTheadXS: [
-        // {
-        //   label: "提供人姓名",
-        //   prop: "tgxsrXm",
-        //   toInfor: true,
-        // },
-        // {
-        //   label: "提供人身份证",
-        //   prop: "tgxsrSfzhm",
-        // },
-        // {
-        //   label: "阵地信息主键编号",
-        //   prop: "zdxxzjbh",
-        // },
-        // {
-        //   label: "户籍地址",
-        //   prop: "tgxsrHjdzXzqhdmStr",
-        //   width: "200",
-        // },
         {
           label: "阵地线索名称",
           prop: "qbxsmc",
+          toInfor: true,
         },
         {
           label: "情报线索内容",
@@ -788,7 +773,7 @@ export default {
           this.cxFormDataCY.glzdxxzjbh = this.xxzjbh;
           this.cxFormDataJY.glxxZdxxzjbh = this.xxzjbh;
           this.cxFormDataBK.glxxXxzjbh = this.xxzjbh;
-          this.cxFormDataXS.zdxxzjbh = this.xxzjbh;
+          this.cxFormDataXS.glzdxxzjbh = this.xxzjbh;
           this.$alert("保存成功!", "提示", {
             confirmButtonText: "确定",
             type: "success",
@@ -931,7 +916,7 @@ export default {
       // this.$router.pushToTab("addZdjyhd");
       this.$router.pushToTab({
         path: "addZdjyhd",
-        query: { glxxzjbh: this.xxzjbh },
+        query: { glzdxxzjbh: this.xxzjbh },
       });
     },
     editJY(scope) {
@@ -971,6 +956,7 @@ export default {
         path: "/detailZdcyryxx",
         query: {
           xxzjbh: data.xxzjbh,
+          glzdxxzjbh: this.xxzjbh,
         },
       });
     },
@@ -979,6 +965,7 @@ export default {
         path: "/detailZdjyhd",
         query: {
           xxzjbh: data.xxzjbh,
+          glzdxxzjbh: this.xxzjbh,
         },
       });
     },
@@ -1049,6 +1036,7 @@ export default {
         path: "/adjustZdxsxx",
         query: {
           xxzjbh: data.row.xxzjbh,
+          glzdxxzjbh: this.xxzjbh,
         },
       });
     },
@@ -1087,6 +1075,7 @@ export default {
         path: "/zdxsxxDetail",
         query: {
           xxzjbh: data.xxzjbh,
+          glzdxxzjbh: this.glzdxxzjbh,
         },
       });
     },
@@ -1781,7 +1770,7 @@ export default {
       this.cxFormDataCY.glzdxxzjbh = this.xxzjbh;
       this.cxFormDataJY.glxxZdxxzjbh = this.xxzjbh;
       this.cxFormDataBK.glxxXxzjbh = this.xxzjbh;
-      this.cxFormDataXS.zdxxzjbh = this.xxzjbh;
+      this.cxFormDataXS.glzdxxzjbh = this.xxzjbh;
       // this.ssdy.cxFormData.glzdxxzjbh = this.xxzjbh;
       // this.ssfjdc.cxFormData.glzdxxzjbh = this.xxzjbh;
       // this.ssjdc.cxFormData.glzdxxzjbh = this.xxzjbh;

src/views/zdxx/zdxxgl/detailZdxx.vue

@@ -8,29 +8,423 @@
 -->
 <template>
   <div class="Content" id="hmxsDetail">
-    <right-content
-      :cxQueryField="cxQueryField"
+    <right-content-detail
+      :cxQueryField="cxQueryFieldDetail"
       :pageObject="pageObject"
       :pageFooterProps="pageFooterProps"
       labelWidth="110px"
-      title="阵地交易活动详情"
+      title="阵地信息详情"
     >
-    </right-content>
+    </right-content-detail>
+
+    <el-card
+      class="box-card"
+      style="width:1150px;margin: -50px auto 70px;"
+      v-if="!!this.xxzjbh && this.xxzjbh != ''"
+    >
+      <div slot="header" class="clearfix">
+        <span>阵地从业人员</span>
+        <el-button
+          style="float: right; padding: 3px 0"
+          type="text"
+          v-show="!showCY"
+          @click="showCY = true"
+          >展开</el-button
+        >
+        <el-button
+          style="float: right; padding: 3px 0"
+          type="text"
+          v-show="showCY"
+          @click="showCY = false"
+          >收起</el-button
+        >
+      </div>
+      <div class="text item" v-show="showCY">
+        <right-content
+          :pageBs="pageBs"
+          :cxFormData="cxFormDataCY"
+          :cxQueryField="cxQueryField"
+          :cxDefaultFormThead="cxDefaultFormTheadCY"
+          :cxUrl="cxUrlCY"
+          ref="rightContentCY"
+          @toInfor="toInforCY"
+          @showDialogG="showDialogGCY"
+          @showDialogS="showDialogSCY"
+        >
+          <template #listOperation="scope">
+            <span class="hbyps" @click="addCY(scope.scope)">
+              <i class="el-icon-plus"></i>新增</span
+            >
+          </template>
+          <template #btnGroup="scope">
+            <span class="hbyp" @click="TOBK(scope.scope)">布控</span>
+            <span class="hbyp" @click="editCY(scope.scope)">修改</span>
+            <span class="hbyp" @click="deleCY(scope.scope)">删除</span>
+            <span class="hbyp" @click="giveInstructions(scope.scope)"
+              >下达指令</span
+            >
+          </template>
+        </right-content>
+      </div>
+    </el-card>
+    <!-- 阵地交易活动 -->
+    <el-card
+      class="box-card"
+      style="width:1150px;margin: -50px auto 70px;"
+      v-if="!!this.xxzjbh && this.xxzjbh != ''"
+    >
+      <div slot="header" class="clearfix">
+        <span>阵地交易活动</span>
+        <el-button
+          style="float: right; padding: 3px 0"
+          type="text"
+          v-show="!showJY"
+          @click="showJY = true"
+          >展开</el-button
+        >
+        <el-button
+          style="float: right; padding: 3px 0"
+          type="text"
+          v-show="showJY"
+          @click="showJY = false"
+          >收起</el-button
+        >
+      </div>
+      <div class="text item" v-show="showJY">
+        <right-content
+          :pageBs="pageBs"
+          :cxFormData="cxFormDataJY"
+          :cxQueryField="cxQueryField"
+          :cxDefaultFormThead="cxDefaultFormTheadJY"
+          :cxUrl="cxUrlJY"
+          ref="rightContentJY"
+          @toInfor="toInforJY"
+        >
+          <template #listOperation="scope">
+            <span class="hbyps" @click="addJY(scope.scope)">
+              <i class="el-icon-plus"></i>新增</span
+            >
+          </template>
+          <template #btnGroup="scope">
+            <span class="hbyp" @click="editJY(scope.scope)">修改</span>
+            <span class="hbyp" @click="deleJY(scope.scope)">删除</span>
+          </template>
+        </right-content>
+      </div>
+    </el-card>
+    <!-- 阵地线索信息 -->
+    <el-card
+      class="box-card"
+      style="width:1150px;margin: -50px auto 70px;"
+      v-if="!!this.xxzjbh && this.xxzjbh != ''"
+    >
+      <div slot="header" class="clearfix">
+        <span>阵地线索信息</span>
+        <el-button
+          style="float: right; padding: 3px 0"
+          type="text"
+          v-show="!showXS"
+          @click="showXS = true"
+          >展开</el-button
+        >
+        <el-button
+          style="float: right; padding: 3px 0"
+          type="text"
+          v-show="showXS"
+          @click="showXS = false"
+          >收起</el-button
+        >
+      </div>
+      <div class="text item" v-show="showXS">
+        <right-content
+          :pageBs="pageBs"
+          :cxFormData="cxFormDataXS"
+          :cxQueryField="cxQueryField"
+          :cxDefaultFormThead="cxDefaultFormTheadXS"
+          :cxUrl="cxUrlXS"
+          ref="rightContentXS"
+          @toInfor="toInforXS"
+        >
+          <template #listOperation="scope">
+            <span class="hbyps" @click="addXS(scope.scope)">
+              <i class="el-icon-plus"></i>新增</span
+            >
+          </template>
+          <template #btnGroup="scope">
+            <span class="hbyp" @click="editXS(scope.scope)">修改</span>
+            <span class="hbyp" @click="deleXS(scope.scope)">删除</span>
+            <span class="hbyp" @click="TOHBXS(scope.scope)">线索核办</span>
+          </template>
+        </right-content>
+      </div>
+    </el-card>
+
+    <el-dialog title="关联案件" :visible.sync="dialogA" width="64%">
+      <el-table
+        element-loading-text="拼命加载中"
+        ref="itemDataTable"
+        :data="tableDataA"
+        tooltip-effect="dark"
+        max-height="600"
+        style="margin: 0 auto"
+        width="100%"
+        size="small"
+      >
+        <el-table-column
+          align="center"
+          v-for="(columnTitle, index) in bshglajA.cxDefaultFormThead"
+          :key="index"
+          :label="columnTitle.label"
+          width="200"
+          :prop="columnTitle.prop"
+        >
+          <template slot-scope="scope">
+            <div v-if="columnTitle.prop == 'jyaq'">
+              <div class="ajxq_s">
+                <span class="none" v-html="scope.row[columnTitle.prop]"></span
+                ><a
+                  href="javascript:void(0);"
+                  onclick='javascript:this.parentNode.style.display="none";this.parentNode.nextSibling.style.display="block"'
+                  style="
+                    display: inline-block;
+                    width: 100%;
+                    text-align: right;
+                    color: #3692c6;
+                    font-weight: 600;
+                  "
+                  id="open"
+                  v-show="
+                    scope.row[columnTitle.prop] != '' &&
+                    scope.row[columnTitle.prop] != null
+                  "
+                  >展开</a
+                >
+              </div>
+              <div class="ajxq_n" style="display: none">
+                <span
+                  style="display: block"
+                  v-html="scope.row[columnTitle.prop]"
+                ></span
+                ><a
+                  href="javascript:void(0);"
+                  onclick='javascript:this.parentNode.style.display="none";this.parentNode.previousSibling.style.display="block"'
+                  style="float: right; color: #3692c6; font-weight: 600"
+                  id="stop"
+                  v-show="
+                    scope.row[columnTitle.prop] != '' &&
+                    scope.row[columnTitle.prop] != null
+                  "
+                  >收起</a
+                >
+              </div>
+            </div>
+            <div v-else>
+              {{ scope.row[columnTitle.prop] }}
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        background
+        @current-change="handleCurrentChangeA"
+        :current-page.sync="currentPage1A"
+        :page-size="pagesize"
+        :page-sizes="[10, 20, 50, 100]"
+        layout="sizes,prev, pager, next"
+        :total="tableDataALength"
+        v-if="pageShowA"
+      >
+      </el-pagination>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogA = false">关闭</el-button>
+      </span>
+    </el-dialog>
+
+    <!-- 从业人员关联案件 -->
+    <el-dialog title="关联案件" :visible.sync="dialogS" width="64%">
+      <el-table
+        element-loading-text="拼命加载中"
+        ref="itemDataTable"
+        :data="tableDataS"
+        tooltip-effect="dark"
+        max-height="600"
+        style="margin: 0 auto"
+        width="100%"
+        size="small"
+      >
+        <el-table-column
+          align="center"
+          v-for="(columnTitle, index) in bshglajS.cxDefaultFormThead"
+          :key="index"
+          :label="columnTitle.label"
+          width="200"
+          :prop="columnTitle.prop"
+        >
+          <template slot-scope="scope">
+            <div v-if="columnTitle.prop == 'jyaq'">
+              <div class="ajxq_s">
+                <span class="none" v-html="scope.row[columnTitle.prop]"></span
+                ><a
+                  href="javascript:void(0);"
+                  onclick='javascript:this.parentNode.style.display="none";this.parentNode.nextSibling.style.display="block"'
+                  style="
+                    display: inline-block;
+                    width: 100%;
+                    text-align: right;
+                    color: #3692c6;
+                    font-weight: 600;
+                  "
+                  id="open"
+                  v-show="
+                    scope.row[columnTitle.prop] != '' &&
+                    scope.row[columnTitle.prop] != null
+                  "
+                  >展开</a
+                >
+              </div>
+              <div class="ajxq_n" style="display: none">
+                <span
+                  style="display: block"
+                  v-html="scope.row[columnTitle.prop]"
+                ></span
+                ><a
+                  href="javascript:void(0);"
+                  onclick='javascript:this.parentNode.style.display="none";this.parentNode.previousSibling.style.display="block"'
+                  style="float: right; color: #3692c6; font-weight: 600"
+                  id="stop"
+                  v-show="
+                    scope.row[columnTitle.prop] != '' &&
+                    scope.row[columnTitle.prop] != null
+                  "
+                  >收起</a
+                >
+              </div>
+            </div>
+            <div v-else>
+              {{ scope.row[columnTitle.prop] }}
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        background
+        @current-change="handleCurrentChangeS"
+        :current-page.sync="currentPage1G"
+        :page-size="pagesize"
+        :page-sizes="[10, 20, 50, 100]"
+        layout="sizes,prev, pager, next"
+        :total="tableDataSLength"
+        v-if="pageShowS"
+      >
+      </el-pagination>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogS = false">关闭</el-button>
+      </span>
+    </el-dialog>
+
+    <el-dialog title="关联案件" :visible.sync="dialogG" width="64%">
+      <el-table
+        element-loading-text="拼命加载中"
+        ref="itemDataTable"
+        :data="tableDataG"
+        tooltip-effect="dark"
+        max-height="600"
+        style="margin: 0 auto"
+        width="100%"
+        size="small"
+      >
+        <el-table-column
+          align="center"
+          v-for="(columnTitle, index) in bshglajG.cxDefaultFormThead"
+          :key="index"
+          :label="columnTitle.label"
+          width="200"
+          :prop="columnTitle.prop"
+        >
+          <template slot-scope="scope">
+            <div v-if="columnTitle.prop == 'jyaq'">
+              <div class="ajxq_s">
+                <span class="none" v-html="scope.row[columnTitle.prop]"></span
+                ><a
+                  href="javascript:void(0);"
+                  onclick='javascript:this.parentNode.style.display="none";this.parentNode.nextSibling.style.display="block"'
+                  style="
+                    display: inline-block;
+                    width: 100%;
+                    text-align: right;
+                    color: #3692c6;
+                    font-weight: 600;
+                  "
+                  id="open"
+                  v-show="
+                    scope.row[columnTitle.prop] != '' &&
+                    scope.row[columnTitle.prop] != null
+                  "
+                  >展开</a
+                >
+              </div>
+              <div class="ajxq_n" style="display: none">
+                <span
+                  style="display: block"
+                  v-html="scope.row[columnTitle.prop]"
+                ></span
+                ><a
+                  href="javascript:void(0);"
+                  onclick='javascript:this.parentNode.style.display="none";this.parentNode.previousSibling.style.display="block"'
+                  style="float: right; color: #3692c6; font-weight: 600"
+                  id="stop"
+                  v-show="
+                    scope.row[columnTitle.prop] != '' &&
+                    scope.row[columnTitle.prop] != null
+                  "
+                  >收起</a
+                >
+              </div>
+            </div>
+            <div v-else>
+              {{ scope.row[columnTitle.prop] }}
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        background
+        @current-change="handleCurrentChangeG"
+        :current-page.sync="currentPage1S"
+        :page-size="pagesize"
+        :page-sizes="[10, 20, 50, 100]"
+        layout="sizes,prev, pager, next"
+        :total="tableDataGLength"
+        v-if="pageShowG"
+      >
+      </el-pagination>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogG = false">关闭</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
+
+
 <script>
-import rightContent from "@c/PersonInfor.vue";
+import rightContentDetail from "@c/PersonInfor.vue";
+import rightContent from "@c/ptCxForm_components.vue";
 import { getZdxxByxxzjbh } from "@/api/zdxx/zdxxgl.js";
 import { get, post, postform, postJson } from "@/utils/http.js";
+import { deleteZdcyryxx } from "@/api/zdxx/zdcyryxx.js";
+import { deleteBbkwp } from "@/api/bkwpxx.js";
+import { deleteZdjyhd } from "@/api/zdxx/zdjyhd.js";
+import { deleteZdxsxx } from "@/api/zdxsxx.js";
 export default {
   name: "queryZdxx",
   components: {
     rightContent,
+    rightContentDetail,
   },
   data() {
     return {
-      cxQueryField: [
+      cxQueryFieldDetail: [
         {
           title: "阵地信息",
           id: 1,
@@ -111,11 +505,11 @@ export default {
               prop: "sjsfdqmc",
               col: "3",
             },
-            {
-              label: "行业划分:",
-              prop: "hyhf",
-              col: "3",
-            },
+            // {
+            //   label: "行业划分:",
+            //   prop: "hyhf",
+            //   col: "3",
+            // },
             // {
             //   label: "阵地规模:",
             //   prop: "zdgmStr",
@@ -137,6 +531,7 @@ export default {
           title: "阵地管理人员", //如果不分小模块就删除title
           id: 2,
           objStr: "zdryxxgl", //对象中的对应字段
+          applyType: "list",
           data: [
             {
               label: "姓名:",
@@ -214,10 +609,287 @@ export default {
       pageFooterProps: [],
       pageObject: {},
       xxzjbh: "",
+      //列表展示
+      showCY: false,
+      showJY: false,
+      showBK: false,
+      showXS: false,
+      pageBs: "adjustZdxxgl",
+      cxFormDataCY: {
+        limit: 10,
+        page: 1,
+        glzdxxzjbh: "",
+      },
+      cxFormDataJY: {
+        limit: 10,
+        page: 1,
+        glxxZdxxzjbh: this.xxzjbh,
+      },
+      cxFormDataBK: {
+        limit: 10,
+        page: 1,
+        glxxXxzjbh: this.xxzjbh,
+      },
+      cxFormDataXS: {
+        limit: 10,
+        page: 1,
+        glzdxxzjbh: this.xxzjbh,
+      },
+      cxQueryField: [],
+      cxDefaultFormTheadCY: [
+        {
+          label: "姓名",
+          prop: "xm",
+          toInfor: true,
+          width: "220",
+        },
+        {
+          /*table默认得表头*/
+          label: "阵地编号",
+          prop: "glzdxxzjbh",
+          width: "200",
+        },
+        {
+          /*table默认得表头*/
+          label: "证件号码",
+          prop: "zjhm",
+          width: "200",
+        },
+        {
+          label: "国籍名称",
+          prop: "gjmc",
+          width: "220",
+        },
+        {
+          label: "婚姻",
+          prop: "hyzkdmStr",
+          width: "120",
+        },
+        {
+          label: "学历",
+          prop: "xldmStr",
+          width: "120",
+        },
+        {
+          label: "是否重点人员",
+          prop: "sfzdgzry",
+          width: "120",
+        },
+        {
+          label: "是否布控",
+          prop: "sfbbkry",
+          width: "120",
+        },
+        {
+          label: "是否刑嫌人员",
+          prop: "sfsxxry",
+          width: "120",
+        },
+        {
+          label: "关联案件",
+          prop: "sfyaj",
+          isShowDialog: true,
+        },
+      ],
+      cxUrlCY: "/zdryxx/selectZdyrxx",
+      cxDefaultFormTheadJY: [
+        {
+          label: "交易地点",
+          prop: "jyddXzqhdm",
+          toInfor: true,
+          width: "220",
+        },
+        {
+          label: "交易地点名称",
+          prop: "jyddXzqhmc",
+          width: "220",
+        },
+        {
+          label: "交易简要情况",
+          prop: "jyfsJyqk",
+          width: "220",
+        },
+      ],
+      cxUrlJY: "/zdjyhdxx/selectZdjyhd",
+      cxDefaultFormTheadXS: [
+        // {
+        //   label: "提供人姓名",
+        //   prop: "tgxsrXm",
+        //   toInfor: true,
+        // },
+        // {
+        //   label: "提供人身份证",
+        //   prop: "tgxsrSfzhm",
+        // },
+        // {
+        //   label: "阵地信息主键编号",
+        //   prop: "zdxxzjbh",
+        // },
+        // {
+        //   label: "户籍地址",
+        //   prop: "tgxsrHjdzXzqhdmStr",
+        //   width: "200",
+        // },
+        {
+          label: "阵地线索名称",
+          prop: "qbxsmc",
+        },
+        {
+          label: "情报线索内容",
+          prop: "qbxsnr",
+        },
+        {
+          label: "线索类型",
+          prop: "zdxsrlqbxs",
+        },
+        {
+          label: "关联案件",
+          prop: "sfyaj",
+          isShowDialog: true,
+        },
+      ],
+      cxUrlXS: "/zdxsxx/selectZdyrxx",
+      //tab标签页
+      activeName: "first",
+      tabIndex: "0",
+      //列表数据
+      dialogA: false,
+      pagesize: 5,
+      tableDataALength: "",
+      pageShowA: false,
+      currentPage1A: 1,
+      tableDataA: [],
+      bshglajA: {
+        pageBs: "adjustZdxxgl",
+        cxFormData: {
+          page: 1,
+          limit: 5,
+        },
+        cxQueryField: [],
+        cxDefaultFormThead: [
+          {
+            label: "案事件编号",
+            prop: "asjbh",
+            toInforDa: true,
+          },
+          {
+            label: "案件名称",
+            prop: "ajmc",
+          },
+          {
+            label: "案件类别",
+            prop: "ajlbdm",
+          },
+          {
+            label: "立案日期",
+            prop: "larq",
+          },
+          {
+            label: "立案单位",
+            prop: "ladwGajgmc",
+          },
+          {
+            label: "简要案情",
+            prop: "jyaq",
+          },
+        ],
+        cxUrl: "/rlqb/getAjListByS",
+      },
+      //从业人员关联案件
+      dialogS: false,
+      dialogG: false,
+      bshglajS: {
+        pageBs: "qyeryrlqbxsGl",
+        cxFormData: {
+          page: 1,
+          limit: 5,
+          rlqbxxzjbh: "",
+        },
+        cxQueryField: [],
+        cxDefaultFormThead: [
+          {
+            label: "案事件编号",
+            prop: "asjbh",
+            toInforDa: true,
+          },
+          {
+            label: "案件名称",
+            prop: "ajmc",
+          },
+          {
+            label: "案件类别",
+            prop: "ajlbdm",
+          },
+          {
+            label: "立案日期",
+            prop: "larq",
+          },
+          {
+            label: "立案单位",
+            prop: "ladwGajgmc",
+          },
+          {
+            label: "简要案情",
+            prop: "jyaq",
+          },
+        ],
+        cxUrl: "/zdryxx/getAjxxByZjhm",
+      },
+      bshglajG: {
+        pageBs: "qyeryrlqbxsGl",
+        cxFormData: {
+          page: 1,
+          limit: 5,
+          rlqbxxzjbh: "",
+        },
+        cxQueryField: [],
+        cxDefaultFormThead: [
+          {
+            label: "案事件编号",
+            prop: "asjbh",
+            toInforDa: true,
+          },
+          {
+            label: "案件名称",
+            prop: "ajmc",
+          },
+          {
+            label: "案件类别",
+            prop: "ajlbdm",
+          },
+          {
+            label: "立案日期",
+            prop: "larq",
+          },
+          {
+            label: "立案单位",
+            prop: "ladwGajgmc",
+          },
+          {
+            label: "简要案情",
+            prop: "jyaq",
+          },
+        ],
+        cxUrl: "/zdryxx/getAjxxByZjhm",
+      },
+      tableDataS: [],
+      tableDataG: [],
+      pagesize: 5,
+      tableDataSLength: "",
+      tableDataGLength: "",
+      pageShowS: false,
+      pageShowG: false,
+      currentPage1G: 1,
+      currentPage1S: 1,
     };
   },
   mounted() {},
   methods: {
+    handleCurrentChangeA(val) {
+      this.currentPage1A = val;
+      this.bshglajA.cxFormData.page = val;
+      this.showDialogA();
+    },
     getInfor() {
       let params = new FormData();
       params.append("xxzjbh", this.xxzjbh);
@@ -235,13 +907,318 @@ export default {
         }
       });
     },
+    addCY() {
+      // this.$router.pushToTab("addZdcyryxx");
+      this.$router.pushToTab({
+        path: "/addZdcyryxx",
+        query: { glxxzjbh: this.xxzjbh },
+      });
+    },
+    editCY(scope) {
+      this.$router.pushToTab({
+        path: "/addZdcyryxx",
+        query: { xxzjbh: scope.row.xxzjbh },
+      });
+    },
+    TOBK(scope){
+      this.$router.pushToTab({
+        path: '/adjustXsbks',
+         query: { glxxlx: '0003',
+         bkdxLxdm: '04',
+         bkdx_hm: scope.row.zjhm},
+      })
+    },
+    deleCY(scope) {
+      this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          deleteZdcyryxx({
+            xxzjbh: scope.row.xxzjbh,
+          }).then((res) => {
+            if (res.success && res.code == 200) {
+              this.$message({
+                type: "success",
+                message: "删除成功",
+              });
+              location.reload();
+            }
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+      console.log(scope.row.xxzjbh);
+    },
+    giveInstructions(scope) {
+      let path = `${this.$baseUrl.alyIP8}/#/addsqfbzl?type=xdzl&xsbh=${scope.row.xxzjbh}&module=zhendi&xsType=04`;
+      window.open(path, "_blank");
+    },
+    //阵地交易活动
+    addJY() {
+      // this.$router.pushToTab("addZdjyhd");
+      this.$router.pushToTab({
+        path: "addZdjyhd",
+        query: { glxxzjbh: this.xxzjbh },
+      });
+    },
+    editJY(scope) {
+      this.$router.pushToTab({
+        path: "addZdjyhd",
+        query: { xxzjbh: scope.row.xxzjbh, glzdxxzjbh: this.xxzjbh },
+      });
+    },
+    deleJY(scope) {
+      this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          deleteZdjyhd({
+            xxzjbh: scope.row.xxzjbh,
+          }).then((res) => {
+            if (res.success && res.code == 200) {
+              this.$message({
+                type: "success",
+                message: "删除成功",
+              });
+              location.reload();
+            }
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
+    toInforCY(data) {
+      this.$router.pushToTab({
+        path: "/detailZdcyryxx",
+        query: {
+          xxzjbh: data.xxzjbh,
+        },
+      });
+    },
+    toInforJY(data) {
+      this.$router.pushToTab({
+        path: "/detailZdjyhd",
+        query: {
+          xxzjbh: data.xxzjbh,
+        },
+      });
+    },
+    //被布控物品
+    addBK() {
+      // this.$router.pushToTab("adjustBbkwpxx");
+      this.$router.pushToTab({
+        path: "/adjustBbkwpxx",
+        query: {
+          glxxzjbh: this.xxzjbh,
+        },
+      });
+    },
+    editBK(data) {
+      this.$router.pushToTab({
+        path: "/adjustBbkwpxx",
+        query: {
+          xxzjbh: data.row.xxzjbh,
+        },
+      });
+    },
+    deleBK(scope) {
+      this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          deleteBbkwp({
+            xxzjbh: scope.row.xxzjbh,
+          }).then((res) => {
+            if (res.success && res.code == 200) {
+              this.$message({
+                type: "success",
+                message: "删除成功",
+              });
+              location.reload();
+            }
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
+    toInforBK(data) {
+      this.$router.pushToTab({
+        path: "/bbkwpxxDetail",
+        query: {
+          id: data.xxzjbh,
+        },
+      });
+    },
+    //线索信息
+    addXS() {
+      // this.$router.pushToTab("adjustZdxsxx");
+      this.$router.pushToTab({
+        path: "/adjustZdxsxx",
+        query: {
+          glzdxxzjbh: this.xxzjbh,
+        },
+      });
+    },
+    editXS(data) {
+      this.$router.pushToTab({
+        path: "/adjustZdxsxx",
+        query: {
+          xxzjbh: data.row.xxzjbh,
+        },
+      });
+    },
+    deleXS(scope) {
+      this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          deleteZdxsxx({
+            xxzjbh: scope.row.xxzjbh,
+          }).then((res) => {
+            if (res.success && res.code == 200) {
+              this.$message({
+                type: "success",
+                message: "删除成功",
+              });
+              location.reload();
+            }
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
+    TOHBXS(scope) {
+      let path = `http://39.99.155.173:9003/#/queryXshb?xxzjbh=${scope.row.xxzjbh}`;
+      window.open(path, "_blank");
+    },
+    toInforXS(data) {
+      this.$router.pushToTab({
+        path: "/zdxsxxDetail",
+        query: {
+          xxzjbh: data.xxzjbh,
+        },
+      });
+    },
+    //标签方法
+    handleClick(tab, event) {
+      // console.log(tab, event);
+      this.tabIndex = tab.index;
+    },
+    handleCurrentChangeS(val) {
+      this.currentPage1S = val;
+      this.bshglajS.cxFormData.page = val;
+      this.showDialogS();
+    },
+    handleCurrentChangeG(val) {
+      this.currentPage1G = val;
+      this.bshglajG.cxFormData.page = val;
+      this.showDialogG();
+    },
+    showDialogGCY(scope) {
+      this.dialogG = true;
+      var params = new FormData();
+      params.append("limit", this.bshglajG.cxFormData.limit);
+      params.append("page", this.bshglajG.cxFormData.page);
+      params.append("sgbzxx", "guo");
+      params.append("zjhm", data.row.zjhm);
+      getAjxxByZjhm(params).then((res) => {
+        if (res.success && res.code == 200) {
+          this.tableDataG = res.data.rows;
+          this.tableDataGLength = res.data.total;
+          if (this.tableDataGLength >= 5) {
+            this.pageShowG = true;
+          } else {
+            this.pageShowG = false;
+          }
+        }
+      });
+    },
+    showDialogSCY(scope) {
+      var params = new FormData();
+      params.append("limit", this.bshglajG.cxFormData.limit);
+      params.append("page", this.bshglajG.cxFormData.page);
+      params.append("sgbzxx", "sheng");
+      params.append("zjhm", data.row.zjhm);
+      getAjxxByZjhm(params).then((res) => {
+        if (res.success && res.code == 200) {
+          this.tableDataS = [...res.data.rows];
+          this.tableDataSLength = res.data.total;
+          if (this.tableDataSLength >= 5) {
+            this.pageShowS = true;
+          } else {
+            this.pageShowS = false;
+          }
+        }
+      });
+      // this.tableDataS = [ ...this.tableDataS ]
+      this.dialogS = true;
+    },
   },
   created() {
     this.xxzjbh = this.$route.query.xxzjbh;
     console.log(this.xxzjbh);
     this.getInfor();
+    if (this.$route.query.xxzjbh) {
+      this.cxFormDataCY.glzdxxzjbh = this.xxzjbh;
+      this.cxFormDataJY.glxxZdxxzjbh = this.xxzjbh;
+      this.cxFormDataXS.zdxxzjbh = this.xxzjbh;
+    }
   },
 };
 </script>
 <style scoped lang="scss">
+@import "@/assets/styles/rightContent.scss";
+.box-card {
+   width: 1150px !important;
+  margin: 0 auto;
+  margin-top: -50px;
+}
+.hbyp {
+  font-size: 14px;
+  font-family: Source Han Sans CN;
+  font-weight: 400;
+  line-height: 22px;
+  color: #007aff;
+  margin-right: 16px;
+  cursor: pointer;
+}
+.hbyps {
+  width: 64px;
+  height: 24px;
+  background: #ffffff;
+  border: 1px solid #007aff;
+  opacity: 1;
+  border-radius: 4px;
+  text-align: center;
+  align-items: center;
+  display: inline-block;
+  font-size: 12px !important;
+  font-weight: 400 !important;
+  color: #007aff !important;
+  cursor: pointer;
+}
 </style>

src/views/zdxx/zdxxgl/sswp/ssdy/addZdssdy.vue

@@ -26,13 +26,6 @@ export default {
       propFormField: [
         //基本信息
         {
-          title: "基本信息",
-          id: 1,
-          objStr: "",
-          index: 0,
-          data: zdssdy_jbxx,
-        },
-        {
           title: "弹药信息",
           id: 2,
           objStr: "",

src/views/zdxx/zdxxgl/sswp/ssdy/detailZdssdy.vue

@@ -31,18 +31,6 @@ export default {
     return {
       cxQueryField: [
         {
-          title: "基本信息", //如果不分小模块就删除title
-          id: 1,
-          objStr: "",
-          data: [
-            {
-              label: "物品编号:",
-              prop: "ssdySawpbh",
-              col: "3",
-            },
-          ],
-        },
-        {
           title: "弹药信息", //如果不分小模块就删除title
           id: 2,
           objStr: "",

src/views/zdxx/zdxxgl/sswp/ssfjdc/addZdssfjdc.vue

@@ -34,13 +34,6 @@ export default {
       propFormField: [
         //基本信息
         {
-          title: "基本信息",
-          id: 1,
-          objStr: "",
-          index: 0,
-          data: zdssfjdc_jbxx,
-        },
-        {
           title: "损失非机动车信息",
           id: 2,
           objStr: "",

src/views/zdxx/zdxxgl/sswp/ssfjdc/detailZdssfjdc.vue

@@ -31,18 +31,6 @@ export default {
     return {
       cxQueryField: [
         {
-          title: "基本信息", //如果不分小模块就删除title
-          id: 1,
-          objStr: "",
-          data: [
-            {
-              label: "物品编号:",
-              prop: "ssddfjdcSawpbh",
-              col: "3",
-            },
-          ],
-        },
-        {
           title: "损失非机动车信息", //如果不分小模块就删除title
           id: 2,
           objStr: "",

src/views/zdxx/zdxxgl/sswp/ssjdc/addZdssjdc.vue

@@ -34,13 +34,6 @@ export default {
       propFormField: [
         //基本信息
         {
-          title: "基本信息",
-          id: 1,
-          objStr: "",
-          index: 0,
-          data: zdssjdc_jbxx,
-        },
-        {
           title: "损失车辆信息",
           id: 21,
           objStr: "",

src/views/zdxx/zdxxgl/sswp/ssjdc/detailZdssjdc.vue

@@ -31,33 +31,11 @@ export default {
     return {
       cxQueryField: [
         {
-          title: "基本信息", //如果不分小模块就删除title
-          id: 1,
-          objStr: "",
-          data: [
-            {
-              label: "物品编号:",
-              prop: "ssjdcSawpbh",
-              col: "3",
-            },
-            {
-              label: "信息主键编号:",
-              prop: "xxzjbh",
-              col: "3",
-            },
-          ],
-        },
-        {
           title: "损失车辆", //如果不分小模块就删除title
           id: 2,
           objStr: "",
           data: [
             {
-              label: "物品编号:",
-              prop: "ssjdcSawpbh",
-              col: "3",
-            },
-            {
               label: "号牌号码:",
               prop: "ssjdcJdchphm",
               col: "3",

src/views/zdxx/zdxxgl/sswp/sskl/detailZdsskl.vue

@@ -33,11 +33,6 @@ export default {
               col: "3",
             },
             {
-              label: "物品编号:",
-              prop: "ssklSawpbh",
-              col: "3",
-            },
-            {
               label: "卡号:",
               prop: "ssklKhWpbzh",
               col: "3",

src/views/zdxx/zdxxgl/sswp/ssqtwp/addZdssqtwp.vue

@@ -26,13 +26,6 @@ export default {
       propFormField: [
         //基本信息
         {
-          title: "基本信息",
-          id: 1,
-          objStr: "",
-          index: 0,
-          data: zdssqtwp_jbxx,
-        },
-        {
           title: "物品信息",
           id: 2,
           objStr: "",

src/views/zdxx/zdxxgl/sswp/ssqtwp/detailZdssqtwp.vue

@@ -36,11 +36,6 @@ export default {
           objStr: "",
           data: [
             {
-              label: "物品编号:",
-              prop: "sswpSawpbh",
-              col: "3",
-            },
-            {
               label: "信息主键编号:",
               prop: "xxzjbh",
               col: "3",

src/views/zdxx/zdxxgl/sswp/ssqz/detailZdssqz.vue

@@ -36,20 +36,10 @@ export default {
           objStr: "",
           data: [
             {
-              label: "物品编号:",
-              prop: "ssqzSawpbh",
-              col: "3",
-            },
-            {
               label: "信息主键编号:",
               prop: "xxzjbh",
               col: "3",
             },
-            // {
-            //   label: "物品编号:",
-            //   prop: "ssqzSawpbh",
-            //   col: "3",
-            // },
             {
               label: "枪支型号:",
               prop: "ssqzQzxhdmStr",

src/views/zdxx/zdxxgl/sswp/ssww/detailZdssww.vue

@@ -36,11 +36,6 @@ export default {
           objStr: "",
           data: [
             {
-              label: "物品编号:",
-              prop: "sswwSawpbh",
-              col: "3",
-            },
-            {
               label: "信息主键编号:",
               prop: "xxzjbh",
               col: "3",

src/views/zdxx/zdxxgl/sswp/sszj/detailZdsszj.vue

@@ -41,11 +41,6 @@ export default {
               col: "3",
             },
             {
-              label: "物品编号:",
-              prop: "sszjSawpbh",
-              col: "3",
-            },
-            {
               label: "常用证件:",
               prop: "sszjCyzjCyzjdm",
               col: "3",

src/views/zjcl/zjclcj.vue

@@ -320,6 +320,8 @@
 
 <style scoped lang="scss">
     .Content{
+      width: 1200px;
+      margin: 0 auto;
         .info{
             background: white;
             border-radius: 8px;

src/views/ztyp/queryZj.vue

@@ -10,9 +10,9 @@
       :tableData1="tableData1"
       ref="rightContent"
       :pageASs="pageASs"
+      :childrenUrl="childrenUrl"
       @rowExpand="rowExpand"
       @adds="adds"
-      @sprops="sprops"
       :loadingZxzjlList="loadingZxzjlList"
     >
       <template #btnGroup="scope">
@@ -77,6 +77,7 @@ import {
   uploadFile,
   selectZxzjbList,
 } from "@/api/yzzfzxsyp/thxs.js";
+import base from "@/api/base";
 export default {
   name: "queryZj",
   components: {
@@ -135,6 +136,7 @@ export default {
         },
       ],
       cxUrl: "/ztypxx/selectJtrwList",
+      childrenUrl: `${base.alyIP}/ztypxx/selectZxzjbList`,
       Menu: [
         {
           id: "queryZj",