From 37aa68ba7aab10901dcbff8d9a66030c53f85b7d Mon Sep 17 00:00:00 2001
From: unknown <xiaoshangqing@Hisense.ad>
Date: Fri, 4 Nov 2022 17:34:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=94=99=E5=88=AB=E5=AD=97=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/capabilityTraceability/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/back/src/views/modules/capabilityTraceability/index.vue b/back/src/views/modules/capabilityTraceability/index.vue
index 9a25f195..59d94b41 100644
--- a/back/src/views/modules/capabilityTraceability/index.vue
+++ b/back/src/views/modules/capabilityTraceability/index.vue
@@ -39,7 +39,7 @@
           </div>
         </div>
         <div class="two" style="position: relative;">
-          <div class="top"><i></i>数字资源能力一本账（按不同部门纬度统计）</div>
+          <div class="top"><i></i>数字资源能力一本账（按不同部门维度统计）</div>
           <div class='all' style="position: absolute;top: 0;right: 55px;font-weight: 600;cursor: pointer;">查看全部</div>
           <div class="main">
              <el-table

From 4c1c3ff6288a60971c469b78b38f2828eaf79eeb Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Fri, 4 Nov 2022 17:46:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/main-sidebar-sub-menu.vue      | 72 +++++++++----------
 back/src/views/main-sidebar.vue               | 12 +++-
 .../modules/capabilityTraceability/index.vue  | 10 +--
 front/public/static/config/basicConfig.js     |  6 +-
 4 files changed, 53 insertions(+), 47 deletions(-)

diff --git a/back/src/views/main-sidebar-sub-menu.vue b/back/src/views/main-sidebar-sub-menu.vue
index 6f9c82ce..2426f0d2 100644
--- a/back/src/views/main-sidebar-sub-menu.vue
+++ b/back/src/views/main-sidebar-sub-menu.vue
@@ -39,76 +39,72 @@
 </template>
 
 <script>
-import SubMenu from "./main-sidebar-sub-menu";
+import SubMenu from './main-sidebar-sub-menu'
 export default {
-  name: "sub-menu",
-  data() {
+  name: 'sub-menu',
+  data () {
     return {
-      browserTabOpenList: ["1156748733921165314"],
-    };
+      browserTabOpenList: ['1156748733921165314']
+    }
   },
   props: {
     menu: {
       type: Object,
-      required: true,
-    },
+      required: true
+    }
   },
   components: {
-    SubMenu,
+    SubMenu
   },
-  created() {
+  created () {
     this.$nextTick(() => {
       if (this.$refs.li) {
-        let $li = this.$refs.li.$el;
-        let $a = $li.firstElementChild;
+        const $li = this.$refs.li.$el
+        const $a = $li.firstElementChild
         if ($a) {
-          let pl = "0",
-            pr = "0";
+          let pl = '0'
+          let pr = '0'
           if ($li.currentStyle) {
-            pl = $li.currentStyle["paddingLeft"];
-            pr = $li.currentStyle["paddingRight"];
+            pl = $li.currentStyle.paddingLeft
+            pr = $li.currentStyle.paddingRight
           } else {
-            pl = window.document.defaultView.getComputedStyle($li, null)[
-              "paddingLeft"
-            ];
-            pr = window.document.defaultView.getComputedStyle($li, null)[
-              "paddingRight"
-            ];
+            pl = window.document.defaultView.getComputedStyle($li, null).paddingLeft
+            pr = window.document.defaultView.getComputedStyle($li, null).paddingRight
           }
-          $li.setAttribute("style", `padding-left: 0; padding-right: 0;`);
+          $li.setAttribute('style', 'padding-left: 0; padding-right: 0;')
           $a.setAttribute(
-            "style",
+            'style',
             `padding-left: ${pl}; padding-right: ${pr};`
-          );
+          )
         }
       }
-    });
+    })
   },
   methods: {
     // 是否通过浏览器Tab打开菜单
-    isBrowserTabOpen(menuId) {
+    isBrowserTabOpen (menuId) {
       return (
         this.browserTabOpenList.filter((item) => item === menuId).length >= 1
-      );
+      )
     },
     // 获取浏览器Tab打开菜单URL
-    getBrowserTabOpenURL(menuId) {
-      var route = window.SITE_CONFIG["dynamicMenuRoutes"].filter(
+    getBrowserTabOpenURL (menuId) {
+      var route = window.SITE_CONFIG.dynamicMenuRoutes.filter(
         (item) => item.meta.menuId === menuId
-      )[0];
-      return route ? route.meta.iframeURL : "";
+      )[0]
+      return route ? route.meta.iframeURL : ''
     },
     // 通过menuId与动态(菜单)路由进行匹配跳转至指定路由
-    gotoRouteHandle(menuId) {
-      var route = window.SITE_CONFIG["dynamicMenuRoutes"].filter(
+    gotoRouteHandle (menuId) {
+      var route = window.SITE_CONFIG.dynamicMenuRoutes.filter(
         (item) => item.meta.menuId === menuId
-      )[0];
+      )[0]
       if (route) {
-        this.$router.push({ name: route.name });
+        this.$router.push({ name: route.name })
       }
-    },
-  },
-};
+    }
+  }
+}
 </script>
 
 <style lang="scss">
