Merge branch 'dev'

src/views/bpm/task/todo.vue

@@ -92,7 +92,7 @@
 import {getTodoTaskPage} from '@/api/bpm/task'
 import { cancelProcessInstance } from "@/api/bpm/processInstance";
 export default {
-  name: "Todo",
+  name: "BpmTaskTodo",
   components: {},
   data() {
     return {

src/views/report/customer_analysis/index.vue

@@ -539,7 +539,9 @@ export default {
   watch: {
     $route(to) {
       //lanbm 2024-05-06 解决重新进入参数不刷新的问题
-      if (this.$route.name == "客户分析") {
+      //this.$route.name == "客户分析" 用name做逻辑判断，有时候菜单名称会变化
+      //"/report/customer_analysis" lanbm 2024-05-07 调整为根据path做逻辑判断
+      if (this.$route.path== "/report/customer_analysis") {
         this.doLoadData();
       }
     },
@@ -766,6 +768,24 @@ export default {
       return strDate;
     },
     test() {
+      //当前路径
+      let sP=this.$route.path;
+      alert(sP);
+      //当前参数
+      let sPar= this.$route.params;
+      alert(sPar);
+      //路由名称
+      let sRoute=this.$route.name;
+      alert(sRoute);
+      //路由查询参数
+      let sQ=this.$route.query;
+      alert(sQ.toString());
+      //路由匹配项
+      let sM=this.$route.matched;
+      alert(sM.toString());
+
+      return;
+
       this.DeptEx.id = this.objEcwReportPermission.deptId;
       listServiceUser(this.DeptEx).then((response) => {
         let json1 = JSON.stringify(response.data);
@@ -773,8 +793,6 @@ export default {
         return;
       });
 
-      return;
-
       let json1 = JSON.stringify(this.deptOptions);
       alert(json1);
       return;

src/views/report/vz/index.vue

@@ -63,7 +63,8 @@
         <el-button
           type="primary"
           plain
-          icon="el-icon-plus" v-show="false"
+          icon="el-icon-plus"
+          v-show="false"
           size="mini"
           @click="TestFun"
         >