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

src/api/zczl/zczl.js

@@ -6,49 +6,49 @@
  * @Description: In User Settings Edit
  * @FilePath: \founder_vue\src\api\zczl\xxgl.js
  */
-import { get, post, postform, postdown } from "@/utils/http.js";
+import {get, post, postform, postdown} from "@/utils/http.js";
 import base from "@/api/base";
 
 
 //导出侦查指令统计Excel
 export const exportZczlExcel = params =>
-  postdown(`${base.alyIP}/zczl/exportZczlExcel`, params);
+    postdown(`${base.alyIP}/zczl/exportZczlExcel`, params);
 export const getTjListPic = params =>
-  post(`${base.alyIP}/zczl/getTjListPic`, params);
+    post(`${base.alyIP}/zczl/getTjListPic`, params);
 //新增侦查指令
 export const doAddZczlxx = params =>
-  postform(`${base.alyIP}/zczl/doAddZczlxxNew`, params);
+    postform(`${base.alyIP}/zczl/doAddZczlxxNew`, params);
 //侦查指令审批
 export const tjsp = params =>
-  post(`${base.alyIP}/zczl/tjsp`, params);
+    post(`${base.alyIP}/zczl/tjspNew`, params);
 //通过侦查指令编号查询指令详情
 export const queryZlxqByZczlbh = params =>
-  postform(`${base.alyIP}/zczl/queryZlxqByZczlbh`, params);
+    postform(`${base.alyIP}/zczl/queryZlxqByZczlbhNew`, params);
 
 //是否都存在联络员
 export const queryLlys = params =>
-  post(`${base.alyIP}/zczl/queryLlys`, params);
+    post(`${base.alyIP}/zczl/queryLlys`, params);
 //删除指令
 export const zlToDelete = params =>
-  post(`${base.alyIP}/zczl/zlToDelete`, params);
+    post(`${base.alyIP}/zczl/zlToDeleteNew`, params);
 //修改侦查指令信息
 export const doEditZczlxx = params =>
-  postform(`${base.alyIP}/zczl/doEditZczlxx`, params);
+    postform(`${base.alyIP}/zczl/doEditZczlxx`, params);
 //修改侦查指令信息
 export const zlTqsp = params =>
-  post(`${base.alyIP}/zczl/zlTqsp`, params);
+    post(`${base.alyIP}/zczl/zlTqspNew`, params);
 //指令签收
 export const zczlQs = params =>
-  post(`${base.alyIP}/zczl/zczlQs`, params);
+    post(`${base.alyIP}/zczl/zczlQs`, params);
 //增加回报或续报
 export const doAddHb = params =>
-  postform(`${base.alyIP}/zczl/doAddHb`, params);
+    postform(`${base.alyIP}/zczl/doAddHb`, params);
 //根据分派编号与是否续报编号拿到回报信息
 export const getHbxxDoHbxgByFpbh = params =>
-  post(`${base.alyIP}/zczl/getHbxxDoHbxgByFpbh`, params);
+    post(`${base.alyIP}/zczl/getHbxxDoHbxgByFpbh`, params);
 //修改回报信息
 export const doHbEdit = params =>
-  postform(`${base.alyIP}/zczl/doHbEdit`, params);
+    postform(`${base.alyIP}/zczl/doHbEdit`, params);
 
 
 //人像比对详情

src/components/form_compontent.vue

@@ -715,6 +715,7 @@
 <script>
 import LazySelectTreeDialog from "./lazy_treeCode_components.vue";
 import SelectTreeDialog from "@c/treeCode_components.vue";
+import url from "@/api/base";
 export default {
   name: "formCommonPage",
   components: {
@@ -1277,7 +1278,29 @@ export default {
         });
     },
     handleBeforeRemove(file, fileList, item, parentItem) {},
