From b21825de9951715f9f6a3bc1146dc179659db5ba Mon Sep 17 00:00:00 2001 From: zhangliming_b Date: Sat, 7 Mar 2020 11:10:45 +0800 Subject: [PATCH 1/4] aaa --- public/json/publishObjectPath.json | 4 +- src/assets/css/PanelView.less | 1 + src/components/common/AreaTree0.vue | 9 +- src/components/common/WsyjDiseaseTrend.vue | 25 +- .../common/WsyjPatientDistribution.vue | 25 +- src/components/common/gisPop/PopBhDetail.vue | 184 +++++------ .../common/gisPop/PopBhDetailTable.vue | 311 ++++++++++++++++++ .../feature/BhfbModule/BhEveryCount.vue | 11 +- src/store/wsyj/BhfbModule/BhfbStore.ts | 31 +- src/views/wsyj/BhfbModule/BhArea.vue | 34 ++ src/views/wsyj/BhfbModule/BhDay.vue | 35 ++ src/views/wsyj/BhfbModule/BhWeek.vue | 34 ++ src/views/wsyj/BhfbModule/BhfbAssist.vue | 24 +- src/views/wsyj/BhfbModule/BhfbHome.vue | 27 +- 14 files changed, 641 insertions(+), 114 deletions(-) create mode 100644 src/components/common/gisPop/PopBhDetailTable.vue create mode 100644 src/views/wsyj/BhfbModule/BhArea.vue create mode 100644 src/views/wsyj/BhfbModule/BhDay.vue create mode 100644 src/views/wsyj/BhfbModule/BhWeek.vue diff --git a/public/json/publishObjectPath.json b/public/json/publishObjectPath.json index eb6cd83..8b18532 100644 --- a/public/json/publishObjectPath.json +++ b/public/json/publishObjectPath.json @@ -3,8 +3,8 @@ "//weatherApi": "天气的服务", "weatherApi": "http://t.weather.sojson.com", "//serverUrl": "后端的服务", - "serverUrl": "http://106.37.227.22:47002/scaffold", - "serverUrl1": "http://106.37.227.25:57002/scaffold", + "serverUrl1": "http://106.37.227.22:47002/scaffold", + "serverUrl": "http://106.37.227.25:57002/scaffold", "//newserverUrl":"服务新地址", "newserverUrl": "http://39.105.209.108:3001", "weather": { diff --git a/src/assets/css/PanelView.less b/src/assets/css/PanelView.less index a48dbad..9ef5bf8 100644 --- a/src/assets/css/PanelView.less +++ b/src/assets/css/PanelView.less @@ -124,6 +124,7 @@ } .cmp-panel-cnt-bd{ + position: relative; height:calc(100% - 50px); // overflow-y: auto; // overflow-x: hidden; diff --git a/src/components/common/AreaTree0.vue b/src/components/common/AreaTree0.vue index 2aa7bf7..0d8a733 100644 --- a/src/components/common/AreaTree0.vue +++ b/src/components/common/AreaTree0.vue @@ -212,7 +212,9 @@ @Emit('nodeClick') private nodeClick(data: any, checked: any, indeterminate: any) { - const that = this; + if(data && !data.leaf){ + this.$store.dispatch('BhfbModule/cityCodeEmit', data.code); + } } private loadNode(node, resolve) { @@ -233,7 +235,8 @@ return } if (node.level >= 1) { - console.log(node); + this.$store.dispatch('BhfbModule/cityCodeEmit', node.data.code); + console.log(222,node); console.log(node.key); let params1: any = { districtCode: node.key // 武汉市code @@ -350,7 +353,7 @@ .layer-tree { .span-ellipsis { display: block; - width: 170px; + width: 150px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; diff --git a/src/components/common/WsyjDiseaseTrend.vue b/src/components/common/WsyjDiseaseTrend.vue index b96332c..b49e0db 100644 --- a/src/components/common/WsyjDiseaseTrend.vue +++ b/src/components/common/WsyjDiseaseTrend.vue @@ -1,9 +1,12 @@ diff --git a/src/components/common/gisPop/PopBhDetailTable.vue b/src/components/common/gisPop/PopBhDetailTable.vue new file mode 100644 index 0000000..291e4a9 --- /dev/null +++ b/src/components/common/gisPop/PopBhDetailTable.vue @@ -0,0 +1,311 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/feature/BhfbModule/BhEveryCount.vue b/src/components/feature/BhfbModule/BhEveryCount.vue index 9e41fd4..317b702 100644 --- a/src/components/feature/BhfbModule/BhEveryCount.vue +++ b/src/components/feature/BhfbModule/BhEveryCount.vue @@ -1,6 +1,6 @@