Merge branch 'dev_xzxt_huNan' of http://39.99.224.27:9022/changchao/founder_vue into dev_xzxt_huNan

src/utils/params.js

@@ -16497,13 +16497,13 @@ let rydaPropLeftMenu = [
   {
     id: 'dswtz',
     label: '多生物特征',
-    index: '10',
+    index: '9',
     className: ''
   },
   {
     id: 'ypbg',
     label: '研判报告',
-    index: '11',
+    index: '10',
     className: ''
   },
   /*{
@@ -16517,7 +16517,7 @@ let rydaPropLeftMenu = [
 let glRyxxList = [
   { label: '民族', id: 'mzStr', ids: 'mzdm', col: '3', show: true,},
   { label: '出生日期', id: 'csrq', col: '3',},
-  { label: '国籍', id: 'gjStr', ids: 'gjdm', col: '3', show: true, },
+  { label: '国籍', id: 'gjStr', ids: 'gjdm', col: '3', show: true,hidden: true  },
   { label: '婚姻状况', id: 'hyztStr', ids: 'hyztdm', col: '3', show: true,hidden: true },
   { label: '兵役状况', id: 'byztStr', ids: 'byztdm', col: '3', show: true,hidden: true  },
   { label: '文化程度', id: 'whcdStr', ids: 'whcddm', col: '3', show: true ,hidden: true },

src/views/jump.vue

@@ -4,7 +4,7 @@
 import request from "@/utils/axiosHttp.js";
 import url from "@/api/base";
 import qs from "qs";
-import  encrypt  from '@/utils/encry.js';
+import encrypt from "@/utils/encry.js";
 import encry from "@/utils/encry.js";
 export default {
   data() {
@@ -13,47 +13,6 @@ export default {
     };
   },
   methods: {
-    login() {
-      var self = this;
-      var arr = document.cookie.split("; ");
-      let userToken = "";
-      let appToken = "";
-      arr.forEach((item) => {
-        if (item.includes("userToken=")) {
-          userToken = item.split("userToken=")[1];
-        }
-        if (item.includes("appToken=")) {
-          appToken = item.split("appToken=")[1];
-        }
-      });
-      axios.defaults.headers = {
-        token: userToken,
-        appToken: appToken,
-      };
-      sessionStorage.setItem("zjhm", self.$route.query.zjhm);
-      var params = new URLSearchParams();
-      params.append("zjhm", self.$route.query.zjhm);
-      axios
-        .post(url.BaseURL + "/loginByZjhm", params, {
-          headers: {
-            "content-type": "application/x-www-form-urlencoded",
-          },
-        })
-        .then((res) => {
-          debugger;
-          self.$router.push({
-            path: self.$route.query.path,
-            query: {
-              cphm: self.$route.query.cphm,
-              zjhm: self.$route.query.zjhms,
-              asjbh: self.$route.query.asjbh,
-            },
-          });
-        })
-        .catch((err) => {
-          console.log(err);
-        });
-    },
     logins() {
       var self = this;
       var arr = document.cookie.split("; ");
@@ -78,7 +37,9 @@ export default {
       } else if (self.$route.query?.zjhm) {
         zjhm = encry.Decrypt(self.$route.query.zjhm);
       }
-      debugger;
+      if (self.$route.query.path == "/rzcxIndex/sjzyykgl") {
+        zjhm = JSON.parse(zjhm);
+      }
       params.append("zjhm", zjhm);
       axios
         .post(url.rzURL + "/loginByZjhm", params, {
@@ -87,70 +48,21 @@ export default {
           },
         })
         .then((res) => {
-          console.log(res)
-          // self.login();
+          if (res.data.code == 200) {
+            debugger;
             self.$router.push({
               path: self.$route.query.path,
               query: {
                 cphm: self.$route.query.cphm,
                 zjhm: self.$route.query.zjhms,
-              asjbh: self.$route.query.asjbh
+                asjbh: self.$route.query.asjbh,
               },
             });
+          }
         });
-      // axios
-      //   .post(url.BaseURL + "/loginByZjhm", params, {
-      //     headers: {
-      //       "content-type": "application/x-www-form-urlencoded",
-      //     },
-      //   })
-      //   .then((res) => {
-      //     self.login();
-      //   });
     },
-    // newlogin() {
-    //   var self = this;
-    //   sessionStorage.removeItem("userInfo");
-    //   console.log(JSON.parse(encrypt.Decrypt(self.$route.query.zjhm)));
-    //   let res = JSON.parse(encrypt.Decrypt(self.$route.query.zjhm))
-    //   sessionStorage.setItem("token", "bearer " + res.accessToken);
-    //   sessionStorage.setItem("userInfo", JSON.stringify(res));
-    //   const roles = res.permission.split(",");
-    //   this.$store.commit("user/SET_ROLES", roles);
-    //   this.Loading.close();
-    //   debugger;
-    //   alert(self.$route.query.zjhm)
-    //   this.$router.push({
-    //     path: self.$route.query.path,
-    //     query: {
-    //       asjbh: self.$route.query.asjbh,
-    //       zczlbh: self.$route.query.zczlbh,
-    //       shsexsbh: self.$route.query.shsexsbh,
-    //       xxzjbh: self.$route.query.xxzjbh,
-    //       asjxgrybh: self.$route.query.asjxgrybh,
-    //       xsbh: self.$route.query.xsbh,
-    //       type: self.$route.query.type,
-    //       module: self.$route.query.module,
-    //       xsType: self.$route.query.xsType,
-    //       operation: self.$route.query.operation
-    //     },
-    //   });
-    // }
   },
   created() {
-    // this.Loading = this.$loading({
-    //   lock: true,
-    //   text: "正在跳转...",
-    //   spinner: "el-icon-loading",
-    //   background: "rgba(255, 255, 255, 0.7)",
-    // });
-    // this.Loading = this.$loading({
-    //   lock: true,
-    //   text: "正在跳转...",
-    //   spinner: "el-icon-loading",
-    //   background: "rgba(255, 255, 255, 0.7)",
-    // });
-    // this.newlogin();
     this.logins();
   },
 };

src/views/ryda/ryGl.vue

@@ -1140,6 +1140,17 @@ export default {
           hidden: true,
         },
         {
+          name: "国籍:",
+          id: "gjdm",
+          type: "code", //字典弹框
+          props: [], //字典弹框需要的字段
+          codeOptions: [],
+          codeTree: "CODE_GJ",
+          value: "",
+          col: "1",
+          hidden: true,
+        },
+        {
           name: "婚姻状况:",
           id: "hyzkdm",
           type: "code", //字典弹框
@@ -1193,17 +1204,6 @@ export default {
           hidden: true,
         },
         {
-          name: "国籍:",
-          id: "gjdm",
-          type: "code", //字典弹框
-          props: [], //字典弹框需要的字段
-          codeOptions: [],
-          codeTree: "CODE_GJ",
-          value: "",
-          col: "1",
-          hidden: true,
-        },
-        {
           name: "服务场所:",
           id: "fwcs",
           type: "text",
@@ -1415,7 +1415,10 @@ export default {
     if (this.$route.query["zjhm"]) {
       sessionStorage.setItem("zjhm", this.$route.query["zjhm"]);
     }
-    this.loginByZjhm();
+    this.getRyxx();
+    this.postgetJjpgLwxxList();
+    this.postgetJjpgCxfsList();
+    this.showSeeksGraph();
     self.propQueryField.forEach((val) => {
       if (val.type == "code" || val.type == "codeTreeDialog") {
         if (val.codeOptions.length == 0) {
@@ -2622,41 +2625,6 @@ export default {
     onLineClick(lineObject, $event) {
       console.log("onLineClick:", lineObject);
     },
-    postLoginByZjhm(zjhm) {
-      return request({
-        url: url.rzURL + "/loginByZjhm?zjhm=" + zjhm,
-        // data: JSON.parse(zjhm),
-        method: "POST",
-      });
-    },
-    loginByZjhm() {
-      if (this.$route.query["idcard"]) {
-        let zjhm = this.$route.query["idcard"];
-        console.log(zjhm);
-        this.postLoginByZjhm(zjhm).then((res) => {
-          if (res.code == 200) {
-            this.$router.push({
-              path: "/rydaIndex/ryGL",
-              query: { zjhm: sessionStorage.getItem("zjhm") },
-            });
-            debugger;
-            this.getRyxx();
-            this.postgetJjpgLwxxList();
-            this.postgetJjpgCxfsList();
-            this.showSeeksGraph();
-            // this.initMap();
-          } else {
-            this.$message.error("登录失败");
-          }
-        });
-      } else {
-        this.getRyxx();
-        this.postgetJjpgLwxxList();
-        this.postgetJjpgCxfsList();
-        this.showSeeksGraph();
-        // this.initMap();
-      }
-    },
   },
   // watch: {
   //   ldList (val) {
@@ -2841,6 +2809,7 @@ button.el-button.el-button--primary {
 }
 /deep/.el-form-item__content {
   display: flex;
+  line-height: unset;
 }
 i.el-icon-folder-add {
   float: right;