-    handlerPreview(file, fileList, item, parentItem) {},
+    handlerPreview(file, fileList, item, parentItem) {
+      // var urls = `${url.alyIP}/flws/download`;
+      //  var params = new FormData();
+      //   params.append("xxzjbh", file.xxzjbh);
+      //   axios
+      //     .post(urls, params, {
+      //       responseType: "arraybuffer",
+      //     })
+      //     .then((res) => {
+      //       let blob = new Blob([res.data], {
+      //         type: "application/vnd.ms-excel",
+      //       });
+      //       // 组装a标签
+      //       let elink = document.createElement("a");
+      //       // 设置下载文件名
+      //       elink.download = file.name;
+      //       elink.style.display = "none";
+      //       elink.href = URL.createObjectURL(blob);
+      //       document.body.appendChild(elink);
+      //       elink.click();
+      //       document.body.removeChild(elink);
+      //     });
+    },
     httpRequest() {},
     handleAvatarSuccess(file, fileList, item) {
       this.imageUrl[item.id] = URL.createObjectURL(file.raw);

src/components/ptCxForm_components.vue

@@ -373,20 +373,6 @@
               </div>
               <div
                 class="flTtitle Add"
-                @click="InviteUsers"
-                v-if="pageBs == 'queryMyyhz' && yqyhz.yhJb == '0001'"
-              >
-                邀请用户
-              </div>
-              <div
-                class="flTtitle Add"
-                @click="DissolutionOrganization"
-                v-if="pageBs == 'queryMyyhz' && yqyhz.yhJb == '0001'"
-              >
-                解散组织
-              </div>
-              <div
-                class="flTtitle Add"
                 @click="adds"
                 v-if="pageASs == 'queryZj'"
               >
@@ -982,7 +968,16 @@
               pageBs == 'queryJcgz' ||
               pageBs == 'queryZjclLb' ||
               pageBs == 'qyeryrlqbxsBJ' ||
-              pageBs == 'qzdjs'
+              pageBs == 'qzdjs' ||
+              pageBs == 'queryRxhc'||
+              pageBs == 'queryNyzzhc'||
+              pageBs == 'queryDnahc'||
+              pageBs == 'queryYstrhc'||
+              pageBs == 'queryNyzzdc'||
+              pageBs == 'queryDnadc'||
+              pageBs == 'queryYstrdc'||
+              pageBs == 'queryZjdc'
+
             )
           "
         >
@@ -1131,16 +1126,7 @@
               "
               >删除</span
             >
-             <span
-              @click="dele(scope)"
-              class="dele"
-              v-if="
-                pageBs == 'queryMyyhz' && yqyhz.yhJb == '0001' 
-              "
-              >删除</span
-            >
             <span
-            
               @click="audit(scope)"
               class="dele"
               v-if="pageBs == 'queryRlqbxsSH'"
