4.0.95 修改Prodog版本，修改仪表盘查询的接口。

package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-base-v4",
   "description": "Leanwo Prodog Client",
-  "version": "4.0.94",
+  "version": "4.0.95",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "ins": "npm install --registry http://wuzhixin.vip:4873",

src/api/base/UserResource.js

@@ -1006,42 +1006,6 @@ export default {
     });
   },
 
-  /**
-	 * 工具类自动生成的方法
-	 * 工具作者: 杨志杰
-	 * 查询当前物流人员输入的密码是否正确 
-	 */
-  queryPasswordByLogisticsPersonnel: function(password){
-    var requestUrl = 'api/userResource/queryPasswordByLogisticsPersonnel';
-    var paramCount = 0;
-    if(password != null){
-      requestUrl += (paramCount > 0) ? '&' : '?';
-      requestUrl += ('password=' + password);
-      paramCount ++;
-    }
-
-
-    return new Promise((resolve, reject) => {
-      $.ajax({
-        url: Common.getApiUrl2(requestUrl),
-        type: 'get',
-        contentType: 'application/json',
-				
-				
-				
-				
-        beforeSend: function(request) {
-          Common.addTokenToRequest(request);
-        },
-        success: function(data) {
-          resolve(data);
-        },
-        error: function(XMLHttpRequest, textStatus, errorThrown) {
-          reject(XMLHttpRequest);
-        },
-      });
-    });
-  },
 
   /**
 	 * 工具类自动生成的方法

src/dashboard/Dashboard.vue

@@ -18,6 +18,9 @@ import Common from '../common/Common.js';
 import { CssUtil,Notify } from 'pc-component-v3';
 import JsUtil from '../common/JsUtil';
 
+import { useRoleStateSingleton } from '../client/RoleState.js';
+
+
 export default defineComponent({
   name: 'DashboardPage',
 
@@ -26,9 +29,17 @@ export default defineComponent({
     return {
       dashboardArray: [],
       moduleDtos: [],
+      roleStateInstance: useRoleStateSingleton,
     };
   },
 
+  watch: {
+    'roleStateInstance.userRoleOrTemplate': function(newValue, oldVal){
+      console.log(newValue);
+      this.loadData();
+    },
+  },
+
   mounted: function () {
     this.loadData();
   },
@@ -46,13 +57,19 @@ export default defineComponent({
       var _self = this;
       $.ajax({
         url: Common.getApiURL('dashboardResource/listDashBoard'),
-        type: 'get',
+        type: 'POST',
+        data: _self.roleStateInstance.userRoleOrTemplate == null ? null : JSON.stringify(_self.roleStateInstance.userRoleOrTemplate),
         dataType: 'json',
+        contentType: 'application/json',
         beforeSend: function (request) {
           Common.addTokenToRequest(request);
         },
         success: function (data) {
-          _self.dynamicInit(data);
+          if(data.errorCode == 0){
+            _self.dynamicInit(data.datas);
+          } else {
+            Notify.error('仪表盘数据获取错误', data.errorMessage, false);
+          }
         },
         error: function (XMLHttpRequest, textStatus, errorThrown) {
           Common.processException(XMLHttpRequest, textStatus, errorThrown);
@@ -75,6 +92,7 @@ export default defineComponent({
      */
     dynamicInit: function (dashboards) {
       let _self = this;
+      _self.dashboardArray.splice(0, _self.dashboardArray.length);
 
       if (dashboards != null && dashboards.length > 0) {
         dashboards.forEach(function (item) {
@@ -113,10 +131,12 @@ export default defineComponent({
                   sortNo: sortNo,
                 };
 
-                console.log(_self.dashboardArray);
-                _self.dashboardArray.push(item1);
-                // add by jack 2024-05-22 增加排序
-                _self.dashboardArray.sort((a, b) => a.sortNo - b.sortNo);
+                // console.log(_self.dashboardArray);
+                if(!_self.isExistDashboardComponent(item1)){
+                  _self.dashboardArray.push(item1);
+                  // add by jack 2024-05-22 增加排序
+                  _self.dashboardArray.sort((a, b) => a.sortNo - b.sortNo);
+                }
               },
               errorData => {
                 console.error(errorData);
@@ -126,6 +146,21 @@ export default defineComponent({
         });
       }
     },
+
+    /**
+     * 是否是现有的看板项
+     * @param dashboardItem 看板项
+     */
+    isExistDashboardComponent(dashboardItem){
+      let _self = this;
+      for(let i = 0; i < _self.dashboardArray.length; i ++){
+        let dashboardItemExist = _self.dashboardArray[i];
+        if(dashboardItemExist.no == dashboardItem.no){
+          return true;
+        }
+      }
+      return false;
+    },
   },
 });
 </script>