From 964b21f45985c504b08340914eafc8e44e2e51ef Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 21 五月 2025 14:41:40 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/index.vue | 173 +++++++++++++++++++++++++++++++++++++------
admin/src/components/business/OperaInternalCompanyWindow.vue | 6 +
screen/src/views/EnergyConsum.vue | 2
3 files changed, 154 insertions(+), 27 deletions(-)
diff --git a/admin/src/components/business/OperaInternalCompanyWindow.vue b/admin/src/components/business/OperaInternalCompanyWindow.vue
index e198ac9..bce73e5 100644
--- a/admin/src/components/business/OperaInternalCompanyWindow.vue
+++ b/admin/src/components/business/OperaInternalCompanyWindow.vue
@@ -129,7 +129,8 @@
this.api.create({
parentId: this.form.parentId,
name: this.form.name,
- type: this.form.type
+ type: this.form.type,
+ sortnum: this.form.sortnum
})
.then(() => {
this.visible = false
@@ -147,7 +148,8 @@
id: this.form.id,
parentId: this.form.parentId,
name: this.form.name,
- type: this.form.type
+ type: this.form.type,
+ sortnum: this.form.sortnum
})
.then(() => {
this.visible = false
diff --git a/admin/src/views/index.vue b/admin/src/views/index.vue
index 6ea8f86..a1c4508 100644
--- a/admin/src/views/index.vue
+++ b/admin/src/views/index.vue
@@ -109,7 +109,8 @@
鏇村<i class="el-icon-arrow-right"></i>
</div> -->
</div>
- <div class="echart" id="echart2"></div>
+ <template v-if="tabPosition==='right'" > <div class="echart" id="echart2"></div></template>
+ <template v-if="tabPosition==='top'" > <div class="echart" id="echart21"></div></template>
</div>
</div>
<div class="df">
@@ -269,11 +270,12 @@
this.initData()
},
methods: {
- changeType(e) {
+ changeType (e) {
console.log(e)
this.initEchart2()
+ this.initEchart21()
},
- getNoticeList(){
+ getNoticeList () {
syncHkNotice().then(res => {
})
@@ -395,6 +397,7 @@
getWorkbenchData({ queryType: 2 }).then(res => {
this.staticData = res || {}
this.initEchart2()
+ this.initEchart21()
this.initEchart3()
this.initEchart4()
})
@@ -431,7 +434,7 @@
},
handleDetail (row) {
if (row.type === 7) {
- this.handleTest(row);
+ this.handleTest(row)
return
}
if (row.objType === 2) {
@@ -510,35 +513,45 @@
},
initEchart2 () {
console.log('initEchart2')
+ if (!document.getElementById('echart2')) {
+ return
+ }
const myChart = echarts.init(document.getElementById('echart2'))
const that = this
+ var ydata = that.staticData.internalList.map(i => i.num)
+ let maxNum = 1
+ ydata.forEach((item, index) => {
+ maxNum = item > maxNum ? item : maxNum
+ })
myChart.setOption({
dataZoom: [
{
type: 'slider', // 婊戝姩鏉＄被鍨�
orient: 'vertical',
left: 'left',
- start: 0, // 璧峰浣嶇疆锛堢櫨鍒嗘瘮锛�
- end: 40, // 缁撴潫浣嶇疆锛堢櫨鍒嗘瘮锛夛紝鎺у埗鍒濆鏄剧ず鑼冨洿
+ showDetail: false,
+ start: 0, // 璧峰浣嶇疆锛堢櫨鍒嗘瘮锛�
+ end: 40, // 缁撴潫浣嶇疆锛堢櫨鍒嗘瘮锛夛紝鎺у埗鍒濆鏄剧ず鑼冨洿
width: 4,
dataBackground: {
areaStyle: { opacity: 0 }, // 璁剧疆鑳屾櫙閫忔槑
lineStyle: { opacity: 0 } // 璁剧疆鑳屾櫙閫忔槑
- },
- moveOnMouseWheel: true,
+ }
+ // moveOnMouseWheel: true,
},
{
- type: 'inside', // 鐢ㄤ簬鐩戝惉婊氳疆浜嬩欢
+ type: 'inside', // 鐢ㄤ簬鐩戝惉婊氳疆浜嬩欢
orient: 'vertical',
start: 0,
end: 40,
+ showDetail: false,
minSpan: 40,
dataBackground: {
areaStyle: { opacity: 0 } // 璁剧疆鑳屾櫙閫忔槑
},
maxSpan: 40,
- zoomLock: true, // 閿佸畾缂╂斁锛堜粎鍏佽骞崇Щ锛�
- moveOnMouseWheel: true, // 鍚敤婊氳疆骞崇Щ
+ zoomLock: true // 閿佸畾缂╂斁锛堜粎鍏佽骞崇Щ锛�
+ // moveOnMouseWheel: true, // 鍚敤婊氳疆骞崇Щ
}
],
grid: {
@@ -556,7 +569,7 @@
},
xAxis: {
type: 'value',
- position: 'bottom',
+ position: 'top',
splitLine: {
show: true,
lineStyle: {
@@ -565,9 +578,117 @@
}
},
axisLabel: {
- formatter: function(value) {
- const intValue = Math.round(value);
- return intValue > 0 ? intValue : '';
+ formatter: function (value) {
+ const intValue = Math.round(value)
+ return intValue > 0 ? intValue : ''
+ }
+ },
+ minInterval: 1,
+ min: 1
+ // max: maxNum
+ },
+ yAxis: {
+ type: 'category',
+ inverse: true,
+ data: that.staticData.internalList.map(i => i.name),
+ axisLabel: {
+ interval: 0
+ }
+ },
+ series: [
+ {
+ data: ydata,
+ type: 'bar',
+ barWidth: 10,
+ itemStyle: {
+ normal: {
+ color: new echarts.graphic.LinearGradient(
+ 1, 0, 0, 0,
+ [
+ { offset: 0, color: '#56abf8' },
+ { offset: 1, color: '#407ff0' }
+ ]
+ )
+ // barBorderRadius: [0, 10, 10, 0]
+ }
+ }
+ }
+ ]
+ })
+ window.addEventListener('resize', function () { // 鎵ц
+ myChart.resize()
+ })
+ },
+ initEchart21 () {
+ console.log('initEchart21')
+ if (!document.getElementById('echart21')) {
+ return
+ }
+
+ const myChart = echarts.init(document.getElementById('echart21'))
+ const that = this
+ var le1 = that.staticData.internalList.length
+ var le2 = that.staticData.lwList.length
+ const end = Math.round(40 * ((le1>0&& le2>0?le1:1) / (le1>0&& le2>0?le2:1)))+10
+ myChart.setOption({
+ dataZoom: [
+ {
+ type: 'slider', // 婊戝姩鏉＄被鍨�
+ orient: 'vertical',
+ left: 'left',
+ showDetail: false,
+ start: 0, // 璧峰浣嶇疆锛堢櫨鍒嗘瘮锛�
+ end: end, // 缁撴潫浣嶇疆锛堢櫨鍒嗘瘮锛夛紝鎺у埗鍒濆鏄剧ず鑼冨洿
+ width: 4,
+ dataBackground: {
+ areaStyle: { opacity: 0 }, // 璁剧疆鑳屾櫙閫忔槑
+ lineStyle: { opacity: 0 } // 璁剧疆鑳屾櫙閫忔槑
+ },
+ zoomLock: true, // 閿佸畾缂╂斁锛堜粎鍏佽骞崇Щ锛�
+ moveOnMouseWheel: true
+ },
+ {
+ type: 'inside', // 鐢ㄤ簬鐩戝惉婊氳疆浜嬩欢
+ orient: 'vertical',
+ start: 0,
+ end: end,
+ showDetail: false,
+ minSpan: end,
+ dataBackground: {
+ areaStyle: { opacity: 0 } // 璁剧疆鑳屾櫙閫忔槑
+ },
+ maxSpan: end,
+ zoomLock: true, // 閿佸畾缂╂斁锛堜粎鍏佽骞崇Щ锛�
+ moveOnMouseWheel: true // 鍚敤婊氳疆骞崇Щ
+ }
+ ],
+ grid: {
+ top: '4%',
+ left: '2%',
+ right: '6%',
+ bottom: '2%',
+ containLabel: true
+ },
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'line'
+ }
+ },
+ xAxis: {
+ type: 'value',
+ position: 'top',
+ splitLine: {
+ show: true,
+ lineStyle: {
+ // 杩欓噷杈撳叆绾挎潯鐨勬牱寮�
+ color: 'rgba(255,255,255,0.14)'
+ }
+ },
+ axisLabel: {
+ formatter: function (value) {
+ const intValue = Math.round(value)
+ return intValue > 0 ? intValue : ''
}
},
minInterval: 1,
@@ -575,11 +696,15 @@
},
yAxis: {
type: 'category',
- data: that.tabPosition === 'top' ? that.staticData.lwList.map(i => i.name) : that.staticData.internalList.map(i => i.name)
+ inverse: true,
+ data: that.staticData.lwList.map(i => i.name),
+ axisLabel: {
+ interval: 0
+ }
},
series: [
{
- data: that.tabPosition === 'top' ? that.staticData.lwList.map(i => i.num) : that.staticData.internalList.map(i => i.num),
+ data: that.staticData.lwList.map(i => i.num),
type: 'bar',
barWidth: 10,
itemStyle: {
@@ -635,9 +760,9 @@
padding: [0, 0, 4, -30] // 鍥涗釜鏁板瓧鍒嗗埆涓轰笂鍙充笅宸︿笌鍘熶綅缃窛绂�
},
axisLabel: {
- formatter: function(value) {
- const intValue = Math.round(value);
- return intValue > 0 ? intValue : '';
+ formatter: function (value) {
+ const intValue = Math.round(value)
+ return intValue > 0 ? intValue : ''
}
},
minInterval: 1,
@@ -750,11 +875,11 @@
}
},
axisLabel: {
- formatter: function(value) {
- const intValue = Math.round(value);
- return intValue > 0 ? intValue : '';
+ formatter: function (value) {
+ const intValue = Math.round(value)
+ return intValue > 0 ? intValue : ''
}
- },
+ },
minInterval: 1,
min: 1
},
diff --git a/screen/src/views/EnergyConsum.vue b/screen/src/views/EnergyConsum.vue
index 3bbb3c3..b1ba998 100644
--- a/screen/src/views/EnergyConsum.vue
+++ b/screen/src/views/EnergyConsum.vue
@@ -27,7 +27,7 @@
<div class="name">鏈勾绱寰幆鐑熺</div>
<div><span class="num" style="color: #68cfb2;" v-if="data1.smokeBoxTotal || data1.smokeBoxTotal == 0">{{
data1.smokeBoxTotal.toLocaleString()
- }}</span><span>涓�</span></div>
+ }}</span><span>鍙�</span></div>
</div>
</div>
</div>
--
Gitblit v1.9.3