智能报表

src/js/common.js

@@ -17,28 +17,28 @@ const runStatDict = {
 // 定义运行模式字典
 const runModeDict = {
   0: {
-    label: "无",
-    color: "lightgray",
+    label: "关机",
+    color: "#bfbfc0",
   },
   1: {
     label: "制冷",
-    color: "darkgreen",
+    color: "#4eac5b",
   },
   2: {
     label: "采暖",
-    color: "orange",
+    color: "#d3722e",
   },
   3: {
     label: "除湿",
-    color: "rgb(182, 172, 195)",
+    color: "#9fcf62",
   },
   4: {
     label: "预热",
-    color: "yellow",
+    color: "#f0c196",
   },
   5: {
     label: "通风",
-    color: "rgb(182, 174, 227)",
+    color: "#dde6f0",
   },
 };
 
@@ -54,7 +54,8 @@ const connectStatDict = {
 const faultDict = {
   0: {
     label: "无",
-    color: "yellowgreen",
+    // color: "yellowgreen",
+    color: ""
   },
   1: {
     label: "有",
@@ -82,6 +83,10 @@ const runStatOpts = [
   },
   {
     label: "离线",
+    value: "2",
+  },
+  {
+    label: "未关联",
     value: "0",
   },
 ];
@@ -109,7 +114,7 @@ const runModeOpts = [
     value: "5",
   },
   {
-    label: "无",
+    label: "关机",
     value: "0",
   },
 ];
@@ -283,7 +288,6 @@ export function calcEndMinAndMaxValue(standalone) {
     end_max_dew_point: 0,
   };
   standalone.forEach((s) => {
-    tmp.end_order = s.end_order;
     tmp.end_exception_num += s.end_exception_num;
     if (s.end_min_temp != 0) {
       tmp.end_min_temp = Math.min(tmp.end_min_temp, s.end_min_temp);
@@ -292,10 +296,7 @@ export function calcEndMinAndMaxValue(standalone) {
       tmp.end_min_humidity = Math.min(tmp.end_min_humidity, s.end_min_humidity);
     }
     if (s.end_min_dew_point != 0) {
-      tmp.end_min_dew_point = Math.min(
-        tmp.end_min_dew_point,
-        s.end_min_dew_point
-      );
+      tmp.end_min_dew_point = Math.min(tmp.end_min_dew_point, s.end_min_dew_point);
     }
     if (s.end_max_temp != 0) {
       tmp.end_max_temp = Math.max(tmp.end_max_temp, s.end_max_temp);
@@ -304,10 +305,7 @@ export function calcEndMinAndMaxValue(standalone) {
       tmp.end_max_humidity = Math.max(tmp.end_max_humidity, s.end_max_humidity);
     }
     if (s.end_max_dew_point != 0) {
-      tmp.end_max_dew_point = Math.max(
-        tmp.end_max_dew_point,
-        s.end_max_dew_point
-      );
+      tmp.end_max_dew_point = Math.max(tmp.end_max_dew_point, s.end_max_dew_point);
     }
   });
   if (tmp.end_min_temp == 10000) {

src/views/equip-management/report/list.vue

@@ -5,16 +5,39 @@
 			<div style="padding-top: 12px;">
 				<el-form :inline="true" :model="queryParams" ref="queryRef" v-show="true" label-width="60px">
 					<el-form-item label="" prop="province">
-						<el-select size="small" v-model="operateSubjectForm.province" @visible-change="getProvinceListFnc"
-							placeholder="省" @change="provinceChange" clearable>
-							<el-option v-for="(item, index) in provinceOption" :label="item.province" :value="item.province"
-								:key="+new Date() + index"></el-option>
-						</el-select></el-form-item>
+						<el-select 
+							size="small" 
+							v-model="operateSubjectForm.province" 
+							@visible-change="getProvinceListFnc"
+							placeholder="省" 
+							@change="provinceChange" 
+							clearable
+							filterable 
+						>
+							<el-option 
+								v-for="(item, index) in provinceOption" 
+								:label="item.province" 
+								:value="item.province"
+								:key="+new Date() + index"
+							></el-option>
+						</el-select>
+					</el-form-item>
 					<el-form-item>
-						<el-select size="small" v-model="operateSubjectForm.city" @visible-change="getCityListFnc" placeholder="市"
-							@change="cityChange" clearable>
-							<el-option v-for="(item, index) in cityOption" :label="item.city" :value="item.city"
-								:key="+new Date() + index"></el-option>
+						<el-select 
+							size="small" 
+							v-model="operateSubjectForm.city" 
+							@visible-change="getCityListFnc" 
+							placeholder="市"
+							@change="cityChange" 
+							clearable
+							filterable
+						>
+							<el-option 
+								v-for="(item, index) in cityOption" 
+								:label="item.city" 
+								:value="item.city"
+								:key="+new Date() + index"
+							></el-option>
 						</el-select>
 						<!-- <el-select v-model="operateSubjectForm.area" @visible-change="getAreaListFunc" placeholder="请选择" @change="areaChange" :disabled="detailTypeComp" clearable>
 							<el-option v-for="(item, index) in areaOption" :label="item.area_cn" :value="item.area_cn" :key="item + index"></el-option>
@@ -299,7 +322,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" sortable>
+						<el-table-column prop="end_exception_num" label="通讯异常数量" align="center" width="120">
 							<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) }">
@@ -308,7 +331,7 @@
 								<span v-else>/</span>
 							</template>
 						</el-table-column>
-						<el-table-column prop="end_min_temp" label="最低室内温度(℃)" align="center" width="140" sortable>
+						<el-table-column prop="end_min_temp" label="最低室内温度(℃)" align="center" width="140">
 							<template slot-scope="scope">
 								<span id="end_min_temp" class="el-table-tag" :style="{ background: calcArgsColor(scope) }"
 									@click="handleItemClick(scope)">
@@ -316,7 +339,7 @@
 								</span>
 							</template>
 						</el-table-column>
-						<el-table-column prop="end_min_humidity" label="最低室内湿度(%)" align="center" width="140" sortable>
+						<el-table-column prop="end_min_humidity" label="最低室内湿度(%)" align="center" width="140">
 							<template slot-scope="scope">
 								<span id="end_min_humidity" class="el-table-tag" :style="{ background: calcArgsColor(scope) }"
 									@click="handleItemClick(scope)">
@@ -324,7 +347,7 @@
 								</span>
 							</template>
 						</el-table-column>
-						<el-table-column prop="end_min_dew_point" label="最低室内露点(℃)" align="center" width="140" sortable>
+						<el-table-column prop="end_min_dew_point" label="最低室内露点(℃)" align="center" width="140">
 							<template slot-scope="scope">
 								<span id="end_min_dew_point" class="el-table-tag" :style="{ background: calcArgsColor(scope) }"
 									@click="handleItemClick(scope)">
@@ -332,7 +355,7 @@
 								</span>
 							</template>
 						</el-table-column>
-						<el-table-column prop="end_max_temp" label="最高室内温度(℃)" align="center" width="140" sortable>
+						<el-table-column prop="end_max_temp" label="最高室内温度(℃)" align="center" width="140">
 							<template slot-scope="scope">
 								<span id="end_max_temp" class="el-table-tag" :style="{ background: calcArgsColor(scope) }"
 									@click="handleItemClick(scope)">
@@ -340,7 +363,7 @@
 								</span>
 							</template>
 						</el-table-column>
-						<el-table-column prop="end_max_humidity" label="最高室内湿度(%)" align="center" width="140" sortable>
+						<el-table-column prop="end_max_humidity" label="最高室内湿度(%)" align="center" width="140">
 							<template slot-scope="scope">
 								<span id="end_max_humidity" class="el-table-tag" :style="{ background: calcArgsColor(scope) }"
 									@click="handleItemClick(scope)">
@@ -348,7 +371,7 @@
 								</span>
 							</template>
 						</el-table-column>
-						<el-table-column prop="end_max_dew_point" label="最高室内露点(℃)" align="center" width="140" sortable>
+						<el-table-column prop="end_max_dew_point" label="最高室内露点(℃)" align="center" width="140">
 							<template slot-scope="scope">
 								<div>
 									<span id="end_max_dew_point" class="el-table-tag" :style="{ background: calcArgsColor(scope) }"