Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev

back/src/views/main-sidebar.vue

@@ -36,6 +36,7 @@
 <script>
 import http from '@/utils/request'
 import SubMenu from "./main-sidebar-sub-menu";
+import returnLocationStr from '@/utils/location';
 export default {
   data() {
     return {
@@ -61,7 +62,8 @@ export default {
       for(let j=0;j<menu.children.length;j++){
         let children=menu.children[j]
         if(children.id=="1541261780432408577"){//能力申请 v2
-          children.total=Number(this.numObject.abilityprocess_v2)
+           //西海岸 v2  市局v3
+          children.total= returnLocationStr() == 'qingdao' ? Number(this.numObject.abilityprocess_v3) : Number(this.numObject.abilityprocess_v2)
          daibanNum=Number(daibanNum)+Number(children.total)
       } if(children.id=="1559376285703081986"){//会议室审核
         children.total=Number(this.numObject.meetingroom_book)