Merge branch 'dev' into xuhui

src/main.js

@@ -56,6 +56,7 @@ import {
   // BackTop,
   // Carousel,
   Tooltip,
+  Progress,
   // CollapsePanel
 } from 'ant-design-vue' 
 
@@ -112,6 +113,7 @@ Vue.use(Table)
 Vue.use(Divider)
 Vue.use(Upload)
 Vue.use(Modal)
+Vue.use(Progress)
 // Vue.use(badge)
 // Vue.use(skeleton)
 // Vue.use(Tree)
@@ -188,7 +190,41 @@ const render = ({appContent, loading} = {}) => { // 渲染方法
 }
 
 // 动态加载子项目的url
-let system = micSystemsList
+let system //= micSystemsList
+let env = process.env.NODE_ENV
+
+console.log(process.env.NODE_ENV, 'NODE_ENV')
+switch (env) {
+// case env.indexOf('pudong') > -1: // 根据当前打包的项目调用该项目对应的路由
+case 'pudong-sit':
+  system = micSystemsList.sit
+  break
+    
+case 'pudong-prod':
+  system = micSystemsList.prod
+  break
+  
+  // case env.indexOf('xuhui') > -1:
+case 'xuhui-sit':
+  system = micSystemsList.sit
+  break
+  
+case 'xuhui-prod':
+  system = micSystemsList.prod
+  break
+
+case 'huangpu-sit':
+  system = micSystemsList.sit
+  break
+  
+case 'huangpu-prod':
+  system = micSystemsList.prod
+  break
+      
+default: // 当前仅可使用pudong / xuhui-sit/uat进行打包
+  system = micSystemsList.sit
+  break
+}
 
 let projects = []
 for (let i = 0; i < system.length; i++) { 

src/router/micSystemsList.json

-[ 
-  {
+{
+
+  "prod":[ {
       "name": "pudong",
       "entry": "http://211.136.105.193/elvweb",
       "activeRule": "/pudong"
@@ -14,6 +15,11 @@
       "entry": "http://211.136.105.193/czd",
       "activeRule": "/czd"
     },
+    {
+      "name": "checkorder",
+      "entry": "http://211.136.105.193/checkorder",
+      "activeRule": "/checkorder"
+    },
     {
       "name": "order",
       "entry": "http://31.0.161.39/order",
@@ -24,4 +30,39 @@
       "entry": "http://31.0.161.39/question",
       "activeRule": "/question"
     }
-]
+  ],
+
+  "sit":[ 
+    {
+      "name": "pudong",
+      "entry": "http://pudong.hm.omniview.pro/elvweb",
+      "activeRule": "/pudong"
+    },
+    {
+      "name": "danger",
+      "entry": "http://pudong.hm.omniview.pro/dangerweb",
+      "activeRule": "/danger"
+    },
+    {
+      "name": "czd",
+      "entry": "http://pudong.hm.omniview.pro/czd",
+      "activeRule": "/czd"
+    },
+    {
+      "name": "checkorder",
+      "entry": "http://pudong.hm.omniview.pro/checkorder",
+      "activeRule": "/checkorder"
+    },
+    {
+      "name": "order",
+      "entry": "http://xuhui.hm.omniview.pro/order",
+      "activeRule": "/order"
+    },
+    {
+      "name": "question",
+      "entry": "http://xuhui.hm.omniview.pro/question",
+      "activeRule": "/question"
+    }
+  
+  ]
+}
\ No newline at end of file

src/views/houseData/propertyInfoView.vue

@@ -904,7 +904,7 @@ export default {
         break
       case 'neighborhoodCommitteesView':
         this.newUrl = this.$api.GET_NEI_ID.replace('{id}', this.$route.params.id)
-        this.tbl = 'tbl_ic_member'
+        this.tbl = 'tbl_residents_committees'
         break
       default:
         break