diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" new file mode 100644 index 0000000..983f916 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" new file mode 100644 index 0000000..983f916 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" new file mode 100644 index 0000000..1ba10d9 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" new file mode 100644 index 0000000..983f916 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" new file mode 100644 index 0000000..1ba10d9 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" new file mode 100644 index 0000000..6fbeb09 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" new file mode 100644 index 0000000..983f916 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" new file mode 100644 index 0000000..1ba10d9 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" new file mode 100644 index 0000000..6fbeb09 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" new file mode 100644 index 0000000..f57ff3f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" new file mode 100644 index 0000000..983f916 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" new file mode 100644 index 0000000..1ba10d9 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" new file mode 100644 index 0000000..6fbeb09 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" new file mode 100644 index 0000000..f57ff3f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" new file mode 100644 index 0000000..50faf2f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" new file mode 100644 index 0000000..983f916 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" new file mode 100644 index 0000000..1ba10d9 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" new file mode 100644 index 0000000..6fbeb09 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" new file mode 100644 index 0000000..f57ff3f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" new file mode 100644 index 0000000..50faf2f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" new file mode 100644 index 0000000..879a0cd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" new file mode 100644 index 0000000..983f916 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" new file mode 100644 index 0000000..1ba10d9 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" new file mode 100644 index 0000000..6fbeb09 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" new file mode 100644 index 0000000..f57ff3f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" new file mode 100644 index 0000000..50faf2f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" new file mode 100644 index 0000000..879a0cd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" new file mode 100644 index 0000000..7d27dfc --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" new file mode 100644 index 0000000..983f916 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" new file mode 100644 index 0000000..1ba10d9 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" new file mode 100644 index 0000000..6fbeb09 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" new file mode 100644 index 0000000..f57ff3f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" new file mode 100644 index 0000000..50faf2f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" new file mode 100644 index 0000000..879a0cd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" new file mode 100644 index 0000000..7d27dfc --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" new file mode 100644 index 0000000..55adcc5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" new file mode 100644 index 0000000..983f916 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" new file mode 100644 index 0000000..1ba10d9 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" new file mode 100644 index 0000000..6fbeb09 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" new file mode 100644 index 0000000..f57ff3f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" new file mode 100644 index 0000000..50faf2f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" new file mode 100644 index 0000000..879a0cd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" new file mode 100644 index 0000000..7d27dfc --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" new file mode 100644 index 0000000..55adcc5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" new file mode 100644 index 0000000..fde8b78 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" new file mode 100644 index 0000000..983f916 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" new file mode 100644 index 0000000..1ba10d9 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" new file mode 100644 index 0000000..6fbeb09 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" new file mode 100644 index 0000000..f57ff3f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" new file mode 100644 index 0000000..50faf2f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" new file mode 100644 index 0000000..879a0cd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" new file mode 100644 index 0000000..7d27dfc --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" new file mode 100644 index 0000000..55adcc5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" new file mode 100644 index 0000000..fde8b78 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" new file mode 100644 index 0000000..7ae3555 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" new file mode 100644 index 0000000..983f916 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" new file mode 100644 index 0000000..1ba10d9 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" new file mode 100644 index 0000000..6fbeb09 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" new file mode 100644 index 0000000..f57ff3f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" new file mode 100644 index 0000000..50faf2f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" new file mode 100644 index 0000000..879a0cd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" new file mode 100644 index 0000000..7d27dfc --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" new file mode 100644 index 0000000..55adcc5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" new file mode 100644 index 0000000..fde8b78 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" new file mode 100644 index 0000000..7ae3555 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" new file mode 100644 index 0000000..87a60fa --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" new file mode 100644 index 0000000..983f916 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" new file mode 100644 index 0000000..1ba10d9 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" new file mode 100644 index 0000000..6fbeb09 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" new file mode 100644 index 0000000..f57ff3f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" new file mode 100644 index 0000000..50faf2f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" new file mode 100644 index 0000000..879a0cd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" new file mode 100644 index 0000000..7d27dfc --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" new file mode 100644 index 0000000..55adcc5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" new file mode 100644 index 0000000..fde8b78 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" new file mode 100644 index 0000000..7ae3555 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" new file mode 100644 index 0000000..87a60fa --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" new file mode 100644 index 0000000..1342ac0 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" new file mode 100644 index 0000000..983f916 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" new file mode 100644 index 0000000..1ba10d9 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" new file mode 100644 index 0000000..6fbeb09 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" new file mode 100644 index 0000000..f57ff3f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" new file mode 100644 index 0000000..50faf2f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" new file mode 100644 index 0000000..879a0cd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" new file mode 100644 index 0000000..7d27dfc --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" new file mode 100644 index 0000000..55adcc5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" new file mode 100644 index 0000000..fde8b78 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" new file mode 100644 index 0000000..7ae3555 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" new file mode 100644 index 0000000..87a60fa --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" new file mode 100644 index 0000000..1342ac0 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" new file mode 100644 index 0000000..0aa9124 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" new file mode 100644 index 0000000..983f916 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" new file mode 100644 index 0000000..1ba10d9 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" new file mode 100644 index 0000000..6fbeb09 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" new file mode 100644 index 0000000..f57ff3f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" new file mode 100644 index 0000000..50faf2f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" new file mode 100644 index 0000000..879a0cd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" new file mode 100644 index 0000000..7d27dfc --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" new file mode 100644 index 0000000..55adcc5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" new file mode 100644 index 0000000..fde8b78 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" new file mode 100644 index 0000000..7ae3555 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" new file mode 100644 index 0000000..87a60fa --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" new file mode 100644 index 0000000..1342ac0 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" new file mode 100644 index 0000000..0aa9124 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" new file mode 100644 index 0000000..61921c8 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" new file mode 100644 index 0000000..983f916 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" new file mode 100644 index 0000000..1ba10d9 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" new file mode 100644 index 0000000..6fbeb09 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" new file mode 100644 index 0000000..f57ff3f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" new file mode 100644 index 0000000..50faf2f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" new file mode 100644 index 0000000..879a0cd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" new file mode 100644 index 0000000..7d27dfc --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" new file mode 100644 index 0000000..55adcc5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" new file mode 100644 index 0000000..fde8b78 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" new file mode 100644 index 0000000..7ae3555 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" new file mode 100644 index 0000000..87a60fa --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" new file mode 100644 index 0000000..1342ac0 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" new file mode 100644 index 0000000..0aa9124 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" new file mode 100644 index 0000000..61921c8 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" new file mode 100644 index 0000000..9b8e443 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" new file mode 100644 index 0000000..983f916 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" new file mode 100644 index 0000000..1ba10d9 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" new file mode 100644 index 0000000..6fbeb09 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" new file mode 100644 index 0000000..f57ff3f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" new file mode 100644 index 0000000..50faf2f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" new file mode 100644 index 0000000..879a0cd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" new file mode 100644 index 0000000..7d27dfc --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" new file mode 100644 index 0000000..55adcc5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" new file mode 100644 index 0000000..fde8b78 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" new file mode 100644 index 0000000..7ae3555 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" new file mode 100644 index 0000000..87a60fa --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" new file mode 100644 index 0000000..1342ac0 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" new file mode 100644 index 0000000..0aa9124 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" new file mode 100644 index 0000000..61921c8 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" new file mode 100644 index 0000000..9b8e443 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" new file mode 100644 index 0000000..03c1f39 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" new file mode 100644 index 0000000..983f916 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" new file mode 100644 index 0000000..1ba10d9 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" new file mode 100644 index 0000000..6fbeb09 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" new file mode 100644 index 0000000..f57ff3f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" new file mode 100644 index 0000000..50faf2f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" new file mode 100644 index 0000000..879a0cd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" new file mode 100644 index 0000000..7d27dfc --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" new file mode 100644 index 0000000..55adcc5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" new file mode 100644 index 0000000..fde8b78 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" new file mode 100644 index 0000000..7ae3555 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" new file mode 100644 index 0000000..87a60fa --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" new file mode 100644 index 0000000..1342ac0 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" new file mode 100644 index 0000000..0aa9124 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" new file mode 100644 index 0000000..61921c8 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" new file mode 100644 index 0000000..9b8e443 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" new file mode 100644 index 0000000..03c1f39 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" new file mode 100644 index 0000000..23c0346 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" new file mode 100644 index 0000000..983f916 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" new file mode 100644 index 0000000..1ba10d9 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" new file mode 100644 index 0000000..6fbeb09 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" new file mode 100644 index 0000000..f57ff3f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" new file mode 100644 index 0000000..50faf2f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" new file mode 100644 index 0000000..879a0cd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" new file mode 100644 index 0000000..7d27dfc --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" new file mode 100644 index 0000000..55adcc5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" new file mode 100644 index 0000000..fde8b78 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" new file mode 100644 index 0000000..7ae3555 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" new file mode 100644 index 0000000..87a60fa --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" new file mode 100644 index 0000000..1342ac0 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" new file mode 100644 index 0000000..0aa9124 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" new file mode 100644 index 0000000..61921c8 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" new file mode 100644 index 0000000..9b8e443 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" new file mode 100644 index 0000000..03c1f39 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" new file mode 100644 index 0000000..23c0346 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 4.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 4.png" new file mode 100644 index 0000000..3eca3f5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 4.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" new file mode 100644 index 0000000..983f916 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" new file mode 100644 index 0000000..1ba10d9 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" new file mode 100644 index 0000000..6fbeb09 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" new file mode 100644 index 0000000..f57ff3f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" new file mode 100644 index 0000000..50faf2f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" new file mode 100644 index 0000000..879a0cd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" new file mode 100644 index 0000000..7d27dfc --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" new file mode 100644 index 0000000..55adcc5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" new file mode 100644 index 0000000..fde8b78 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" new file mode 100644 index 0000000..7ae3555 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" new file mode 100644 index 0000000..87a60fa --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" new file mode 100644 index 0000000..1342ac0 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" new file mode 100644 index 0000000..0aa9124 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" new file mode 100644 index 0000000..61921c8 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" new file mode 100644 index 0000000..9b8e443 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" new file mode 100644 index 0000000..03c1f39 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" new file mode 100644 index 0000000..23c0346 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 4.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 4.png" new file mode 100644 index 0000000..3eca3f5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 40.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 40.png" new file mode 100644 index 0000000..5876ddb --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 40.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" new file mode 100644 index 0000000..983f916 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" new file mode 100644 index 0000000..1ba10d9 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" new file mode 100644 index 0000000..6fbeb09 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" new file mode 100644 index 0000000..f57ff3f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" new file mode 100644 index 0000000..50faf2f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" new file mode 100644 index 0000000..879a0cd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" new file mode 100644 index 0000000..7d27dfc --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" new file mode 100644 index 0000000..55adcc5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" new file mode 100644 index 0000000..fde8b78 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" new file mode 100644 index 0000000..7ae3555 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" new file mode 100644 index 0000000..87a60fa --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" new file mode 100644 index 0000000..1342ac0 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" new file mode 100644 index 0000000..0aa9124 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" new file mode 100644 index 0000000..61921c8 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" new file mode 100644 index 0000000..9b8e443 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" new file mode 100644 index 0000000..03c1f39 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" new file mode 100644 index 0000000..23c0346 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 4.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 4.png" new file mode 100644 index 0000000..3eca3f5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 40.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 40.png" new file mode 100644 index 0000000..5876ddb --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 40.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 41.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 41.png" new file mode 100644 index 0000000..e6f7ddd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 41.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" new file mode 100644 index 0000000..983f916 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" new file mode 100644 index 0000000..1ba10d9 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" new file mode 100644 index 0000000..6fbeb09 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" new file mode 100644 index 0000000..f57ff3f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" new file mode 100644 index 0000000..50faf2f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" new file mode 100644 index 0000000..879a0cd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" new file mode 100644 index 0000000..7d27dfc --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" new file mode 100644 index 0000000..55adcc5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" new file mode 100644 index 0000000..fde8b78 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" new file mode 100644 index 0000000..7ae3555 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" new file mode 100644 index 0000000..87a60fa --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" new file mode 100644 index 0000000..1342ac0 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" new file mode 100644 index 0000000..0aa9124 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" new file mode 100644 index 0000000..61921c8 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" new file mode 100644 index 0000000..9b8e443 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" new file mode 100644 index 0000000..03c1f39 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" new file mode 100644 index 0000000..23c0346 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 4.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 4.png" new file mode 100644 index 0000000..3eca3f5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 40.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 40.png" new file mode 100644 index 0000000..5876ddb --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 40.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 41.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 41.png" new file mode 100644 index 0000000..e6f7ddd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 41.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 44bb.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 44bb.png" new file mode 100644 index 0000000..7f3da41 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 44bb.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" new file mode 100644 index 0000000..983f916 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" new file mode 100644 index 0000000..1ba10d9 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" new file mode 100644 index 0000000..6fbeb09 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" new file mode 100644 index 0000000..f57ff3f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" new file mode 100644 index 0000000..50faf2f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" new file mode 100644 index 0000000..879a0cd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" new file mode 100644 index 0000000..7d27dfc --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" new file mode 100644 index 0000000..55adcc5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" new file mode 100644 index 0000000..fde8b78 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" new file mode 100644 index 0000000..7ae3555 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" new file mode 100644 index 0000000..87a60fa --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" new file mode 100644 index 0000000..1342ac0 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" new file mode 100644 index 0000000..0aa9124 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" new file mode 100644 index 0000000..61921c8 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" new file mode 100644 index 0000000..9b8e443 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" new file mode 100644 index 0000000..03c1f39 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" new file mode 100644 index 0000000..23c0346 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 4.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 4.png" new file mode 100644 index 0000000..3eca3f5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 40.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 40.png" new file mode 100644 index 0000000..5876ddb --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 40.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 41.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 41.png" new file mode 100644 index 0000000..e6f7ddd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 41.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 44bb.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 44bb.png" new file mode 100644 index 0000000..7f3da41 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 44bb.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 7.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 7.png" new file mode 100644 index 0000000..350e980 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 7.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" new file mode 100644 index 0000000..983f916 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" new file mode 100644 index 0000000..1ba10d9 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" new file mode 100644 index 0000000..6fbeb09 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" new file mode 100644 index 0000000..f57ff3f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" new file mode 100644 index 0000000..50faf2f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" new file mode 100644 index 0000000..879a0cd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" new file mode 100644 index 0000000..7d27dfc --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" new file mode 100644 index 0000000..55adcc5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" new file mode 100644 index 0000000..fde8b78 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" new file mode 100644 index 0000000..7ae3555 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" new file mode 100644 index 0000000..87a60fa --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" new file mode 100644 index 0000000..1342ac0 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" new file mode 100644 index 0000000..0aa9124 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" new file mode 100644 index 0000000..61921c8 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" new file mode 100644 index 0000000..9b8e443 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" new file mode 100644 index 0000000..03c1f39 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" new file mode 100644 index 0000000..23c0346 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 4.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 4.png" new file mode 100644 index 0000000..3eca3f5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 40.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 40.png" new file mode 100644 index 0000000..5876ddb --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 40.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 41.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 41.png" new file mode 100644 index 0000000..e6f7ddd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 41.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 44bb.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 44bb.png" new file mode 100644 index 0000000..7f3da41 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 44bb.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 7.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 7.png" new file mode 100644 index 0000000..350e980 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 7.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 9.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 9.png" new file mode 100644 index 0000000..a8c33f5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 9.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" new file mode 100644 index 0000000..983f916 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" new file mode 100644 index 0000000..1ba10d9 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" new file mode 100644 index 0000000..6fbeb09 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" new file mode 100644 index 0000000..f57ff3f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" new file mode 100644 index 0000000..50faf2f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" new file mode 100644 index 0000000..879a0cd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" new file mode 100644 index 0000000..7d27dfc --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" new file mode 100644 index 0000000..55adcc5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" new file mode 100644 index 0000000..fde8b78 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" new file mode 100644 index 0000000..7ae3555 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" new file mode 100644 index 0000000..87a60fa --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" new file mode 100644 index 0000000..1342ac0 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" new file mode 100644 index 0000000..0aa9124 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" new file mode 100644 index 0000000..61921c8 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" new file mode 100644 index 0000000..9b8e443 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" new file mode 100644 index 0000000..03c1f39 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" new file mode 100644 index 0000000..23c0346 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 4.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 4.png" new file mode 100644 index 0000000..3eca3f5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 40.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 40.png" new file mode 100644 index 0000000..5876ddb --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 40.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 41.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 41.png" new file mode 100644 index 0000000..e6f7ddd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 41.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 44bb.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 44bb.png" new file mode 100644 index 0000000..7f3da41 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 44bb.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 7.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 7.png" new file mode 100644 index 0000000..350e980 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 7.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 9.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 9.png" new file mode 100644 index 0000000..a8c33f5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 9.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\2201_1644568543649.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\2201_1644568543649.png" new file mode 100644 index 0000000..21da485 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\2201_1644568543649.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" new file mode 100644 index 0000000..983f916 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" new file mode 100644 index 0000000..1ba10d9 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" new file mode 100644 index 0000000..6fbeb09 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" new file mode 100644 index 0000000..f57ff3f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" new file mode 100644 index 0000000..50faf2f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" new file mode 100644 index 0000000..879a0cd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" new file mode 100644 index 0000000..7d27dfc --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" new file mode 100644 index 0000000..55adcc5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" new file mode 100644 index 0000000..fde8b78 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" new file mode 100644 index 0000000..7ae3555 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" new file mode 100644 index 0000000..87a60fa --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" new file mode 100644 index 0000000..1342ac0 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" new file mode 100644 index 0000000..0aa9124 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" new file mode 100644 index 0000000..61921c8 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" new file mode 100644 index 0000000..9b8e443 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" new file mode 100644 index 0000000..03c1f39 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" new file mode 100644 index 0000000..23c0346 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 4.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 4.png" new file mode 100644 index 0000000..3eca3f5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 40.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 40.png" new file mode 100644 index 0000000..5876ddb --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 40.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 41.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 41.png" new file mode 100644 index 0000000..e6f7ddd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 41.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 44bb.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 44bb.png" new file mode 100644 index 0000000..7f3da41 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 44bb.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 7.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 7.png" new file mode 100644 index 0000000..350e980 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 7.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 9.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 9.png" new file mode 100644 index 0000000..a8c33f5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 9.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\2201_1644568543649.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\2201_1644568543649.png" new file mode 100644 index 0000000..21da485 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\2201_1644568543649.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\2204_2.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\2204_2.png" new file mode 100644 index 0000000..4c467e7 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\2204_2.png" Binary files differ diff --git a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue index c515076..4ea399b 100644 --- a/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue +++ b/src/views/zhangqiu/components/handlingAlarm/handlingAlarm.vue @@ -137,23 +137,23 @@ }, methods: { getWellSituation() { - this.handlingAlarm[0].status = '111' - this.handlingAlarm[0].finished = '88' + this.handlingAlarm[0].status = '' + this.handlingAlarm[0].finished = '75' this.handlingAlarm[0].unfinished = 100 - this.handlingAlarm[0].finished }, getOtherGasSituation() { - this.handlingAlarm[1].status = '222' - this.handlingAlarm[1].finished = '77' + this.handlingAlarm[1].status = '' + this.handlingAlarm[1].finished = '84' this.handlingAlarm[1].unfinished = 100 - this.handlingAlarm[1].finished }, getGasSituation() { - this.handlingAlarm[2].status = '333' - this.handlingAlarm[2].finished = '66' + this.handlingAlarm[2].status = '' + this.handlingAlarm[2].finished = '79' this.handlingAlarm[2].unfinished = 100 - this.handlingAlarm[2].finished }, getPantiltSituation() { - this.handlingAlarm[3].status = '444' - this.handlingAlarm[3].finished = '55' + this.handlingAlarm[3].status = '' + this.handlingAlarm[3].finished = '87' this.handlingAlarm[3].unfinished = 100 - this.handlingAlarm[3].finished } } diff --git a/src/views/zhangqiu/components/tableData.vue b/src/views/zhangqiu/components/tableData.vue index a834e73..1a2602d 100644 --- a/src/views/zhangqiu/components/tableData.vue +++ b/src/views/zhangqiu/components/tableData.vue @@ -20,39 +20,144 @@ dept: '权属单位', }, { - road: '双山西街', - length: '54', + road: '锦绣花园中区', + length: '0.261', + dept: '济南中燃', + }, + { + road: '锦绣花园东区', + length: '0.43', + dept: '济南中燃', + }, + { + road: '城建景园', + length: '0.079', + dept: '济南中燃', + }, + { + road: '鲁宏宿舍', + length: '0.327', + dept: '济南中燃', + }, + { + road: '汽配厂宿舍', + length: '0.073', + dept: '济南中燃', + }, + { + road: '丽园花园', + length: '0.251', + dept: '济南中燃', + }, + { + road: '金梦轩', + length: '0.188', + dept: '济南中燃', + }, + { + road: '实验二中宿舍', + length: '0.126', + dept: '济南中燃', + }, + { + road: '宏昌西区', + length: '0.052', + dept: '济南中燃', + }, + { + road: '宏昌新座', + length: '0.079', + dept: '济南中燃', + }, + { + road: '银座上城', + length: '0.239', + dept: '济南中燃', + }, + { + road: '妇幼办健院宿舍', + length: '0.375', + dept: '济南中燃', + }, + { + road: '福园小区', + length: '0.115', + dept: '济南中燃', + }, + { + road: '广电宿舍', + length: '0.274', + dept: '济南中燃', + }, + { + road: '新世纪', + length: '1.008', + dept: '济南中燃', + }, + { + road: '经十路', + length: '4.918', dept: '圣井燃气', }, { - road: '绣水大街', - length: '32', + road: '潘王路', + length: '2.879', + dept: '圣井燃气', + }, + { + road: '中学路', + length: '1.452', + dept: '圣井燃气', + }, + { + road: '三号路中压', + length: '4.831', + dept: '圣井燃气', + }, + { + road: '三号路', + length: '1.013', + dept: '圣井燃气', + }, + { + road: '明堂路支线', + length: '0.3', dept: '正和燃气', }, { - road: '鲁宏大街', - length: '44', + road: '绣阳路支线', + length: '1.866', dept: '正和燃气', }, { - road: '清照大街', - length: '10', - dept: '中燃燃气', + road: '建陶城外线', + length: '0.246', + dept: '正和燃气', }, { - road: '福泰路', - length: '2', - dept: '中燃燃气', + road: '中石化双山门站', + length: '5.956', + dept: '华润燃气', }, { - road: '唐王山路', - length: '37', - dept: '圣井燃气', + road: '华民路', + length: '1.977', + dept: '华润燃气', }, { - road: '经十东路', - length: '43', - dept: '圣井燃气', + road: '城东园区', + length: '1.875', + dept: '华润燃气', + }, + { + road: '中小企业园', + length: '0.898', + dept: '华润燃气', + }, + { + road: '滨湖路', + length: '1.097', + dept: '华气燃气', } ] } diff --git a/src/views/zhangqiu/js/data.js b/src/views/zhangqiu/js/data.js index 1ca77ce..6f787f6 100644 --- a/src/views/zhangqiu/js/data.js +++ b/src/views/zhangqiu/js/data.js @@ -15,17 +15,21 @@ series: [ { type: 'pie', + minAngle: 5, 　　 //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互 + avoidLabelOverlap: true, data: [ - { name: '中燃燃气', value: 2000 }, - { name: '圣井燃气', value: 2400 }, - { name: '正和燃气', value: 3200 }, + { name: '华润燃气', value: 8.729 }, + { name: '中燃燃气', value: 202.905 }, + { name: '华气燃气', value: 1.097 }, + { name: '圣井燃气', value: 105.719 }, + { name: '正和燃气', value: 2.412 } ], radius : 60, insideLabel: { //内部标签 show: true, }, outsideLabel:{ - labelLineBendGap:10, + labelLineBendGap:20, labelLineEndLength:12, } diff --git a/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg new file mode 100644 index 0000000..52d3f78 --- /dev/null +++ b/src/views/zhangqiu/resources/t010195ab8ccba21193.jpg Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_1.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_2.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_3.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" new file mode 100644 index 0000000..a0e7900 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\234\206_00000_iSpt_4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" new file mode 100644 index 0000000..983f916 --- /dev/null +++ "b/src/views/zhangqiu/resources/\345\260\217\345\272\225_00000_iSpt.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" new file mode 100644 index 0000000..1ba10d9 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 16.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" new file mode 100644 index 0000000..6fbeb09 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 17.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" new file mode 100644 index 0000000..f57ff3f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 20.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" new file mode 100644 index 0000000..50faf2f --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 21.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" new file mode 100644 index 0000000..879a0cd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 22.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" new file mode 100644 index 0000000..7d27dfc --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 23.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" new file mode 100644 index 0000000..55adcc5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 24.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" new file mode 100644 index 0000000..fde8b78 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" new file mode 100644 index 0000000..7ae3555 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 25_1644546164422.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" new file mode 100644 index 0000000..87a60fa --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 26.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" new file mode 100644 index 0000000..1342ac0 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 27.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" new file mode 100644 index 0000000..0aa9124 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 30.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" new file mode 100644 index 0000000..61921c8 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 32.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" new file mode 100644 index 0000000..9b8e443 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 35.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" new file mode 100644 index 0000000..03c1f39 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 37.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" new file mode 100644 index 0000000..23c0346 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 39.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 4.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 4.png" new file mode 100644 index 0000000..3eca3f5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 4.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 40.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 40.png" new file mode 100644 index 0000000..5876ddb --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 40.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 41.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 41.png" new file mode 100644 index 0000000..e6f7ddd --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 41.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 44bb.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 44bb.png" new file mode 100644 index 0000000..7f3da41 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 44bb.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 7.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 7.png" new file mode 100644 index 0000000..350e980 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 7.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\220 9.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 9.png" new file mode 100644 index 0000000..a8c33f5 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\220 9.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\2201_1644568543649.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\2201_1644568543649.png" new file mode 100644 index 0000000..21da485 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\2201_1644568543649.png" Binary files differ diff --git "a/src/views/zhangqiu/resources/\350\265\204\346\272\2204_2.png" "b/src/views/zhangqiu/resources/\350\265\204\346\272\2204_2.png" new file mode 100644 index 0000000..4c467e7 --- /dev/null +++ "b/src/views/zhangqiu/resources/\350\265\204\346\272\2204_2.png" Binary files differ diff --git a/src/views/zhangqiu/zqindex.vue b/src/views/zhangqiu/zqindex.vue index a5623fd..5e4cbcc 100644 --- a/src/views/zhangqiu/zqindex.vue +++ b/src/views/zhangqiu/zqindex.vue @@ -4,7 +4,7 @@
- +