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

src/components/ptCxForm_components.vue

@@ -1104,7 +1104,7 @@
                 v-html="scope.row[columnTitle.prop]"
               ></span>
             </div>
-            
+
             <div v-else-if="columnTitle.toInforDa">
               <span
                 @click="toInforDa(scope.row)"
@@ -3183,9 +3183,7 @@ export default {
         this.pageBs == "queryWysp"
       ) {
         currentUrl = `${url.alyIP13}${this.cxUrl}`;
-      } else if (
-        this.pageBs == "queryMbxx"
-      ) {
+      } else if (this.pageBs == "queryMbxx") {
         currentUrl = `${url.alyIP15}${this.cxUrl}`;
       } else {
         currentUrl = `${url.alyIP}${this.cxUrl}`;
@@ -3709,6 +3707,15 @@ export default {
         }
       },
     },
+    "cxFormData.ajfl": {
+      handler(val, old) {
+        debugger
+        if (val != old) {
+          this.doQuery("yes");
+        }
+      },
+      deep: true,
+    },
   },
 };
 </script>

src/layout/menuLayout.vue

@@ -121,7 +121,7 @@ export default {
     this.topHeader = this.header;
     this.$bus.$on("routerPath", () => {
       console.log(sessionStorage.getItem("routerPath"));
-      this.$refs.menu.activeIndex = sessionStorage.getItem("routerPath");
+      // this.$refs.menu.activeIndex = sessionStorage.getItem("routerPath");
     });
   },
   watch: {
@@ -143,8 +143,8 @@ export default {
       // this.header = val;
     },
     $route(val) {
-      this.activeIndex =
-        sessionStorage.getItem("routerPath") || this.$route.name;
+      this.activeIndex =this.$route.name;
+        debugger
       let index = this.topMenus.findIndex((i) => i.id == val.name);
       if (!val.meta.isAdd && index >= 0) {
         this.activeName = val.name;

src/views/brainPhoto/brainAsjzc.vue

@@ -267,8 +267,10 @@ export default {
           type: "select",
           selectData: [
             { name: "全部", value: "" },
+            { name: "盗抢骗案件", value: "3" },
             { name: "电诈案件", value: "2" },
             { name: "涉黑涉恶案件", value: "1" },
+            { name: "其他", value: "4" },
           ],
           value: "",
           placeholder: "",
@@ -741,10 +743,19 @@ export default {
       //   });
     },
     toBrai(scope) {
+      let ajfl = "";
+      if (scope.row.ajfl == "2") {
+        ajfl = "hnDxzp";
+      } else if (scope.row.ajfl == "1") {
+        ajfl = "shse";
+      } else {
+        ajfl = "AjXx";
+      }
+      debugger
       var userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
       var idcard = userInfo.identitycard;
       var params = {
-        type: this.typeNt,
+        type: ajfl,
         kybh: scope.row.asjbh,
         userId: idcard,
         // username: userInfo.userName,
@@ -773,19 +784,19 @@ export default {
     },
   },
   watch: {
-    "cxFormData.ajfl": {
-      handler(val, old) {
-        debugger;
-        if (val == "2") {
-          this.typeNt = "hnDxzp";
-        } else if (val == "1") {
-          this.typeNt = "shse";
-        } else {
-          this.typeNt = "AjXx";
-        }
-      },
-      deep: true,
-    },
+    // "cxFormData.ajfl": {
+    //   handler(val, old) {
+    //     debugger;
+    //     if (val == "2") {
+    //       this.typeNt = "hnDxzp";
+    //     } else if (val == "1") {
+    //       this.typeNt = "shse";
+    //     } else {
+    //       this.typeNt = "AjXx";
+    //     }
+    //   },
+    //   deep: true,
+    // },
   },
 };
 </script>

src/views/queryRyhx/queryRyhx.vue

@@ -67,7 +67,7 @@ export default {
           id: "queryRyhx",
           label: "画像工厂",
           newAuth: "M01",
-          index: "2",
+          index: "1",
           className: "iconfont icongongnengfuwu",
           hasChildren: true,
           children: [

vue.config.js

@@ -59,6 +59,7 @@ module.exports = {
     proxy: {
       "/apialy": {
         target: "http://39.99.155.173:9022",  //西藏: https://155.1.33.10:20010/   阿里云：http://39.99.155.173:9022
+        // target: "http://192.168.1.113:8762",  //西藏: https://155.1.33.10:20010/   阿里云：http://39.99.155.173:9022
         // ws: true, 
         changeOrigin: true,
         secure: false,