kukuasir@vip.qq.com 1 year ago
parent
commit
41b6c06e38
3 changed files with 40 additions and 34 deletions
  1. 2 2
      package.json
  2. 2 2
      src/js/common.js
  3. 36 30
      src/views/equip-management/report/list.vue

+ 2 - 2
package.json

@@ -70,6 +70,7 @@
     "nprogress": "0.2.0",
     "paho-mqtt": "^1.1.0",
     "path-to-regexp": "2.4.0",
+    "perfect-scrollbar": "^1.5.5",
     "postcss-px2rem": "^0.3.0",
     "prettier": "^1.12.1",
     "qrcodejs2": "0.0.2",
@@ -85,8 +86,7 @@
     "vuedraggable": "2.20.0",
     "vuex": "3.1.0",
     "xlsx": "0.14.1",
-    "xlsx-js-style": "^1.2.0",
-    "perfect-scrollbar": "^1.5.5"
+    "xlsx-js-style": "^1.2.0"
   },
   "devDependencies": {
     "@babel/core": "7.0.0",

+ 2 - 2
src/js/common.js

@@ -1,6 +1,6 @@
 // 定义运行状态字典
 const runStatDict = {
-  0: {
+  2: {
     label: "离线",
     color: "lightgray",
   },
@@ -8,7 +8,7 @@ const runStatDict = {
     label: "在线",
     color: "yellowgreen",
   },
-  2: {
+  0: {
     label: "未关联",
     color: "lightgray",
   },

+ 36 - 30
src/views/equip-management/report/list.vue

@@ -1,6 +1,5 @@
 <template>
 	<div id="container" class="box-management-container">
-		<!--		<div class="title">智能报表</div>-->
 		<div class="bottom">
 			<div style="padding-top: 12px;">
 				<el-form :inline="true" :model="queryParams" ref="queryRef" v-show="true" label-width="60px">
@@ -110,9 +109,11 @@
 					</el-row>
 				</div>
 				<el-table
+					id="dataTable"
 					:data="pageData"
-					@sort-change="changeSort"
+					empty-text="无数据"
 					:span-method="objectSpanMethod"
+					@sort-change="changeSort"
 					@selection-change="handleSelectionChange"
 					v-fixed-scroll="handleScroll"
 					border
@@ -123,18 +124,18 @@
 							<span>{{ (queryParams.page_index - 1) * queryParams.page_size + scope.$index + 1 }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column prop="boxName" label="盒子名称" align="center" width="180" fixed sortable>
+					<el-table-column prop="boxName" label="盒子名称" align="center" width="180" show-overflow-tooltip fixed sortable>
 						<template slot-scope="scope">
 							<span @click="debug(scope)">{{ scope.row.boxName }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column prop="runStatus" label="在线状态" align="center" width="100" fixed sortable>
+					<el-table-column prop="runStatus" label="在线状态" align="center" width="120" fixed sortable>
 						<template slot-scope="scope">
 							<span class="el-table-tag" :style="{ background: runStatMap[scope.row.runStatus].color }">{{
 								runStatMap[scope.row.runStatus].label }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column prop="runMode" label="运行模式" align="center" width="100" fixed>
+					<el-table-column prop="runMode" label="运行模式" align="center" width="120" fixed>
 						<template slot-scope="scope">
 							<span class="el-table-tag"
 								:style="{ background: scope.row.runStatus == 2 ? '' : runModeMap[scope.row.runMode].color }">
@@ -150,7 +151,7 @@
 								<span>{{ scope.row.host_order || '/' }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column prop="host_connect_status" label="通讯状态" align="center" width="100" sortable>
+						<el-table-column prop="host_connect_status" label="通讯状态" align="center" width="120" sortable>
 							<template slot-scope="scope">
 								<span v-if="scope.row.host_connect_status != undefined && scope.row.host_connect_status != null"
 									class="el-table-tag" :style="{ background: connectStatColor(scope.row, 'host_connect_status') }">
@@ -168,7 +169,7 @@
 								<span v-else>/</span>
 							</template>
 						</el-table-column>
-						<el-table-column prop="host_su_temp" label="供水水温(℃)" align="center" width="120" sortable>
+						<el-table-column prop="host_su_temp" label="供水水温(℃)" align="center" width="140" sortable>
 							<template slot-scope="scope">
 								<span v-if="scope.row.host_su_temp" class="el-table-tag" :style="{ background: calcArgsColor(scope) }">
 									{{ fixedVal(scope.row, 'host_su_temp') }}
@@ -176,7 +177,7 @@
 								<span v-else>/</span>
 							</template>
 						</el-table-column>
-						<el-table-column prop="host_re_temp" label="回水水温(℃)" align="center" width="120" sortable>
+						<el-table-column prop="host_re_temp" label="回水水温(℃)" align="center" width="140" sortable>
 							<template slot-scope="scope">
 								<span v-if="scope.row.host_re_temp" class="el-table-tag" :style="{ background: calcArgsColor(scope) }">
 									{{ fixedVal(scope.row, 'host_re_temp') }}
@@ -184,7 +185,7 @@
 								<span v-else>/</span>
 							</template>
 						</el-table-column>
-						<el-table-column prop="host_temp_diff" label="温差" align="center" width="100" sortable>
+						<el-table-column prop="host_temp_diff" label="温差" align="center" width="120" sortable>
 							<template slot-scope="scope">
 								<div>
 									<span class="el-table-tag" :style="{ background: calcArgsColor(scope) }">
@@ -205,7 +206,7 @@
 								<span>{{ scope.row.nt_order || '/' }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column prop="nt_connect_status" label="通讯状态" align="center" width="100" sortable>
+						<el-table-column prop="nt_connect_status" label="通讯状态" align="center" width="120" sortable>
 							<template slot-scope="scope">
 								<span v-if="scope.row.nt_connect_status != undefined && scope.row.nt_connect_status != null"
 									class="el-table-tag" :style="{ background: connectStatColor(scope.row, 'nt_connect_status') }">
@@ -223,7 +224,7 @@
 								<span v-else>/</span>
 							</template>
 						</el-table-column>
-						<el-table-column prop="nt_in_temp" label="送风温度(℃)" align="center" width="120" sortable>
+						<el-table-column prop="nt_in_temp" label="送风温度(℃)" align="center" width="140" sortable>
 							<template slot-scope="scope">
 								<span v-if="scope.row.nt_in_temp" class="el-table-tag" :style="{ background: calcArgsColor(scope) }">
 									{{ fixedVal(scope.row, 'nt_in_temp') }}
@@ -231,7 +232,7 @@
 								<span v-else>/</span>
 							</template>
 						</el-table-column>
-						<el-table-column prop="nt_in_humidity" label="送风湿度(%)" align="center" width="120" sortable>
+						<el-table-column prop="nt_in_humidity" label="送风湿度(%)" align="center" width="140" sortable>
 							<template slot-scope="scope">
 								<span v-if="scope.row.nt_in_humidity" class="el-table-tag" :style="{ background: calcArgsColor(scope) }">
 									{{ fixedVal(scope.row, 'nt_in_humidity') }}
@@ -239,7 +240,7 @@
 								<span v-else>/</span>
 							</template>
 						</el-table-column>
-						<el-table-column prop="nt_dew_point" label="露点(℃)" align="center" width="120" sortable>
+						<el-table-column prop="nt_dew_point" label="露点(℃)" align="center" width="140" sortable>
 							<template slot-scope="scope">
 								<div v-if="scope.row.nt_dew_point">
 									<span class="el-table-tag" :style="{ background: calcArgsColor(scope) }">
@@ -261,7 +262,7 @@
 								<span>{{ scope.row.hex_order || '/' }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column prop="hex_connect_status" label="通讯状态" align="center" width="100" sortable>
+						<el-table-column prop="hex_connect_status" label="通讯状态" align="center" width="120" sortable>
 							<template slot-scope="scope">
 								<span v-if="scope.row.hex_connect_status != undefined && scope.row.hex_connect_status != null"
 									class="el-table-tag" :style="{ background: connectStatColor(scope.row, 'hex_connect_status') }">
@@ -279,7 +280,7 @@
 								<span v-else>/</span>
 							</template>
 						</el-table-column>
-						<el-table-column prop="hex_su_temp" label="供水水温(℃)" align="center" width="120" sortable>
+						<el-table-column prop="hex_su_temp" label="供水水温(℃)" align="center" width="140" sortable>
 							<template slot-scope="scope">
 								<span v-if="scope.row.hex_su_temp" class="el-table-tag" :style="{ background: calcArgsColor(scope) }">
 									{{ fixedVal(scope.row, 'hex_su_temp') }}
@@ -287,7 +288,7 @@
 								<span v-else>/</span>
 							</template>
 						</el-table-column>
-						<el-table-column prop="hex_re_temp" label="回水水温(℃)" align="center" width="120" sortable>
+						<el-table-column prop="hex_re_temp" label="回水水温(℃)" align="center" width="140" sortable>
 							<template slot-scope="scope">
 								<span v-if="scope.row.hex_re_temp" class="el-table-tag" :style="{ background: calcArgsColor(scope) }">
 									{{ fixedVal(scope.row, 'hex_re_temp') }}
@@ -295,7 +296,7 @@
 								<span v-else>/</span>
 							</template>
 						</el-table-column>
-						<el-table-column prop="hex_temp_diff" label="温差(℃)" align="center" width="90" sortable>
+						<el-table-column prop="hex_temp_diff" label="温差(℃)" align="center" width="120" sortable>
 							<template slot-scope="scope">
 								<span v-if="scope.row.hex_temp_diff != undefined && scope.row.hex_temp_diff != null" class="el-table-tag"
 									:style="{ background: calcArgsColor(scope) }">
@@ -304,7 +305,7 @@
 								<span v-else>/</span>
 							</template>
 						</el-table-column>
-						<el-table-column prop="hex_pump_status" label="水泵状态" align="center" width="100" sortable>
+						<el-table-column prop="hex_pump_status" label="水泵状态" align="center" width="120" sortable>
 							<template slot-scope="scope">
 								<div v-if="scope.row.hex_pump_status != undefined && scope.row.hex_pump_status != null">
 									<span class="el-table-tag" :style="{ background: hexPumpStateColor(scope.row) }">
@@ -322,7 +323,7 @@
 					<!-- 末端列 Begin -->
 					<el-table-column label="" align="center" width="60" :render-header="(h, obj) => renderHeader(h, obj, '末端控制器')">
 						<!-- <el-table-column prop="end_order" label="编号" align="center" width="60" /> -->
-						<el-table-column prop="end_exception_num" label="通讯异常数量" align="center" width="120">
+						<el-table-column prop="end_exception_num" label="通讯异常数量" align="center" width="160" sortable>
 							<template slot-scope="scope">
 								<span v-if="scope.row.end_exception_num != undefined && scope.row.end_exception_num != null"
 									class="el-table-tag" :style="{ background: endExceptionNumColor(scope.row) }">
@@ -331,7 +332,7 @@
 								<span v-else>/</span>
 							</template>
 						</el-table-column>
-						<el-table-column prop="end_min_temp" label="最低室内温度(℃)" align="center" width="140">
+						<el-table-column prop="end_min_temp" label="最低室内温度(℃)" align="center" width="160">
 							<template slot-scope="scope">
 								<span id="end_min_temp" class="el-table-tag" :style="{ background: calcArgsColor(scope) }"
 									@click="handleItemClick(scope)">
@@ -339,7 +340,7 @@
 								</span>
 							</template>
 						</el-table-column>
-						<el-table-column prop="end_min_humidity" label="最低室内湿度(%)" align="center" width="140">
+						<el-table-column prop="end_min_humidity" label="最低室内湿度(%)" align="center" width="160">
 							<template slot-scope="scope">
 								<span id="end_min_humidity" class="el-table-tag" :style="{ background: calcArgsColor(scope) }"
 									@click="handleItemClick(scope)">
@@ -347,7 +348,7 @@
 								</span>
 							</template>
 						</el-table-column>
-						<el-table-column prop="end_min_dew_point" label="最低室内露点(℃)" align="center" width="140">
+						<el-table-column prop="end_min_dew_point" label="最低室内露点(℃)" align="center" width="160">
 							<template slot-scope="scope">
 								<span id="end_min_dew_point" class="el-table-tag" :style="{ background: calcArgsColor(scope) }"
 									@click="handleItemClick(scope)">
@@ -355,7 +356,7 @@
 								</span>
 							</template>
 						</el-table-column>
-						<el-table-column prop="end_max_temp" label="最高室内温度(℃)" align="center" width="140">
+						<el-table-column prop="end_max_temp" label="最高室内温度(℃)" align="center" width="160">
 							<template slot-scope="scope">
 								<span id="end_max_temp" class="el-table-tag" :style="{ background: calcArgsColor(scope) }"
 									@click="handleItemClick(scope)">
@@ -363,7 +364,7 @@
 								</span>
 							</template>
 						</el-table-column>
-						<el-table-column prop="end_max_humidity" label="最高室内湿度(%)" align="center" width="140">
+						<el-table-column prop="end_max_humidity" label="最高室内湿度(%)" align="center" width="160">
 							<template slot-scope="scope">
 								<span id="end_max_humidity" class="el-table-tag" :style="{ background: calcArgsColor(scope) }"
 									@click="handleItemClick(scope)">
@@ -371,7 +372,7 @@
 								</span>
 							</template>
 						</el-table-column>
-						<el-table-column prop="end_max_dew_point" label="最高室内露点(℃)" align="center" width="140">
+						<el-table-column prop="end_max_dew_point" label="最高室内露点(℃)" align="center" width="160">
 							<template slot-scope="scope">
 								<div>
 									<span id="end_max_dew_point" class="el-table-tag" :style="{ background: calcArgsColor(scope) }"
@@ -428,9 +429,6 @@ export default {
 		PopEndInfo
 	},
 	computed: {
-		// detailTypeComp () {
-		// 	return this._props.operateType == "detail";
-		// },
 		connectStatColor() {
 			return function (row, prop) {
 				if (row.runStatus != 1) return '';
@@ -1020,7 +1018,7 @@ export default {
 };
 </script>
 
-<style>
+<style lang="scss">
 .el-table-tag {
 	width: 2.5rem;
 	padding: 4px 0;
@@ -1033,7 +1031,6 @@ export default {
 .ps__rail-x {
 	display: block;
 	z-index: 99;
-	/*大于fixed table 的z-index*/
 }
 
 .ml10 {
@@ -1043,4 +1040,13 @@ export default {
 .mt10 {
 	margin-top: 10px;
 }
+
+.el-table__body-wrapper {    
+  &::-webkit-scrollbar { // 滚动条高 解决行未对齐      
+    height: 18px;    
+  } 
+}
+.el-table__fixed-body-wrapper .el-table__body {  
+  padding-bottom: 18px; // 滚动条高度
+}
 </style>