Merge branch 'projects/mesxc-test' into projects/mesxc-zhp

Reviewed-on: #285

src/views/OperationalOverview/AGVBoard.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-26 09:57:35
+ * @LastEditTime: 2024-03-27 10:25:15
  * @Description:
 -->
 <template>
@@ -410,6 +410,9 @@ export default {
 <style lang="scss" scoped>
 
 
+
+
+
 .visual-container {
   width: 1920px;
   height: 1080px;
@@ -422,7 +425,8 @@ export default {
     background-size: 100% 100%;
     color: #00fff0;
     text-align: center;
-    word-spacing:8px;
+    letter-spacing: 8px;
+    word-spacing: 8px;
     position: relative;
     .unit{
       position: absolute;
@@ -430,6 +434,7 @@ export default {
       top:25px;
       color: rgba($color: #ffffff, $alpha: 8);
       font-size: 20px;
+      letter-spacing: 0px;
     }
     .time{
       position: absolute;
@@ -437,6 +442,7 @@ export default {
       top:25px;
       color: rgba($color: #ffffff, $alpha: 8);
       font-size: 20px;
+      letter-spacing: 0px;
     }
     .title-button {
       color: #00fff0;

src/views/OperationalOverview/coldBoard.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-29 16:50:26
- * @LastEditTime: 2024-03-26 18:00:34
+ * @LastEditTime: 2024-03-27 10:58:39
  * @LastEditors: zhp
  * @Description:
 -->
@@ -61,7 +61,7 @@
 
       <el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="10" type="flex" class="flex-1">
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
-          <base-container :no-content-padding="true" :height="256" :title="'废片 缺陷数据'" :size="'middle'"
+          <base-container :no-content-padding="true" :height="256" :title="'废片 缺陷数据'" :size="'eqStatus'"
             :title-icon="'scrap'">
             <!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;">
               <top-radio-group />
@@ -495,7 +495,8 @@ export default {
             </span>`,
                 `<span style="color:rgba(255,255,255,0.5)" >${i || ''}
             </span>`,
-                `<span style="color:rgba(255,255,255,0.5)">${this.funWsData.data.annealFanInfo[i] || ''}</span>`,
+                `<span style="color:rgba(255,255,255,0.5)"><div style="${this.funWsData.data.annealFanInfo[i] == '3片' ? 'width:10px;height:10px;border-radius: 50%; background-color: blue;float:left;margin:12px 10px 0 0 ' : 'width:10px;height:10px;border-radius: 50%; background-color: yellow;float:left;margin:12px 10px 0 0 '}"></div>  ${this.funWsData.data.annealFanInfo[i] || ''}</span>`,
+                // `<span style="color:rgba(255,255,255,0.5)">  ${this.funWsData.data.annealFanInfo[i] || ''}</span>`,
               ])
           }
           this.annealFunConfig.data = arr
@@ -509,7 +510,8 @@ export default {
               arr.push([
                 `<span style="color:rgba(255,255,255,0.5)" >${index || ''}</span>`,
                 `<span style="color:rgba(255,255,255,0.5)" >${i || ''}</span>`,
-                `<span style="color:rgba(255,255,255,0.5)">${this.funWsData.data.fanInfo[i] || ''}</span>`,
+                `<span style="color:rgba(255,255,255,0.5)"><div style="${this.funWsData.data.fanInfo[i] == '3片' ? 'width:10px;height:10px;border-radius: 50%; background-color: blue;float:left;margin:12px 10px 0 0 ' : 'width:10px;height:10px;border-radius: 50%; background-color: yellow;float:left;margin:12px 10px 0 0 '}"></div>  ${this.funWsData.data.fanInfo[i] || ''}</span>`,
+                // `<span style="color:rgba(255,255,255,0.5)">${this.funWsData.data.fanInfo[i] || ''}</span>`,
               ])
           }
           this.funConfig.data = arr
@@ -714,14 +716,16 @@ export default {
     background-size: 100% 100%;
     color: rgba(0, 255, 247, 1);
     text-align: center;
+    letter-spacing: 8px;
     word-spacing: 8px;
     .unit {
       position: absolute;
-      left: 260px;
+      left: 290px;
       top: 25px;
       color: rgba(255, 255, 255, 0.80);
       font-size: 20px;
-    }
+      letter-spacing: 0px;
+      }
 
     .time {
       position: absolute;
@@ -729,6 +733,7 @@ export default {
       color: rgba(255, 255, 255, 0.80);
       top: 25px;
       font-size: 20px;
+      letter-spacing: 0px;
     }
 
     .title-button {

src/views/OperationalOverview/components/baseContainer/index.vue

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2022-01-19 15:58:17
  * @LastEditors: zhp
- * @LastEditTime: 2024-02-22 10:26:59
+ * @LastEditTime: 2024-03-27 10:26:35
  * @Description: file content
  * @FilePath: \mt-bus-fe\src\views\OperationalOverview\components\baseContainer\index.vue
 -->
@@ -158,6 +158,7 @@ export default {
 <style lang="scss" scoped>
 
 
+
 .base-container {
   color: #fff;
   width: 100%;
@@ -192,7 +193,7 @@ export default {
           backdrop-filter: blur(5px);
         }
         &__eqStatus {
-          background: url(../../../../assets/img/high.png) no-repeat;
+          background: url(../../../../assets/img/large.png) no-repeat;
           background-size: 100% 100%;
           backdrop-filter: blur(5px);
         }

src/views/OperationalOverview/processingBoard.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-26 17:57:44
+ * @LastEditTime: 2024-03-27 11:08:13
  * @Description:
 -->
 <template>
@@ -33,7 +33,7 @@
         </el-col>
 
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8" height="100%">
-          <base-container :height="318" :size="'small'" :title="'工单监控'" :title-icon="'order'">
+          <base-container :height="318" :size="'small'" :title="'工单监控'" :title-icon="'eqMonitoring'">
             <div style="width:100%; overflow: hidden scroll;">
               <el-row v-for="op in orderList" :key="op.id" style="margin-bottom: 1em">
                 <!-- <el-col :span="12"> -->
@@ -49,8 +49,8 @@
 
       <el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="12" type="flex" class="flex-1">
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
-          <base-container :show-yes-time="true" :no-content-padding="true" :height="256" :size="'middle'" :title="'能源监控'"
-            :title-icon="'energyMonitoring'">
+          <base-container :show-yes-time="true" :no-content-padding="true" :height="256" :size="'eqStatus'"
+            :title="'能源监控'" :title-icon="'energyMonitoring'">
             <el-row :gutter="9">
               <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="24">
                 <linear-bar-chart ref="EnergyMonitoringChart" :name-list="EnergyMonitoringNameList"
@@ -60,7 +60,7 @@
           </base-container>
         </el-col>
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
-          <base-container :show-time="true"   :no-content-padding="true" :height="318 + 338 + 16" :size="'middle'"
+          <base-container :show-time="true" :no-content-padding="true" :height="318 + 338 + 16" :size="'eqStatus'"
             :title="'产线产量及良品率'" :title-icon="'productLine'">
             <double-y-chart ref="productLineChart" :id=" 'doubleYChart' " :height="390" :show-legend="true" />
           </base-container>
@@ -464,7 +464,7 @@ export default {
             `<span style="color:rgba(255,255,255,0.5)" >${item.name || ''}
             </span>`,
             `<span style="color:rgba(255,255,255,0.5)">${item.code || ''}</span>`,
-            `<span style="color:rgba(255,255,255,0.5)">${item.status || ''}</span>`,
+            `<span style="color:rgba(255,255,255,0.5)"><span style="color:rgba(255,255,255,0.5)"></span>  ${item.status || ''}</span>`,
             `<span style="color:rgba(255,255,255,0.5)">${item.error || ''}</span>`,
           ])
           this.eqConfig.data = eqArr
@@ -654,7 +654,7 @@ export default {
     background: url('../../assets/img/OperationalOverview/title.png') no-repeat;
     background-size: 100% 100%;
     color: #00fff0;
-    // word-spacing: 8px;
+    word-spacing: 8px;
     letter-spacing: 8px;
     text-align: center;
       .unit {

src/views/energy/base/energyPlcConnect/index.vue

@@ -36,7 +36,8 @@ const tableProps = [
   },
   {
     prop: 'objCode',
-    label: '对象编码'
+    label: '对象编码',
+    showOverflowtooltip: true
   },
   {
     prop: 'plcTableName',

src/views/energy/base/energyQuantityManual/index.vue

@@ -46,7 +46,8 @@ const tableProps = [
     prop: 'tableName',
     label: '能源表名',
     filter: publicFormatter('table_name'),
-    minWidth: 110
+    minWidth: 110,
+    showOverflowtooltip: true
   },
   {
     prop: 'recordTime',

src/views/energy/base/energyQuantityRealtime/index.vue

@@ -20,15 +20,18 @@ import * as XLSX from 'xlsx/xlsx.mjs'
 const tableProps = [
   {
     prop: 'objName',
-    label: '统计对象'
+    label: '统计对象',
+    showOverflowtooltip: true
   },
   {
     prop: 'objCode',
-    label: '对象编码'
+    label: '对象编码',
+    showOverflowtooltip: true
   },
   {
     prop: 'energyTypeName',
-    label: '能源类型'
+    label: '能源类型',
+    showOverflowtooltip: true
   },
   {
     prop: 'startValue',

src/views/energy/monitoring/energyStatistics/index.vue

@@ -2,46 +2,23 @@
   <div class="app-container">
 
     <!-- 搜索工作栏 -->
-    <search-bar
-      :formConfigs="formConfig"
-      ref="searchBarForm"
-      @headBtnClick="buttonClick"
-    />
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
     <!-- 列表 -->
-    <base-table
-      :page="queryParams.pageNo"
-      :limit="queryParams.pageSize"
-      :table-props="tableProps"
-      :table-data="list"
-      :max-height="tableH"
-    >
-      <method-btn
-        v-if="tableBtn.length"
-        slot="handleBtn"
-        :width="160"
-        label="操作"
-        :method-list="tableBtn"
-        @clickBtn="handleClick"
-      />
+    <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
+      :max-height="tableH">
+      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="160" label="操作" :method-list="tableBtn"
+        @clickBtn="handleClick" />
     </base-table>
-    <pagination
-      :page.sync="queryParams.pageNo"
-      :limit.sync="queryParams.pageSize"
-      :total="total"
-      @pagination="getList"
-    />
+    <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
+      @pagination="getList" />
     <!-- 新增 -->
-    <base-dialog
-      :dialogTitle="addOrEditTitle"
-      :dialogVisible="centervisible"
-      @cancel="handleCancel"
-      @confirm="handleConfirm"
-      :before-close="handleCancel"
-    >
+    <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="centervisible" @cancel="handleCancel"
+      @confirm="handleConfirm" :before-close="handleCancel">
       <energy-statistics-add ref="energyStatistics" @successSubmit="successSubmit" />
     </base-dialog>
     <!-- 参数绑定/查看 -->
-    <energy-statistics-det ref="plcParam" @closeDrawer="closeDrawer" :energyTypeList="energyTypeList"></energy-statistics-det>
+    <energy-statistics-det ref="plcParam" @closeDrawer="closeDrawer"
+      :energyTypeList="energyTypeList"></energy-statistics-det>
   </div>
 </template>
 
@@ -63,7 +40,7 @@ const tableProps = [
     showOverflowtooltip: true
   },
   {
-    prop: 'type', 
+    prop: 'type',
     label: '统计类型',
     filter: publicFormatter('statistic_type')
   },
@@ -81,7 +58,7 @@ const tableProps = [
   }
 ]
 export default {
-  name: "energyStatistics",
+  name: "EnergyStatistics",
   components: { EnergyStatisticsAdd, EnergyStatisticsDet },
   data() {
     return {
@@ -112,26 +89,26 @@ export default {
       tableProps,
       tableBtn: [
         this.$auth.hasPermi('monitoring:energy-statistics:bind')
-        ? {
+          ? {
             type: 'connect',
             btnName: '绑定'
           }
-        : undefined,
+          : undefined,
         {
           type: 'detail',
           btnName: '详情'
         },
         this.$auth.hasPermi('monitoring:energy-statistics:update')
           ? {
-              type: 'edit',
-              btnName: '编辑'
-            }
+            type: 'edit',
+            btnName: '编辑'
+          }
           : undefined,
         this.$auth.hasPermi('monitoring:energy-statistics:delete')
           ? {
-              type: 'delete',
-              btnName: '删除'
-            }
+            type: 'delete',
+            btnName: '删除'
+          }
           : undefined
       ].filter((v) => v),
       tableH: this.tableHeight(260),
@@ -224,13 +201,13 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$modal.confirm('是否确认删除方案名称为"' + row.name + '"的数据项?').then(function() {
-          return deleteEnergyStatistics(row.id);
-        }).then(() => {
-          this.queryParams.pageNo = 1;
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+      this.$modal.confirm('是否确认删除方案名称为"' + row.name + '"的数据项?').then(function () {
+        return deleteEnergyStatistics(row.id);
+      }).then(() => {
+        this.queryParams.pageNo = 1;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
     },
     closeDrawer() {
       this.getList()