From 622e2b900a43fb6658e4d46cd376cd99e9633ab1 Mon Sep 17 00:00:00 2001
From: zt916916 <1903964620@qq.com>
Date: 星期四, 20 三月 2025 18:37:05 +0800
Subject: [PATCH] Merge branch 'develop1.0' into zt_from_develop1.0
---
zhitan-vue/src/views/comprehensive/monthlyComprehensive/index.vue | 9 +++++----
zhitan-vue/src/views/comprehensive/yearComprehensive/index.vue | 2 +-
zhitan-vue/src/views/processEnergy/year/index.vue | 2 +-
zhitan-vue/src/views/keyEquipment/monthly/index.vue | 2 +-
zhitan-vue/src/views/keyEquipment/year/index.vue | 2 +-
zhitan-vue/src/views/keyEquipment/daily/index.vue | 2 +-
zhitan-vue/src/views/processEnergy/monthly/index.vue | 2 +-
zhitan-vue/src/views/comprehensive/dailyComprehensive/index.vue | 2 +-
README.md | 25 ++++++++++++++++++-------
readme/img/qq.png | 0
zhitan-vue/src/views/processEnergy/daily/index.vue | 2 +-
11 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/README.md b/README.md
index 6e221bd..3a9b307 100644
--- a/README.md
+++ b/README.md
@@ -23,12 +23,19 @@
##### 鏁版嵁閲囬泦绋嬪簭锛氫篃鍗砿qtt鉃★笍鏃跺簭搴撳姛鑳斤紝甯傞潰涓婂紑婧愬簱闈炲父澶氾紝鍙弬鑰僼hingsjs绛夌煡鍚嶉」鐩紝鎴栬�呰嚜宸辩敤netty鑷繁瀹炵幇銆�
##### 鏁版嵁娓呮礂鏈嶅姟锛氫篃鍗虫椂搴忓簱鉃★笍鍏崇郴搴擄紝瀛︿範鑰呭彲浠ヤ娇鐢╦ava鑷甫鐨刋XL job绛夎鍒掍换鍔″伐鍏疯嚜宸辨寜鐓т笟鍔″姛鑳斤紝鏉ュ疄鐜版暟鎹竻娲楁湇鍔°��
-## 鍏充簬闂绛旂枒
+## 搴斿緢澶氬紑鍙戣�呰姹傦紝涓嬫柟鏀句簡QQ缇ゅ拰鑱旂郴鏂瑰紡銆�
-##### 鍥犳�绘槸鏈変汉鎭舵剰涓炬姤鎴戜滑浠撳簱锛岃鎴戜滑鍋氬晢涓氭帹骞匡紝椤炬垜宸茬粡鍒犻櫎浜嗘墍鏈夎仈绯绘柟寮忓拰浜ゆ祦缇�
-##### 婕旂ずdemo銆乴ogo銆佹埅鍥剧瓑涔熸崲鎴愪簡涓�х殑鍚嶅瓧锛屽幓鎺変簡鎵�鏈夋湁鍙兘娑夊強鍒版秹瀚屾帹骞跨殑瀛楃溂锛堟垜浠篃涓嶇煡閬揼it琚妇鎶ョ殑瑙勫垯鏄粈涔堛�傘�傘�傦級
-##### 鎵�浠ュぇ瀹跺鏋滄湁闂锛屾彁issue鍚с�傘�傘��
-##
+## 涓嬩竴姝�
+1. 瀹屽杽wiki锛堜箣鍓嶅湪鐮佷簯涓婅鎭舵剰涓炬姤锛寃iki閮戒涪浜嗭級
+2. 澧炲姞寤虹瓚鑳借�楃浉鍏冲唴瀹癸紙鏀矾銆佸垎椤癸級
+3. 澧炲姞寤虹瓚鑳借�楃┖璋冪浉鍏冲唴瀹�
+4. 澧炲姞绌哄帇鏈洪噸鐐硅澶囪妭鑳藉唴瀹�
+5. 瀹屽杽鍗曡�楃浉鍏冲唴瀹�
+6. 澧炲姞纰虫帓鏀惧洜瀛愮浉鍏冲唴瀹�
+7. 澧炲姞婧愮綉鑽峰偍锛堝井鐢电綉锛夌浉鍏冲姛鑳�
+8. 澧炲姞鑷畾涔夋姤琛�
+9. 澧炲姞缁勬�佽嚜瀹氫箟閰嶇疆
+10. 鎴栬�呭叾浠栧唴瀹癸紝寮�鍙戣�呭彲浠ユ彁issue鎴戜滑鏉ユ帓姘�
## 鍦ㄧ嚎浣撻獙
@@ -137,12 +144,16 @@
## 娌熼�氫氦娴�
-鎵爜娣诲姞寰俊浜ゆ祦锛屽姞寰俊璇峰娉細ems銆�
+鎵爜娣诲姞寰俊浜ゆ祦锛屽姞寰俊璇峰娉細ems+濮撳悕銆�
<p align="center">
- <img src="readme/img/image.png" width=50% height=50%>
+ <img src="readme/img/image-yc.png" width=50% height=50%>
</p>
+搴斿緢澶氬紑鍙戣�呯淇★紝鎴戝垱寤轰簡QQ缇や氦娴侊紝璇峰娉細ems+濮撳悕銆�
+<p align="center">
+ <img src="readme/img/qq.png" width=50% height=50%>
+</p>
## 鍙備笌璐＄尞
diff --git a/readme/img/qq.png b/readme/img/qq.png
new file mode 100644
index 0000000..e88723e
--- /dev/null
+++ b/readme/img/qq.png
Binary files differ
diff --git a/zhitan-vue/src/views/comprehensive/dailyComprehensive/index.vue b/zhitan-vue/src/views/comprehensive/dailyComprehensive/index.vue
index 1d2d092..618d690 100644
--- a/zhitan-vue/src/views/comprehensive/dailyComprehensive/index.vue
+++ b/zhitan-vue/src/views/comprehensive/dailyComprehensive/index.vue
@@ -54,7 +54,7 @@
style="margin-right: 8px"
></el-button>
<el-tooltip
- v-if="scope.row.indexName.length > 9"
+ v-if="scope.row.indexName && scope.row.indexName.length > 9"
class="item"
effect="dark"
:content="scope.row.indexName"
diff --git a/zhitan-vue/src/views/comprehensive/monthlyComprehensive/index.vue b/zhitan-vue/src/views/comprehensive/monthlyComprehensive/index.vue
index cc43f28..f6b537e 100644
--- a/zhitan-vue/src/views/comprehensive/monthlyComprehensive/index.vue
+++ b/zhitan-vue/src/views/comprehensive/monthlyComprehensive/index.vue
@@ -18,7 +18,7 @@
v-model="queryParams.dataTime"
type="month"
:clearable="false"
- value-format="yyyy-MM"
+ value-format="YYYY-MM"
placeholder="閫夋嫨鏃ユ湡"
>
</el-date-picker>
@@ -35,7 +35,7 @@
<div class="table-bg-style" style="padding-bottom: 12px">
<div class="table-box">
- <el-table :data="energyList" v-loading="loading" border max-height="380px">
+ <el-table :data="energyList" v-loading="loading" border max-height="380px" height="380">
<el-table-column fixed prop="indexName" label="鎸囨爣鍚嶇О" width="210px">
<template #default="scope">
<div style="width: 100%; text-align: left">
@@ -54,7 +54,7 @@
style="margin-right: 8px"
></el-button>
<el-tooltip
- v-if="scope.row.indexName.length > 9"
+ v-if="scope.row.indexName && scope.row.indexName.length > 9"
class="item"
effect="dark"
:content="scope.row.indexName"
@@ -68,7 +68,7 @@
</div>
</template>
</el-table-column>
- <el-table-column v-for="index in 31" :key="index" :label="index + '鏃�'" align="center" min-width="100">
+ <el-table-column v-for="index in 31" :key="index" :label="index + '鏃�'" align="center" min-width="100px">
<template #default="scope">{{ numFilter(scope.row[`value${index}`]) }}</template>
</el-table-column>
</el-table>
@@ -123,6 +123,7 @@
getDataList({
...queryParams.value,
}).then((response) => {
+ console.log("1111111111", response)
energyList.value = response.data.tabledata
if (energyList.value && energyList.value.length !== 0) {
selectChange(energyList.value[0])
diff --git a/zhitan-vue/src/views/comprehensive/yearComprehensive/index.vue b/zhitan-vue/src/views/comprehensive/yearComprehensive/index.vue
index d916e04..83b06c9 100644
--- a/zhitan-vue/src/views/comprehensive/yearComprehensive/index.vue
+++ b/zhitan-vue/src/views/comprehensive/yearComprehensive/index.vue
@@ -54,7 +54,7 @@
style="margin-right: 8px"
></el-button>
<el-tooltip
- v-if="scope.row.indexName.length > 9"
+ v-if="scope.row.indexName && scope.row.indexName.length > 9"
class="item"
effect="dark"
:content="scope.row.indexName"
diff --git a/zhitan-vue/src/views/keyEquipment/daily/index.vue b/zhitan-vue/src/views/keyEquipment/daily/index.vue
index f247892..055037a 100644
--- a/zhitan-vue/src/views/keyEquipment/daily/index.vue
+++ b/zhitan-vue/src/views/keyEquipment/daily/index.vue
@@ -59,7 +59,7 @@
style="margin-right: 8px"
></el-button>
<el-tooltip
- v-if="scope.row.indexName.length > 9"
+ v-if="scope.row.indexName && scope.row.indexName.length > 9"
class="item"
effect="dark"
:content="scope.row.indexName"
diff --git a/zhitan-vue/src/views/keyEquipment/monthly/index.vue b/zhitan-vue/src/views/keyEquipment/monthly/index.vue
index af4344b..b7a327c 100644
--- a/zhitan-vue/src/views/keyEquipment/monthly/index.vue
+++ b/zhitan-vue/src/views/keyEquipment/monthly/index.vue
@@ -18,7 +18,7 @@
v-model="queryParams.dataTime"
type="month"
:clearable="false"
- value-format="yyyy-MM"
+ value-format="YYYY-MM"
placeholder="閫夋嫨鏃ユ湡"
>
</el-date-picker>
diff --git a/zhitan-vue/src/views/keyEquipment/year/index.vue b/zhitan-vue/src/views/keyEquipment/year/index.vue
index a0b3306..cdb08f3 100644
--- a/zhitan-vue/src/views/keyEquipment/year/index.vue
+++ b/zhitan-vue/src/views/keyEquipment/year/index.vue
@@ -54,7 +54,7 @@
style="margin-right: 8px"
></el-button>
<el-tooltip
- v-if="scope.row.indexName.length > 9"
+ v-if="scope.row.indexName && scope.row.indexName.length > 9"
class="item"
effect="dark"
:content="scope.row.indexName"
diff --git a/zhitan-vue/src/views/processEnergy/daily/index.vue b/zhitan-vue/src/views/processEnergy/daily/index.vue
index c8af060..1ca6431 100644
--- a/zhitan-vue/src/views/processEnergy/daily/index.vue
+++ b/zhitan-vue/src/views/processEnergy/daily/index.vue
@@ -54,7 +54,7 @@
style="margin-right: 8px"
></el-button>
<el-tooltip
- v-if="scope.row.indexName.length > 9"
+ v-if="scope.row.indexName && scope.row.indexName.length > 9"
class="item"
effect="dark"
:content="scope.row.indexName"
diff --git a/zhitan-vue/src/views/processEnergy/monthly/index.vue b/zhitan-vue/src/views/processEnergy/monthly/index.vue
index 88b38c4..8378f6f 100644
--- a/zhitan-vue/src/views/processEnergy/monthly/index.vue
+++ b/zhitan-vue/src/views/processEnergy/monthly/index.vue
@@ -54,7 +54,7 @@
style="margin-right: 8px"
></el-button>
<el-tooltip
- v-if="scope.row.indexName.length > 9"
+ v-if="scope.row.indexName && scope.row.indexName.length > 9"
class="item"
effect="dark"
:content="scope.row.indexName"
diff --git a/zhitan-vue/src/views/processEnergy/year/index.vue b/zhitan-vue/src/views/processEnergy/year/index.vue
index b43a3b2..93564e0 100644
--- a/zhitan-vue/src/views/processEnergy/year/index.vue
+++ b/zhitan-vue/src/views/processEnergy/year/index.vue
@@ -54,7 +54,7 @@
style="margin-right: 8px"
></el-button>
<el-tooltip
- v-if="scope.row.indexName.length > 9"
+ v-if="scope.row.indexName && scope.row.indexName.length > 9"
class="item"
effect="dark"
:content="scope.row.indexName"
--
Gitblit v1.9.3