Merge remote-tracking branch 'origin/dev_xzeq_xz' into dev_xzeq_xz

src/layout/menuLayout.vue

@@ -2,15 +2,15 @@
   <!--左侧导航-->
   <div>
     <div class="headerTitle">
-      <img src="../assets/img/login/jinhui.png"
-           alt="" /><span>{{
+      <img src="../assets/img/login/jinhui.png" alt="" /><span>{{
         topHeader
       }}</span>
     </div>
-    <div style="display: flex"
-         class="queryContent">
-      <div class="leftMenu"
-           :style="{ width: isCollapse == true ? '72px' : '240px' }">
+    <div style="display: flex" class="queryContent">
+      <div
+        class="leftMenu"
+        :style="{ width: isCollapse == true ? '72px' : '240px' }"
+      >
         <el-scrollbar style="height: 100%">
           <el-menu
             @select="changeSidebar"
@@ -22,7 +22,8 @@
             active-text-color="#007AFF"
             background-color="#ffffff"
             text-color="rgba(90, 93, 103, 1)"
-            ref="menu">
+            ref="menu"
+          >
             <div
               class="menu_wrap"
               v-for="item in leftMenus"
@@ -35,24 +36,25 @@
                 @click="goDetail(item)"
                 ><i :class="item.className"></i>{{ item.label }}
               </el-menu-item>
-              <el-submenu
-                :index="item.index"
-                v-if="item.hasChildren == true"
-              >
+              <el-submenu :index="item.index" v-if="item.hasChildren == true">
                 <template slot="title">
                   <i :class="item.className"></i>
-                  <span
-                    slot="title"
-                    style="color: #343a3f !important"
-                  >{{ item.label }}</span>
+                  <span slot="title" style="color: #343a3f !important">{{
+                    item.label
+                  }}</span>
                 </template>
                 <el-menu-item
                   :index="subitem.index"
                   v-for="(subitem, index) in item.children"
                   :key="index"
                   @click="goDetail(subitem)"
-                  v-permission="subitem.roles">
-                  <i class="iconfont iconquanxianjiesuo" v-show="subitem.disabled"></i>{{ subitem.label }}
+                  v-permission="subitem.roles"
+                >
+                  <i
+                    class="iconfont iconquanxianjiesuo"
+                    v-show="subitem.disabled"
+                  ></i
+                  >{{ subitem.label }}
                 </el-menu-item>
               </el-submenu>
             </div>
@@ -61,13 +63,17 @@
       </div>
       <div class="rightContent">
         <div v-if="!$route.meta.isAdd">
-          <el-tabs v-model="activeName"
+          <el-tabs
+            v-model="activeName"
             @tab-click="handleClick"
-                   class="topMenu">
-            <el-tab-pane :label="item.label"
+            class="topMenu"
+          >
+            <el-tab-pane
+              :label="item.label"
               :name="item.id"
               v-for="item in topMenus"
-                         :key="item.id">
+              :key="item.id"
+            >
             </el-tab-pane>
           </el-tabs>
         </div>
@@ -87,7 +93,7 @@ export default {
   props: {
     isCollapseP: Boolean,
   },
-  data () {
+  data() {
     return {
       isOpenOnly: true,
       isCollapse: this.isCollapseP,
@@ -103,7 +109,7 @@ export default {
   computed: {
     ...mapGetters(["topMenu", "Breadcrumbs", "leftMenu", "header"]),
   },
-  created () {
+  created() {
     this.navList = JSON.parse(sessionStorage.getItem("navList"));
     this.topMenus = this.topMenu;
     this.breadcrumbList = this.Breadcrumbs;
@@ -115,24 +121,24 @@ export default {
     });
   },
   watch: {
-    isCollapseP (val) {
+    isCollapseP(val) {
       this.isCollapse = val;
     },
-    topMenu (val) {
+    topMenu(val) {
       this.topMenus = val;
       this.activeName = val[0].id;
     },
-    breadcrumbList (val) {
+    breadcrumbList(val) {
       this.breadcrumbList = val;
     },
-    leftMenu (val) {
+    leftMenu(val) {
       this.leftMenus = val;
     },
-    header (val) {
+    header(val) {
       this.topHeader = val;
       // this.header = val;
     },
-    $route (val) {
+    $route(val) {
       this.activeIndex = this.$route.name;
       debugger;
       let index = this.topMenus.findIndex((i) => i.id == val.name);
@@ -142,7 +148,7 @@ export default {
     },
   },
   methods: {
-    goDetail (item) {
+    goDetail(item) {
       let Base64 = require("js-base64").Base64;
       debugger;
       if (item.id == "dwcx") {
@@ -153,8 +159,10 @@ export default {
             JSON.stringify(JSON.parse(sessionStorage.getItem("userInfo")))
           )
         );
-        let path = `${this.$baseUrl.alyIP14
-          }/#/jump?token=${base}&path=/jccxIndex&zjhm=${JSON.parse(sessionStorage.getItem("userInfo")).identitycard
+        let path = `${
+          this.$baseUrl.alyIP14
+        }/#/jump?token=${base}&path=/jccxIndex&zjhm=${
+          JSON.parse(sessionStorage.getItem("userInfo")).identitycard
         }`;
         console.log(path);
         window.open(path, "_blank");
@@ -176,7 +184,8 @@ export default {
         item.id == "zcajfl" ||
         item.id == "zczbgctj"
       ) {
-        let path = `${this.$baseUrl.alyIP10}/jump?zjhm=${JSON.parse(sessionStorage.getItem("userInfo")).identitycard
+        let path = `${this.$baseUrl.alyIP10}/jump?zjhm=${
+          JSON.parse(sessionStorage.getItem("userInfo")).identitycard
         }&path=/esAjzb/ajzbIndex`;
         window.open(path, "_blank");
       } else if (item.id == "zdryGl") {
@@ -208,7 +217,21 @@ export default {
         let path = `${this.$baseUrl.alyIP9}/#/jumplogin?idcard=${skjm}`;
         window.open(path, "_blank");
       } else if (item.id == "kjdzxxbd") {
-        let path = "http://xzxt-zhyy.dsj.xz:9007/#/home";
+        let path = "http://xzxt-zhyy.dsj.xz/gps/#/home";
+        window.open(path, "_blank");
+      } else if (item.id == "dgjzhfx") {
+        let key =
+          "maplogin" +
+          encrypt.creattimeBumderNYR(new Date()).split("-").join("");
+        let vi =
+          "map_vues" +
+          encrypt.creattimeBumderNYR(new Date()).split("-").join("");
+        let skjm = encrypt.skEncrypt(
+          JSON.parse(sessionStorage.getItem("userInfo")).identitycard,
+          key.trim(),
+          vi.trim()
+        );
+        let path = `${this.$baseUrl.alyIP9}/#/jumplogin?idcard=${skjm}&menuTop=gjfx&toType=gjfx`;
         window.open(path, "_blank");
       } else if (item.id == "queryYpzl") {
         this.$router.pushToTab({
@@ -239,7 +262,7 @@ export default {
         this.$router.push(item.index);
       }
     },
-    navAuth () {
+    navAuth() {
       var self = this;
       if (self.navList.length > 0) {
         self.leftMenu.forEach((item) => {
@@ -269,21 +292,21 @@ export default {
         });
       }
     },
-    handleClick (tab) {
+    handleClick(tab) {
       this.activeName = tab.name;
       this.$router.push(tab.name);
     },
-    handleMenuOpen (key, keyPath) {
+    handleMenuOpen(key, keyPath) {
       // if(key!=this.$route.name&&key.indexOf("basicServer")==0){
       //   this.$router.push("/"+key)
       // }
     },
-    handleMenuClose (key, keyPath) {
+    handleMenuClose(key, keyPath) {
       // if(key!=this.$route.name&&key.indexOf("basicServer")==0){
       //   this.$router.push("/"+key)
       // }
     },
-    changeSidebar (index) {
+    changeSidebar(index) {
       sessionStorage.setItem("routerPath", index);
     },
   },

src/layout/menuLayouts.vue

@@ -227,7 +227,7 @@ export default {
         let path = `${this.$baseUrl.alyIP9}/#/jumplogin?idcard=${skjm}`;
         window.open(path, "_blank");
       } else if (item.id == "kjdzxxbd") {
-        let path = "http://xzxt-zhyy.dsj.xz:9007/#/home";
+        let path = "http://xzxt-zhyy.dsj.xz/gps/#/home";
         window.open(path, "_blank");
       } else if (item.id == "queryYpzl") {
         this.$router.pushToTab({

src/views/cbyp/cbypTxxxfx.vue

@@ -47,8 +47,10 @@ export default {
   },
   methods: {
     goDetail() {
-      let Base64 = require("js-base64").Base64;
-      let path = `${this.$baseUrl.alyIP11}/hdfx/hdfx/toIframe?drrZjhm=${this.form.zjhm}`;
+      let rxtoken = sessionStorage.getItem("rxtoken")
+        ? sessionStorage.getItem("rxtoken").replace(/\+/g, "%2B")
+        : "";
+      let path = `http://xzxt-zhyy.dsj.xz/telephone/#/jump?path=/queryHdfx&token${rxtoken}`;
       window.open(path, "_blank");
     },
   },

src/views/ztyp/transactionFlow.vue

@@ -1129,7 +1129,7 @@ export default {
         //console.log(JSON.stringify(this.picDataList))
         this.picDataLoading = false;
         window.open(
-          "http://xzxt-zhyy.dsj.xz:9007/#/home?data=" +
+          "http://xzxt-zhyy.dsj.xz/gps/#/home?data=" +
             JSON.stringify(this.picDataList),
           "_blank"
         );