@@ -1569,7 +1555,6 @@ export default {
   },
   data() {
     return {
-      yqyhz: {},
       toggleZd: false,
       srcList: [],
       tagType: ["danger", "success", "warning", "info", ""],
@@ -1980,12 +1965,6 @@ export default {
     add() {
       this.$emit("add");
     },
-    InviteUsers() {
-      this.$emit("InviteUsers", this.yqyhz);
-    },
-    DissolutionOrganization() {
-      this.$emit("DissolutionOrganization", this.yqyhz);
-    },
     adds() {
       this.$emit("adds");
     },
@@ -2275,7 +2254,6 @@ export default {
                     item.codeTxt = item.codeTxt.split("#").slice(1);
                   }
                 });
-                self.yqyhz = response.data.yh;
                 self.tableData = response.data.rows;
                 for (let t in self.transformFormTable) {
                   self.tableData.map((res) => {

src/components/qgccj/form.vue

@@ -855,6 +855,7 @@
 <script>
 import LazySelectTreeDialog from "./../lazy_treeCode_components.vue";
 import SelectTreeDialog from "@c/treeCode_components.vue";
+import url from "@/api/base";
 export default {
   name: "formCommonPage",
   components: {
@@ -882,8 +883,8 @@ export default {
     pageBs: String,
     fileLists: {
       type: Object,
-      default: () => {}
-    }
+      default: () => {},
+    },
   },
   data() {
     return {
@@ -936,7 +937,7 @@ export default {
       //   console.log(item.id);
       //   console.log(document.querySelector(item.id));
       //   console.log(document.querySelector(item.id)?.offsetTop);
-         
+
       // })
     },
     examine() {
@@ -1406,7 +1407,7 @@ export default {
       console.log(this.formLabelAlign);
     },
     handleChange(file, fileList, item, parentItem) {
-     debugger
+      debugger;
       var self = this;
       let isLt1M = "";
       isLt1M = file.raw.size / 1024 / 1024 < 101;
@@ -1417,14 +1418,20 @@ export default {
       // debugger;
       if (item.type == "photo") {
         if (isJPG) {
-          debugger
+          debugger;
           this.$set(self.imageUrl, item.id, file.raw);
           this.$set(
             self.formLabelAlign,
             item.id,
             URL.createObjectURL(file.raw)
           );
-          this.$emit("uploadPhoto", self.imageUrl[item.id], file, fileList, item,);
+          this.$emit(
+            "uploadPhoto",
+            self.imageUrl[item.id],
+            file,
+            fileList,
+            item
+          );
         } else {
           self.$message.error("请上传正确的图片");
         }
@@ -1435,8 +1442,8 @@ export default {
         }
         if (isLt1M) {
           this.fileLists[item.id].push(file);
-          debugger
-          this.$emit('handleChange',file, fileList, item)
+          debugger;
+          this.$emit("handleChange", file, fileList, item);
           // this.$refs.formLabelAlign.clearValidate();
         } else {
           this.$confirm("上传文件不能超过100M", "提示", {
@@ -1480,20 +1487,20 @@ export default {
       this.$emit("flwsInsert", file);
     },
     flwsRemove(file, fileList, item, parentItem) {
-      debugger
+      debugger;
       this.$emit("flwsRemove", file);
       this.$set(this.fileLists, item.id, fileList);
       console.log(this.fileLists);
     },
     handleRemove(file, fileList, item, parentItem) {
-      debugger
+      debugger;
       this.$emit("handleRemove", file);
       this.$set(this.fileLists, item.id, fileList);
       console.log(this.fileLists);
     },
     //子组件调用删除接口后进行前端删除
     photoRemove(item) {
-      debugger
+      debugger;
       this.$set(this.formLabelAlign, item.id, "");
       this.$set(this.imageUrl, item.id, "");
     },
@@ -1505,7 +1512,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          debugger
+          debugger;
           this.$emit("removePhoto", item);
         })
         .catch(() => {
@@ -1517,7 +1524,27 @@ export default {
     },
     handleBeforeRemove(file, fileList, item, parentItem) {},
     handlerPreview(file, fileList, item, parentItem) {
-      debugger
+      var urls = `${url.alyIP}/flws/download`;
+      var params = new FormData();
+      params.append("xxzjbh", file.xxzjbh);
+      axios
+        .post(urls, params, {
+          responseType: "arraybuffer",
+        })
+        .then((res) => {
+          let blob = new Blob([res.data], {
+            type: "application/vnd.ms-excel",
+          });
+          // 组装a标签
+          let elink = document.createElement("a");
+          // 设置下载文件名
+          elink.download = file.name;
+          elink.style.display = "none";
+          elink.href = URL.createObjectURL(blob);
+          document.body.appendChild(elink);
+          elink.click();
+          document.body.removeChild(elink);
+        });
     },
     httpRequest() {},
     handleAvatarSuccess(file, fileList, item) {
@@ -1659,20 +1686,24 @@ export default {
     });
     this.$forceUpdate();
     // document.onmousewheel = this.scrollFun();
-    if ((navigator.userAgent.toLowerCase().indexOf("firefox") != -1)) {
-        document.addEventListener("DOMMouseScroll", this.scrollFun, false);
-      } else if (document.addEventListener) {
-        document.addEventListener("mousewheel", this.scrollFun, false);
-      } else if (document.attachEvent) {
-        document.attachEvent("onmousewheel", this.scrollFun);
-      } else {
-        document.onmousewheel = this.scrollFun;
-      }
-    this.menuList.map((item,index) => {
-        console.log(document.querySelector(item.id)?.offsetTop);
-        this.mailListTop.push({id:item.id,height:document.querySelector(item.id)?.offsetTop,index:index})
-      })
-      console.log(this.mailListTop);
+    if (navigator.userAgent.toLowerCase().indexOf("firefox") != -1) {
+      document.addEventListener("DOMMouseScroll", this.scrollFun, false);
+    } else if (document.addEventListener) {
+      document.addEventListener("mousewheel", this.scrollFun, false);
+    } else if (document.attachEvent) {
+      document.attachEvent("onmousewheel", this.scrollFun);
+    } else {
+      document.onmousewheel = this.scrollFun;
+    }
+    this.menuList.map((item, index) => {
+      console.log(document.querySelector(item.id)?.offsetTop);
+      this.mailListTop.push({
+        id: item.id,
+        height: document.querySelector(item.id)?.offsetTop,
+        index: index,
+      });
+    });
+    console.log(this.mailListTop);
   },
   watch: {
     "formLabelAligns.editing": {
@@ -1715,7 +1746,7 @@ export default {
       deep: true,
     },
     fileLists(val) {
-      debugger
+      debugger;
       console.log(222, val);
     },
     "formLabelAlign.jssj"(val) {
@@ -1739,7 +1770,7 @@ export default {
         new Date(this.formLabelAlign.xckyKssj).getTime()
       ) {
         console.log(12321);
-        debugger
+        debugger;
         this.$set(this.formLabelAlign, "xckyJssj", "");
         this.$message.error("开始时间不能大于结束时间");
       }
@@ -1755,13 +1786,13 @@ export default {
       }
     },
     "formLabelAlign.asjfssjAsjfsjssj"(val) {
-      debugger
+      debugger;
       if (
         new Date(val).getTime() <=
         new Date(this.formLabelAlign.asjfssjAsjfskssj).getTime()
       ) {
         console.log(12321);
-        debugger
+        debugger;
         this.$set(this.formLabelAlign, "asjfssjAsjfsjssj", "");
         this.$message.error("开始时间不能大于结束时间");
       }

src/views/ryxscxbd/queryDnadc.vue

@@ -65,6 +65,7 @@ export default {
         {
           label: "案事件编号",
           prop: "asjbh",
+          toInfor:true
         },
         {
           label: "接警编号",
@@ -167,7 +168,7 @@ export default {
     },
     toInfor(scope) {
       this.$router.push({
-        path: "/detailRlqbxs",
+        path: "/detailDnabz",
         query: {
           xxzjbh: scope.xxzjbh,
         },

src/views/ryxscxbd/queryDnahc.vue

@@ -30,8 +30,8 @@ export default {
       pageBs: "queryDnahc",
       cxFormData: {
         rydnabh: "",
-         xyrXm:'',
-        xyrZjhm:"",
+        xyrXm: "",
+        xyrZjhm: "",
         rows: 10,
         page: 1,
       },
@@ -65,8 +65,9 @@ export default {
         {
           label: "姓名",
           prop: "xm",
+          toInfor:true
         },
-                {
+        {
           label: "别名",
           prop: "bmch",
         },
@@ -74,7 +75,7 @@ export default {
           label: "人员身份证",
           prop: "cyzjZjhm",
         },
-                {
+        {
           label: "民族",
           prop: "mzdm",
         },
@@ -98,7 +99,7 @@ export default {
           label: "现住址",
           prop: "xzzDzmc",
         },
-          {
+        {
           label: "政治面貌",
           prop: "zzmmdm",
         },
@@ -171,7 +172,7 @@ export default {
     },
     toInfor(scope) {
       this.$router.push({
-        path: "/detailRlqbxs",
+        path: "/detailDnabz",
         query: {
           xxzjbh: scope.xxzjbh,
         },

src/views/ryxscxbd/queryNyzzdc.vue

@@ -20,14 +20,14 @@
 import rightContent from "@c/ptCxForm_components.vue";
 import { deleteKyxsxx } from "@/api/rlqbxs.js";
 export default {
-  name: "queryYstrdc",
+  name: "queryNyzzdc",
   components: {
     rightContent,
   },
   data() {
     return {
       header: "捺印指掌纹涉案倒查",
-      pageBs: "queryYstrdc",
+      pageBs: "queryNyzzdc",
       cxFormData: {
         szzwbh: "",
          xyrXm:'',
@@ -65,6 +65,7 @@ export default {
         {
           label: "案事件编号",
           prop: "asjbh",
+          toInfor:true
         },
                 {
           label: "接警编号",
@@ -167,7 +168,7 @@ export default {
     },
     toInfor(scope) {
       this.$router.push({
-        path: "/detailRlqbxs",
+        path: "/detailXczw",
         query: {
           xxzjbh: scope.xxzjbh,
         },

src/views/ryxscxbd/queryNyzzhc.vue

@@ -147,15 +147,11 @@ export default {
           });
         });
     },
-    toInfor(scope) {
-      debugger
+     toInfor(scope) {
       this.$router.push({
-        path: "/rxhcDetail",
+        path: "/detailXczw",
         query: {
-          szzwbh: scope.szzwbh,
-          asjbh:scope.asjbh,
-          xyrXm:scope.xyrXm?scope.xyrXm:'',
-          xyrZjhm:scope.xyrZjhm?scope.xyrZjhm:'',
+          xxzjbh: scope.xxzjbh,
         },
       });
     },

src/views/ryxscxbd/queryRxhc.vue

@@ -30,7 +30,7 @@ export default {
       pageBs: "queryRxhc",
       cxFormData: {
         file: "",
-        sfzh:"",
+        sfzh: "",
         rows: 10,
         page: 1,
       },
@@ -43,7 +43,7 @@ export default {
           placeholder: "",
           col: "1",
         },
-         {
+        {
           name: "身份证号",
           id: "sfzh",
           type: "text",
@@ -51,30 +51,37 @@ export default {
           placeholder: "",
           col: "3",
         },
-        
       ],
       cxDefaultFormThead: [
         {
-          label: "情报线索名称",
-          prop: "qbxsmc",
-          
+          label: "姓名",
+          prop: "name",
+          toInfor:true
         },
         {
           /*table默认得表头*/
-          label: "登记时间",
-          prop: "djsj",
+          label: "人员身份证",
+          prop: "personId",
+        },
+        {
+          label: "相似度",
+          prop: "similarity",
         },
         {
-          label: "情报线索分类名称",
-          prop: "qbxsflmc",
+          label: "籍贯",
+          prop: "nativePlace",
         },
         {
-          label: "线索状态",
-          prop: "xsztdmStr",
+          label: "住址",
+          prop: "nativePlaceAddr",
         },
         {
-          label: "线索标识号类型",
-          prop: "kyxsbshlxStr",
+          label: "人员标签",
+          prop: "tagAry",
+        },
+        {
+          label: "图片来源",
+          prop: "picOriginName",
         },
       ],
       cxUrl: "/rxbdhc/selectRxbdhcList",
@@ -98,7 +105,7 @@ export default {
           className: "iconfont icongongnengfuwu",
           hasChildren: false,
         },
-         {
+        {
           id: "queryNyzzhc",
           label: "捺印指掌纹身份核查",
           newAuth: "M01",
@@ -106,7 +113,7 @@ export default {
           className: "iconfont icongongnengfuwu",
           hasChildren: false,
         },
-         {
+        {
           id: "queryDnahc",
           label: "人员DNA身份核查",
           newAuth: "M01",
@@ -114,7 +121,7 @@ export default {
           className: "iconfont icongongnengfuwu",
           hasChildren: false,
         },
-         {
+        {
           id: "queryYstrhc",
           label: "人员YSTR身份核查",
           newAuth: "M01",
@@ -122,7 +129,7 @@ export default {
           className: "iconfont icongongnengfuwu",
           hasChildren: false,
         },
-         {
+        {
           id: "queryNyzzdc",
           label: "捺印指掌纹涉案倒查",
           newAuth: "M01",
@@ -130,7 +137,7 @@ export default {
           className: "iconfont icongongnengfuwu",
           hasChildren: false,
         },
-         {
+        {
           id: "queryDnadc",
           label: "人员DNA涉案倒查",
           newAuth: "M01",
@@ -138,7 +145,7 @@ export default {
           className: "iconfont icongongnengfuwu",
           hasChildren: false,
         },
-         {
+        {
           id: "queryYstrdc",
           label: "人员YSTR身份涉案倒查",
           newAuth: "M01",
@@ -146,7 +153,7 @@ export default {
           className: "iconfont icongongnengfuwu",
           hasChildren: false,
         },
-         {
+        {
           id: "queryZjdc",
           label: "人员足迹涉案倒查",
           newAuth: "M01",
@@ -201,7 +208,7 @@ export default {
     },
     toInfor(scope) {
       this.$router.push({
-        path: "/detailRlqbxs",
+        path: "/detailXcrx",
         query: {
           xxzjbh: scope.xxzjbh,
         },

src/views/ryxscxbd/queryYstrdc.vue

@@ -65,6 +65,7 @@ export default {
         {
           label: "案事件编号",
           prop: "asjbh",
+          toInfor:true
         },
                 {
           label: "接警编号",
@@ -167,7 +168,7 @@ export default {
     },
     toInfor(scope) {
       this.$router.push({
-        path: "/detailRlqbxs",
+        path: "/detailXcystr",
         query: {
           xxzjbh: scope.xxzjbh,
         },

src/views/ryxscxbd/queryYstrhc.vue

@@ -65,6 +65,7 @@ export default {
         {
           label: "姓名",
           prop: "xm",
+          toInfor:true
         },
                 {
           label: "别名",
@@ -171,7 +172,7 @@ export default {
     },
     toInfor(scope) {
       this.$router.push({
-        path: "/detailRlqbxs",
+        path: "/detailXcystr",
         query: {
           xxzjbh: scope.xxzjbh,
         },

src/views/ryxscxbd/queryZjdc.vue

@@ -65,6 +65,7 @@ export default {
         {
           label: "人员编号",
           prop: "rybh",
+          toInfor:true
         },
         {
           label: "姓名",
@@ -167,7 +168,7 @@ export default {
     },
     toInfor(scope) {
       this.$router.push({
-        path: "/detailRlqbxs",
+        path: "/detailXczj",
         query: {
           xxzjbh: scope.xxzjbh,
         },

src/views/xxtk/gzry/queryGzry.vue

@@ -448,7 +448,7 @@ export default {
         //左侧导航(模块第一个页面需要)
         {
           id: "queryGzry",
-          label: "刑嫌调控工作",
+          label: "刑嫌列控工作",
           newAuth: "M01",
           index: "2",
           className: "iconfont icongongnengfuwu",
@@ -504,6 +504,100 @@ export default {
             },
           ],
         },
+        {
+          id: "queryGzry",
+          label: "刑嫌对象日常管控",
+          newAuth: "M01",
+          index: "2",
+          className: "iconfont icongongnengfuwu",
+          hasChildren: true,
+          children: [
+            {
+              id: "home",
+              label: "高危人员滚动查控",
+              index: "home",
+              auth: "M0101",
+              className: "iconfont iconrizhi",
+              disabled: false,
+            },
+            {
+              id: "queryLklz",
+              label: "刑嫌对象线索发现及管控",
+              index: "queryLklz",
+              auth: "M0102",
+              className: "iconfont icongongnengfuwu",
+              disabled: false,
+            },
+            {
+              id: "queryCklz",
+              label: "管控工作指令",
+              index: "queryCklz",
+              auth: "M0103",
+              className: "iconfont iconfangwen",
+              disabled: false,
+            }
+          ],
+        },
+         {
+          id: "queryGzry",
+          label: "刑嫌对象信息研判",
+          newAuth: "M01",
+          index: "2",
+          className: "iconfont icongongnengfuwu",
+          hasChildren: true,
+          children: [
+            {
+              id: "queryGzry",
+              label: "刑嫌对象研判",
+              index: "queryGzry",
+              auth: "M0101",
+              className: "iconfont iconrizhi",
+              disabled: false,
+            },
+            {
+              id: "queryLklz",
+              label: "刑嫌对象异常情况研判",
+              index: "queryLklz",
+              auth: "M0102",
+              className: "iconfont icongongnengfuwu",
+              disabled: false,
+            },
+            {
+              id: "queryCklz",
+              label: "登记工作发现线索信息",
+              index: "queryCklz",
+              auth: "M0103",
+              className: "iconfont iconfangwen",
+              disabled: false,
+            },
+          ],
+        },
+         {
+          id: "queryGzry",
+          label: "智能化信息服务",
+          newAuth: "M01",
+          index: "2",
+          className: "iconfont icongongnengfuwu",
+          hasChildren: true,
+          children: [
+            {
+              id: "queryGzry",
+              label: "刑嫌对象关联线索定向推送服务",
+              index: "queryGzry",
+              auth: "M0101",
+              className: "iconfont iconrizhi",
+              disabled: false,
+            },
+            {
+              id: "queryLklz",
+              label: "列控管理提醒信息服务",
+              index: "queryLklz",
+              auth: "M0102",
+              className: "iconfont icongongnengfuwu",
+              disabled: false,
+            }
+          ],
+        },
       ],
       newlyVisiable: false,
       lkForm: {

src/views/zczl/zczl/wfqdzczl.vue

@@ -112,7 +112,7 @@ export default {
           col: "3",
         },
         {
-          name: "指令接手单位",
+          name: "指令接收单位",
           id: "zljsdwdm",
           type: "codeTreeDialog",
           props: "checkEmpty",
@@ -256,7 +256,7 @@ export default {
         },
         {
           label: "指令类型",
-          prop: "zllx_str",
+          prop: "zllxStr",
         },
         {
           label: "指令签收个数",
@@ -272,7 +272,7 @@ export default {
         },
         {
           label: "业务类型",
-          prop: "ywlx_str",
+          prop: "ywlxStr",
         },
         {
           label: "工作要求",

src/views/zczl/zczl/wsqfbdzczl.vue

@@ -100,7 +100,7 @@ export default {
           col: "3",
         },
         {
-          name: "指令接手单位",
+          name: "指令接收单位",
           id: "zljsdwdm",
           type: "codeTreeDialog",
           props: "checkEmpty",

src/views/zczl/zczl/xywspdzczl.vue

 <template>
   <div class="Content">
     <right-content
-      :tableOperation="tableOperation"
-      :pageBs="pageBs"
-      :header="header"
-      :cxFormData="cxFormData"
-      :cxQueryField="cxQueryField"
-      :transformFormTable="transformFormTable"
-      :cxDefaultFormThead="cxDefaultFormThead"
-      :cxUrl="cxUrl"
-      @examine="examine"
-      ref="rightContent"
+        :tableOperation="tableOperation"
+        :pageBs="pageBs"
+        :header="header"
+        :cxFormData="cxFormData"
+        :cxQueryField="cxQueryField"
+        :transformFormTable="transformFormTable"
+        :cxDefaultFormThead="cxDefaultFormThead"
+        :cxUrl="cxUrl"
+        @examine="examine"
+        ref="rightContent"
     >
       <template #btnGroup="scope">
         <el-button :disabled="scope.scope.row.ifsp!='能'" @click="examine(scope.scope)" type="text">审批</el-button>
@@ -24,30 +24,30 @@
           <el-col :span="20" :offset="2" style="margin-top: 20px">
             <el-form-item :label="labelForm.xm" style="width：100%">
               <el-input
-                disabled
-                type="text"
-                v-model="ckForm.fqyxm"
-                style="width: 120px"
+                  disabled
+                  type="text"
+                  v-model="ckForm.fqyxm"
+                  style="width: 120px"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="20" :offset="2">
             <el-form-item :label="labelForm.dwmc" style="width：100%">
               <el-input
-                disabled
-                type="text"
-                v-model="ckForm.fqydwmc"
-                style="width: 120px"
+                  disabled
+                  type="text"
+                  v-model="ckForm.fqydwmc"
+                  style="width: 120px"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="20" :offset="2">
             <el-form-item :label="labelForm.dh" style="width：100%">
               <el-input
-                disabled
-                type="text"
-                v-model="ckForm.fqylxdh"
-                style="width: 120px"
+                  disabled
+                  type="text"
+                  v-model="ckForm.fqylxdh"
+                  style="width: 120px"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -64,8 +64,9 @@
 
 <script>
 import rightContent from "@c/ptCxForm_components.vue";
-import { tjsp, queryZlxqByZczlbh } from "@/api/zczl/zczl.js";
-import  { spsftg, ifsp} from "@/assets/js/transformFormTable.js";
+import {tjsp, queryZlxqByZczlbh} from "@/api/zczl/zczl.js";
+import {spsftg, ifsp} from "@/assets/js/transformFormTable.js";
+
 export default {
   name: "rlqbxsxx",
   components: {
@@ -73,7 +74,7 @@ export default {
   },
   data() {
     return {
-      tableOperation:true,
+      tableOperation: true,
       transformFormTable: {
         ifsp,
         spsftg
@@ -151,7 +152,7 @@ export default {
           col: "3",
         },
         {
-          name: "指令接手单位",
+          name: "指令接收单位",
           id: "zljsdwdm",
           type: "codeTreeDialog",
           props: "checkEmpty",
@@ -209,11 +210,11 @@ export default {
         },
         {
           label: "指令类型",
-          prop: "zllx_str",
+          prop: "zllxStr",
         },
         {
           label: "指令接收单位名称",
-          prop: "zljsdwdm_name",
+          prop: "zjjsdwdm_name",
         },
         {
           label: "指令文号",
@@ -225,7 +226,7 @@ export default {
         },
         {
           label: "业务类型",
-          prop: "ywlx_str",
+          prop: "ywlxStr",
         },
         {
           label: "是否能审批",
@@ -244,7 +245,7 @@ export default {
           prop: "spsftg",
         },
       ],
-      cxUrl: "/zczl/getXywspdzczlList",
+      cxUrl: "/zczl/getXywspdzczlListNew",
       Menu: [
         {
           id: "xywspdzczl",
@@ -274,7 +275,7 @@ export default {
       });
     },
     examine(scope) {
-      if (scope.row.ifsp == "0") {
+      if (scope.row.ifsp == "不能") {
         this.$message.error("不可以审批此条消息");
         return;
       }
@@ -311,56 +312,68 @@ export default {
           }
           self.revokeVisiable = true;
         } else {
+          loading.close();
           this.$message.error("提取信息失败");
         }
       });
     },
   },
-  mounted() {},
+  mounted() {
+  },
 };
 </script>
 <style>
 .el-dialog__body {
   padding: 10px 15px !important;
 }
+
 .rightContent .el-input__inner,
 #formCommonPage .el-input__inner {
   height: 32px;
   line-height: 32px;
   font-family: inherit;
 }
+
 .el-table__header-wrapper th,
 .el-table__header-wrapper tr {
   background: #f4f6f7;
 }
+
 .rightContent .el-input__icon,
 #formCommonPage .el-input__icon,
 .el-input__suffix-inner {
   line-height: 36px;
 }
+
 .rightContent .el-range-separator {
   position: relative;
   top: -4px;
 }
+
 .rightContent .el-textarea__inner,
 #formCommonPage .el-textarea__inner {
   width: 100%;
   font-family: inherit;
 }
+
 .rightContent .el-range-input,
 #formCommonPage .el-range-input {
   vertical-align: top;
 }
+
 .rightContent .el-date-editor .el-range__close-icon {
   margin-top: -4px;
 }
+
 .rightContent .el-form-item__error {
   left: calc(66% - 27px);
   top: 12px;
 }
+
 .success-row {
   background-color: #fbf9f4 !important;
 }
+
 .Content .el-input,
 .Content .el-date-editor--daterange.el-input__inner {
   width: 100% !important;
@@ -368,6 +381,7 @@ export default {
 </style>
 <style scoped lang="scss">
 @import "@/assets/styles/rightContent.scss";
+
 .el-input {
   /deep/ .el-input__inner {
     color: #333;

src/views/zdxx/zdxxgl/queryZdxxgl.vue

@@ -70,7 +70,7 @@ export default {
   },
   data() {
     return {
-      header: "阵地信息管理",
+      header: "阵地管控工作管理",
       pageBs: "zdxxgl",
       cxFormData: {
         djsjStart: "",
@@ -203,37 +203,131 @@ export default {
           newAuth: "M01",
           index: "queryZdxx",
           className: "iconfont icongongnengfuwu",
-          hasChildren: false,
+          hasChildren: true,
+          children: [
+            {
+              id: "queryZdxx",
+              label: "阵地信息管理",
+              index: "queryZdxx",
+              auth: "M0101",
+              className: "iconfont iconrizhi",
+              disabled: false,
+            },
+            {
+              id: "queryZdcyryxx",
+              label: "阵地从业人员信息管理",
+              index: "queryZdcyryxx",
+              auth: "M0101",
+              className: "iconfont iconrizhi",
+              disabled: false,
+            },
+            {
+              id: "queryZdxxs",
+              label: "阵地信息查询",
+              index: "queryZdxxs",
+              auth: "M0101",
+              className: "iconfont iconrizhi",
+              disabled: false,
+            },
+          ],
         },
         {
-          id: "queryZdcyryxx",
-          label: "阵地从业人员信息管理",
+          id: "queryZdjyhd",
+          label: "阵地活动信息管理",
           newAuth: "M01",
-          index: "queryZdcyryxx",
+          index: "queryZdjyhd",
           className: "iconfont icongongnengfuwu",
           hasChildren: false,
         },
-        {
-          id: "queryZdjyhd",
-          label: "阵地交易活动",
+         {
+          id: "queryZdxx",
+          label: "阵地信息监测预警",
           newAuth: "M01",
-          index: "queryZdjyhd",
+          index: "queryZdxx",
           className: "iconfont icongongnengfuwu",
-          hasChildren: false,
+          hasChildren: true,
+          children: [
+            {
+              id: "queryZdxx",
+              label: "阵地监测预警模型管理",
+              index: "queryZdxx1",
+              auth: "M0101",
+              className: "iconfont iconrizhi",
+              disabled: false,
+            },
+            {
+              id: "queryZdcyryxx",
+              label: "阵地信息监测预警",
+              index: "queryZdcyryxx",
+              auth: "M0101",
+              className: "iconfont iconrizhi",
+              disabled: false,
+            },
+            {
+              id: "queryZdxxs2",
+              label: "阵地预警信息处置",
+              index: "queryZdxxs",
+              auth: "M0101",
+              className: "iconfont iconrizhi",
+              disabled: false,
+            },
+          ],
         },
         {
+          id: "queryZdxx3",
+          label: "阵地信息研判",
+          newAuth: "M01",
+          index: "queryZdxx3",
+          className: "iconfont icongongnengfuwu",
+          hasChildren: true,
+          children: [
+            {
+              id: "queryZdxx",
+              label: "阵地信息研判",
+              index: "queryZdxx4",
+              auth: "M0101",
+              className: "iconfont iconrizhi",
+              disabled: false,
+            },
+            {
+              id: "queryZdcyryxx",
+              label: "阵地从业人员信息研判",
+              index: "queryZdcyryxx",
+              auth: "M0101",
+              className: "iconfont iconrizhi",
+              disabled: false,
+            },
+            {
+              id: "queryZdxxs",
+              label: "阵地活动信息研判",
+              index: "queryZdxxs5",
+              auth: "M0101",
+              className: "iconfont iconrizhi",
+              disabled: false,
+            },
+             {
+              id: "queryZdxxs",
+              label: "阵地监测预警信息研判",
+              index: "queryZdxxs6",
+              auth: "M0101",
+              className: "iconfont iconrizhi",
+              disabled: false,
+            },
+          ],
+        },
+         {
           id: "queryBbkwpxx",
-          label: "被布控物品信息",
+          label: "智能化信息服务",
           newAuth: "M01",
           index: "queryBbkwpxx",
           className: "iconfont icongongnengfuwu",
           hasChildren: false,
         },
         {
-          id: "queryZdxsxx",
-          label: "阵地线索信息",
+          id: "queryBbkwpxx",
+          label: "被布控物品信息",
           newAuth: "M01",
-          index: "queryZdxsxx",
+          index: "queryBbkwpxx",
           className: "iconfont icongongnengfuwu",
           hasChildren: false,
         },