diff --git a/back/src/views/main-sidebar.vue b/back/src/views/main-sidebar.vue
index 78596756..095684c3 100644
--- a/back/src/views/main-sidebar.vue
+++ b/back/src/views/main-sidebar.vue
@@ -2,7 +2,7 @@
  * @Author: kongjun qdkongjun@gmail.com
  * @Date: 2022-06-20 09:29:59
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-18 15:46:51
+ * @LastEditTime: 2022-11-04 15:21:13
  * @FilePath: \back\src\views\main-sidebar.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -95,6 +95,9 @@ export default {
             }
             menu.total = daibanNum
           }
+          if (menu.id == '1588427411604197378') {
+            menu.total = Number(this.numObject.resourcemountapply)
+          }
         }
         this.$store.state.sidebarMenuList = menuList
       })
@@ -124,5 +127,12 @@ export default {
       width: 266px;
     }
   }
+  .tabNum{
+  color: #ffffff;
+  margin-left: 5px;
+  background: red;
+  padding:1px  4px;
+  border-radius:5px;
+}
 }
 </style>
diff --git a/back/src/views/modules/capabilityTraceability/index.vue b/back/src/views/modules/capabilityTraceability/index.vue
index 9a25f195..29747f92 100644
--- a/back/src/views/modules/capabilityTraceability/index.vue
+++ b/back/src/views/modules/capabilityTraceability/index.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: Light
  * @Date: 2022-10-31 09:24:38
- * @LastEditors: Light
- * @LastEditTime: 2022-11-03 14:46:01
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-11-04 14:38:09
  * @Description: 能力溯源分析
 -->
 <template>
@@ -361,9 +361,9 @@ export default {
       yunshow: false,
       tabList: ['总体情况', '部门情况', '地市情况'],
       selectTab: '总体情况',
-      allSituation: [{ name: '注册项目', num: '100个' }, { name: '注册系统', num: '100个' }, { name: '视频资源', num: '100万路' }, { name: 'GIS图层', num: '100项' }, { name: '云网资源', num: '100个' }, { name: '组件资源', num: '100项' }],
-      allSituationDept: [{ name: '注册项目', num: '100个' }, { name: '注册系统', num: '100个' }, { name: '视频资源', num: '100万路' }, { name: 'GIS图层', num: '100项' }, { name: '云网资源', num: '100个' }, { name: '组件资源', num: '100项' }],
-      allSituationDept2: [{ name: '注册地市', num: '100个' }, { name: '注册项目', num: '100个' }, { name: '注册系统', num: '100个' }, { name: '视频资源', num: '100万路' }, { name: 'GIS图层', num: '100项' }, { name: '云网资源', num: '100个' }, { name: '组件资源', num: '100项' }],
+      allSituation: [{ name: '注册项目', num: '133个' }, { name: '注册系统', num: '266个' }, { name: '视频资源', num: '120万路' }, { name: 'GIS图层', num: '220项' }, { name: '云网资源', num: '30个' }, { name: '组件资源', num: '226项' }],
+      allSituationDept: [{ name: '注册项目', num: '80个' }, { name: '注册系统', num: '145个' }, { name: '视频资源', num: '60万路' }, { name: 'GIS图层', num: '100项' }, { name: '云网资源', num: '10个' }, { name: '组件资源', num: '100项' }],
+      allSituationDept2: [{ name: '注册地市', num: '17个' }, { name: '注册项目', num: '53个' }, { name: '注册系统', num: '121个' }, { name: '视频资源', num: '60万路' }, { name: 'GIS图层', num: '120项' }, { name: '云网资源', num: '20个' }, { name: '组件资源', num: '126项' }],
       tableData1: [{
         deptName: '山东省信访局',
         project: '2',
diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js
index 55240d20..fede4d93 100644
--- a/front/public/static/config/basicConfig.js
+++ b/front/public/static/config/basicConfig.js
@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
- * @LastEditors: Light
- * @LastEditTime: 2022-11-02 17:15:39
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-11-04 14:48:01
  * @Description: 系统静态参数配置
  */
 var _global = {}
@@ -86,7 +86,7 @@ var CONFIGITEM = {
         userPwd: '',
       },
       backUrl: 'http://localhost:8001',
-      previewUrl: 'http://192.168.124.233:9796/',
+      previewUrl: 'http://192.168.124.236:9796/',
       websocketURL: '192.168.124.233:8888/ucs-admin',
       // websocketURL: '10.18.1.99:8889/ucs-admin',
       POI_URL: