diff --git a/public/json/publishObjectPath.json b/public/json/publishObjectPath.json index 7ed3a4979cc7bdadbd8f9f4caa0ed7ffdbb7eb32..10b68fdcbe7d38056bd71a7126b5c91567c02b1f 100644 --- a/public/json/publishObjectPath.json +++ b/public/json/publishObjectPath.json @@ -3,8 +3,10 @@ "//weatherApi": "天气的服务", "weatherApi": "http://t.weather.sojson.com", "//serverUrl": "后端的服务", - "serverUrl1": "http://106.37.227.22:47002/scaffold", - "serverUrl": "http://106.37.227.25:57002/scaffold", + "serverUrl": "http://106.37.227.22:47002/scaffold", + "serverUrl1": "http://106.37.227.25:57002/scaffold", + "//qytServer": "企业通服务地址（企业复工模块适用）", + "qytServer":"http://hrbwx.gsafetycloud.com:9832/api/v2/enterprise-provider", "//newserverUrl":"服务新地址", "newserverUrl": "http://39.105.209.108:3001", "//webSocketServer":"消息服务新地址", @@ -27,7 +29,8 @@ "//arrModule说明-需要就把key值贴下面":[ {"title":"综合态势","key":"Zhts"}, {"title":"病患分布","key":"Bhfb"}, + {"title":"企业复工情况","key":"Qyfgqk"}, {"title":"应急队伍分布","key":"Yjdwfb"}, {"title":"物资需求分布","key":"Wzxqyfb"}], - "arrModule":["Bhfb","Yjdwfb","Wzxqyfb"] + "arrModule":["Bhfb","Qyfgqk","Yjdwfb","Wzxqyfb"] } diff --git a/src/api/installServer.ts b/src/api/installServer.ts index 7f3b40dc5ee1ecbfe4fd80170ed55f629e585efd..c8e75e971e82ceead3d7d7c53d9c2c95e003e593 100644 --- a/src/api/installServer.ts +++ b/src/api/installServer.ts @@ -11,6 +11,7 @@ import { MedicalServer } from './feature/medicalServer'; import { WeatherServer } from './feature/weatherServer'; import { ChartServer } from './feature/chartServer'; import { BhfbService } from './wsyj/BhfbModule/BhfbService'; +import { QyfgqkService } from './wsyj/QyfgqkModule/QyfgqkService'; import { EmergencySever } from './feature/emergencySever'; import { YjwzService } from './wsyj/YjwzfbModule/YjwzfbService'; import { ZhtsService } from './wsyj/ZhtsModule/ZhtsService'; @@ -30,6 +31,7 @@ const medicalServer = new MedicalServer({ baseURL: publicPath }); const weatherServer = new WeatherServer({}); const chartServer = new ChartServer({ baseURL: publishObjectPath.value.serverUrl }); const bhfbServer = new BhfbService({ baseURL: publishObjectPath.value.serverUrl }); +const qyfgqkServer = new QyfgqkService({ baseURL: publishObjectPath.value.qytServer }); const emergencySever = new EmergencySever({ baseURL: publishObjectPath.value.serverUrl }); const yjwzServer = new YjwzService({ baseURL: publishObjectPath.value.serverUrl }); const ZhtsServer = new ZhtsService({ baseURL: publishObjectPath.value.serverZhts }); @@ -52,5 +54,6 @@ export { ZhtsServer, cityListServer, compreSituationServer, - panServer + panServer, + qyfgqkServer }; diff --git a/src/api/wsyj/QyfgqkModule/QyfgqkService.ts b/src/api/wsyj/QyfgqkModule/QyfgqkService.ts new file mode 100644 index 0000000000000000000000000000000000000000..d2aad0df3d45581213bf113bcf918fcbb997e7b0 --- /dev/null +++ b/src/api/wsyj/QyfgqkModule/QyfgqkService.ts @@ -0,0 +1,23 @@ +import qs from 'qs'; +import { RequestServerClass } from '@/util/request'; + +export class QyfgqkService { + + public rSerivce: any; + + constructor(opt: any, axiosFilterFn?: any) { + this.rSerivce = new RequestServerClass(opt); + } + + // 复工策略-根据行政区划code查询就业影响数据列表排行(企业人数) + public getEmploymentDatas(opts?: any) { + const url = '/enterprise/resumption/employment/impact/enterprise/list'; + return this.rSerivce.serverObj.get(url + "?" + qs.stringify(opts)); + } + public getLivelihoodDatas(opts?: any) { + const url = '/enterprise/resumption/livelihood/enterprise/list'; + return this.rSerivce.serverObj.get(url + "?" + qs.stringify(opts)); + } + + +} diff --git a/src/assets/img/qyfgqkModule/adress.png b/src/assets/img/qyfgqkModule/adress.png new file mode 100644 index 0000000000000000000000000000000000000000..dc7da887beb0b09e21215e3f1fe6ce279c01d4de Binary files /dev/null and b/src/assets/img/qyfgqkModule/adress.png differ diff --git a/src/assets/img/qyfgqkModule/assit-bg.png b/src/assets/img/qyfgqkModule/assit-bg.png new file mode 100644 index 0000000000000000000000000000000000000000..b778a879cd3c1247c317230c7a3490e0bf12706e Binary files /dev/null and b/src/assets/img/qyfgqkModule/assit-bg.png differ diff --git a/src/assets/img/qyfgqkModule/bottom-line-bak.png b/src/assets/img/qyfgqkModule/bottom-line-bak.png new file mode 100644 index 0000000000000000000000000000000000000000..4a2ea6dacd5f152ba973fabdec9d511e47c3eab2 Binary files /dev/null and b/src/assets/img/qyfgqkModule/bottom-line-bak.png differ diff --git a/src/assets/img/qyfgqkModule/bottom-line.png b/src/assets/img/qyfgqkModule/bottom-line.png new file mode 100644 index 0000000000000000000000000000000000000000..b2b10b6f97c0ff1a9808bf81405ce346779b6c25 Binary files /dev/null and b/src/assets/img/qyfgqkModule/bottom-line.png differ diff --git a/src/assets/img/qyfgqkModule/detail-bg .png b/src/assets/img/qyfgqkModule/detail-bg .png new file mode 100644 index 0000000000000000000000000000000000000000..1ce88968ec4c876dab2d88c74fe3564d7f15d7c0 Binary files /dev/null and b/src/assets/img/qyfgqkModule/detail-bg .png differ diff --git a/src/assets/img/qyfgqkModule/list.png b/src/assets/img/qyfgqkModule/list.png new file mode 100644 index 0000000000000000000000000000000000000000..7a348d95cdfed816f1140be0861aa87d54d2740f Binary files /dev/null and b/src/assets/img/qyfgqkModule/list.png differ diff --git a/src/assets/img/qyfgqkModule/location.png b/src/assets/img/qyfgqkModule/location.png new file mode 100644 index 0000000000000000000000000000000000000000..99fde170867db198fc13f3954c9edb5e3fc5efba Binary files /dev/null and b/src/assets/img/qyfgqkModule/location.png differ diff --git a/src/assets/img/qyfgqkModule/peple.png b/src/assets/img/qyfgqkModule/peple.png new file mode 100644 index 0000000000000000000000000000000000000000..f83261662293a61c471d7d5a6590c786bb68cf03 Binary files /dev/null and b/src/assets/img/qyfgqkModule/peple.png differ diff --git a/src/assets/img/qyfgqkModule/rowIcon.png b/src/assets/img/qyfgqkModule/rowIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..58f09fa130d7ee88707571a892a608abb030d9b7 Binary files /dev/null and b/src/assets/img/qyfgqkModule/rowIcon.png differ diff --git a/src/assets/img/qyfgqkModule/scroll.png b/src/assets/img/qyfgqkModule/scroll.png new file mode 100644 index 0000000000000000000000000000000000000000..c9961fb020a4cd55eeb7006b62047eec261b5035 Binary files /dev/null and b/src/assets/img/qyfgqkModule/scroll.png differ diff --git a/src/assets/img/qyfgqkModule/tab-bg.png b/src/assets/img/qyfgqkModule/tab-bg.png new file mode 100644 index 0000000000000000000000000000000000000000..8696240a7729eff70293e1c9f91170d668e292b2 Binary files /dev/null and b/src/assets/img/qyfgqkModule/tab-bg.png differ diff --git a/src/assets/img/qyfgqkModule/tabItem-active-v.png b/src/assets/img/qyfgqkModule/tabItem-active-v.png new file mode 100644 index 0000000000000000000000000000000000000000..7026829b6dcc94247bd0a70165e54bcc94363ca9 Binary files /dev/null and b/src/assets/img/qyfgqkModule/tabItem-active-v.png differ diff --git a/src/assets/img/qyfgqkModule/tabItem-active.png b/src/assets/img/qyfgqkModule/tabItem-active.png new file mode 100644 index 0000000000000000000000000000000000000000..0934a8156673cba911cf9a0e09cff6ee09b69940 Binary files /dev/null and b/src/assets/img/qyfgqkModule/tabItem-active.png differ diff --git a/src/assets/img/qyfgqkModule/tabItem-bg.png b/src/assets/img/qyfgqkModule/tabItem-bg.png new file mode 100644 index 0000000000000000000000000000000000000000..ab3e4ad981c2d8b1428e9bbdfd39118f6b2ce330 Binary files /dev/null and b/src/assets/img/qyfgqkModule/tabItem-bg.png differ diff --git a/src/assets/img/qyfgqkModule/tankang_bg.png b/src/assets/img/qyfgqkModule/tankang_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..4827c34b1ca9d2ceee8770743c67f8d77c023862 Binary files /dev/null and b/src/assets/img/qyfgqkModule/tankang_bg.png differ diff --git a/src/assets/img/qyfgqkModule/zhishu.png b/src/assets/img/qyfgqkModule/zhishu.png new file mode 100644 index 0000000000000000000000000000000000000000..40704c46210da9e09f7bf05f18aa500905ada11a Binary files /dev/null and b/src/assets/img/qyfgqkModule/zhishu.png differ diff --git a/src/components/common/AreaTree0.vue b/src/components/common/AreaTree0.vue index 7019b3ea95e5318ca4a72bde949d436b5d540a1d..8de04760610cd7d05201396e0bbb692b92a6cc4b 100644 --- a/src/components/common/AreaTree0.vue +++ b/src/components/common/AreaTree0.vue @@ -219,9 +219,6 @@ @Emit('nodeClick') private nodeClick(data: any, checked: any, indeterminate: any) { - if(data && data.level<4){ - this.$store.dispatch('BhfbModule/districtCodeEmit', data.code); - } } private loadNode(node: any, resolve: any) { @@ -246,6 +243,7 @@ this.$store.dispatch('BhfbModule/cityCodeEmit', node.data.code); if(node.level==1){ this.$store.dispatch('BhfbModule/districtCodeEmit', node.data.code); + this.$store.dispatch('QyfgqkModule/districtCodeEmit', node.data.code); } let params1: any = { districtCode: node.key // 武汉市code @@ -305,6 +303,7 @@ private mounted() { (this as any).resolveMap('map').then(() => { this.getComponent().on('onDistrictChange',(res: any) => { + debugger if(!this.treeDatasFinishFlag)return; this.searchFlag = false; this.filterText = ""; diff --git a/src/components/common/WsyjDiseaseTrend.vue b/src/components/common/WsyjDiseaseTrend.vue index afdb482e5312a5329fc1529d5482fc204dd4b4a2..c631fbd596979bec6d0e3f162613148315627b5f 100644 --- a/src/components/common/WsyjDiseaseTrend.vue +++ b/src/components/common/WsyjDiseaseTrend.vue @@ -145,8 +145,10 @@ const mins = this.getMin(this.data); this.gvChart.config('grid', { top: 25, - left: "15%", - right: "10%" + left: "5%", + right: "8%", + bottom:"8%", + containLabel:true }); this.gvChart.config('series[0].name', '确诊病例'); this.gvChart.config('series[1].name', '疑似病例'); diff --git a/src/components/common/gisPop/PopBhDetailTable.vue b/src/components/common/gisPop/PopBhDetailTable.vue index fe231a696d6a18a9bdb732e3abee3cfeeed9bdb5..7ebdd8539af67868c72eb39bda648f36f8dd72f2 100644 --- a/src/components/common/gisPop/PopBhDetailTable.vue +++ b/src/components/common/gisPop/PopBhDetailTable.vue @@ -72,7 +72,9 @@
-
行政区划：{{resData.address}}
+
+
行政区划：
+
{{resData.address}}
联系电话：{{resData.telephone}}
@@ -268,6 +270,16 @@ display: flex; flex-direction: column; justify-content: space-between; + .addressWrap{ + width: 100%; + display: flex; + .addressContent{ + width: calc(100% - 100px); + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + } } } } diff --git a/src/router/router.ts b/src/router/router.ts index 7dc1d6074ab4f60ef381fa9337ad5c3910657b0a..ccda8183f486cfdf32922317c23ebc880231e69f 100644 --- a/src/router/router.ts +++ b/src/router/router.ts @@ -7,6 +7,7 @@ import YjdwfbHome from '@/views/wsyj/YjdwfbModule/YjdwfbHome.vue'; // 应急队 import WzxqyfbHome from '@/views/wsyj/WzxqyfbModule/WzxqyfbHome.vue'; // 应急物资分布 import ZhtsHome from '@/views/wsyj/ZhtsModule/ZhtsHome.vue'; // 综合态势 import BhfbHome from '@/views/wsyj/BhfbModule/BhfbHome.vue'; // 病患分布 +import QyfgqkHome from '@/views/wsyj/QyfgqkModule/QyfgqkHome.vue'; // 企业复工情况 const arrModule: any = publishObjectPath.value.arrModule; Vue.use(Router); @@ -29,6 +30,11 @@ export default new Router({ name: 'BhfbHome', component: BhfbHome, }, + { + path: '/Qyfgqk', + name: 'QyfgqkHome', + component: QyfgqkHome, + }, { path: '/Yjdwfb', name: 'YjdwfbHome', diff --git a/src/store/index.ts b/src/store/index.ts index b2fd0f78135c1274a61c7989ac5e376ff453fe38..5ad388f5a0a2e2da8be7cf9d7199bbe1ebdc8807 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -11,6 +11,7 @@ import BhfbModule from './wsyj/BhfbModule/BhfbStore'; import WzxqyfbModule from './wsyj/WzxqyfbModule/WzxqyfbStore'; import ZhtsModule from './wsyj/ZhtsModule/ZhtsStore'; import cityListModule from './module/cityListModule/cityList'; +import QyfgqkModule from './wsyj/QyfgqkModule/QyfgqkStore'; Vue.use(Vuex); @@ -26,6 +27,7 @@ export default new Vuex.Store({ WzxqyfbModule, ZhtsModule, cityListModule, + QyfgqkModule }, }); diff --git a/src/store/wsyj/QyfgqkModule/QyfgqkStore.ts b/src/store/wsyj/QyfgqkModule/QyfgqkStore.ts new file mode 100644 index 0000000000000000000000000000000000000000..89dc2d488c4edf9b6aebfac602ac580fdba811a5 --- /dev/null +++ b/src/store/wsyj/QyfgqkModule/QyfgqkStore.ts @@ -0,0 +1,37 @@ + + +export default { + namespaced: true, + state: { + qyfgqkTankangShow:false, + districtCode:"", + enterpriseCode:"" + }, + mutations: { + qyfgqkTankangShowUpdate(state: any, data: any) { + state.qyfgqkTankangShow = data; + }, + districtCodeUpdate(state: any, data: any) { + state.districtCode = data; + }, + enterpriseCodeUpdate(state: any, data: any) { + state.enterpriseCode = data; + }, + + + }, + actions: { + qyfgqkTankangShowEmit(content: any, data: any) { + content.commit('qyfgqkTankangShowUpdate', data); + }, + districtCodeEmit(content: any, data: any) { + content.commit('districtCodeUpdate', data); + }, + enterpriseCodeEmit(content: any, data: any) { + content.commit('enterpriseCodeUpdate', data); + }, + + }, +}; + + diff --git a/src/views/common/TabBar.vue b/src/views/common/TabBar.vue index 9cc7e016663f2fa8afd7ef12109ebe69827d6fcb..8528f70f412fe2add864f53ce30729b8a0333b15 100644 --- a/src/views/common/TabBar.vue +++ b/src/views/common/TabBar.vue @@ -6,10 +6,13 @@ 病患分布 - + + 企业复工情况 + + 应急队伍分布 - + 物资需求分布 @@ -35,11 +38,14 @@ if (n.path.indexOf('Bhfb') > -1) { this.currIndex = 1; } + if (n.path.indexOf('Qyfgqk') > -1) { + this.currIndex = 2; + } if (n.path.indexOf('Yjdwfb') > -1) { - this.currIndex = 2; + this.currIndex = 3; } if (n.path.indexOf('Wzxqyfb') > -1) { - this.currIndex = 3; + this.currIndex = 4; } console.log(this.currIndex); } diff --git a/src/views/wsyj/BhfbModule/BhWeek.vue b/src/views/wsyj/BhfbModule/BhWeek.vue index 507e5c703b972101006af7d0de7b02bd2c2d5e1a..936ac6c2ad93b87ef351a133c27ca8cdf3edc07a 100644 --- a/src/views/wsyj/BhfbModule/BhWeek.vue +++ b/src/views/wsyj/BhfbModule/BhWeek.vue @@ -122,9 +122,10 @@ export default class BhfbTree extends Vue { }; this.gvChart.config('grid', { top: "10%", - left:"8%", + left:"3%", right:"5%", - bottom:"22%" + bottom:"12%", + containLabel:true }); this.gvChart.config('dataZoom', { start: 0, diff --git a/src/views/wsyj/BhfbModule/BhfbSidebar.vue b/src/views/wsyj/BhfbModule/BhfbSidebar.vue index bde96626e05011bb512709fd0742b57514f2d8f4..2b370cced8a08b8d15ce11dccc6cae2d81498dd4 100644 --- a/src/views/wsyj/BhfbModule/BhfbSidebar.vue +++ b/src/views/wsyj/BhfbModule/BhfbSidebar.vue @@ -35,6 +35,9 @@ export default class BhfbSidebar extends Vue { }); } private treeNnodeClick(data: any, checked: any, indeterminate: any) { + if(data && data.level<4){ + this.$store.dispatch('BhfbModule/districtCodeEmit', data.code); + } this.MapComp.panTo(data.level, data.location, data.code); } // 获取地图功能 diff --git a/src/views/wsyj/QyfgqkModule/QyfgqkAssist.vue b/src/views/wsyj/QyfgqkModule/QyfgqkAssist.vue new file mode 100644 index 0000000000000000000000000000000000000000..ec5c108b9f90510779a94a2bd7e9ace79e1f973f --- /dev/null +++ b/src/views/wsyj/QyfgqkModule/QyfgqkAssist.vue @@ -0,0 +1,501 @@ + + + + + diff --git a/src/views/wsyj/QyfgqkModule/QyfgqkDetail.vue b/src/views/wsyj/QyfgqkModule/QyfgqkDetail.vue new file mode 100644 index 0000000000000000000000000000000000000000..ae6a15e81d9348d4e8ed747dcaaa14e66dac48cd --- /dev/null +++ b/src/views/wsyj/QyfgqkModule/QyfgqkDetail.vue @@ -0,0 +1,380 @@ + + + + diff --git a/src/views/wsyj/QyfgqkModule/QyfgqkHome.vue b/src/views/wsyj/QyfgqkModule/QyfgqkHome.vue new file mode 100644 index 0000000000000000000000000000000000000000..b9b629cbbdca30ead608e0b5586e56c37f5a0870 --- /dev/null +++ b/src/views/wsyj/QyfgqkModule/QyfgqkHome.vue @@ -0,0 +1,60 @@ + + + diff --git a/src/views/wsyj/QyfgqkModule/QyfgqkSidebar.vue b/src/views/wsyj/QyfgqkModule/QyfgqkSidebar.vue new file mode 100644 index 0000000000000000000000000000000000000000..f54c30372aef47384c3c47744662ca1dd16436cb --- /dev/null +++ b/src/views/wsyj/QyfgqkModule/QyfgqkSidebar.vue @@ -0,0 +1,41 @@ + + + diff --git a/src/views/wsyj/WzxqyfbModule/WzxqyfbSidebar.vue b/src/views/wsyj/WzxqyfbModule/WzxqyfbSidebar.vue index 1022b3a0a9f20dd811a3031fcdfc33cb5d154203..01a3759cf83bae964f04544a1797ed9417b79ec8 100644 --- a/src/views/wsyj/WzxqyfbModule/WzxqyfbSidebar.vue +++ b/src/views/wsyj/WzxqyfbModule/WzxqyfbSidebar.vue @@ -38,8 +38,7 @@ export default class WzxqyfbSidebar extends Vue { private treeNnodeClick(data: any, checked: any, indeterminate: any) { this.messsageBus.emit("wzxqyfbSidebar", checked.data); - console.debug(data.level,data.location); - this.getComponent().panTo(data.level, data.location, data.code); + this.getComponent().panTo(data.level, data.location); } // private getComponent() {