改页面

itdmWeb/src/views/module-iTDM/itdmDevicedata/itdmDevicedataList.vue

@@ -1,8 +1,8 @@
 <template>
         <a-tabs default-active-key="1" @change="callback" class="card-container">
-          <a-tab-pane key="1" tab="温箱试验数据">
-            <itdm-wenxiang-list @ok="submitCallback" :key="timer1"></itdm-wenxiang-list>
-          </a-tab-pane>
+<!--          <a-tab-pane key="1" tab="温箱试验数据">-->
+<!--            <itdm-wenxiang-list @ok="submitCallback" :key="timer1"></itdm-wenxiang-list>-->
+<!--          </a-tab-pane>-->
           <a-tab-pane key="2" tab="通用电压数据" force-render>
             <itdm-wenxiang-voltage-list :key="timer2"></itdm-wenxiang-voltage-list>
           </a-tab-pane>

itdmWeb/src/views/module-iTDM/itdmWenxiangHistory/ItdmWenxiangHistory05List.vue

@@ -15,10 +15,10 @@
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-<!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
-<!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
-<!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
-<!--              </a>-->
+              <!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
+              <!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
+              <!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+              <!--              </a>-->
             </span>
           </a-col>
         </a-row>
@@ -28,45 +28,27 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-<!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
-      <a-button type="primary" icon="download" @click="handleExportXls('0.5立方温箱历史数据')">导出</a-button>
-<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
-<!--        <a-button type="primary" icon="import">导入</a-button>-->
-<!--      </a-upload>-->
-      <!-- 高级查询区域 -->
-<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
-<!--      <a-dropdown v-if="selectedRowKeys.length > 0">-->
-<!--        <a-menu slot="overlay">-->
-<!--          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
-<!--        </a-menu>-->
-<!--        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
-<!--      </a-dropdown>-->
+      <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+      <a-button type="primary" icon="download" @click="handleExportXls('1立方温箱历史数据')">导出</a-button>
+      <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+      <!--        <a-button type="primary" icon="import">导入</a-button>-->
+      <!--      </a-upload>-->
+      <!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+      <!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+      <!--      <a-dropdown v-if="selectedRowKeys.length > 0">-->
+      <!--        <a-menu slot="overlay">-->
+      <!--          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
+      <!--        </a-menu>-->
+      <!--        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
+      <!--      </a-dropdown>-->
     </div>
 
     <!-- table区域-begin -->
     <div>
-<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
-<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
-<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
-<!--      </div>-->
-
-      <!-- 通过判断alarm的值，动态渲染对应数据这一列单元格的样式 -->
-      <div slot="temperature" slot-scope="text, record">
-        <span v-if="record.temperatureAlarm ==1" class="y">{{text}}</span>
-        <span v-else>{{text}}</span>
-      </div>
-      <div slot="humidity" slot-scope="text, record">
-        <span :class="record.humidityAlarm == 1?'y':''">{{text}}</span>
-      </div>
-      <div slot="currentA" slot-scope="text, record">
-        <span :class="record.currentAAlarm == 1?'y':''">{{text}}</span>
-      </div>
-      <div slot="currentB" slot-scope="text, record">
-        <span :class="record.currentBAlarm == 1?'y':''">{{text}}</span>
-      </div>
-      <div slot="currentC" slot-scope="text, record">
-        <span :class="record.currentCAlarm == 1?'y':''">{{text}}</span>
-      </div>
+      <!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+      <!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+      <!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+      <!--      </div>-->
 
       <a-table
         ref="table"
@@ -78,10 +60,27 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         class="j-table-force-nowrap"
         @change="handleTableChange">
 
+        <!-- 通过判断alarm的值，动态渲染对应数据这一列单元格的样式 -->
+        <div slot="temperature" slot-scope="text, record">
+          <span v-if="record.temperatureAlarm ==1" class="y">{{text}}</span>
+          <span v-else>{{text}}</span>
+        </div>
+        <div slot="humidity" slot-scope="text, record">
+          <span :class="record.humidityAlarm == 1?'y':''">{{text}}</span>
+        </div>
+        <div slot="currentA" slot-scope="text, record">
+          <span :class="record.currentAAlarm == 1?'y':''">{{text}}</span>
+        </div>
+        <div slot="currentB" slot-scope="text, record">
+          <span :class="record.currentBAlarm == 1?'y':''">{{text}}</span>
+        </div>
+        <div slot="currentC" slot-scope="text, record">
+          <span :class="record.currentCAlarm == 1?'y':''">{{text}}</span>
+        </div>
+
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
@@ -124,7 +123,7 @@
       </a-table>
     </div>
 
-    <itdm-wenxiang-history05-modal ref="modalForm" @ok="modalFormOk"></itdm-wenxiang-history05-modal>
+    <itdm-wenxiang-history1-modal ref="modalForm" @ok="modalFormOk"></itdm-wenxiang-history1-modal>
   </a-card>
 </template>
 
