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

src/components/ptCxForm_components.vue

@@ -511,6 +511,7 @@
                   pageBs != 'queryMenu' &&
                   pageBs != 'queryUser' &&
                   pageBs != 'queryZjcl' &&
+                  pageBs != 'xxtkgzfl' &&
                   pageBs != 'queryRole'
                 "
               >
@@ -1562,6 +1563,7 @@
                   pageBs == 'queryMenu' ||
                   pageBs == 'querySqdlb' ||
                   pageBs == 'queryJz' ||
+                  pageBs == 'xxtkgzfl' ||
                   pageBs == 'queryRole'
                 )
               "
@@ -1767,6 +1769,7 @@
                 pageBs != 'queryUser' &&
                 pageBs != 'queryMenu' &&
                 pageBs != 'queryJz' &&
+                pageBs != 'xxtkgzfl' &&
                 pageBs != 'querySqdlb' &&
                 pageBs != 'queryRole'
               "

src/router/modules/xxtk.js

@@ -7,7 +7,7 @@ const menuLayouts = [
     meta: {
       title: '刑嫌对象信息管理'
     },
-    component: () => import("@/views/xxtk/gzry/queryGzry.vue")
+    component: () => import("@/views/xxtk/gzry/queryGzrys.vue")
   },
   {
     path: "/queryGzrys",

src/views/brainPhoto/brainClqypz.vue

@@ -48,9 +48,18 @@ export default {
   },
   methods: {
     goDetail() {
-      var userInfo = JSON.parse(sessionStorage.getItem("userInfo"))
-      var idcard = userInfo.identitycard  
-      var params = { type: "KyJdc", kybh: this.form.cph, userId: idcard, };
+      var userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
+      var idcard = userInfo.identitycard;
+      var params = {
+        type: "KyJdc",
+        kybh: this.form.cph,
+        userId: idcard,
+        username: userInfo.userName,
+        trueName: userInfo.userName,
+        identitycard: userInfo.identitycard,
+        unitcode: userInfo.unitcode,
+        unitname: userInfo.unitname,
+      };
       this.toDetail(`${this.$baseUrl.alyIP4}/naotuBox`, params);
     },
     toDetail(url, PARAMS) {

src/views/brainPhoto/brainClskbszb.vue

@@ -23,9 +23,7 @@ export default {
           type: "text",
           placeholder: "车牌号",
           col: "3",
-          rules: [
-            { required: true, message: "请输入车牌号", trigger: "blur" },
-          ],
+          rules: [{ required: true, message: "请输入车牌号", trigger: "blur" }],
         },
       ],
       form: {
@@ -48,9 +46,18 @@ export default {
   },
   methods: {
     goDetail() {
-      var userInfo = JSON.parse(sessionStorage.getItem("userInfo"))
-      var idcard = userInfo.identitycard  
-      var params = { type: "KyJdc", kybh: this.form.cph, userId: idcard, };
+      var userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
+      var idcard = userInfo.identitycard;
+      var params = {
+        type: "KyJdc",
+        kybh: this.form.cph,
+        userId: idcard,
+        username: userInfo.userName,
+        trueName: userInfo.userName,
+        identitycard: userInfo.identitycard,
+        unitcode: userInfo.unitcode,
+        unitname: userInfo.unitname,
+      };
       this.toDetail(`${this.$baseUrl.alyIP4}/naotuBox`, params);
     },
     toDetail(url, PARAMS) {

src/views/brainPhoto/brainDzaj.vue

@@ -344,8 +344,7 @@ export default {
         console.log(err);
       });
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     sqspBtn(scope) {
       this.dialogVisible = true;
@@ -424,7 +423,16 @@ export default {
     toBrain(scope) {
       var userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
       var idcard = userInfo.identitycard;
-      var params = { type: "hnDxzp", kybh: scope.row.asjbh, userId: idcard };
+      var params = {
+        type: "hnDxzp",
+        kybh: scope.row.asjbh,
+        userId: idcard,
+        username: userInfo.userName,
+        trueName: userInfo.userName,
+        identitycard: userInfo.identitycard,
+        unitcode: userInfo.unitcode,
+        unitname: userInfo.unitname,
+      };
       this.toDetail(`${this.$baseUrl.alyIP4}/naotuBox`, params);
     },
     toDetail(url, PARAMS) {
@@ -443,7 +451,6 @@ export default {
       temp_form.submit();
     },
   },
-
 };
 </script>
 <style>

src/views/brainPhoto/brainIMEI.vue

@@ -23,9 +23,7 @@ export default {
           type: "text",
           placeholder: "IMEI",
           col: "3",
-          rules: [
-            { required: true, message: "请输入IMEI", trigger: "blur" },
-          ],
+          rules: [{ required: true, message: "请输入IMEI", trigger: "blur" }],
         },
       ],
       form: {
@@ -48,9 +46,18 @@ export default {
   },
   methods: {
     goDetail() {
-      var userInfo = JSON.parse(sessionStorage.getItem("userInfo"))
-      var idcard = userInfo.identitycard  
-      var params = { type: "KyIMEI", kybh: this.form.imei, userId: idcard, };
+      var userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
+      var idcard = userInfo.identitycard;
+      var params = {
+        type: "KyIMEI",
+        kybh: this.form.imei,
+        userId: idcard,
+        username: userInfo.userName,
+        trueName: userInfo.userName,
+        identitycard: userInfo.identitycard,
+        unitcode: userInfo.unitcode,
+        unitname: userInfo.unitname,
+      };
       this.toDetail(`${this.$baseUrl.alyIP4}/naotuBox`, params);
     },
     toDetail(url, PARAMS) {

src/views/brainPhoto/brainIMSI.vue

@@ -23,9 +23,7 @@ export default {
           type: "text",
           placeholder: "IMSI",
           col: "3",
-          rules: [
-            { required: true, message: "请输入IMSI", trigger: "blur" },
-          ],
+          rules: [{ required: true, message: "请输入IMSI", trigger: "blur" }],
         },
       ],
       form: {
@@ -48,9 +46,18 @@ export default {
   },
   methods: {
     goDetail() {
-      var userInfo = JSON.parse(sessionStorage.getItem("userInfo"))
-      var idcard = userInfo.identitycard  
-      var params = { type: "KyIMSI", kybh: this.form.imsi, userId: idcard, };
+      var userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
+      var idcard = userInfo.identitycard;
+      var params = {
+        type: "KyIMSI",
+        kybh: this.form.imsi,
+        userId: idcard,
+        username: userInfo.userName,
+        trueName: userInfo.userName,
+        identitycard: userInfo.identitycard,
+        unitcode: userInfo.unitcode,
+        unitname: userInfo.unitname,
+      };
       this.toDetail(`${this.$baseUrl.alyIP4}/naotuBox`, params);
     },
     toDetail(url, PARAMS) {

src/views/brainPhoto/brainQQ.vue

@@ -23,9 +23,7 @@ export default {
           type: "text",
           placeholder: "QQ号",
           col: "3",
-          rules: [
-            { required: true, message: "请输入QQ号", trigger: "blur" },
-          ],
+          rules: [{ required: true, message: "请输入QQ号", trigger: "blur" }],
         },
       ],
       form: {
@@ -48,9 +46,18 @@ export default {
   },
   methods: {
     goDetail() {
-      var userInfo = JSON.parse(sessionStorage.getItem("userInfo"))
-      var idcard = userInfo.identitycard  
-      var params = { type: "KyQq", kybh: this.form.qqh, userId: idcard, };
+      var userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
+      var idcard = userInfo.identitycard;
+      var params = {
+        type: "KyQq",
+        kybh: this.form.qqh,
+        userId: idcard,
+        username: userInfo.userName,
+        trueName: userInfo.userName,
+        identitycard: userInfo.identitycard,
+        unitcode: userInfo.unitcode,
+        unitname: userInfo.unitname,
+      };
       this.toDetail(`${this.$baseUrl.alyIP4}/naotuBox`, params);
     },
     toDetail(url, PARAMS) {

src/views/brainPhoto/brainRyqypz.vue

@@ -48,9 +48,18 @@ export default {
   },
   methods: {
     goDetail() {
-      var userInfo = JSON.parse(sessionStorage.getItem("userInfo"))
-      var idcard = userInfo.identitycard  
-      var params = { type: "KyRy", kybh: this.form.zjhm, userId: idcard, };
+      var userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
+      var idcard = userInfo.identitycard;
+      var params = {
+        type: "KyRy",
+        kybh: this.form.zjhm,
+        userId: idcard,
+        username: userInfo.userName,
+        trueName: userInfo.userName,
+        identitycard: userInfo.identitycard,
+        unitcode: userInfo.unitcode,
+        unitname: userInfo.unitname,
+      };
       this.toDetail(`${this.$baseUrl.alyIP4}/naotuBox`, params);
     },
     toDetail(url, PARAMS) {

src/views/brainPhoto/brainRyskbszb.vue

@@ -48,9 +48,18 @@ export default {
   },
   methods: {
     goDetail() {
-      var userInfo = JSON.parse(sessionStorage.getItem("userInfo"))
-      var idcard = userInfo.identitycard  
-      var params = { type: "KyRy", kybh: this.form.zjhm, userId: idcard, };
+      var userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
+      var idcard = userInfo.identitycard;
+      var params = {
+        type: "KyRy",
+        kybh: this.form.zjhm,
+        userId: idcard,
+        username: userInfo.userName,
+        trueName: userInfo.userName,
+        identitycard: userInfo.identitycard,
+        unitcode: userInfo.unitcode,
+        unitname: userInfo.unitname,
+      };
       this.toDetail(`${this.$baseUrl.alyIP4}/naotuBox`, params);
     },
     toDetail(url, PARAMS) {

src/views/brainPhoto/brainSjhmqypz.vue

@@ -23,9 +23,7 @@ export default {
           type: "text",
           placeholder: "手机号",
           col: "3",
-          rules: [
-            { required: true, message: "请输入手机号", trigger: "blur" },
-          ],
+          rules: [{ required: true, message: "请输入手机号", trigger: "blur" }],
         },
       ],
       form: {
@@ -48,9 +46,18 @@ export default {
   },
   methods: {
     goDetail() {
-      var userInfo = JSON.parse(sessionStorage.getItem("userInfo"))
-      var idcard = userInfo.identitycard  
-      var params = { type: "KySj", kybh: this.form.sjh, userId: idcard, };
+      var userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
+      var idcard = userInfo.identitycard;
+      var params = {
+        type: "KySj",
+        kybh: this.form.sjh,
+        userId: idcard,
+        username: userInfo.userName,
+        trueName: userInfo.userName,
+        identitycard: userInfo.identitycard,
+        unitcode: userInfo.unitcode,
+        unitname: userInfo.unitname,
+      };
       this.toDetail(`${this.$baseUrl.alyIP4}/naotuBox`, params);
     },
     toDetail(url, PARAMS) {

src/views/brainPhoto/brainSjhmskbs.vue

@@ -22,9 +22,7 @@ export default {
           type: "text",
           placeholder: "手机号",
           col: "3",
-          rules: [
-            { required: true, message: "请输入手机号", trigger: "blur" },
-          ],
+          rules: [{ required: true, message: "请输入手机号", trigger: "blur" }],
         },
       ],
       form: {
@@ -47,9 +45,18 @@ export default {
   },
   methods: {
     goDetail() {
-      var userInfo = JSON.parse(sessionStorage.getItem("userInfo"))
-      var idcard = userInfo.identitycard  
-      var params = { type: "KySj", kybh: this.form.sjh, userId: idcard, };
+      var userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
+      var idcard = userInfo.identitycard;
+      var params = {
+        type: "KySj",
+        kybh: this.form.sjh,
+        userId: idcard,
+        username: userInfo.userName,
+        trueName: userInfo.userName,
+        identitycard: userInfo.identitycard,
+        unitcode: userInfo.unitcode,
+        unitname: userInfo.unitname,
+      };
       this.toDetail(`${this.$baseUrl.alyIP4}/naotuBox`, params);
     },
     toDetail(url, PARAMS) {

src/views/brainPhoto/brainWechat.vue

@@ -23,9 +23,7 @@ export default {
           type: "text",
           placeholder: "微信号",
           col: "3",
-          rules: [
-            { required: true, message: "请输入微信号", trigger: "blur" },
-          ],
+          rules: [{ required: true, message: "请输入微信号", trigger: "blur" }],
         },
       ],
       form: {
@@ -48,9 +46,18 @@ export default {
   },
   methods: {
     goDetail() {
-      var userInfo = JSON.parse(sessionStorage.getItem("userInfo"))
-      var idcard = userInfo.identitycard  
-      var params = { type: "KyWx", kybh: this.form.wxh, userId: idcard, };
+      var userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
+      var idcard = userInfo.identitycard;
+      var params = {
+        type: "KyWx",
+        kybh: this.form.wxh,
+        userId: idcard,
+        username: userInfo.userName,
+        trueName: userInfo.userName,
+        identitycard: userInfo.identitycard,
+        unitcode: userInfo.unitcode,
+        unitname: userInfo.unitname,
+      };
       this.toDetail(`${this.$baseUrl.alyIP4}/naotuBox`, params);
     },
     toDetail(url, PARAMS) {

src/views/brainPhotoxxxx/brainGzdxzhfx.vue

@@ -44,7 +44,7 @@ export default {
       ],
       leftMenus: [
         //左侧导航(模块第一个页面需要)
-				{
+        {
           id: "brainGzdxzhfx",
           label: "关注对象综合分析",
           newAuth: "M01",
@@ -52,7 +52,7 @@ export default {
           className: "iconfont icongongnengfuwu",
           hasChildren: false,
         },
-				{
+        {
           id: "brainQyxsfx",
           label: "区域线索分析",
           newAuth: "M01",
@@ -60,7 +60,7 @@ export default {
           className: "iconfont icongongnengfuwu",
           hasChildren: false,
         },
-				{
+        {
           id: "dwcx",
           label: "线索多维要素分析",
           newAuth: "M01",
@@ -75,7 +75,7 @@ export default {
     this.$store.commit("user/SET_Menu", this.Menu);
     this.$store.commit("user/SET_LeftMenu", this.leftMenus);
     this.$store.commit("user/SET_Header", this.header);
-		axios
+    axios
       .get(`${this.$baseUrl.alyIP4}/login?userId=142302198901012417`)
       .then((res) => {
         console.log(res);
@@ -88,9 +88,18 @@ export default {
     goDetail() {
       // let path = `http://39.99.155.173:8007/naotuBox?type=nmKyRy&kybh=${this.form.zjhm}`;
       // window.open(path, "_blank");
-      var userInfo = JSON.parse(sessionStorage.getItem("userInfo"))
-      var idcard = userInfo.identitycard  
-      var params = { type: "KyRy", kybh: this.form.zjhm, userId: idcard, };
+      var userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
+      var idcard = userInfo.identitycard;
+      var params = {
+        type: "KyRy",
+        kybh: this.form.zjhm,
+        userId: idcard,
+        username: userInfo.userName,
+        trueName: userInfo.userName,
+        identitycard: userInfo.identitycard,
+        unitcode: userInfo.unitcode,
+        unitname: userInfo.unitname,
+      };
       // var params = { type: "KyRy", kybh: this.form.zjhm, userId: '142302198901012417' };
       this.toDetail(`${this.$baseUrl.alyIP4}/naotuBox`, params);
       // this.toDetail("http://39.99.155.173:8007/naotuBox", params);

src/views/rlqbxsxx/detailRlqbxs.vue

@@ -17,15 +17,15 @@
     </right-content>
 
     <right-content-list
-        style="margin: -50px auto 70px; width:1150px;"
-        :pageBs="bshglaj.pageBs"
-        :cxFormData="bshglaj.cxFormData"
-        :cxQueryField="bshglaj.cxQueryField"
-        :cxDefaultFormThead="bshglaj.cxDefaultFormThead"
-        :cxUrl="bshglaj.cxUrl"
-        ref="rightContentGl"
-        @toBrain="toBrain"
-      ></right-content-list>
+      style="margin: -50px auto 70px; width: 1150px"
+      :pageBs="bshglaj.pageBs"
+      :cxFormData="bshglaj.cxFormData"
+      :cxQueryField="bshglaj.cxQueryField"
+      :cxDefaultFormThead="bshglaj.cxDefaultFormThead"
+      :cxUrl="bshglaj.cxUrl"
+      ref="rightContentGl"
+      @toBrain="toBrain"
+    ></right-content-list>
   </div>
 </template>
 
@@ -424,7 +424,7 @@ export default {
         cxFormData: {
           page: 1,
           limit: 5,
-          rlqbxxzjbh: '',
+          rlqbxxzjbh: "",
         },
         cxQueryField: [],
         cxDefaultFormThead: [
@@ -460,9 +460,9 @@ export default {
       }).then((res) => {
         loading.close();
         var result = res.data.rows;
-        if(res.data.rows.sfzsxstgz == 0) {
-          this.cxQueryField.splice(1,1)
-          result.tgz = []
+        if (res.data.rows.sfzsxstgz == 0) {
+          this.cxQueryField.splice(1, 1);
+          result.tgz = [];
         }
         this.pageObject = result;
       });
@@ -470,23 +470,66 @@ export default {
     toBrain(scope) {
       var userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
       var idcard = userInfo.identitycard;
-      var params = { type: "hnDxzp", kybh: scope.row.bshvalue, userId: idcard };
+      var params = {
+        type: "hnDxzp",
+        kybh: scope.row.bshvalue,
+        userId: idcard,
+        username: userInfo.userName,
+        trueName: userInfo.userName,
+        identitycard: userInfo.identitycard,
+        unitcode: userInfo.unitcode,
+        unitname: userInfo.unitname,
+      };
       this.toDetail(`${this.$baseUrl.alyIP4}/naotuBox`, params);
 
-      if(scope.row.bshlx == 'qq' && scope.row.bshvalue != "") {
-        var params = { type: "KyQq", kybh: scope.row.bshvalue, userId: idcard };
-      }else if(scope.row.bshlx == 'mobile' && scope.row.bshvalue != "") {
-        var params = { type: "KySj", kybh: scope.row.bshvalue, userId: idcard };
-      }else if(scope.row.bshlx == 'carid' && scope.row.bshvalue != "") {
-        var params = { type: "KyJdc", kybh: scope.row.bshvalue, userId: idcard };
-      }else if(scope.row.bshlx == 'personid' && scope.row.bshvalue != "") {
-        var params = { type: "KyRy", kybh: scope.row.bshvalue, userId: idcard };
-      }else if(scope.row.bshlx == 'ip' && scope.row.bshvalue != "") {
-        
+      if (scope.row.bshlx == "qq" && scope.row.bshvalue != "") {
+        var params = {
+          type: "KyQq",
+          kybh: scope.row.bshvalue,
+          userId: idcard,
+          username: userInfo.userName,
+          trueName: userInfo.userName,
+          identitycard: userInfo.identitycard,
+          unitcode: userInfo.unitcode,
+          unitname: userInfo.unitname,
+        };
+      } else if (scope.row.bshlx == "mobile" && scope.row.bshvalue != "") {
+        var params = {
+          type: "KySj",
+          kybh: scope.row.bshvalue,
+          userId: idcard,
+          username: userInfo.userName,
+          trueName: userInfo.userName,
+          identitycard: userInfo.identitycard,
+          unitcode: userInfo.unitcode,
+          unitname: userInfo.unitname,
+        };
+      } else if (scope.row.bshlx == "carid" && scope.row.bshvalue != "") {
+        var params = {
+          type: "KyJdc",
+          kybh: scope.row.bshvalue,
+          userId: idcard,
+          username: userInfo.userName,
+          trueName: userInfo.userName,
+          identitycard: userInfo.identitycard,
+          unitcode: userInfo.unitcode,
+          unitname: userInfo.unitname,
+        };
+      } else if (scope.row.bshlx == "personid" && scope.row.bshvalue != "") {
+        var params = {
+          type: "KyRy",
+          kybh: scope.row.bshvalue,
+          userId: idcard,
+          username: userInfo.userName,
+          trueName: userInfo.userName,
+          identitycard: userInfo.identitycard,
+          unitcode: userInfo.unitcode,
+          unitname: userInfo.unitname,
+        };
+      } else if (scope.row.bshlx == "ip" && scope.row.bshvalue != "") {
         // var params = { type: "KyRy", kybh: scope.row.bshvalue, userId: idcard };
-      } 
+      }
       this.toDetail(`${this.$baseUrl.alyIP4}/naotuBox`, params);
-
     },
     toDetail(url, PARAMS) {
       var temp_form = document.createElement("form");

src/views/shse/fzth/fzth.vue

@@ -831,11 +831,16 @@ export default {
       // let path = `http://39.99.155.173:8007/naotuBox?type=hnDxzp&kybh=${scope.row.asjbh}`;
       // window.open(path, "_blank");
       // ?userId=142302198901012417
-      var obj = JSON.parse(sessionStorage.getItem("userInfo"));
+      var userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
       var params = {
         type: "shse",
         kybh: this.$route.query.asjbh,
-        userId: obj.identitycard,
+        userId: userInfo.identitycard,
+        username: userInfo.userName,
+        trueName: userInfo.userName,
+        identitycard: userInfo.identitycard,
+        unitcode: userInfo.unitcode,
+        unitname: userInfo.unitname,
       };
       console.log(params);
       this.toDetail(`${this.$baseUrl.alyIP4}/naotuBox`, params);

src/views/shse/fzth/fzthDanger.vue

 <template>
-
   <div
     ref="zlXq"
     class="xsfk"
@@ -320,7 +319,7 @@ export default {
                       placeholder: "请选择",
                       col: "2",
                     },
-                     {
+                    {
                       name: "人员标签:",
                       id: "rybqdm",
                       prop: "checkEmpty",
@@ -931,11 +930,16 @@ export default {
       // let path = `http://39.99.155.173:8007/naotuBox?type=hnDxzp&kybh=${scope.row.asjbh}`;
       // window.open(path, "_blank");
       // ?userId=142302198901012417
-      var obj = JSON.parse(sessionStorage.getItem("userInfo"));
+      var userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
       var params = {
         type: "shse",
         kybh: this.$route.query.asjbh,
-        userId: obj.identitycard,
+        userId: userInfo.identitycard,
+        username: userInfo.userName,
+        trueName: userInfo.userName,
+        identitycard: userInfo.identitycard,
+        unitcode: userInfo.unitcode,
+        unitname: userInfo.unitname,
       };
       console.log(params);
       this.toDetail(`${this.$baseUrl.alyIP4}/naotuBox`, params);

src/views/shse/fzth/fzthxz.vue

@@ -485,13 +485,13 @@ export default {
       selectHxThAsjbh({
         asjbh: this.$route.query.asjbh,
       }).then((res) => {
-        debugger
+        debugger;
         this.sftj = res.data.rows.sfxz;
         if (res.data.rows.sftj == "1") {
           //   this.getselectHxThAsjbh();
           //   this.headerTitle = "犯罪团伙修改";
           // } else {
-            debugger
+          debugger;
           this.dialogVisible = true;
           this.ajList = res.data.rows.tjaj;
           this.xyrList = res.data.rows.tjxyr;
@@ -521,11 +521,16 @@ export default {
       // let path = `http://39.99.155.173:8007/naotuBox?type=hnDxzp&kybh=${scope.row.asjbh}`;
       // window.open(path, "_blank");
       // ?userId=142302198901012417
-      var obj = JSON.parse(sessionStorage.getItem("userInfo"));
+      var userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
       var params = {
         type: "shse",
         kybh: this.$route.query.asjbh,
-        userId: obj.identitycard,
+        userId: userInfo.identitycard,
+        username: userInfo.userName,
+        trueName: userInfo.userName,
+        identitycard: userInfo.identitycard,
+        unitcode: userInfo.unitcode,
+        unitname: userInfo.unitname,
       };
       console.log(params);
       this.toDetail(`${this.$baseUrl.alyIP4}/naotuBox`, params);
@@ -1337,7 +1342,7 @@ export default {
               this.loadingFk = false;
               // this.toNt();     window.opener.location.reload();
               window.close();
-                   window.opener.location.reload();
+              window.opener.location.reload();
             },
           });
         }
@@ -1357,7 +1362,7 @@ export default {
               this.loadingFk = false;
               // this.toNt();
               window.close();
-                   window.opener.location.reload();
+              window.opener.location.reload();
             },
           });
         }

src/views/userAuth/menu/addMenu.vue

@@ -12,7 +12,7 @@
 
 <script>
 import formCompontent from "@c/form.vue";
-import { submit, detail } from "@/api/userAuth/menu.js";
+import { submit, detail, tree } from "@/api/userAuth/menu.js";
 export default {
   name: "addMenu",
   components: {
@@ -47,14 +47,15 @@ export default {
               placeholder: "请输入",
               col: "2",
             },
-            {
+              {
               name: "上级菜单:",
               id: "parentId",
-              type: "text",
-              prop: "checkEmpty",
+              type: "codeTree",
+              codeOptions: [],
               value: "",
               placeholder: "请输入",
               col: "2",
+              isLazy: true,
             },
             {
               name: "菜单编号:",
@@ -73,7 +74,7 @@ export default {
               value: "",
               placeholder: "请输入",
               col: "2",
-            }
+            },
           ],
         },
       ],
@@ -162,9 +163,41 @@ export default {
         }, 500);
       });
     },
+    getTree() {
+      let self = this
+      tree().then((res) => {
+        if (res.success) {
+          res.data.forEach((item) => {
+            item.label = item.title;
+            if (item.hasChildren) {
+              self.changeTitle(item);
+            }
+          });
+          console.log(res.data);
+          self.$set(
+            self.propFormField[0].data[2],
+            "codeOptions",
+            res.data
+          );
+        }
+      });
+    },
+    changeTitle(data) {
+      debugger;
+      let self = this;
+      data.children.forEach((item) => {
+        item.label = item.title;
+        if (item.hasChildren) {
+          self.changeTitle(item);
+        }
+      });
+
+      return data;
+    },
   },
   created() {
     this.$store.commit("user/SET_Breadcrumb", this.breadcrumbList);
+    this.getTree()
     if (this.$route.query.xxzjbh) {
       this.Loading = this.$loading({
         lock: true,
@@ -172,7 +205,8 @@ export default {
         spinner: "el-icon-loading",
         background: "rgba(255, 255, 255, 0.7)",
       });
-      this.title = "角色信息修改";
+      this.title = "菜单信息修改";
+      this.$set(this.propFormField[0], "title", "修改菜单");
       this.xxzjbh = this.$route.query.xxzjbh;
       this.getshuju();
     }

src/views/userAuth/role/addRole.vue

@@ -198,6 +198,7 @@ export default {
         background: "rgba(255, 255, 255, 0.7)",
       });
       this.title = "角色信息修改";
+      this.$set(this.propFormField[0],'title','修改角色')
       this.xxzjbh = this.$route.query.xxzjbh;
       this.getshuju();
     }

src/views/userAuth/role/queryRole.vue

@@ -157,7 +157,7 @@ export default {
       if (this.selectedId.length > 0) {
         this.dialogVisible = true;
       } else {
-        this.$message.error("请选择用户");
+        this.$message.error("请选择角色");
       }
     },
     getTree() {

src/views/userAuth/user/addXg.vue

@@ -25,11 +25,11 @@ export default {
   },
   data() {
     return {
-      title: "用户新增",
+      title: "用户修改",
       propFormField: [
         //基本信息
         {
-          title: "新增用户",
+          title: "修改用户",
           id: 1,
           objStr: "",
 

src/views/userAuth/user/queryUser.vue

@@ -166,10 +166,6 @@ export default {
           label: "用户级别",
           prop: "gradeStr",
         },
-        {
-          label: "用户状态",
-          prop: "openFlag",
-        },
       ],
       cxUrl: "/sysuser/selectUserNewList",
       Menu: [
@@ -230,14 +226,22 @@ export default {
     this.isPremission = JSON.parse(sessionStorage.getItem("userInfo"))
       .permission.split(",")
       .findIndex((item) => item == "A0000");
-    debugger;
     this.identitycard = JSON.parse(
       sessionStorage.getItem("userInfo")
     ).identitycard;
-    debugger;
     this.getTree();
+    this.getThead();
   },
   methods: {
+    getThead() {
+      if (this.isPremission >= 0) {
+        let obj = {
+          label: "用户状态",
+          prop: "openFlag",
+        };
+        this.cxDefaultFormThead.push(obj);
+      }
+    },
     editMa(scope) {
       debugger;
       this.$set(this.form, "id", scope.row.id);
@@ -343,15 +347,15 @@ export default {
       });
     },
     edit(obj) {
-      if (this.identitycard == obj.row.identitycard) {
+      if (this.identitycard == obj.row.identitycard || this.isPremission >= 0) {
         this.$router.pushToTab({
           path: "/addXg",
           query: {
             xxzjbh: obj.row.id,
           },
         });
-      }else{
-        this.$message.error('暂无权限，只能修改本人信息')
+      } else {
+        this.$message.error("暂无权限，只能修改本人信息");
       }
     },
     dele(obj) {

src/views/xshb/xshb/djgzxs.vue

@@ -1355,6 +1355,11 @@ export default {
         type: "KyRy",
         kybh: scope.gmsfzh,
         userId: obj.identitycard,
+        username: obj.userName,
+        trueName: obj.userName,
+        identitycard: obj.identitycard,
+        unitcode: obj.unitcode,
+        unitname: obj.unitname,
       };
       console.log(params);
       this.toDetail(`${this.$baseUrl.alyIP4}/naotuBox`, params);
@@ -1403,6 +1408,11 @@ export default {
           type: bsh,
           kybh: kybh,
           userId: obj.identitycard,
+          username: obj.userName,
+          trueName: obj.userName,
+          identitycard: obj.identitycard,
+          unitcode: obj.unitcode,
+          unitname: obj.unitname,
         };
         this.toDetail(`${this.$baseUrl.alyIP4}/naotuBox`, params);
         // this.toDetail("http://39.99.155.173:8007/naotuBox", params);

src/views/xxtk/gzry/queryGzry.vue

@@ -58,7 +58,7 @@
     </el-dialog>
     <!-- 新增列控 -->
 
-    <!-- <el-dialog title="新增列控信息" :visible.sync="newlyVisiable">
+    <el-dialog title="新增列控信息" :visible.sync="newlyVisiable">
       <el-form :inline="true" :model="lkForm" class="demo-form-inline">
         <el-row>
           <el-col :span="20" :offset="2" style="margin-top: 20px">
@@ -99,9 +99,9 @@
         <el-button @click="newlyVisiable = false">取 消</el-button>
         <el-button type="primary" @click="submitLKD">确 定</el-button>
       </div>
-    </el-dialog> -->
+    </el-dialog>
     <!-- 撤控 -->
-    <!-- <el-dialog title="新增撤控信息" :visible.sync="revokeVisiable">
+    <el-dialog title="新增撤控信息" :visible.sync="revokeVisiable">
       <el-form :inline="true" :model="ckForm" class="demo-form-inline">
         <el-row>
           <el-col :span="20" :offset="2" style="margin-top: 20px">
@@ -142,7 +142,7 @@
         <el-button @click="revokeVisiable = false">取 消</el-button>
         <el-button type="primary" @click="submitCKD">确 定</el-button>
       </div>
-    </el-dialog> -->
+    </el-dialog>
   </div>
 </template>
 
@@ -928,6 +928,7 @@ export default {
       });
     },
     newlyLK(xzgzrybh) {
+      debugger
       for (let key in this.lkForm) {
         this.$set(this.lkForm, key, "");
       }

src/views/zdxx/zdxsxx/zdxsxxDetail.vue

@@ -255,21 +255,62 @@ export default {
     toBrain(scope) {
       var userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
       var idcard = userInfo.identitycard;
-      var params = { type: "hnDxzp", kybh: scope.row.bshvalue, userId: idcard };
+      var params = {
+        type: "hnDxzp",
+        kybh: scope.row.bshvalue,
+        userId: idcard,
+        username: userInfo.userName,
+        trueName: userInfo.userName,
+        identitycard: userInfo.identitycard,
+        unitcode: userInfo.unitcode,
+        unitname: userInfo.unitname,
+      };
       this.toDetail(`${this.$baseUrl.alyIP4}/naotuBox`, params);
 
       if (scope.row.bshlx == "qq" && scope.row.bshvalue != "") {
-        var params = { type: "KyQq", kybh: scope.row.bshvalue, userId: idcard };
+        var params = {
+          type: "KyQq",
+          kybh: scope.row.bshvalue,
+          userId: idcard,
+          username: userInfo.userName,
+          trueName: userInfo.userName,
+          identitycard: userInfo.identitycard,
+          unitcode: userInfo.unitcode,
+          unitname: userInfo.unitname,
+        };
       } else if (scope.row.bshlx == "mobile" && scope.row.bshvalue != "") {
-        var params = { type: "KySj", kybh: scope.row.bshvalue, userId: idcard };
+        var params = {
+          type: "KySj",
+          kybh: scope.row.bshvalue,
+          userId: idcard,
+          username: userInfo.userName,
+          trueName: userInfo.userName,
+          identitycard: userInfo.identitycard,
+          unitcode: userInfo.unitcode,
+          unitname: userInfo.unitname,
+        };
       } else if (scope.row.bshlx == "carid" && scope.row.bshvalue != "") {
         var params = {
           type: "KyJdc",
           kybh: scope.row.bshvalue,
           userId: idcard,
+          username: userInfo.userName,
+          trueName: userInfo.userName,
+          identitycard: userInfo.identitycard,
+          unitcode: userInfo.unitcode,
+          unitname: userInfo.unitname,
         };
       } else if (scope.row.bshlx == "personid" && scope.row.bshvalue != "") {
-        var params = { type: "KyRy", kybh: scope.row.bshvalue, userId: idcard };
+        var params = {
+          type: "KyRy",
+          kybh: scope.row.bshvalue,
+          userId: idcard,
+          username: userInfo.userName,
+          trueName: userInfo.userName,
+          identitycard: userInfo.identitycard,
+          unitcode: userInfo.unitcode,
+          unitname: userInfo.unitname,
+        };
       } else if (scope.row.bshlx == "ip" && scope.row.bshvalue != "") {
         // var params = { type: "KyRy", kybh: scope.row.bshvalue, userId: idcard };
       }

src/views/ztyp/queryWl.vue

@@ -135,7 +135,16 @@ export default {
       debugger;
       var userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
       var idcard = userInfo.identitycard;
-      var params = { type: "KySj", kybh: data.fsfsjh, userId: idcard };
+      var params = {
+        type: "KySj",
+        kybh: data.fsfsjh,
+        userId: idcard,
+        username: userInfo.userName,
+        trueName: userInfo.userName,
+        identitycard: userInfo.identitycard,
+        unitcode: userInfo.unitcode,
+        unitname: userInfo.unitname,
+      };
       console.log(params);
       this.toDetail(`${this.$baseUrl.alyIP4}/naotuBox`, params);
       // let params = {