From 1ab5269ae5960bcc47b59f6f5c89f26d138b1b50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=86=8A=E4=B8=BD=E5=90=9B?= <664953382@qq.com> Date: Wed, 16 Feb 2022 11:17:07 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9dataZoom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 12 + src/views/bigScreen/components/scaleBox.vue | 148 +- src/views/bigScreen/drivingCabin/center.vue | 40 +- src/views/bigScreen/drivingCabin/left1.vue | 23 +- src/views/bigScreen/drivingCabin/left2.vue | 23 +- src/views/bigScreen/drivingCabin/right1.vue | 184 +- src/views/bigScreen/drivingCabin/right2.vue | 188 +- src/views/bigScreen/information/center.vue | 398 ++-- src/views/bigScreen/information/left1.vue | 29 +- src/views/bigScreen/information/right1.vue | 1142 +++++------ src/views/bigScreen/management/center.vue | 79 +- src/views/bigScreen/management/left1.vue | 23 +- src/views/bigScreen/management/left2.vue | 23 +- src/views/bigScreen/management/right1.vue | 27 +- src/views/bigScreen/management/right2.vue | 54 +- src/views/bigScreen/qualityManage/center.vue | 20 +- src/views/bigScreen/qualityManage/center2.vue | 23 +- src/views/bigScreen/qualityManage/left1.vue | 897 ++++----- src/views/bigScreen/qualityManage/right1.vue | 1700 +++++++++-------- .../bigScreen/scientific/tab2/center1.vue | 181 +- .../bigScreen/scientific/tab2/center2.vue | 189 +- src/views/bigScreen/scientific/tab2/left1.vue | 127 +- src/views/bigScreen/scientific/tab3/left1.vue | 1258 ++++++------ src/views/bigScreen/securityManage/center.vue | 1 + src/views/bigScreen/securityManage/left2.vue | 367 ++-- src/views/bigScreen/securityManage/right1.vue | 187 +- vue.config.js | 3 +- 27 files changed, 3952 insertions(+), 3394 deletions(-) diff --git a/src/main.js b/src/main.js index 00fa465..1efe892 100644 --- a/src/main.js +++ b/src/main.js @@ -59,6 +59,18 @@ Vue.prototype.dataZoomEnd = (titLength, defaultLength = 7) => { } return ((defaultLength / (titLength + 1)) * 100).toFixed(0) } +Vue.prototype.dataZoomStart = (titLength, defaultLength = 4,position) => { + if (titLength <= defaultLength) { + if(position=='start'){ + return 0 + } + return titLength - 1 + } + if(position=='start'){ + return titLength - 4 + } + return titLength - 1 +} // 全局组件挂载 Vue.component('DictTag', DictTag) diff --git a/src/views/bigScreen/components/scaleBox.vue b/src/views/bigScreen/components/scaleBox.vue index 7260f21..221bcea 100644 --- a/src/views/bigScreen/components/scaleBox.vue +++ b/src/views/bigScreen/components/scaleBox.vue @@ -1,85 +1,85 @@ diff --git a/src/views/bigScreen/drivingCabin/center.vue b/src/views/bigScreen/drivingCabin/center.vue index ab4d7c0..ead4ec7 100644 --- a/src/views/bigScreen/drivingCabin/center.vue +++ b/src/views/bigScreen/drivingCabin/center.vue @@ -22,15 +22,16 @@ >
- {{ handleMillion(val.completedIncome) }}/{{ handleMillion(val.completedIncome) }}/{{ handleMillion(val.targetIncome) }}亿元 + >亿元 --> + 99.99/99.99亿元
-
+
@@ -39,15 +40,16 @@ >
- {{ handleMillion(val.completedProfit) }}/{{ handleMillion(val.completedProfit) }}/{{ handleMillion(val.targetProfit) }}亿元 + >亿元 --> + 99.99/99.99亿元
-
+
@@ -56,17 +58,18 @@ >
- {{ handleMillion(val.completedChargeQuantity) }}/{{ handleMillion(val.completedChargeQuantity) }}/{{ handleMillion(val.targetChargeQuantity) }}亿件 + >亿件 --> + 99.99/99.99亿件
-
+
@@ -75,18 +78,19 @@ >
- {{ handleMillion(val.completedDeliveryQuantity) }}/{{ handleMillion(val.completedDeliveryQuantity) }}/{{ handleMillion(val.targetDeliveryQuantity) }}亿件 + >亿件 --> + 99.99/99.99亿件
-
+
@@ -168,8 +172,8 @@ export default { color: #ffffff; font-size: 18px; .data-item { - // flex: 1; - width: 20%; + flex: 1; + // width: 20%; display: flex; flex-direction: column; align-items: flex-start; diff --git a/src/views/bigScreen/drivingCabin/left1.vue b/src/views/bigScreen/drivingCabin/left1.vue index ffeea9f..9a975e6 100644 --- a/src/views/bigScreen/drivingCabin/left1.vue +++ b/src/views/bigScreen/drivingCabin/left1.vue @@ -222,11 +222,24 @@ export default { }, }, }, - dataZoom: { - type: "slider", - start: 0, - end: this.dataZoomEnd(titData.length, 7), - }, + // dataZoom: { + // type: "slider", + // start: 0, + // end: this.dataZoomEnd(titData.length, 7), + // }, + dataZoom: [ + { + type: "slider", + textStyle: { + color: "#fff", + }, + startValue: this.dataZoomStart(titData.length, 4, "start"), + endValue: this.dataZoomStart(titData.length, 4, "end"), + }, + { + type: "inside", + }, + ], color: ["#ccc", "red"], yAxis: [ { diff --git a/src/views/bigScreen/drivingCabin/left2.vue b/src/views/bigScreen/drivingCabin/left2.vue index c08de29..f7d6032 100644 --- a/src/views/bigScreen/drivingCabin/left2.vue +++ b/src/views/bigScreen/drivingCabin/left2.vue @@ -307,11 +307,24 @@ export default { top: 50, bottom: 50, }, - dataZoom: { - type: "slider", - start: 0, - end: this.dataZoomEnd(titData.length, 7), - }, + // dataZoom: { + // type: "slider", + // start: 0, + // end: this.dataZoomEnd(titData.length, 7), + // }, + dataZoom: [ + { + type: "slider", + textStyle: { + color: "#fff", + }, + startValue: this.dataZoomStart(titData.length, 4, "start"), + endValue: this.dataZoomStart(titData.length, 4, "end"), + }, + { + type: "inside", + }, + ], series: [ { name: "预测", diff --git a/src/views/bigScreen/drivingCabin/right1.vue b/src/views/bigScreen/drivingCabin/right1.vue index 5787175..a340faf 100644 --- a/src/views/bigScreen/drivingCabin/right1.vue +++ b/src/views/bigScreen/drivingCabin/right1.vue @@ -10,7 +10,7 @@
· 已完成任务/完成率 - {{rate.completedTotal}}/{{rate.rate}}% + {{ rate.completedTotal }}/{{ rate.rate }}%
@@ -29,25 +29,25 @@ diff --git a/src/views/bigScreen/information/left1.vue b/src/views/bigScreen/information/left1.vue index 784a9d3..011ec90 100644 --- a/src/views/bigScreen/information/left1.vue +++ b/src/views/bigScreen/information/left1.vue @@ -12,7 +12,7 @@ 已完成任务/完成率 {{ totalAndRate.total }}/{{ - Math.floor(totalAndRate.rate * 100) / 100 + Math.floor(totalAndRate.rate * 100) / 100 || 0 }}% @@ -351,14 +351,27 @@ export default { }, }, }, - dataZoom: { - type: "slider", - start: 0, - end: this.dataZoomEnd(titList.length, 5), - textStyle: { - color: "#fff", + // dataZoom: { + // type: "slider", + // start: 0, + // end: this.dataZoomEnd(titList.length, 5), + // textStyle: { + // color: "#fff", + // }, + // }, + dataZoom: [ + { + type: "slider", + textStyle: { + color: "#fff", + }, + startValue: this.dataZoomStart(titList.length, 4, "start"), + endValue: this.dataZoomStart(titList.length, 4, "end"), }, - }, + { + type: "inside", + }, + ], color: ["#ccc", "red"], yAxis: [ { diff --git a/src/views/bigScreen/information/right1.vue b/src/views/bigScreen/information/right1.vue index cf9075b..e85d96a 100644 --- a/src/views/bigScreen/information/right1.vue +++ b/src/views/bigScreen/information/right1.vue @@ -1,577 +1,637 @@ diff --git a/src/views/bigScreen/management/center.vue b/src/views/bigScreen/management/center.vue index 78d56f3..98f7f3c 100644 --- a/src/views/bigScreen/management/center.vue +++ b/src/views/bigScreen/management/center.vue @@ -16,15 +16,16 @@ >
- {{ handleMillion(resData.realIncome) }}/{{ handleMillion(resData.realIncome) }}/{{ handleMillion(resData.targetIncome) }}亿元 + >亿元 --> + 99.99/99.99亿元
-
+
@@ -33,15 +34,16 @@ >
- {{ handleMillion(resData.realProfit) }}/{{ handleMillion(resData.realProfit) }}/{{ handleMillion(resData.targetProfit) }}亿元 + >亿元 --> + 99.99/99.99亿元
-
+
@@ -50,17 +52,18 @@ >
- {{ handleMillion(resData.realEva) }}/{{ handleMillion(resData.realEva) }}/{{ handleMillion(resData.targetEva) }}亿元 + >亿元 --> + 99.99/99.99亿元
-
+
-
+
两金
-
- {{ handleMillion(resData.realCollection) }}/ + + 99.99/99.99亿元 +
+ 产成品 +
- 产成品 -
+ +
-
- {{ handleMillion(resData.realFinishProduct) }}/ + + 99.99/99.99亿元 +
+ 应收账款 +
- 应收账款 -
+
@@ -848,7 +870,8 @@ export default { padding: 5px 0; display: flex; flex-direction: column; - justify-content: space-between; + justify-content: center; + // justify-content: space-between; align-items: flex-start; > div { margin: 5px 0; diff --git a/src/views/bigScreen/management/left1.vue b/src/views/bigScreen/management/left1.vue index 1fcbf4e..07f0c41 100644 --- a/src/views/bigScreen/management/left1.vue +++ b/src/views/bigScreen/management/left1.vue @@ -591,11 +591,24 @@ export default { top: 50, bottom: 50, }, - dataZoom: { - type: "slider", - start: 0, - end: this.dataZoomEnd(list.length, 5), - }, + // dataZoom: { + // type: "slider", + // start: 0, + // end: this.dataZoomEnd(list.length, 5), + // }, + dataZoom: [ + { + type: "slider", + textStyle: { + color: "#fff", + }, + startValue: this.dataZoomStart(list.length, 4, "start"), + endValue: this.dataZoomStart(list.length, 4, "end"), + }, + { + type: "inside", + }, + ], series: [ { name: "实际", diff --git a/src/views/bigScreen/management/left2.vue b/src/views/bigScreen/management/left2.vue index 24894c1..1837dc9 100644 --- a/src/views/bigScreen/management/left2.vue +++ b/src/views/bigScreen/management/left2.vue @@ -579,11 +579,24 @@ export default { top: 30, bottom: 40, }, - dataZoom: { - type: "slider", - start: 0, - end: this.dataZoomEnd(list.length, 11), - }, + // dataZoom: { + // type: "slider", + // start: 0, + // end: this.dataZoomEnd(list.length, 11), + // }, + dataZoom: [ + { + type: "slider", + textStyle: { + color: "#fff", + }, + startValue: this.dataZoomStart(list.length, 4, "start"), + endValue: this.dataZoomStart(list.length, 4, "end"), + }, + { + type: "inside", + }, + ], xAxis: { data: list.map((e) => e.deptName), // data: [ diff --git a/src/views/bigScreen/management/right1.vue b/src/views/bigScreen/management/right1.vue index 66c02b9..8c6373c 100644 --- a/src/views/bigScreen/management/right1.vue +++ b/src/views/bigScreen/management/right1.vue @@ -330,14 +330,27 @@ export default { bottom: 50, containLabel: true, }, - dataZoom: { - type: "slider", - start: 0, - end: this.dataZoomEnd(list.length, 5), - textStyle: { - color: "#fff", + // dataZoom: { + // type: "slider", + // start: 0, + // end: this.dataZoomEnd(list.length, 5), + // textStyle: { + // color: "#fff", + // }, + // }, + dataZoom: [ + { + type: "slider", + textStyle: { + color: "#fff", + }, + startValue: this.dataZoomStart(list.length, 4, "start"), + endValue: this.dataZoomStart(list.length, 4, "end"), }, - }, + { + type: "inside", + }, + ], xAxis: [ { type: "category", diff --git a/src/views/bigScreen/management/right2.vue b/src/views/bigScreen/management/right2.vue index b30c1d4..9bec295 100644 --- a/src/views/bigScreen/management/right2.vue +++ b/src/views/bigScreen/management/right2.vue @@ -191,14 +191,27 @@ export default { bottom: 50, containLabel: true, }, - dataZoom: { - type: "slider", - start: 0, - end: this.dataZoomEnd(list.length, 7), - textStyle: { - color: "#fff", + // dataZoom: { + // type: "slider", + // start: 0, + // end: this.dataZoomEnd(list.length, 7), + // textStyle: { + // color: "#fff", + // }, + // }, + dataZoom: [ + { + type: "slider", + textStyle: { + color: "#fff", + }, + startValue: this.dataZoomStart(list.length, 4, "start"), + endValue: this.dataZoomStart(list.length, 4, "end"), }, - }, + { + type: "inside", + }, + ], xAxis: [ { type: "category", @@ -793,14 +806,27 @@ export default { top: 30, bottom: 50, }, - dataZoom: { - type: "slider", - start: 0, - end: this.dataZoomEnd(list.length, 7), - textStyle: { - color: "#fff", + // dataZoom: { + // type: "slider", + // start: 0, + // end: this.dataZoomEnd(list.length, 7), + // textStyle: { + // color: "#fff", + // }, + // }, + dataZoom: [ + { + type: "slider", + textStyle: { + color: "#fff", + }, + startValue: this.dataZoomStart(list.length, 4, "start"), + endValue: this.dataZoomStart(list.length, 4, "end"), }, - }, + { + type: "inside", + }, + ], xAxis: { data: list.map((e) => e.deptName), axisLine: { diff --git a/src/views/bigScreen/qualityManage/center.vue b/src/views/bigScreen/qualityManage/center.vue index 6161032..f040538 100644 --- a/src/views/bigScreen/qualityManage/center.vue +++ b/src/views/bigScreen/qualityManage/center.vue @@ -7,18 +7,18 @@
{{ percentage }}%
-
+
产品合格率
{{ dataInfo.productCate || 0 }}%
-
+
一般性质量问题数量
@@ -43,9 +43,9 @@ {{ dataInfo.smallProductCate || 0 }}%
-
+
产品错、漏检率
@@ -64,9 +64,9 @@ dataInfo.qualityPlanCompleteTotal }}
-
+
质量检查完成率
@@ -76,9 +76,9 @@ dataInfo.qualityNotificationCompleteTotal }}
-
+
diff --git a/src/views/bigScreen/qualityManage/center2.vue b/src/views/bigScreen/qualityManage/center2.vue index d38b215..c3105ad 100644 --- a/src/views/bigScreen/qualityManage/center2.vue +++ b/src/views/bigScreen/qualityManage/center2.vue @@ -150,11 +150,24 @@ export default { top: 30, bottom: 50, }, - dataZoom: { - type: "slider", - start: 0, - end: this.dataZoomEnd(productName.length, 7), - }, + // dataZoom: { + // type: "slider", + // start: 0, + // end: this.dataZoomEnd(productName.length, 7), + // }, + dataZoom: [ + { + type: "slider", + textStyle: { + color: "#fff", + }, + startValue: this.dataZoomStart(productName.length, 4, "start"), + endValue: this.dataZoomStart(productName.length, 4, "end"), + }, + { + type: "inside", + }, + ], series: [ { name: "实际", diff --git a/src/views/bigScreen/qualityManage/left1.vue b/src/views/bigScreen/qualityManage/left1.vue index 27adc63..96e1016 100644 --- a/src/views/bigScreen/qualityManage/left1.vue +++ b/src/views/bigScreen/qualityManage/left1.vue @@ -1,457 +1,490 @@ diff --git a/src/views/bigScreen/qualityManage/right1.vue b/src/views/bigScreen/qualityManage/right1.vue index 7b98716..522f450 100644 --- a/src/views/bigScreen/qualityManage/right1.vue +++ b/src/views/bigScreen/qualityManage/right1.vue @@ -1,46 +1,82 @@ diff --git a/src/views/bigScreen/scientific/tab2/center1.vue b/src/views/bigScreen/scientific/tab2/center1.vue index eda099e..19fc998 100644 --- a/src/views/bigScreen/scientific/tab2/center1.vue +++ b/src/views/bigScreen/scientific/tab2/center1.vue @@ -3,35 +3,58 @@
-
+
军品收入
- {{res.realMilitaryIncome}}/{{res.targetMilitaryIncome}} + {{ res.realMilitaryIncome }}/{{ + res.targetMilitaryIncome + }}
装药量
- {{res.realCharge}}/{{res.targetCharge}} + {{ res.realCharge }}/{{ + res.targetCharge + }}
大型产品
- {{res.realBigProduct}}/{{res.targetBigProduct}} + {{ res.realBigProduct }}/{{ + res.targetBigProduct + }}
中型产品
- {{res.realMediumProduct}}/{{res.targetMediumProduct}} + {{ res.realMediumProduct }}/{{ + res.targetMediumProduct + }}
小型产品
- {{res.realSmallProduct}}/{{res.targetSmallProduct}} + {{ res.realSmallProduct }}/{{ + res.targetSmallProduct + }}
@@ -43,19 +66,23 @@ diff --git a/src/views/bigScreen/securityManage/center.vue b/src/views/bigScreen/securityManage/center.vue index 7255618..a8c9f08 100644 --- a/src/views/bigScreen/securityManage/center.vue +++ b/src/views/bigScreen/securityManage/center.vue @@ -202,6 +202,7 @@ export default { method: "get", }).then((res) => { if (200 == res.code) { + console.log(res.data); this.pointLevelCount = res.data.pointLevelCount; this.sourceLevelCount = res.data.sourceLevelCount; this.points = res.data.points; diff --git a/src/views/bigScreen/securityManage/left2.vue b/src/views/bigScreen/securityManage/left2.vue index 00b7169..3477a74 100644 --- a/src/views/bigScreen/securityManage/left2.vue +++ b/src/views/bigScreen/securityManage/left2.vue @@ -3,7 +3,10 @@
- +
@@ -20,30 +23,69 @@ - + 序号 - 安全隐患内容 + 安全隐患内容 措施 责任人 - +
  • - {{ item.id }} - {{ item.dangerContent }} + {{ + item.id + }} + {{ item.dangerContent }}
    - · - · + · + · 未整改 已整改
    - {{ item.personLiable }} + {{ + item.personLiable + }}
@@ -57,20 +99,20 @@ diff --git a/src/views/bigScreen/drivingCabin/index.vue b/src/views/bigScreen/drivingCabin/index.vue index c2e85dc..02a7f00 100644 --- a/src/views/bigScreen/drivingCabin/index.vue +++ b/src/views/bigScreen/drivingCabin/index.vue @@ -3,12 +3,12 @@
- +
- +