@@ -146,16 +145,21 @@
         description: '0.5立方温箱历史数据管理页面',
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
+          // {
+          //   title: '#',
+          //   dataIndex: '',
+          //   key:'rowIndex',
+          //   width:60,
+          //   align:"center",
+          //   customRender:function (t,r,index) {
+          //     return parseInt(index)+1;
+          //   }
+          // },
+          // {
+          //   title:'设备id',
+          //   align:"center",
+          //   dataIndex: 'deviceId_dictText'
+          // },
           {
             title:'设备名称',
             align:"center",
@@ -169,116 +173,121 @@
           {
             title:'温度',
             align:"center",
-            dataIndex: 'temperature'
+            dataIndex: 'temperature',
+            scopedSlots: { customRender: 'temperature' }
           },
           {
-            title:'温度上限',
+            title:'温度Max',
             align:"center",
             dataIndex: 'temperatureMax'
           },
           {
-            title:'温度下限',
+            title:'温度Min',
             align:"center",
             dataIndex: 'temperatureMin'
           },
-          {
-            title:'温度报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'temperatureAlarm'
-          },
+          // {
+          //   title:'温度报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'temperatureAlarm_dictText'
+          // },
           {
             title:'湿度',
             align:"center",
-            dataIndex: 'humidity'
+            dataIndex: 'humidity',
+            scopedSlots: { customRender: 'humidity' }
           },
           {
-            title:'湿度上限',
+            title:'湿度Max',
             align:"center",
             dataIndex: 'humidityMax'
           },
           {
-            title:'湿度下限',
+            title:'湿度Min',
             align:"center",
             dataIndex: 'humidityMin'
           },
-          {
-            title:'湿度报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'humidityAlarm'
-          },
+          // {
+          //   title:'湿度报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'humidityAlarm_dictText'
+          // },
           {
             title:'A相电流',
             align:"center",
-            dataIndex: 'currentA'
+            dataIndex: 'currentA',
+            scopedSlots: { customRender: 'currentA' }
           },
           {
-            title:'A相电流上限',
+            title:'A相电流Max',
             align:"center",
             dataIndex: 'currentAMax'
           },
           {
-            title:'A相电流下限',
+            title:'A相电流Min',
             align:"center",
             dataIndex: 'currentAMin'
           },
-          {
-            title:'A相电流报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'currentAAlarm'
-          },
+          // {
+          //   title:'A相电流报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'currentAAlarm_dictText'
+          // },
           {
             title:'B相电流',
             align:"center",
-            dataIndex: 'currentB'
+            dataIndex: 'currentB',
+            scopedSlots: { customRender: 'currentB' }
           },
           {
-            title:'B相电流上限',
+            title:'B相电流Max',
             align:"center",
             dataIndex: 'currentBMax'
           },
           {
-            title:'B相电流下限',
+            title:'B相电流Min',
             align:"center",
             dataIndex: 'currentBMin'
           },
-          {
-            title:'B相电流报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'currentBAlarm'
-          },
+          // {
+          //   title:'B相电流报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'currentBAlarm_dictText'
+          // },
           {
             title:'C相电流',
             align:"center",
-            dataIndex: 'currentC'
+            dataIndex: 'currentC',
+            scopedSlots: { customRender: 'currentC' }
           },
           {
-            title:'C相电流上限',
+            title:'C相电流Max',
             align:"center",
             dataIndex: 'currentCMax'
           },
           {
-            title:'C相电流下限',
+            title:'C相电流Min',
             align:"center",
             dataIndex: 'currentCMin'
           },
-          {
-            title:'C相电流报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'currentCAlarm'
-          },
+          // {
+          //   title:'C相电流报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'currentCAlarm_dictText'
+          // },
           {
             title:'创建时间',
             align:"center",
             dataIndex: 'createTime'
           },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
+          // {
+          //   title: '操作',
+          //   dataIndex: 'action',
+          //   align:"center",
+          //   fixed:"right",
+          //   width:147,
+          //   scopedSlots: { customRender: 'action' }
+          // }
         ],
         url: {
           list: "/itdmWenxiangHistory/itdmWenxiangHistory05/list",
@@ -335,4 +344,12 @@
 </script>
 <style scoped>
   @import '~@assets/less/common.less';
+  ::v-deep .ant-card-body{
+    padding-top: 0px !important;
+    padding-left: 10px !important;
+    padding-right: 10px !important;
+  }
+  .y {
+    color: red;
+  }
 </style>

itdmWeb/src/views/module-iTDM/itdmWenxiangHistory/ItdmWenxiangHistory16List.vue

@@ -15,10 +15,10 @@
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+              <!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
+              <!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
+              <!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+              <!--              </a>-->
             </span>
           </a-col>
         </a-row>
@@ -28,27 +28,27 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('16立方温箱历史数据')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
+      <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+      <a-button type="primary" icon="download" @click="handleExportXls('1立方温箱历史数据')">导出</a-button>
+      <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+      <!--        <a-button type="primary" icon="import">导入</a-button>-->
+      <!--      </a-upload>-->
+      <!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+      <!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+      <!--      <a-dropdown v-if="selectedRowKeys.length > 0">-->
+      <!--        <a-menu slot="overlay">-->
+      <!--          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
+      <!--        </a-menu>-->
+      <!--        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
+      <!--      </a-dropdown>-->
     </div>
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+      <!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+      <!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+      <!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+      <!--      </div>-->
 
       <a-table
         ref="table"
@@ -60,10 +60,27 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         class="j-table-force-nowrap"
         @change="handleTableChange">
 
+        <!-- 通过判断alarm的值，动态渲染对应数据这一列单元格的样式 -->
+        <div slot="temperature" slot-scope="text, record">
+          <span v-if="record.temperatureAlarm ==1" class="y">{{text}}</span>
+          <span v-else>{{text}}</span>
+        </div>
+        <div slot="humidity" slot-scope="text, record">
+          <span :class="record.humidityAlarm == 1?'y':''">{{text}}</span>
+        </div>
+        <div slot="currentA" slot-scope="text, record">
+          <span :class="record.currentAAlarm == 1?'y':''">{{text}}</span>
+        </div>
+        <div slot="currentB" slot-scope="text, record">
+          <span :class="record.currentBAlarm == 1?'y':''">{{text}}</span>
+        </div>
+        <div slot="currentC" slot-scope="text, record">
+          <span :class="record.currentCAlarm == 1?'y':''">{{text}}</span>
+        </div>
+
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
@@ -106,7 +123,7 @@
       </a-table>
     </div>
 
-    <itdm-wenxiang-history16-modal ref="modalForm" @ok="modalFormOk"></itdm-wenxiang-history16-modal>
+    <itdm-wenxiang-history1-modal ref="modalForm" @ok="modalFormOk"></itdm-wenxiang-history1-modal>
   </a-card>
 </template>
 
@@ -128,21 +145,21 @@
         description: '16立方温箱历史数据管理页面',
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'设备id',
-            align:"center",
-            dataIndex: 'deviceId'
-          },
+          // {
+          //   title: '#',
+          //   dataIndex: '',
+          //   key:'rowIndex',
+          //   width:60,
+          //   align:"center",
+          //   customRender:function (t,r,index) {
+          //     return parseInt(index)+1;
+          //   }
+          // },
+          // {
+          //   title:'设备id',
+          //   align:"center",
+          //   dataIndex: 'deviceId_dictText'
+          // },
           {
             title:'设备名称',
             align:"center",
@@ -156,116 +173,121 @@
           {
             title:'温度',
             align:"center",
-            dataIndex: 'temperature'
+            dataIndex: 'temperature',
+            scopedSlots: { customRender: 'temperature' }
           },
           {
-            title:'温度上限',
+            title:'温度Max',
             align:"center",
             dataIndex: 'temperatureMax'
           },
           {
-            title:'温度下限',
+            title:'温度Min',
             align:"center",
             dataIndex: 'temperatureMin'
           },
-          {
-            title:'温度报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'temperatureAlarm'
-          },
+          // {
+          //   title:'温度报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'temperatureAlarm_dictText'
+          // },
           {
             title:'湿度',
             align:"center",
-            dataIndex: 'humidity'
+            dataIndex: 'humidity',
+            scopedSlots: { customRender: 'humidity' }
           },
           {
-            title:'湿度上限',
+            title:'湿度Max',
             align:"center",
             dataIndex: 'humidityMax'
           },
           {
-            title:'湿度下限',
+            title:'湿度Min',
             align:"center",
             dataIndex: 'humidityMin'
           },
-          {
-            title:'湿度报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'humidityAlarm'
-          },
+          // {
+          //   title:'湿度报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'humidityAlarm_dictText'
+          // },
           {
             title:'A相电流',
             align:"center",
-            dataIndex: 'currentA'
+            dataIndex: 'currentA',
+            scopedSlots: { customRender: 'currentA' }
           },
           {
-            title:'A相电流上限',
+            title:'A相电流Max',
             align:"center",
             dataIndex: 'currentAMax'
           },
           {
-            title:'A相电流下限',
+            title:'A相电流Min',
             align:"center",
             dataIndex: 'currentAMin'
           },
-          {
-            title:'A相电流报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'currentAAlarm'
-          },
+          // {
+          //   title:'A相电流报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'currentAAlarm_dictText'
+          // },
           {
             title:'B相电流',
             align:"center",
-            dataIndex: 'currentB'
+            dataIndex: 'currentB',
+            scopedSlots: { customRender: 'currentB' }
           },
           {
-            title:'B相电流上限',
+            title:'B相电流Max',
             align:"center",
             dataIndex: 'currentBMax'
           },
           {
-            title:'B相电流下限',
+            title:'B相电流Min',
             align:"center",
             dataIndex: 'currentBMin'
           },
-          {
-            title:'B相电流报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'currentBAlarm'
-          },
+          // {
+          //   title:'B相电流报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'currentBAlarm_dictText'
+          // },
           {
             title:'C相电流',
             align:"center",
-            dataIndex: 'currentC'
+            dataIndex: 'currentC',
+            scopedSlots: { customRender: 'currentC' }
           },
           {
-            title:'C相电流上限',
+            title:'C相电流Max',
             align:"center",
             dataIndex: 'currentCMax'
           },
           {
-            title:'C相电流下限',
+            title:'C相电流Min',
             align:"center",
             dataIndex: 'currentCMin'
           },
-          {
-            title:'C相电流报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'currentCAlarm'
-          },
+          // {
+          //   title:'C相电流报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'currentCAlarm_dictText'
+          // },
           {
             title:'创建时间',
             align:"center",
             dataIndex: 'createTime'
           },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
+          // {
+          //   title: '操作',
+          //   dataIndex: 'action',
+          //   align:"center",
+          //   fixed:"right",
+          //   width:147,
+          //   scopedSlots: { customRender: 'action' }
+          // }
         ],
         url: {
           list: "/itdmWenxiangHistory/itdmWenxiangHistory16/list",
@@ -273,7 +295,7 @@
           deleteBatch: "/itdmWenxiangHistory/itdmWenxiangHistory16/deleteBatch",
           exportXlsUrl: "/itdmWenxiangHistory/itdmWenxiangHistory16/exportXls",
           importExcelUrl: "itdmWenxiangHistory/itdmWenxiangHistory16/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
@@ -323,4 +345,12 @@
 </script>
 <style scoped>
   @import '~@assets/less/common.less';
+  ::v-deep .ant-card-body{
+    padding-top: 0px !important;
+    padding-left: 10px !important;
+    padding-right: 10px !important;
+  }
+  .y {
+    color: red;
+  }
 </style>

itdmWeb/src/views/module-iTDM/itdmWenxiangHistory/ItdmWenxiangHistory1List.vue

@@ -60,7 +60,6 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         class="j-table-force-nowrap"
         @change="handleTableChange">
 
@@ -156,6 +155,11 @@
           //     return parseInt(index)+1;
           //   }
           // },
+          // {
+          //   title:'设备id',
+          //   align:"center",
+          //   dataIndex: 'deviceId_dictText'
+          // },
           {
             title:'设备名称',
             align:"center",
@@ -169,15 +173,16 @@
           {
             title:'温度',
             align:"center",
-            dataIndex: 'temperature'
+            dataIndex: 'temperature',
+            scopedSlots: { customRender: 'temperature' }
           },
           {
-            title:'温度上限',
+            title:'温度Max',
             align:"center",
             dataIndex: 'temperatureMax'
           },
           {
-            title:'温度下限',
+            title:'温度Min',
             align:"center",
             dataIndex: 'temperatureMin'
           },
@@ -189,15 +194,16 @@
           {
             title:'湿度',
             align:"center",
-            dataIndex: 'humidity'
+            dataIndex: 'humidity',
+            scopedSlots: { customRender: 'humidity' }
           },
           {
-            title:'湿度上限',
+            title:'湿度Max',
             align:"center",
             dataIndex: 'humidityMax'
           },
           {
-            title:'湿度下限',
+            title:'湿度Min',
             align:"center",
             dataIndex: 'humidityMin'
           },
@@ -209,15 +215,16 @@
           {
             title:'A相电流',
             align:"center",
-            dataIndex: 'currentA'
+            dataIndex: 'currentA',
+            scopedSlots: { customRender: 'currentA' }
           },
           {
-            title:'A相电流上限',
+            title:'A相电流Max',
             align:"center",
             dataIndex: 'currentAMax'
           },
           {
-            title:'A相电流下限',
+            title:'A相电流Min',
             align:"center",
             dataIndex: 'currentAMin'
           },
@@ -229,15 +236,16 @@
           {
             title:'B相电流',
             align:"center",
-            dataIndex: 'currentB'
+            dataIndex: 'currentB',
+            scopedSlots: { customRender: 'currentB' }
           },
           {
-            title:'B相电流上限',
+            title:'B相电流Max',
             align:"center",
             dataIndex: 'currentBMax'
           },
           {
-            title:'B相电流下限',
+            title:'B相电流Min',
             align:"center",
             dataIndex: 'currentBMin'
           },
@@ -249,15 +257,16 @@
           {
             title:'C相电流',
             align:"center",
-            dataIndex: 'currentC'
+            dataIndex: 'currentC',
+            scopedSlots: { customRender: 'currentC' }
           },
           {
-            title:'C相电流上限',
+            title:'C相电流Max',
             align:"center",
             dataIndex: 'currentCMax'
           },
           {
-            title:'C相电流下限',
+            title:'C相电流Min',
             align:"center",
             dataIndex: 'currentCMin'
           },
@@ -269,7 +278,6 @@
           {
             title:'创建时间',
             align:"center",
-            sorter: true,
             dataIndex: 'createTime'
           },
           // {
@@ -336,4 +344,12 @@
 </script>
 <style scoped>
   @import '~@assets/less/common.less';
+  ::v-deep .ant-card-body{
+    padding-top: 0px !important;
+    padding-left: 10px !important;
+    padding-right: 10px !important;
+  }
+  .y {
+    color: red;
+  }
 </style>

itdmWeb/src/views/module-iTDM/itdmWenxiangHistory/ItdmWenxiangHistory48List.vue

@@ -15,10 +15,10 @@
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+              <!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
+              <!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
+              <!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+              <!--              </a>-->
             </span>
           </a-col>
         </a-row>
@@ -28,27 +28,27 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('48立方温箱数据')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
+      <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+      <a-button type="primary" icon="download" @click="handleExportXls('1立方温箱历史数据')">导出</a-button>
+      <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+      <!--        <a-button type="primary" icon="import">导入</a-button>-->
+      <!--      </a-upload>-->
+      <!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+      <!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+      <!--      <a-dropdown v-if="selectedRowKeys.length > 0">-->
+      <!--        <a-menu slot="overlay">-->
+      <!--          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
+      <!--        </a-menu>-->
+      <!--        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
+      <!--      </a-dropdown>-->
     </div>
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+      <!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+      <!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+      <!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+      <!--      </div>-->
 
       <a-table
         ref="table"
@@ -60,10 +60,27 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         class="j-table-force-nowrap"
         @change="handleTableChange">
 
+        <!-- 通过判断alarm的值，动态渲染对应数据这一列单元格的样式 -->
+        <div slot="temperature" slot-scope="text, record">
+          <span v-if="record.temperatureAlarm ==1" class="y">{{text}}</span>
+          <span v-else>{{text}}</span>
+        </div>
+        <div slot="humidity" slot-scope="text, record">
+          <span :class="record.humidityAlarm == 1?'y':''">{{text}}</span>
+        </div>
+        <div slot="currentA" slot-scope="text, record">
+          <span :class="record.currentAAlarm == 1?'y':''">{{text}}</span>
+        </div>
+        <div slot="currentB" slot-scope="text, record">
+          <span :class="record.currentBAlarm == 1?'y':''">{{text}}</span>
+        </div>
+        <div slot="currentC" slot-scope="text, record">
+          <span :class="record.currentCAlarm == 1?'y':''">{{text}}</span>
+        </div>
+
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
@@ -106,7 +123,7 @@
       </a-table>
     </div>
 
-    <itdm-wenxiang-history48-modal ref="modalForm" @ok="modalFormOk"></itdm-wenxiang-history48-modal>
+    <itdm-wenxiang-history1-modal ref="modalForm" @ok="modalFormOk"></itdm-wenxiang-history1-modal>
   </a-card>
 </template>
 
@@ -128,16 +145,21 @@
         description: '48立方温箱数据管理页面',
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
+          // {
+          //   title: '#',
+          //   dataIndex: '',
+          //   key:'rowIndex',
+          //   width:60,
+          //   align:"center",
+          //   customRender:function (t,r,index) {
+          //     return parseInt(index)+1;
+          //   }
+          // },
+          // {
+          //   title:'设备id',
+          //   align:"center",
+          //   dataIndex: 'deviceId_dictText'
+          // },
           {
             title:'设备名称',
             align:"center",
@@ -151,116 +173,121 @@
           {
             title:'温度',
             align:"center",
-            dataIndex: 'temperature'
+            dataIndex: 'temperature',
+            scopedSlots: { customRender: 'temperature' }
           },
           {
-            title:'温度上限',
+            title:'温度Max',
             align:"center",
             dataIndex: 'temperatureMax'
           },
           {
-            title:'温度下限',
+            title:'温度Min',
             align:"center",
             dataIndex: 'temperatureMin'
           },
-          {
-            title:'温度报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'temperatureAlarm'
-          },
+          // {
+          //   title:'温度报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'temperatureAlarm_dictText'
+          // },
           {
             title:'湿度',
             align:"center",
-            dataIndex: 'humidity'
+            dataIndex: 'humidity',
+            scopedSlots: { customRender: 'humidity' }
           },
           {
-            title:'湿度上限',
+            title:'湿度Max',
             align:"center",
             dataIndex: 'humidityMax'
           },
           {
-            title:'湿度下限',
+            title:'湿度Min',
             align:"center",
             dataIndex: 'humidityMin'
           },
-          {
-            title:'湿度报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'humidityAlarm'
-          },
+          // {
+          //   title:'湿度报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'humidityAlarm_dictText'
+          // },
           {
             title:'A相电流',
             align:"center",
-            dataIndex: 'currentA'
+            dataIndex: 'currentA',
+            scopedSlots: { customRender: 'currentA' }
           },
           {
-            title:'A相电流上限',
+            title:'A相电流Max',
             align:"center",
             dataIndex: 'currentAMax'
           },
           {
-            title:'A相电流下限',
+            title:'A相电流Min',
             align:"center",
             dataIndex: 'currentAMin'
           },
-          {
-            title:'A相电流报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'currentAAlarm'
-          },
+          // {
+          //   title:'A相电流报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'currentAAlarm_dictText'
+          // },
           {
             title:'B相电流',
             align:"center",
-            dataIndex: 'currentB'
+            dataIndex: 'currentB',
+            scopedSlots: { customRender: 'currentB' }
           },
           {
-            title:'B相电流上限',
+            title:'B相电流Max',
             align:"center",
             dataIndex: 'currentBMax'
           },
           {
-            title:'B相电流下限',
+            title:'B相电流Min',
             align:"center",
             dataIndex: 'currentBMin'
           },
-          {
-            title:'B相电流报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'currentBAlarm'
-          },
+          // {
+          //   title:'B相电流报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'currentBAlarm_dictText'
+          // },
           {
             title:'C相电流',
             align:"center",
-            dataIndex: 'currentC'
+            dataIndex: 'currentC',
+            scopedSlots: { customRender: 'currentC' }
           },
           {
-            title:'C相电流上限',
+            title:'C相电流Max',
             align:"center",
             dataIndex: 'currentCMax'
           },
           {
-            title:'C相电流下限',
+            title:'C相电流Min',
             align:"center",
             dataIndex: 'currentCMin'
           },
-          {
-            title:'C相电流报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'currentCAlarm'
-          },
+          // {
+          //   title:'C相电流报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'currentCAlarm_dictText'
+          // },
           {
             title:'创建时间',
             align:"center",
             dataIndex: 'createTime'
           },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
+          // {
+          //   title: '操作',
+          //   dataIndex: 'action',
+          //   align:"center",
+          //   fixed:"right",
+          //   width:147,
+          //   scopedSlots: { customRender: 'action' }
+          // }
         ],
         url: {
           list: "/itdmWenxiangHistory/itdmWenxiangHistory48/list",
@@ -268,7 +295,7 @@
           deleteBatch: "/itdmWenxiangHistory/itdmWenxiangHistory48/deleteBatch",
           exportXlsUrl: "/itdmWenxiangHistory/itdmWenxiangHistory48/exportXls",
           importExcelUrl: "itdmWenxiangHistory/itdmWenxiangHistory48/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
@@ -317,4 +344,12 @@
 </script>
 <style scoped>
   @import '~@assets/less/common.less';
+  ::v-deep .ant-card-body{
+    padding-top: 0px !important;
+    padding-left: 10px !important;
+    padding-right: 10px !important;
+  }
+  .y {
+    color: red;
+  }
 </style>

itdmWeb/src/views/module-iTDM/itdmWenxiangHistory/ItdmWenxiangHistory8List.vue

@@ -15,10 +15,10 @@
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+              <!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
+              <!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
+              <!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+              <!--              </a>-->
             </span>
           </a-col>
         </a-row>
@@ -28,27 +28,27 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('8立方温箱历史数据')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
+      <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+      <a-button type="primary" icon="download" @click="handleExportXls('1立方温箱历史数据')">导出</a-button>
+      <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+      <!--        <a-button type="primary" icon="import">导入</a-button>-->
+      <!--      </a-upload>-->
+      <!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+      <!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+      <!--      <a-dropdown v-if="selectedRowKeys.length > 0">-->
+      <!--        <a-menu slot="overlay">-->
+      <!--          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
+      <!--        </a-menu>-->
+      <!--        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
+      <!--      </a-dropdown>-->
     </div>
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+      <!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+      <!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+      <!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+      <!--      </div>-->
 
       <a-table
         ref="table"
@@ -60,10 +60,27 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         class="j-table-force-nowrap"
         @change="handleTableChange">
 
+        <!-- 通过判断alarm的值，动态渲染对应数据这一列单元格的样式 -->
+        <div slot="temperature" slot-scope="text, record">
+          <span v-if="record.temperatureAlarm ==1" class="y">{{text}}</span>
+          <span v-else>{{text}}</span>
+        </div>
+        <div slot="humidity" slot-scope="text, record">
+          <span :class="record.humidityAlarm == 1?'y':''">{{text}}</span>
+        </div>
+        <div slot="currentA" slot-scope="text, record">
+          <span :class="record.currentAAlarm == 1?'y':''">{{text}}</span>
+        </div>
+        <div slot="currentB" slot-scope="text, record">
+          <span :class="record.currentBAlarm == 1?'y':''">{{text}}</span>
+        </div>
+        <div slot="currentC" slot-scope="text, record">
+          <span :class="record.currentCAlarm == 1?'y':''">{{text}}</span>
+        </div>
+
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
@@ -106,7 +123,7 @@
       </a-table>
     </div>
 
-    <itdm-wenxiang-history8-modal ref="modalForm" @ok="modalFormOk"></itdm-wenxiang-history8-modal>
+    <itdm-wenxiang-history1-modal ref="modalForm" @ok="modalFormOk"></itdm-wenxiang-history1-modal>
   </a-card>
 </template>
 
@@ -128,16 +145,21 @@
         description: '8立方温箱历史数据管理页面',
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
+          // {
+          //   title: '#',
+          //   dataIndex: '',
+          //   key:'rowIndex',
+          //   width:60,
+          //   align:"center",
+          //   customRender:function (t,r,index) {
+          //     return parseInt(index)+1;
+          //   }
+          // },
+          // {
+          //   title:'设备id',
+          //   align:"center",
+          //   dataIndex: 'deviceId_dictText'
+          // },
           {
             title:'设备名称',
             align:"center",
@@ -151,116 +173,121 @@
           {
             title:'温度',
             align:"center",
-            dataIndex: 'temperature'
+            dataIndex: 'temperature',
+            scopedSlots: { customRender: 'temperature' }
           },
           {
-            title:'温度上限',
+            title:'温度Max',
             align:"center",
             dataIndex: 'temperatureMax'
           },
           {
-            title:'温度下限',
+            title:'温度Min',
             align:"center",
             dataIndex: 'temperatureMin'
           },
-          {
-            title:'温度报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'temperatureAlarm'
-          },
+          // {
+          //   title:'温度报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'temperatureAlarm_dictText'
+          // },
           {
             title:'湿度',
             align:"center",
-            dataIndex: 'humidity'
+            dataIndex: 'humidity',
+            scopedSlots: { customRender: 'humidity' }
           },
           {
-            title:'湿度上限',
+            title:'湿度Max',
             align:"center",
             dataIndex: 'humidityMax'
           },
           {
-            title:'湿度下限',
+            title:'湿度Min',
             align:"center",
             dataIndex: 'humidityMin'
           },
-          {
-            title:'湿度报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'humidityAlarm'
-          },
+          // {
+          //   title:'湿度报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'humidityAlarm_dictText'
+          // },
           {
             title:'A相电流',
             align:"center",
-            dataIndex: 'currentA'
+            dataIndex: 'currentA',
+            scopedSlots: { customRender: 'currentA' }
           },
           {
-            title:'A相电流上限',
+            title:'A相电流Max',
             align:"center",
             dataIndex: 'currentAMax'
           },
           {
-            title:'A相电流下限',
+            title:'A相电流Min',
             align:"center",
             dataIndex: 'currentAMin'
           },
-          {
-            title:'A相电流报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'currentAAlarm'
-          },
+          // {
+          //   title:'A相电流报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'currentAAlarm_dictText'
+          // },
           {
             title:'B相电流',
             align:"center",
-            dataIndex: 'currentB'
+            dataIndex: 'currentB',
+            scopedSlots: { customRender: 'currentB' }
           },
           {
-            title:'B相电流上限',
+            title:'B相电流Max',
             align:"center",
             dataIndex: 'currentBMax'
           },
           {
-            title:'B相电流下限',
+            title:'B相电流Min',
             align:"center",
             dataIndex: 'currentBMin'
           },
-          {
-            title:'B相电流报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'currentBAlarm'
-          },
+          // {
+          //   title:'B相电流报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'currentBAlarm_dictText'
+          // },
           {
             title:'C相电流',
             align:"center",
-            dataIndex: 'currentC'
+            dataIndex: 'currentC',
+            scopedSlots: { customRender: 'currentC' }
           },
           {
-            title:'C相电流上限',
+            title:'C相电流Max',
             align:"center",
             dataIndex: 'currentCMax'
           },
           {
-            title:'C相电流下限',
+            title:'C相电流Min',
             align:"center",
             dataIndex: 'currentCMin'
           },
-          {
-            title:'C相电流报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'currentCAlarm'
-          },
+          // {
+          //   title:'C相电流报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'currentCAlarm_dictText'
+          // },
           {
             title:'创建时间',
             align:"center",
             dataIndex: 'createTime'
           },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
+          // {
+          //   title: '操作',
+          //   dataIndex: 'action',
+          //   align:"center",
+          //   fixed:"right",
+          //   width:147,
+          //   scopedSlots: { customRender: 'action' }
+          // }
         ],
         url: {
           list: "/itdmWenxiangHistory/itdmWenxiangHistory8/list",
@@ -268,7 +295,7 @@
           deleteBatch: "/itdmWenxiangHistory/itdmWenxiangHistory8/deleteBatch",
           exportXlsUrl: "/itdmWenxiangHistory/itdmWenxiangHistory8/exportXls",
           importExcelUrl: "itdmWenxiangHistory/itdmWenxiangHistory8/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
@@ -317,4 +344,12 @@
 </script>
 <style scoped>
   @import '~@assets/less/common.less';
+  ::v-deep .ant-card-body{
+    padding-top: 0px !important;
+    padding-left: 10px !important;
+    padding-right: 10px !important;
+  }
+  .y {
+    color: red;
+  }
 </style>

itdmWeb/src/views/module-iTDM/itdmWenxiangHistory/ItdmWenxiangHistoryMjList.vue

@@ -15,10 +15,10 @@
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+              <!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
+              <!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
+              <!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+              <!--              </a>-->
             </span>
           </a-col>
         </a-row>
@@ -28,27 +28,27 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('霉菌温箱历史数据')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
+      <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+      <a-button type="primary" icon="download" @click="handleExportXls('1立方温箱历史数据')">导出</a-button>
+      <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+      <!--        <a-button type="primary" icon="import">导入</a-button>-->
+      <!--      </a-upload>-->
+      <!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+      <!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+      <!--      <a-dropdown v-if="selectedRowKeys.length > 0">-->
+      <!--        <a-menu slot="overlay">-->
+      <!--          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
+      <!--        </a-menu>-->
+      <!--        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
+      <!--      </a-dropdown>-->
     </div>
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+      <!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+      <!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+      <!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+      <!--      </div>-->
 
       <a-table
         ref="table"
@@ -60,10 +60,27 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         class="j-table-force-nowrap"
         @change="handleTableChange">
 
+        <!-- 通过判断alarm的值，动态渲染对应数据这一列单元格的样式 -->
+        <div slot="temperature" slot-scope="text, record">
+          <span v-if="record.temperatureAlarm ==1" class="y">{{text}}</span>
+          <span v-else>{{text}}</span>
+        </div>
+        <div slot="humidity" slot-scope="text, record">
+          <span :class="record.humidityAlarm == 1?'y':''">{{text}}</span>
+        </div>
+        <div slot="currentA" slot-scope="text, record">
+          <span :class="record.currentAAlarm == 1?'y':''">{{text}}</span>
+        </div>
+        <div slot="currentB" slot-scope="text, record">
+          <span :class="record.currentBAlarm == 1?'y':''">{{text}}</span>
+        </div>
+        <div slot="currentC" slot-scope="text, record">
+          <span :class="record.currentCAlarm == 1?'y':''">{{text}}</span>
+        </div>
+
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
@@ -106,7 +123,7 @@
       </a-table>
     </div>
 
-    <itdm-wenxiang-history-mj-modal ref="modalForm" @ok="modalFormOk"></itdm-wenxiang-history-mj-modal>
+    <itdm-wenxiang-history1-modal ref="modalForm" @ok="modalFormOk"></itdm-wenxiang-history1-modal>
   </a-card>
 </template>
 
@@ -128,16 +145,21 @@
         description: '霉菌温箱历史数据管理页面',
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
+          // {
+          //   title: '#',
+          //   dataIndex: '',
+          //   key:'rowIndex',
+          //   width:60,
+          //   align:"center",
+          //   customRender:function (t,r,index) {
+          //     return parseInt(index)+1;
+          //   }
+          // },
+          // {
+          //   title:'设备id',
+          //   align:"center",
+          //   dataIndex: 'deviceId_dictText'
+          // },
           {
             title:'设备名称',
             align:"center",
@@ -151,116 +173,121 @@
           {
             title:'温度',
             align:"center",
-            dataIndex: 'temperature'
+            dataIndex: 'temperature',
+            scopedSlots: { customRender: 'temperature' }
           },
           {
-            title:'温度上限',
+            title:'温度Max',
             align:"center",
             dataIndex: 'temperatureMax'
           },
           {
-            title:'温度下限',
+            title:'温度Min',
             align:"center",
             dataIndex: 'temperatureMin'
           },
-          {
-            title:'温度报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'temperatureAlarm'
-          },
+          // {
+          //   title:'温度报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'temperatureAlarm_dictText'
+          // },
           {
             title:'湿度',
             align:"center",
-            dataIndex: 'humidity'
+            dataIndex: 'humidity',
+            scopedSlots: { customRender: 'humidity' }
           },
           {
-            title:'湿度上限',
+            title:'湿度Max',
             align:"center",
             dataIndex: 'humidityMax'
           },
           {
-            title:'湿度下限',
+            title:'湿度Min',
             align:"center",
             dataIndex: 'humidityMin'
           },
-          {
-            title:'湿度报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'humidityAlarm'
-          },
+          // {
+          //   title:'湿度报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'humidityAlarm_dictText'
+          // },
           {
             title:'A相电流',
             align:"center",
-            dataIndex: 'currentA'
+            dataIndex: 'currentA',
+            scopedSlots: { customRender: 'currentA' }
           },
           {
-            title:'A相电流上限',
+            title:'A相电流Max',
             align:"center",
             dataIndex: 'currentAMax'
           },
           {
-            title:'A相电流下限',
+            title:'A相电流Min',
             align:"center",
             dataIndex: 'currentAMin'
           },
-          {
-            title:'A相电流报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'currentAAlarm'
-          },
+          // {
+          //   title:'A相电流报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'currentAAlarm_dictText'
+          // },
           {
             title:'B相电流',
             align:"center",
-            dataIndex: 'currentB'
+            dataIndex: 'currentB',
+            scopedSlots: { customRender: 'currentB' }
           },
           {
-            title:'B相电流上限',
+            title:'B相电流Max',
             align:"center",
             dataIndex: 'currentBMax'
           },
           {
-            title:'B相电流下限',
+            title:'B相电流Min',
             align:"center",
             dataIndex: 'currentBMin'
           },
-          {
-            title:'B相电流报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'currentBAlarm'
-          },
+          // {
+          //   title:'B相电流报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'currentBAlarm_dictText'
+          // },
           {
             title:'C相电流',
             align:"center",
-            dataIndex: 'currentC'
+            dataIndex: 'currentC',
+            scopedSlots: { customRender: 'currentC' }
           },
           {
-            title:'C相电流上限',
+            title:'C相电流Max',
             align:"center",
             dataIndex: 'currentCMax'
           },
           {
-            title:'C相电流下限',
+            title:'C相电流Min',
             align:"center",
             dataIndex: 'currentCMin'
           },
-          {
-            title:'C相电流报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'currentCAlarm'
-          },
+          // {
+          //   title:'C相电流报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'currentCAlarm_dictText'
+          // },
           {
             title:'创建时间',
             align:"center",
             dataIndex: 'createTime'
           },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
+          // {
+          //   title: '操作',
+          //   dataIndex: 'action',
+          //   align:"center",
+          //   fixed:"right",
+          //   width:147,
+          //   scopedSlots: { customRender: 'action' }
+          // }
         ],
         url: {
           list: "/itdmWenxiangHistory/itdmWenxiangHistoryMj/list",
@@ -268,7 +295,7 @@
           deleteBatch: "/itdmWenxiangHistory/itdmWenxiangHistoryMj/deleteBatch",
           exportXlsUrl: "/itdmWenxiangHistory/itdmWenxiangHistoryMj/exportXls",
           importExcelUrl: "itdmWenxiangHistory/itdmWenxiangHistoryMj/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
@@ -317,4 +344,12 @@
 </script>
 <style scoped>
   @import '~@assets/less/common.less';
+  ::v-deep .ant-card-body{
+    padding-top: 0px !important;
+    padding-left: 10px !important;
+    padding-right: 10px !important;
+  }
+  .y {
+    color: red;
+  }
 </style>

itdmWeb/src/views/module-iTDM/itdmWenxiangHistory/ItdmWenxiangHistorySzhList.vue

@@ -15,10 +15,10 @@
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+              <!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
+              <!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
+              <!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+              <!--              </a>-->
             </span>
           </a-col>
         </a-row>
@@ -28,27 +28,27 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('三综合温箱历史数据')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
+      <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+      <a-button type="primary" icon="download" @click="handleExportXls('1立方温箱历史数据')">导出</a-button>
+      <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+      <!--        <a-button type="primary" icon="import">导入</a-button>-->
+      <!--      </a-upload>-->
+      <!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+      <!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+      <!--      <a-dropdown v-if="selectedRowKeys.length > 0">-->
+      <!--        <a-menu slot="overlay">-->
+      <!--          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
+      <!--        </a-menu>-->
+      <!--        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
+      <!--      </a-dropdown>-->
     </div>
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+      <!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+      <!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+      <!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+      <!--      </div>-->
 
       <a-table
         ref="table"
@@ -60,10 +60,27 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         class="j-table-force-nowrap"
         @change="handleTableChange">
 
+        <!-- 通过判断alarm的值，动态渲染对应数据这一列单元格的样式 -->
+        <div slot="temperature" slot-scope="text, record">
+          <span v-if="record.temperatureAlarm ==1" class="y">{{text}}</span>
+          <span v-else>{{text}}</span>
+        </div>
+        <div slot="humidity" slot-scope="text, record">
+          <span :class="record.humidityAlarm == 1?'y':''">{{text}}</span>
+        </div>
+        <div slot="currentA" slot-scope="text, record">
+          <span :class="record.currentAAlarm == 1?'y':''">{{text}}</span>
+        </div>
+        <div slot="currentB" slot-scope="text, record">
+          <span :class="record.currentBAlarm == 1?'y':''">{{text}}</span>
+        </div>
+        <div slot="currentC" slot-scope="text, record">
+          <span :class="record.currentCAlarm == 1?'y':''">{{text}}</span>
+        </div>
+
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
@@ -106,7 +123,7 @@
       </a-table>
     </div>
 
-    <itdm-wenxiang-history-szh-modal ref="modalForm" @ok="modalFormOk"></itdm-wenxiang-history-szh-modal>
+    <itdm-wenxiang-history1-modal ref="modalForm" @ok="modalFormOk"></itdm-wenxiang-history1-modal>
   </a-card>
 </template>
 
@@ -128,16 +145,21 @@
         description: '三综合温箱历史数据管理页面',
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
+          // {
+          //   title: '#',
+          //   dataIndex: '',
+          //   key:'rowIndex',
+          //   width:60,
+          //   align:"center",
+          //   customRender:function (t,r,index) {
+          //     return parseInt(index)+1;
+          //   }
+          // },
+          // {
+          //   title:'设备id',
+          //   align:"center",
+          //   dataIndex: 'deviceId_dictText'
+          // },
           {
             title:'设备名称',
             align:"center",
@@ -151,116 +173,121 @@
           {
             title:'温度',
             align:"center",
-            dataIndex: 'temperature'
+            dataIndex: 'temperature',
+            scopedSlots: { customRender: 'temperature' }
           },
           {
-            title:'温度上限',
+            title:'温度Max',
             align:"center",
             dataIndex: 'temperatureMax'
           },
           {
-            title:'温度下限',
+            title:'温度Min',
             align:"center",
             dataIndex: 'temperatureMin'
           },
-          {
-            title:'温度报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'temperatureAlarm'
-          },
+          // {
+          //   title:'温度报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'temperatureAlarm_dictText'
+          // },
           {
             title:'湿度',
             align:"center",
-            dataIndex: 'humidity'
+            dataIndex: 'humidity',
+            scopedSlots: { customRender: 'humidity' }
           },
           {
-            title:'湿度上限',
+            title:'湿度Max',
             align:"center",
             dataIndex: 'humidityMax'
           },
           {
-            title:'湿度下限',
+            title:'湿度Min',
             align:"center",
             dataIndex: 'humidityMin'
           },
-          {
-            title:'湿度报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'humidityAlarm'
-          },
+          // {
+          //   title:'湿度报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'humidityAlarm_dictText'
+          // },
           {
             title:'A相电流',
             align:"center",
-            dataIndex: 'currentA'
+            dataIndex: 'currentA',
+            scopedSlots: { customRender: 'currentA' }
           },
           {
-            title:'A相电流上限',
+            title:'A相电流Max',
             align:"center",
             dataIndex: 'currentAMax'
           },
           {
-            title:'A相电流下限',
+            title:'A相电流Min',
             align:"center",
             dataIndex: 'currentAMin'
           },
-          {
-            title:'A相电流报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'currentAAlarm'
-          },
+          // {
+          //   title:'A相电流报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'currentAAlarm_dictText'
+          // },
           {
             title:'B相电流',
             align:"center",
-            dataIndex: 'currentB'
+            dataIndex: 'currentB',
+            scopedSlots: { customRender: 'currentB' }
           },
           {
-            title:'B相电流上限',
+            title:'B相电流Max',
             align:"center",
             dataIndex: 'currentBMax'
           },
           {
-            title:'B相电流下限',
+            title:'B相电流Min',
             align:"center",
             dataIndex: 'currentBMin'
           },
-          {
-            title:'B相电流报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'currentBAlarm'
-          },
+          // {
+          //   title:'B相电流报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'currentBAlarm_dictText'
+          // },
           {
             title:'C相电流',
             align:"center",
-            dataIndex: 'currentC'
+            dataIndex: 'currentC',
+            scopedSlots: { customRender: 'currentC' }
           },
           {
-            title:'C相电流上限',
+            title:'C相电流Max',
             align:"center",
             dataIndex: 'currentCMax'
           },
           {
-            title:'C相电流下限',
+            title:'C相电流Min',
             align:"center",
             dataIndex: 'currentCMin'
           },
-          {
-            title:'C相电流报警（0正常1报警）',
-            align:"center",
-            dataIndex: 'currentCAlarm'
-          },
+          // {
+          //   title:'C相电流报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'currentCAlarm_dictText'
+          // },
           {
             title:'创建时间',
             align:"center",
             dataIndex: 'createTime'
           },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
+          // {
+          //   title: '操作',
+          //   dataIndex: 'action',
+          //   align:"center",
+          //   fixed:"right",
+          //   width:147,
+          //   scopedSlots: { customRender: 'action' }
+          // }
         ],
         url: {
           list: "/itdmWenxiangHistory/itdmWenxiangHistorySzh/list",
@@ -268,7 +295,7 @@
           deleteBatch: "/itdmWenxiangHistory/itdmWenxiangHistorySzh/deleteBatch",
           exportXlsUrl: "/itdmWenxiangHistory/itdmWenxiangHistorySzh/exportXls",
           importExcelUrl: "itdmWenxiangHistory/itdmWenxiangHistorySzh/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
@@ -317,4 +344,12 @@
 </script>
 <style scoped>
   @import '~@assets/less/common.less';
+  ::v-deep .ant-card-body{
+    padding-top: 0px !important;
+    padding-left: 10px !important;
+    padding-right: 10px !important;
+  }
+  .y {
+    color: red;
+  }
 </style>