Merge branch 'chronic-master' of…

Merge branch 'chronic-master' of http://gitlab.yiboshi.com/nightkis1995/frontend-h5 into chronic-master

src/residentWX/visit/List.vue

@@ -93,22 +93,22 @@ export default {
         baseInfo() {
             return this.store.userInfo
         },
-        chronicTagsArray() {
-            let chronicTagsArray = this.baseInfo.chronicTagsArray || ''
-            return chronicTagsArray.split(',')
+        groupsArrays() {
+            let groupsArrays = this.baseInfo.groupsArrays || ''
+            return groupsArrays.split(',')
         },
         tabList() {
             const list = [
                 { title: '全部', name: undefined, code: undefined },
-                { title: '高血压', name: 1, code: '1' },
-                { title: '糖尿病', name: 2, code: '2' },
-                { title: '冠心病', name: 3, code: '4' },
-                { title: '脑卒中', name: 4, code: '8' },
-                { title: '慢性阻塞性疾病', name: 5, code: '16' },
-                { title: '慢性肾病', name: 6, code: '32' },
-                { title: '血脂异常', name: 7, code: '64' }
+                { title: '高血压', name: 512, code: '512' },
+                { title: '糖尿病', name: 1024, code: '1024' },
+                { title: '冠心病', name: 2048, code: '2048' },
+                { title: '脑卒中', name: 4096, code: '4096' },
+                { title: '慢性阻塞性疾病', name: 8192, code: '8192' },
+                { title: '慢性肾病', name: 16384, code: '16384' },
+                { title: '血脂异常', name: 32768, code: '32768' }
             ]
-            let res = list.filter(e => this.chronicTagsArray.includes(e.code)) || []
+            let res = list.filter(e => this.groupsArrays.includes(e.code)) || []
              res.unshift( { title: '全部', name: '', code: '' })
             return res
         }
@@ -129,7 +129,7 @@ export default {
             if (!this.isResidentInfo()) return
             const query = {
                 residentInfoId: this.baseInfo.residentInfoId,
-                diseaseType: this.activeTab,
+                groupsArrays: this.activeTab,
                 pageIndex: this.pagination.pageIndex,
                 pageSize: this.pagination.pageSize
             }
@@ -147,8 +147,8 @@ export default {
             this.load()
         },
         init() {
-            if (this.chronicTagsArray.length) {
-                const item = this.tabList.find(e => e.code === this.chronicTagsArray[0]) || {}
+            if (this.groupsArrays.length) {
+                const item = this.tabList.find(e => e.code === this.groupsArrays[0]) || {}
                 this.activeTab = item.name
             }
         },

vue.config.js

@@ -39,12 +39,12 @@ module.exports = defineConfig({
                 }
             },
             '/chronic-resident': {
-                // target: 'http://192.168.1.125:8903',
-                target: 'https://beta-tumour.zmnyjk.com',
+                target: 'http://192.168.1.142:8903',
+                // target: 'https://beta-tumour.zmnyjk.com',
                 changOrigin: true,
                 pathRewrite: {
-                    // '^/chronic-resident': '/',
-                    '^/chronic-resident': '/chronic-resident'
+                    '^/chronic-resident': '/',
+                    // '^/chronic-resident': '/chronic-resident'
                 }
             }
         },