From ec832e8cbfe13131a8e3c64daee6ba57ebb6d600 Mon Sep 17 00:00:00 2001 From: zhangliming_b Date: Tue, 10 Mar 2020 15:22:14 +0800 Subject: [PATCH 1/3] Merge branch 'develop-v1.0.1' of https://gitee.com/gsafety2020/front_end_scaffold_works into develop-v1.0.1 # Conflicts: # public/json/publishObjectPath.json --- public/json/publishObjectPath.json | 2 +- src/components/common/AreaTree0.vue | 27 +++- src/components/common/WsyjDiseaseTrend.vue | 4 +- .../common/WsyjPatientDistribution.vue | 4 +- .../common/gisPop/PopBhDetailTable.vue | 129 ++++++++++-------- .../feature/BhfbModule/BhEveryCount.vue | 4 +- src/main.ts | 2 +- src/store/wsyj/BhfbModule/BhfbStore.ts | 7 + src/util/socket.ts | 5 + src/views/wsyj/BhfbModule/BhArea.vue | 4 +- src/views/wsyj/BhfbModule/BhDay.vue | 4 +- src/views/wsyj/BhfbModule/BhWeek.vue | 4 +- src/views/wsyj/BhfbModule/BhfbHome.vue | 9 +- 13 files changed, 131 insertions(+), 74 deletions(-) diff --git a/public/json/publishObjectPath.json b/public/json/publishObjectPath.json index 36bf7e0..7ed3a49 100644 --- a/public/json/publishObjectPath.json +++ b/public/json/publishObjectPath.json @@ -8,7 +8,7 @@ "//newserverUrl":"服务新地址", "newserverUrl": "http://39.105.209.108:3001", "//webSocketServer":"消息服务新地址", - "webSocketServer": "ws://openg.imwork.net:48149/qd-site/ws/datachange/002", + "webSocketServer": "ws://106.37.227.22:47002/ws/datachange/001", "weather": { "city": "武汉", "code": "101200101", diff --git a/src/components/common/AreaTree0.vue b/src/components/common/AreaTree0.vue index 15df589..e5d5482 100644 --- a/src/components/common/AreaTree0.vue +++ b/src/components/common/AreaTree0.vue @@ -41,11 +41,13 @@ import { Component, Vue, Prop, Emit, Watch } from 'vue-property-decorator'; import { bhfbServer } from '@/api/installServer'; import publishObjectPath from '@/util/configRegistry'; + import MapCommon from '@/util/MapCommon'; const districtCode = publishObjectPath.value.districtCode; @Component({ name: 'AreaTree', - components: {} + components: {}, + mixins: [MapCommon] // GIS 将地图解析方法混入当前组件 }) export default class AreaTree extends Vue { @Prop() private isShowSearch: any; @@ -212,8 +214,8 @@ @Emit('nodeClick') private nodeClick(data: any, checked: any, indeterminate: any) { - if(data && !data.leaf){ - this.$store.dispatch('BhfbModule/cityCodeEmit', data.code); + if(data && data.level<4){ + this.$store.dispatch('BhfbModule/districtCodeEmit', data.code); } } @@ -236,8 +238,9 @@ } if (node.level >= 1) { this.$store.dispatch('BhfbModule/cityCodeEmit', node.data.code); - console.log(222,node); - console.log(node.key); + if(node.level==1){ + this.$store.dispatch('BhfbModule/districtCodeEmit', node.data.code); + } let params1: any = { districtCode: node.key // 武汉市code }; @@ -293,6 +296,20 @@ // 接口存在问题注释 // this.initData(); } + private mounted() { + (this as any).resolveMap('map').then(() => { + this.getComponent().on('onDistrictChange',res => { + debugger + }); + + }); + } + private getComponent() { + const self: any = this; + const modules = self.$ioc.resolve('GISModules-map'); + const component = modules.eventSituation.getComponent('sicknessDistribute'); + return component; + } } diff --git a/src/components/common/WsyjDiseaseTrend.vue b/src/components/common/WsyjDiseaseTrend.vue index 327a7af..34a6b97 100644 --- a/src/components/common/WsyjDiseaseTrend.vue +++ b/src/components/common/WsyjDiseaseTrend.vue @@ -23,11 +23,11 @@ private loading: any = true; - @Watch("$store.state.BhfbModule.cityCode") + @Watch("$store.state.BhfbModule.districtCode") private requestDatas(){ this.loading = true; const params = { - districtCode:this.$store.state['BhfbModule' as any].cityCode, + districtCode:this.$store.state['BhfbModule' as any].districtCode, days:7 }; gv.config.ChartTemplate.load(); diff --git a/src/components/common/WsyjPatientDistribution.vue b/src/components/common/WsyjPatientDistribution.vue index 38e93dc..a9c434b 100644 --- a/src/components/common/WsyjPatientDistribution.vue +++ b/src/components/common/WsyjPatientDistribution.vue @@ -30,11 +30,11 @@ private gvChart?: any; private loading: any = true; - @Watch("$store.state.BhfbModule.cityCode") + @Watch("$store.state.BhfbModule.districtCode") private request(){ this.loading = true; const params = { - districtCode:this.$store.state['BhfbModule' as any].cityCode, + districtCode:this.$store.state['BhfbModule' as any].districtCode, }; // 加载统计组件模板 gv.config.ChartTemplate.load(); diff --git a/src/components/common/gisPop/PopBhDetailTable.vue b/src/components/common/gisPop/PopBhDetailTable.vue index 291e4a9..3edb03c 100644 --- a/src/components/common/gisPop/PopBhDetailTable.vue +++ b/src/components/common/gisPop/PopBhDetailTable.vue @@ -10,7 +10,7 @@
-
{{bhName}}病患情况
+
{{resData.name}}病患情况
×
@@ -20,59 +20,60 @@
{{item.num}}
例
- - + - - - + - -
-
行政区划：{{area}}
-
联系电话：{{phone}}
+ +
+
+
行政区划：{{resData.address}}
+
联系电话：{{resData.telephone}}
@@ -86,12 +87,11 @@ import moment from 'moment'; @Component({ - name: 'PopBhDetail', + name: 'PopBhDetailTable', components: {}, }) export default class PopBhDetail extends Vue { @Prop() private datas?: any; // 从父组件传入的详情数据. - private bhName: any = "天通苑小区"; private area: any = "XX省XX市XX县XX街道XX社区"; private phone: any = "18512345678"; private isShow: any = true; @@ -99,36 +99,39 @@ { label:"确诊", className:"redClass", - num:"23" + num:"", + key:"diagnosis" }, { label:"疑似", className:"orangeClass", - num:"21" + num:"", + key:"suspected" }, { label:"密接者", className:"yellowClass", - num:"24" + num:"", + key:"closeContact" } ]; private col: any = [ { - key:'1', prop:'name',label:'姓名',width:'100',align:'center' + key:'1', prop:'patientName',label:'姓名',width:'100',align:'center' }, { - key:'2', prop:'sex',label:'性别',width:'55',align:'center' + key:'2', prop:'patientsSex',label:'性别',width:'55',align:'center' }, { - key:'3', prop:'type',label:'类型',width:'70',align:'center' + key:'3', prop:'patientType',label:'类型',width:'70',align:'center' }, { - key:'4', prop:'address',label:'地址',width:'',align:'center' + key:'4', prop:'liveAddress',label:'地址',width:'',align:'center' }, { - key:'5', prop:'time',label:'诊断时间',width:'',align:'center' + key:'5', prop:'confirmDate',label:'诊断时间',width:'',align:'center' } ]; private tableData: any = [ @@ -177,6 +180,10 @@ get resData() { const self: any = this; if(self.popData) { + this.topDatas.forEach(item=>{ + item.num = self.popData[item.key]; + }); + console.log(self.popData); return self.popData; } return null @@ -188,8 +195,12 @@ self.closeDetailPop(); return false; } + + private datasInit(){ + + } private mounted() { - console.log(this.resData); + this.datasInit(); } } @@ -225,18 +236,28 @@ margin-right: 20px; .redClass{ color: #ff3535; + margin-right: 5px; + font-weight: bold; } .orangeClass{ color: #e8643d; + margin-right: 5px; + font-weight: bold; } .yellowClass{ color: #ffb81e; + margin-right: 5px; + font-weight: bold; } } } .tableClass{ width: 100%; } + .pop-middle{ + width: 100%; + height: 270px; + } .bottomItem{ width: 100%; height: 70px; diff --git a/src/components/feature/BhfbModule/BhEveryCount.vue b/src/components/feature/BhfbModule/BhEveryCount.vue index 68915cf..022451d 100644 --- a/src/components/feature/BhfbModule/BhEveryCount.vue +++ b/src/components/feature/BhfbModule/BhEveryCount.vue @@ -123,7 +123,7 @@ export default class BhEveryCount extends Vue { // this.initData(); } - @Watch("$store.state.BhfbModule.cityCode") + @Watch("$store.state.BhfbModule.districtCode") private initData() { this.loading = true; this.currDate = @@ -133,7 +133,7 @@ export default class BhEveryCount extends Vue { let params = {}; params = { // districtCode: districtCode // 默认用武汉市 后续使用vuex通信 - districtCode:this.$store.state['BhfbModule' as any].cityCode, + districtCode:this.$store.state['BhfbModule' as any].districtCode, }; bhfbServer.getYqEveryCount(params).then((res: any) => { if (res.data && res.data.data && res.data.data.length) { diff --git a/src/main.ts b/src/main.ts index b8b60b4..9bb2e49 100644 --- a/src/main.ts +++ b/src/main.ts @@ -12,7 +12,7 @@ import publishObjectPath from '@/util/configRegistry'; import * as ElementUI from 'element-ui'; -// require('@/util/socket'); +require('@/util/socket'); Vue.use(ElementUI); Vue.use(VueC); diff --git a/src/store/wsyj/BhfbModule/BhfbStore.ts b/src/store/wsyj/BhfbModule/BhfbStore.ts index 019bf35..4e3ef75 100644 --- a/src/store/wsyj/BhfbModule/BhfbStore.ts +++ b/src/store/wsyj/BhfbModule/BhfbStore.ts @@ -6,6 +6,7 @@ export default { msg: 'hello', bhfbMap: null, cityCode:"", + districtCode:"" , bhAreaShow:false, bhWeekShow:false, bhDayShow:false, @@ -20,6 +21,9 @@ export default { cityCodeUpdate(state: any, data: any) { state.cityCode = data; }, + districtCodeUpdate(state: any, data: any) { + state.districtCode = data; + }, bhAreaShowUpdate(state: any, data: any) { state.bhAreaShow = data; }, @@ -40,6 +44,9 @@ export default { cityCodeEmit(content: any, data: any) { content.commit('cityCodeUpdate', data); }, + districtCodeEmit(content: any, data: any) { + content.commit('districtCodeUpdate', data); + }, bhAreaShowEmit(content: any, data: any) { content.commit('bhAreaShowUpdate', data); }, diff --git a/src/util/socket.ts b/src/util/socket.ts index 7b254ae..8176a0b 100644 --- a/src/util/socket.ts +++ b/src/util/socket.ts @@ -111,6 +111,11 @@ Socket.prototype.send = function(key: string , type: string) { } }; + + + + + const socket = new Socket(path); socket.init(); diff --git a/src/views/wsyj/BhfbModule/BhArea.vue b/src/views/wsyj/BhfbModule/BhArea.vue index 0481917..9cf73e9 100644 --- a/src/views/wsyj/BhfbModule/BhArea.vue +++ b/src/views/wsyj/BhfbModule/BhArea.vue @@ -27,11 +27,11 @@ this.$store.dispatch('BhfbModule/bhAreaShowEmit', false); } - @Watch("$store.state.BhfbModule.cityCode") + @Watch("$store.state.BhfbModule.districtCode") private request(){ this.loading = true; const params = { - districtCode:this.$store.state['BhfbModule' as any].cityCode, + districtCode:this.$store.state['BhfbModule' as any].districtCode, }; // 加载统计组件模板 gv.config.ChartTemplate.load(); diff --git a/src/views/wsyj/BhfbModule/BhDay.vue b/src/views/wsyj/BhfbModule/BhDay.vue index 4ec1154..e8bb643 100644 --- a/src/views/wsyj/BhfbModule/BhDay.vue +++ b/src/views/wsyj/BhfbModule/BhDay.vue @@ -127,11 +127,11 @@ export default class BhfbTree extends Vue { this.$store.dispatch('BhfbModule/bhDayShowEmit', false); } - @Watch("$store.state.BhfbModule.cityCode") + @Watch("$store.state.BhfbModule.districtCode") private initData() { this.loading = true; let params = { - districtCode:this.$store.state['BhfbModule' as any].cityCode, + districtCode:this.$store.state['BhfbModule' as any].districtCode, }; bhfbServer.getYqEveryCount(params).then((res: any) => { if (res.data && res.data.data && res.data.data.length) { diff --git a/src/views/wsyj/BhfbModule/BhWeek.vue b/src/views/wsyj/BhfbModule/BhWeek.vue index ff17bef..699270d 100644 --- a/src/views/wsyj/BhfbModule/BhWeek.vue +++ b/src/views/wsyj/BhfbModule/BhWeek.vue @@ -62,11 +62,11 @@ export default class BhfbTree extends Vue { this.days = item.num; this.requestDatas(); } - @Watch("$store.state.BhfbModule.cityCode") + @Watch("$store.state.BhfbModule.districtCode") private requestDatas(){ this.loading = true; const params = { - districtCode:this.$store.state['BhfbModule' as any].cityCode, + districtCode:this.$store.state['BhfbModule' as any].districtCode, days:this.days }; gv.config.ChartTemplate.load(); diff --git a/src/views/wsyj/BhfbModule/BhfbHome.vue b/src/views/wsyj/BhfbModule/BhfbHome.vue index 64e32f1..3ecc63b 100644 --- a/src/views/wsyj/BhfbModule/BhfbHome.vue +++ b/src/views/wsyj/BhfbModule/BhfbHome.vue @@ -43,6 +43,7 @@ import QuickSearch from '@/components/common/QuickSearch.vue'; import PopMemberList from '@/components/common/PopMemberList.vue'; import MapCommon from '@/util/MapCommon'; import PopBhDetail from "@/components/common/gisPop/PopBhDetail.vue"; +import PopBhDetailTable from "@/components/common/gisPop/PopBhDetailTable.vue" import BhDay from '@/views/wsyj/BhfbModule/BhDay.vue' import BhWeek from '@/views/wsyj/BhfbModule/BhWeek.vue' import BhArea from '@/views/wsyj/BhfbModule/BhArea.vue' @@ -130,7 +131,13 @@ export default class BhfbHome extends Vue { } }, }; - const temp: any = new PopBhDetail($vm); + if(data.data.type == 1){ + const temp: any = new PopBhDetail($vm); + } + if(data.data.type == 2){ + const temp: any = new PopBhDetailTable($vm); + } + } } -- Gitee From 9db306b57a9eb3646d84ca5d59fae73dc83b921a Mon Sep 17 00:00:00 2001 From: duzhiqiang Date: Tue, 10 Mar 2020 16:05:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=A0=91=20=E6=A8=A1?= =?UTF-8?q?=E6=8B=9F=E7=82=B9=E5=87=BB;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/AreaTree0.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/components/common/AreaTree0.vue b/src/components/common/AreaTree0.vue index e5d5482..ed3f93a 100644 --- a/src/components/common/AreaTree0.vue +++ b/src/components/common/AreaTree0.vue @@ -19,7 +19,7 @@ @node-click="nodeClick" > - {{ node.label }} + {{ node.label + data.code}} - {{ node.label }} + {{ node.label}}
@@ -303,6 +303,12 @@ }); }); + + setTimeout(()=>{ + const firstNode = document.querySelector('#code420600'); + firstNode.click(); + },10000) + } private getComponent() { const self: any = this; -- Gitee From 9331bfa92538290e0bcf4b5b345feb3904e1b641 Mon Sep 17 00:00:00 2001 From: zhangliming_b Date: Tue, 10 Mar 2020 17:09:25 +0800 Subject: [PATCH 3/3] Merge branch 'develop-v1.0.1' of https://gitee.com/gsafety2020/front_end_scaffold_works into develop-v1.0.1 # Conflicts: # public/json/publishObjectPath.json --- src/components/common/AreaTree0.vue | 27 ++++++++++++------- src/components/common/WsyjDiseaseTrend.vue | 4 +-- .../common/WsyjPatientDistribution.vue | 4 +-- .../common/gisPop/PopBhDetailTable.vue | 2 +- 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/components/common/AreaTree0.vue b/src/components/common/AreaTree0.vue index ed3f93a..6df21d0 100644 --- a/src/components/common/AreaTree0.vue +++ b/src/components/common/AreaTree0.vue @@ -19,7 +19,9 @@ @node-click="nodeClick" > - {{ node.label + data.code}} + {{ node.label}} - {{ node.label}} + {{ node.label}} @@ -55,6 +59,7 @@ private defExpKeys: any = []; private loading: any = false; private searchFlag: any = false; + private treeDatasFinishFlag: any = false; private defaultProps: any = { children: 'children', label: 'name', @@ -231,6 +236,7 @@ firstdata[0].children = []; resolve(firstdata); this.defExpKeys = [districtCode]; + this.treeDatasFinishFlag =true; return; } }); @@ -298,17 +304,18 @@ } private mounted() { (this as any).resolveMap('map').then(() => { - this.getComponent().on('onDistrictChange',res => { - debugger + this.getComponent().on('onDistrictChange',(res: any) => { + if(!this.treeDatasFinishFlag)return; + this.searchFlag = false; + this.filterText = ""; + setTimeout(()=>{ + let firstNode = document.querySelector(`#code${res.districtCode}`); + firstNode.click(); + },1000) }); }); - setTimeout(()=>{ - const firstNode = document.querySelector('#code420600'); - firstNode.click(); - },10000) - } private getComponent() { const self: any = this; @@ -470,4 +477,4 @@ } } } - + \ No newline at end of file diff --git a/src/components/common/WsyjDiseaseTrend.vue b/src/components/common/WsyjDiseaseTrend.vue index 34a6b97..286ceb9 100644 --- a/src/components/common/WsyjDiseaseTrend.vue +++ b/src/components/common/WsyjDiseaseTrend.vue @@ -42,9 +42,9 @@ result.data.code === 0 && result.data.data ) { - let tempArr = []; + const tempArr: any = []; if(result.data.data.items && result.data.data.items.length){ - result.data.data.items.forEach(ele =>{ + result.data.data.items.forEach( ( ele: any ) => { tempArr.push({entrys:[ele.entrys[0],ele.entrys[1],ele.entrys[2]]}); }) } diff --git a/src/components/common/WsyjPatientDistribution.vue b/src/components/common/WsyjPatientDistribution.vue index a9c434b..ded9e56 100644 --- a/src/components/common/WsyjPatientDistribution.vue +++ b/src/components/common/WsyjPatientDistribution.vue @@ -57,9 +57,9 @@ result.data.code === 0 && result.data.data ) { - let tempArr = []; + let tempArr: any = []; if(result.data.data.items && result.data.data.items.length){ - result.data.data.items.forEach(ele =>{ + result.data.data.items.forEach( ( ele: any ) =>{ tempArr.push({entrys:[ele.entrys[0],ele.entrys[1],ele.entrys[2]]}); }) } diff --git a/src/components/common/gisPop/PopBhDetailTable.vue b/src/components/common/gisPop/PopBhDetailTable.vue index 3edb03c..fe231a6 100644 --- a/src/components/common/gisPop/PopBhDetailTable.vue +++ b/src/components/common/gisPop/PopBhDetailTable.vue @@ -180,7 +180,7 @@ get resData() { const self: any = this; if(self.popData) { - this.topDatas.forEach(item=>{ + this.topDatas.forEach((item: any) =>{ item.num = self.popData[item.key]; }); console.log(self.popData); -- Gitee