ws心跳检查

Reviewed-on: #272

.env.dev

@@ -1,7 +1,7 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-03-22 14:18:33
+ # @LastEditTime: 2024-03-25 15:59:53
  # @LastEditors: zhp
  # @Description:
 ###
@@ -25,7 +25,7 @@ VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.47:48082'
 # socket地址
-VUE_APP_Socket_API = 'ws://192.168.0.33:48082'
+VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
 VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
 
 # 积木报表指向地址

src/views/OperationalOverview/coldBoard.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-29 16:50:26
- * @LastEditTime: 2024-03-13 09:07:37
+ * @LastEditTime: 2024-03-25 18:33:48
  * @LastEditors: zhp
  * @Description:
 -->
@@ -793,11 +793,11 @@ export default {
             // formatDate(item.planStartTime) || '',
             // `<span style="color:rgba(255,255,255,0.5)" >${item.line || ''}
             // </span>`,
-          `<span style="color:rgba(255,255,255,0.5)">${item.name || ''}</span>`,
+          `<span style="color:rgba(255,255,255,0.5)">${ele.name || ''}</span>`,
           // `<span style="color:rgba(255,255,255,0.5)">${item.code || ''}</span>`,
-          `<span style="color:rgba(255,255,255,0.5)">${item.run || ''}</span>`,
+          `<span style="color:rgba(255,255,255,0.5)">${ele.run || ''}</span>`,
           // `<span style="color:rgba(255,255,255,0.5)">${item.error || ''}</span>`,
-          ]);
+          ])
       }
       this.realEqConfig.data = this.realEqList
       this.$refs['realEqScrollBoard'].updateRows(this.realEqList)

src/views/OperationalOverview/components/coldDoubleYChart.vue

@@ -2,7 +2,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-09-21 09:06:28
- * @LastEditTime: 2024-01-29 15:39:59
+ * @LastEditTime: 2024-03-25 18:34:58
  * @LastEditors: zhp
  * @Description:
 -->
@@ -158,7 +158,7 @@ export default {
         legend: {
           itemWidth: 10,
           itemHeight: 10,
-          top: '1%',
+          top: '20',
           // right: '20px',
           data: ['产线产量', '产线良品率'],
           textStyle: {

src/views/OperationalOverview/components/linearBarChart.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div :id="id" :class="className" :style="{ height: height + 'px', width: width }" />
+    <div :id="id" :class="className" :style="{ height: '420px', width: width }" />
   </div>
 </template>
 
@@ -19,7 +19,7 @@ export default {
     },
     className: {
       type: String,
-      default: 'chart'
+      default: 'enChart'
     },
     width: {
       type: String,
@@ -84,7 +84,7 @@ export default {
   },
   methods: {
     initChart(nameList, dataList) {
-      console.log('1111', dataList);
+      // console.log('1111', dataList);
       // console.log(1)
       this.chart = echarts.init(document.getElementById(this.id))
       // if (dataList.length !== 0) {
@@ -123,13 +123,7 @@ export default {
             type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
           }
         },
-        grid: {
+        grid: { top: 90, right: 60, bottom: 20, left: 90 },
-          top: 30,
-          left: '2%',
-          right: '2%',
-          bottom: '3%',
-          containLabel: true
-        },
         // legend: {
         //   itemWidth: 10,
         //   itemHeight: 10,
@@ -205,4 +199,11 @@ export default {
   }
 }
 </script>
-
+<style>
+.enChart {
+  position: absolute;
+  height: 100%;
+  width: 100%;
+  top: -30px;
+}
+</style>

src/views/OperationalOverview/components/pileBarChart.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-27 13:54:52
- * @LastEditTime: 2024-03-13 09:04:11
+ * @LastEditTime: 2024-03-25 18:37:26
  * @LastEditors: zhp
  * @Description:
 -->
@@ -92,18 +92,20 @@ export default {
   methods: {
     initChart(nameList, topNameList, nameWasteList, passRateList, wasteList) {
       let rawData = []
-      rawData.push(passRateList,wasteList)
+      let colors = ['#0fdedb', '#2359ec']
-      // console.log(1)
+      if (passRateList && wasteList) {
-      const totalData = [];
+        rawData.push(passRateList, wasteList)
-      for (let i = 0; i < rawData[0].length; ++i) {
+        // console.log(1)
-        let sum = 0;
+        const totalData = [];
-        for (let j = 0; j < rawData.length; ++j) {
+        for (let i = 0; i < rawData[0].length; ++i) {
-          sum += rawData[j][i];
+          let sum = 0;
+          for (let j = 0; j < rawData.length; ++j) {
+            sum += rawData[j][i];
+          }
+          totalData.push(sum);
         }
-        totalData.push(sum);
+        console.log('total', totalData);
       }
-      let colors = ['#0fdedb', '#2359ec' ]
-      console.log('total', totalData);
       this.chart = echarts.init(document.getElementById(this.id))
       const series = [
         '良品',
@@ -123,9 +125,9 @@ export default {
             formatter: (params) => Math.round(params.value * 1000) / 10 + '%'
           },
           color:colors[sid],
-          data: rawData[sid].map((d, did) =>
+          data: rawData.length != 0 ? rawData[sid].map((d, did) =>
             totalData[did] <= 0 ? 0 : d / totalData[did]
-          )
+          ) : []
         };
       });
       // let series = [
@@ -172,6 +174,7 @@ export default {
         legend: {
           itemWidth: 12,
           itemHeight: 12,
+          top:'10',
           icon: 'rect',
           textStyle: {
             color: '#ffffff'

src/views/OperationalOverview/processingBoard.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-21 16:07:39
+ * @LastEditTime: 2024-03-25 16:54:49
  * @Description:
 -->
 <template>
@@ -605,10 +605,7 @@ export default {
     }
   },
   created() {
-    // this.fetchList('exception-alarm')
+    this.getData()
-    // this.fetchList('inAndOutOfEachLine')
-    // this.fetchList('order-process')
-    // this.fetchList('line-chart-data')
     this.init()
     setTimeout(() => {
       window.location.reload()
@@ -671,6 +668,22 @@ export default {
   //   removeEventListener('resize', resizeFun)
   // },
   methods: {
+    getData() {
+      let processArr = qualityMonthList.map((item, index) => [
+        // console.log(item)
+        `<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
+            </span>`,
+        // formatDate(item.planStartTime) || '',
+        `
+          <span style="color:rgba(255,255,255,0.5)" >${item.productionLineName || ''}
+            </span>`,
+        `<span style="color:rgba(255,255,255,0.5)">${item.sectionName || ''}</span>`,
+        `<span style="color:rgba(255,255,255,0.5)">${item.count || ''}</span>`,
+        `<span style="color:rgba(255,255,255,0.5)">${item.inspectionTypeName || ''}</span>`,
+      ])
+      this.processConfig.data = processArr
+      this.$refs['processScrollBoard'].updateRows(processArr)
+    },
     // getList() {
     //   // this.$axios.get(
     //   //   'base/core-production-line/listAll',
@@ -867,20 +880,6 @@ export default {
         // this.$nextTick(() => {
         this.$refs.productLineChart.initChart(nameList, passRateList, outputNumList)
       } else if (this.SJGInitWebSocket === 'inspection') {
-        let processArr = qualityMonthList.map((item, index) => [
-          // console.log(item)
-          `<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
-            </span>`,
-          // formatDate(item.planStartTime) || '',
-          `
-          <span style="color:rgba(255,255,255,0.5)" >${item.productionLineName || ''}
-            </span>`,
-          `<span style="color:rgba(255,255,255,0.5)">${item.sectionName || ''}</span>`,
-          `<span style="color:rgba(255,255,255,0.5)">${item.count || ''}</span>`,
-          `<span style="color:rgba(255,255,255,0.5)">${item.inspectionTypeName || ''}</span>`,
-        ])
-        this.processConfig.data = processArr
-        this.$refs['processScrollBoard'].updateRows(processArr)
       }
     },
     // 数据发送

src/views/cost/rawMaterialConfig/index.vue

@@ -79,10 +79,9 @@ const tableProps = [
 		align: 'right',
 	},
 	{
-		prop: 'enabledTime',
+		prop: 'time',
 		label: '生效时间',
-		filter: parseTime,
+		width: 235,
-		width: 150,
 	},
 	{
 		prop: 'remark',

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

@@ -2,42 +2,18 @@
   <div class="app-container">
 
     <!-- 搜索工作栏 -->
-    <search-bar
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-      :formConfigs="formConfig"
-      ref="searchBarForm"
-      @headBtnClick="buttonClick"
-    />
     <!-- 列表 -->
-    <base-table
+    <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
-      :page="queryParams.pageNo"
+      :max-height="tableH">
-      :limit="queryParams.pageSize"
+      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="80" label="操作" :method-list="tableBtn"
-      :table-props="tableProps"
+        @clickBtn="handleClick" />
-      :table-data="list"
-      :max-height="tableH"
-    >
-      <method-btn
-        v-if="tableBtn.length"
-        slot="handleBtn"
-        :width="80"
-        label="操作"
-        :method-list="tableBtn"
-        @clickBtn="handleClick"
-      />
     </base-table>
-    <pagination
+    <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
-      :page.sync="queryParams.pageNo"
+      @pagination="getList" />
-      :limit.sync="queryParams.pageSize"
-      :total="total"
-      @pagination="getList"
-    />
     <!-- 新增 -->
-    <base-dialog
+    <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="centervisible" @cancel="handleCancel"
-      :dialogTitle="addOrEditTitle"
+      @confirm="handleConfirm" :before-close="handleCancel">
-      :dialogVisible="centervisible"
-      @cancel="handleCancel"
-      @confirm="handleConfirm"
-      :before-close="handleCancel"
-    >
       <energy-plc-add ref="energyPlc" @successSubmit="successSubmit" />
     </base-dialog>
   </div>
@@ -50,7 +26,8 @@ import EnergyPlcAdd from './components/energyPlcAdd.vue'
 const tableProps = [
   {
     prop: 'plcTableName',
-    label: '关联表名'
+    label: '关联表名',
+    showOverflowtooltip: true
   },
   {
     prop: 'code',
@@ -60,7 +37,9 @@ const tableProps = [
   },
   {
     prop: 'name',
-    label: '标识名'
+    label: '标识名',
+    minWidth: 150,
+    showOverflowtooltip: true
   },
   {
     prop: 'enName',
@@ -109,21 +88,21 @@ export default {
       tableBtn: [
         this.$auth.hasPermi('base:energy-plc:update')
           ? {
-              type: 'edit',
+            type: 'edit',
-              btnName: '编辑'
+            btnName: '编辑'
-            }
+          }
           : undefined,
         this.$auth.hasPermi('base:energy-plc:delete')
           ? {
-              type: 'delete',
+            type: 'delete',
-              btnName: '删除'
+            btnName: '删除'
-            }
+          }
           : undefined
       ].filter((v) => v),
       tableH: this.tableHeight(260),
       collectionList: [
-        {value: 0,label: '否'},
+        { value: 0, label: '否' },
-        {value: 1,label: '是'}
+        { value: 1, label: '是' }
       ],
       // 总条数
       total: 0,
@@ -167,7 +146,7 @@ export default {
     getList() {
       getEnergyPlcPage(this.queryParams).then(response => {
         let arr = response.data.list || [];
-        arr&&arr.map(item => {
+        arr && arr.map(item => {
           this.collectionList.map(i => {
             if (item.collection === i.value) {
               item.collection = i.label
@@ -188,7 +167,7 @@ export default {
           this.centervisible = true
           break
         default:
-        this.handleDelete(val.data)
+          this.handleDelete(val.data)
       }
     },
     handleCancel() {
@@ -205,13 +184,13 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$modal.confirm('是否确认删除关联表名为"' + row.name + '"的数据项?').then(function() {
+      this.$modal.confirm('是否确认删除关联表名为"' + row.name + '"的数据项?').then(function () {
-          return deleteEnergyPlc(row.id);
+        return deleteEnergyPlc(row.id);
-        }).then(() => {
+      }).then(() => {
-          this.queryParams.pageNo = 1;
+        this.queryParams.pageNo = 1;
-          this.getList();
+        this.getList();
-          this.$modal.msgSuccess("删除成功");
+        this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+      }).catch(() => { });
     }
   }
 };

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

@@ -2,47 +2,23 @@
   <div class="app-container">
 
     <!-- 搜索工作栏 -->
-    <search-bar
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-      :formConfigs="formConfig"
-      ref="searchBarForm"
-      @headBtnClick="buttonClick"
-    />
     <!-- 列表 -->
-    <base-table
+    <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
-      :page="queryParams.pageNo"
+      :max-height="tableH">
-      :limit="queryParams.pageSize"
+      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="160" label="操作" :method-list="tableBtn"
-      :table-props="tableProps"
+        @clickBtn="handleClick" />
-      :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
+    <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
-      :page.sync="queryParams.pageNo"
+      @pagination="getList" />
-      :limit.sync="queryParams.pageSize"
-      :total="total"
-      @pagination="getList"
-    />
     <!-- 新增 -->
-    <base-dialog
+    <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="centervisible" @cancel="handleCancel"
-      :dialogTitle="addOrEditTitle"
+      @confirm="handleConfirm" :before-close="handleCancel" width='30%'>
-      :dialogVisible="centervisible"
-      @cancel="handleCancel"
-      @confirm="handleConfirm"
-      :before-close="handleCancel"
-      width='30%'
-    >
       <energy-plc-connect-add ref="energyPlcConnect" :objList="objList" @successSubmit="successSubmit" />
     </base-dialog>
     <!-- 参数绑定/查看 -->
-    <energy-plc-param v-if="paramVisible" ref="plcParam" @closeDrawer="closeDrawer" :energyTypeList="energyTypeList"></energy-plc-param>
+    <energy-plc-param v-if="paramVisible" ref="plcParam" @closeDrawer="closeDrawer"
+      :energyTypeList="energyTypeList"></energy-plc-param>
   </div>
 </template>
 
@@ -63,17 +39,20 @@ const tableProps = [
     label: '对象编码'
   },
   {
-    prop: 'plcTableName', 
+    prop: 'plcTableName',
     label: '关联表名'
   },
   {
     prop: 'plcTableCode',
     label: '关联表编码',
+    minWidth: 150,
     showOverflowtooltip: true
   },
   {
     prop: 'cnName',
-    label: '标识名'
+    label: '标识名',
+    minWidth: 150,
+    showOverflowtooltip: true
   },
   {
     prop: 'varNum',
@@ -113,9 +92,9 @@ export default {
       tableBtn: [
         this.$auth.hasPermi('base:energy-plc-connect:bind')
           ? {
-              type: 'connect',
+            type: 'connect',
-              btnName: '绑定'
+            btnName: '绑定'
-            }
+          }
           : undefined,
         {
           type: 'detail',
@@ -123,15 +102,15 @@ export default {
         },
         this.$auth.hasPermi('base:energy-plc-connect:update')
           ? {
-              type: 'edit',
+            type: 'edit',
-              btnName: '编辑'
+            btnName: '编辑'
-            }
+          }
           : undefined,
         this.$auth.hasPermi('base:energy-plc-connect:delete')
           ? {
-              type: 'delete',
+            type: 'delete',
-              btnName: '删除'
+            btnName: '删除'
-            }
+          }
           : undefined
       ].filter((v) => v),
       tableH: this.tableHeight(260),
@@ -230,13 +209,13 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$modal.confirm('是否确认删除对象为"' + row.objName + '"的数据项?').then(function() {
+      this.$modal.confirm('是否确认删除对象为"' + row.objName + '"的数据项?').then(function () {
-          return deleteEnergyPlcConnect(row.id);
+        return deleteEnergyPlcConnect(row.id);
-        }).then(() => {
+      }).then(() => {
-          this.queryParams.pageNo = 1;
+        this.queryParams.pageNo = 1;
-          this.getList();
+        this.getList();
-          this.$modal.msgSuccess("删除成功");
+        this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+      }).catch(() => { });
     },
     closeDrawer() {
       this.getList()

src/views/extend/processEquMaterialBom/add-or-updata.vue

@@ -2,11 +2,11 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-20 09:18:30
+ * @LastEditTime: 2024-03-22 17:11:55
  * @Description:
 -->
 <template>
-  <el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="false" class="drawer" size="50%">
+  <el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="true" class="drawer" size="50%">
     <small-title slot="title" :no-padding="true">
       {{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
     </small-title>
@@ -75,7 +75,7 @@
           :limit.sync="listQuery.pageSize" :page-sizes="[5, 10, 15]" @pagination="getList" />
       </div>
     </div>
-    <div class="drawer-body__footer">
+    <div v-if="!isdetail" class="drawer-body__footer">
       <el-button style="" @click="goback()">取消</el-button>
       <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
     </div>
@@ -198,7 +198,7 @@ export default {
         }
         // 修改的提交
         if (this.dataForm.id) {
-          this.urlOptions.updateURL(this.dataForm).then(response => {
+          this.urlOptions.updateURL(this.dataForm).then(res => {
             this.$modal.msgSuccess("修改成功");
             this.visible = false;
             this.$emit("refreshDataList");
@@ -206,7 +206,7 @@ export default {
           return;
         }
         // 添加的提交
-        this.urlOptions.createURL(this.dataForm).then(response => {
+        this.urlOptions.createURL(this.dataForm).then(res => {
           this.$modal.msgSuccess("新增成功");
           this.idAttrShow = true;
           this.dataForm.id = res.data

src/views/extend/processEquValueBom/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-22 09:01:30
+ * @LastEditTime: 2024-03-25 14:07:31
  * @Description:
 -->
 <template>
@@ -289,7 +289,7 @@ export default {
         }
         // 修改的提交
         if (this.dataForm.id) {
-          this.urlOptions.updateURL(this.dataForm).then(response => {
+          this.urlOptions.updateURL(this.dataForm).then(res => {
             this.$modal.msgSuccess("修改成功");
             this.visible = false;
             this.$emit("refreshDataList");
@@ -297,7 +297,7 @@ export default {
           return;
         }
         // 添加的提交
-        this.urlOptions.createURL(this.dataForm).then(response => {
+        this.urlOptions.createURL(this.dataForm).then(res => {
           this.$modal.msgSuccess("新增成功");
           this.idAttrShow = true;
           this.dataForm.id = res.data

src/views/extend/processEquValueBom/attr-add.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-08 15:30:27
- * @LastEditTime: 2023-12-04 15:19:33
+ * @LastEditTime: 2024-03-25 14:14:04
  * @LastEditors: zhp
  * @Description:
 -->
@@ -118,7 +118,7 @@ export default {
 				this.$refs['dataForm'].resetFields();
 				if (this.dataForm.id) {
           getProcessEquValueBomDet({
-						id: this.dataForm.id
+            id: this.dataForm.id,
 					}).then((res) => {
             this.dataForm = res.data;
             const arr = []

src/views/extend/processEquValueBom/statusBtn.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-08 14:00:52
- * @LastEditTime: 2023-11-09 09:59:53
+ * @LastEditTime: 2024-03-25 14:09:33
  * @LastEditors: zhp
  * @Description:
 -->
@@ -25,24 +25,24 @@ export default {
   },
   data() {
     return {
-      state: false
+      // state: false
+    }
+  },
+  computed: {
+    state() {
+      return this.injectData.enabled === 1 ? true : false
     }
   },
-  // computed: {
-  //   readonly() {
-  //     return !!this.injectData.readonly
-  //   }
-  // },
   mounted() {
-    this.mapToState()
+    // this.mapToState()
   },
 
   methods: {
-    mapToState() {
+    // mapToState() {
-      if (this.injectData.prop === 'enabled') {
+    //   if (this.injectData.prop === 'enabled') {
-        this.state = this.injectData.enabled === 1 ? true : false
+    //     this.state = this.injectData.enabled === 1 ? true : false
-      }
+    //   }
-    },
+    // },
     changeHandler() {
       // let params = {}
       let payload = {}

src/views/group/base/groupClasses/index.vue

@@ -2,43 +2,18 @@
   <div class="app-container">
 
     <!-- 搜索工作栏 -->
-    <search-bar
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-      :formConfigs="formConfig"
-      ref="searchBarForm"
-      @headBtnClick="buttonClick"
-    />
     <!-- 列表 -->
-    <base-table
+    <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
-      :page="queryParams.pageNo"
+      :max-height="tableH">
-      :limit="queryParams.pageSize"
+      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
-      :table-props="tableProps"
+        @clickBtn="handleClick" />
-      :table-data="list"
-      :max-height="tableH"
-    >
-      <method-btn
-        v-if="tableBtn.length"
-        slot="handleBtn"
-        :width="120"
-        label="操作"
-        :method-list="tableBtn"
-        @clickBtn="handleClick"
-      />
     </base-table>
-    <pagination
+    <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
-      :page.sync="queryParams.pageNo"
+      @pagination="getList" />
-      :limit.sync="queryParams.pageSize"
-      :total="total"
-      @pagination="getList"
-    />
     <!-- 新增 -->
-    <base-dialog
+    <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="centervisible" @cancel="handleCancel"
-      :dialogTitle="addOrEditTitle"
+      @confirm="handleConfirm" :before-close="handleCancel" width='50%'>
-      :dialogVisible="centervisible"
-      @cancel="handleCancel"
-      @confirm="handleConfirm"
-      :before-close="handleCancel"
-      width='50%'
-    >
       <group-class-add ref="classList" @successSubmit="successSubmit" />
     </base-dialog>
   </div>
@@ -85,7 +60,7 @@ const tableProps = [
   }
 ]
 export default {
-  name: "GroupClass",
+  name: "GroupClasses",
   components: { GroupClassAdd },
   data() {
     return {
@@ -115,33 +90,33 @@ export default {
       ],
       tableProps,
       tableBtn: [
-      this.$auth.hasPermi('base:group-classes:cancel')
+        this.$auth.hasPermi('base:group-classes:cancel')
           ? {
-              type: 'cancel',
+            type: 'cancel',
-              btnName: '作废',
+            btnName: '作废',
-              showParam: {
+            showParam: {
-                type: '&',
+              type: '&',
-                data: [
+              data: [
-                  {
+                {
-                    type: 'unequal',
+                  type: 'unequal',
-                    name: 'status',
+                  name: 'status',
-                    value: '不可用'
+                  value: '不可用'
-                  }
+                }
-                ]
+              ]
-              }
             }
+          }
           : undefined,
         this.$auth.hasPermi('base:group-classes:update')
           ? {
-              type: 'edit',
+            type: 'edit',
-              btnName: '编辑'
+            btnName: '编辑'
-            }
+          }
           : undefined,
         this.$auth.hasPermi('base:group-classes:delete')
           ? {
-              type: 'delete',
+            type: 'delete',
-              btnName: '删除'
+            btnName: '删除'
-            }
+          }
           : undefined
       ].filter((v) => v),
       tableH: this.tableHeight(260),
@@ -213,7 +188,7 @@ export default {
           this.discard(val.data)
           break
         default:
-        this.handleDelete(val.data)
+          this.handleDelete(val.data)
       }
     },
     handleCancel() {
@@ -235,33 +210,33 @@ export default {
       obj.endTime = row.endTime
       obj.enableTime = row.enableTime
       obj.disableTime = Date.parse(new Date())
-      this.$modal.confirm('是否确认作废班次名称为"' + row.name + '"的数据项?').then(function() {
+      this.$modal.confirm('是否确认作废班次名称为"' + row.name + '"的数据项?').then(function () {
-          return updateGroupClasses({ ...obj })
+        return updateGroupClasses({ ...obj })
-        }).then(() => {
+      }).then(() => {
-          this.getList();
+        this.getList();
-          this.$modal.msgSuccess("操作成功");
+        this.$modal.msgSuccess("操作成功");
-        }).catch(() => {});
+      }).catch(() => { });
     },
     /** 删除按钮操作 */
     handleDelete(row) {
       console.log(row)
       let _this = this
       if (row.status === '可用') {// 可用
-        _this.$modal.confirm('删除的班次"' + row.name + '"可能会影响交接班计划，请点取消再次确认！').then(function() {
+        _this.$modal.confirm('删除的班次"' + row.name + '"可能会影响交接班计划，请点取消再次确认！').then(function () {
-          return _this.$modal.confirm('是否确认删除班次名称为"' + row.name + '"的数据项?').then(function() {
+          return _this.$modal.confirm('是否确认删除班次名称为"' + row.name + '"的数据项?').then(function () {
-              return deleteGroupClasses(row.id);
-            }).then(() => {
-              _this.getList();
-              _this.$modal.msgSuccess("删除成功");
-            }).catch(() => {});
-          })
-      } else {
-        _this.$modal.confirm('是否确认删除班次名称为"' + row.name + '"的数据项?').then(function() {
             return deleteGroupClasses(row.id);
           }).then(() => {
             _this.getList();
             _this.$modal.msgSuccess("删除成功");
-          }).catch(() => {});
+          }).catch(() => { });
+        })
+      } else {
+        _this.$modal.confirm('是否确认删除班次名称为"' + row.name + '"的数据项?').then(function () {
+          return deleteGroupClasses(row.id);
+        }).then(() => {
+          _this.getList();
+          _this.$modal.msgSuccess("删除成功");
+        }).catch(() => { });
       }
     }
   }

src/views/login.vue

@@ -299,14 +299,14 @@ export default {
 		getCookie() {
 			// const username = getUsername();
 			// const password = getPassword();
-			// const rememberMe = getRememberMe();
+			const rememberMe = getRememberMe()
-			const tenantName = getTenantName();
+			// const tenantName = getTenantName();
 			this.loginForm = {
 				...this.loginForm,
-				username: username ? username : this.loginForm.username,
+				username: this.loginForm.username,
-				password: password ? password : this.loginForm.password,
+				password: this.loginForm.password,
 				rememberMe: rememberMe ? getRememberMe() : false,
-				tenantName: tenantName ? tenantName : this.loginForm.tenantName,
+				tenantName: this.loginForm.tenantName,
 			};
 		},
 		handleLogin(captchaParams) {

src/views/order/base/orderManage/orderDetailData.vue

@@ -21,7 +21,7 @@
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">产品名称</div>
-            <div class="lightTip">{{ orderMsg.productName }}</div>
+            <div class="lightTip" :title='orderMsg.productName'>{{ orderMsg.productName }}</div>
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">产品规格</div>
@@ -282,6 +282,9 @@ export default {
       font-weight: 400;
       color: rgba(102, 102, 102, 0.75);
       margin-bottom: 12px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
     }
   }
 

src/views/order/monitoring/orderCompletionMonitoring/index.vue

@@ -1,38 +1,21 @@
 <template>
   <div class="app-container orderMonitoring">
     <!-- 搜索工作栏 -->
-    <search-bar
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-      :formConfigs="formConfig"
-      ref="searchBarForm"
-      @headBtnClick="buttonClick"
-    />
     <el-tabs v-model="activeName" @tab-click="toggleTab">
       <el-tab-pane label="数据列表" name="dataList"></el-tab-pane>
       <el-tab-pane label="环形图" name="barChart"></el-tab-pane>
     </el-tabs>
     <!-- 表 -->
     <div v-if="activeName === 'dataList'">
-      <base-table
+      <base-table :page="1" :limit="1000000000000" :table-props="tableProps" :table-data="list" :max-height="tableH"
-        :page="1"
+        row-key="id" :tree-props="{ children: 'orderMonitorVOS', hasChildren: 'hasChildren' }">
-        :limit="1000000000000"
+        <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
-        :table-props="tableProps"
+          @clickBtn="handleClick" />
-        :table-data="list"
-        :max-height="tableH"
-        row-key="id"
-        :tree-props="{children: 'orderMonitorVOS', hasChildren: 'hasChildren'}"
-      >
-        <method-btn
-          v-if="tableBtn.length"
-          slot="handleBtn"
-          :width="100"
-          label="操作"
-          :method-list="tableBtn"
-          @clickBtn="handleClick"
-        />
       </base-table>
     </div>
     <!-- 图 -->
-    <monitoring-ring-charts ref='monitoringRingCharts' v-else :chart-list='chartList'/>
+    <monitoring-ring-charts ref='monitoringRingCharts' v-else :chart-list='chartList' />
     <!-- <pagination
       :page.sync="queryParams.pageNo"
       :limit.sync="queryParams.pageSize"
@@ -168,65 +151,65 @@ export default {
       },
       tableProps,
       list: [],
-      tableH: this.tableHeight(305),
+      tableH: this.tableHeight(260),
       total: 0,
       tableBtn: [
-      this.$auth.hasPermi('base:order-completion-monitoring:orderDet')
+        this.$auth.hasPermi('base:order-completion-monitoring:orderDet')
           ? {
-              type: 'orderDetail',
+            type: 'orderDetail',
-              btnName: '详情',
+            btnName: '详情',
-              showTip: '订单/工单详情',
+            showTip: '订单/工单详情',
-              showParam: {
+            showParam: {
-                type: '&',
+              type: '&',
-                data: [
+              data: [
-                  {
+                {
-                    type: 'more',
+                  type: 'more',
-                    name: 'orderNum',
+                  name: 'orderNum',
-                    value: 1
+                  value: 1
-                  }
+                }
-                ]
+              ]
-              }
             }
+          }
           : undefined,
-      this.$auth.hasPermi('base:order-completion-monitoring:qualityDet')
+        this.$auth.hasPermi('base:order-completion-monitoring:qualityDet')
           ? {
-              type: 'qualityDetail',
+            type: 'qualityDetail',
-              btnName: '质量',
+            btnName: '质量',
-              showTip: '质量详情',
+            showTip: '质量详情',
-              showParam: {
+            showParam: {
-                type: '&',
+              type: '&',
-                data: [
+              data: [
-                  {
+                {
-                    type: 'more',
+                  type: 'more',
-                    name: 'orderNum',
+                  name: 'orderNum',
-                    value: 1
+                  value: 1
-                  },
+                },
-                  {
+                {
-                    type: 'unequal',
+                  type: 'unequal',
-                    name: 'woIdString',
+                  name: 'woIdString',
-                    value: ''
+                  value: ''
-                  }
+                }
-                ]
+              ]
-              }
             }
+          }
           : undefined
-      // this.$auth.hasPermi('base:order-completion-monitoring:sendOut')
+        // this.$auth.hasPermi('base:order-completion-monitoring:sendOut')
-      //     ? {
+        //     ? {
-      //         type: 'sendOutDetail',
+        //         type: 'sendOutDetail',
-      //         btnName: '发货',
+        //         btnName: '发货',
-      //         showTip: '发货详情',
+        //         showTip: '发货详情',
-      //         showParam: {
+        //         showParam: {
-      //           type: '&',
+        //           type: '&',
-      //           data: [
+        //           data: [
-      //             {
+        //             {
-      //               type: 'more',
+        //               type: 'more',
-      //               name: 'workOrderNum',
+        //               name: 'workOrderNum',
-      //               value: 1
+        //               value: 1
-      //             }
+        //             }
-      //           ]
+        //           ]
-      //         }
+        //         }
-      //       }
+        //       }
-      //     : undefined
+        //     : undefined
       ].filter((v) => v),
       chartList: []
     }
@@ -234,7 +217,7 @@ export default {
   components: { MonitoringRingCharts },
   mounted() {
     window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(305)
+      this.tableH = this.tableHeight(260)
     })
     let start = moment().subtract(30, 'days').format('yyyy-MM-DD')
     let end = moment().format('yyyy-MM-DD')
@@ -245,10 +228,10 @@ export default {
   },
   methods: {
     getPage() {
-      orderGroupMonitor({...this.queryParams}).then(res => {
+      orderGroupMonitor({ ...this.queryParams }).then(res => {
         let arr = res.data || []
         if (arr.length > 0) {
-          let color = ['#7164FF','#288AFF','#63BDFF','#8EF0AB','#FFCE6A']
+          let color = ['#7164FF', '#288AFF', '#63BDFF', '#8EF0AB', '#FFCE6A']
           let arr2 = []
           arr.map(item => {
             item.orderType = '集团订单'//前端写死订单类型
@@ -261,11 +244,11 @@ export default {
             obj.num = item.planQuantity || 0
             let sunNum = 0
             if (item.orderMonitorVOS && item.orderMonitorVOS.length > 0) {
-              for(let i = 0; i < item.orderMonitorVOS.length; i++) {
+              for (let i = 0; i < item.orderMonitorVOS.length; i++) {
                 item.orderMonitorVOS[i].orderType = '厂务订单'//前端写死订单类型
                 item.orderMonitorVOS[i].id = item.orderMonitorVOS[i].orderid
                 item.orderMonitorVOS[i].orderNum = item.orderMonitorVOS[i].workOrderNum
-                woIdString+=item.orderMonitorVOS[i].woIdString?item.orderMonitorVOS[i].woIdString:''
+                woIdString += item.orderMonitorVOS[i].woIdString ? item.orderMonitorVOS[i].woIdString : ''
                 //==============图数据
                 let subObj = {}
                 subObj.value = item.orderMonitorVOS[i].actualquantity
@@ -273,9 +256,9 @@ export default {
                 if (i < 5) {
                   subObj.color = color[i]
                 } else {
-                  subObj.color = color[i%5]
+                  subObj.color = color[i % 5]
                 }
-                sunNum+=(item.orderMonitorVOS[i].actualquantity || 0)
+                sunNum += (item.orderMonitorVOS[i].actualquantity || 0)
                 arr3.push(subObj)
               }
             }
@@ -295,7 +278,7 @@ export default {
               this.$refs.monitoringRingCharts.initChart()
             })
           }
-        }else{
+        } else {
           // 显示无数据的图片
           this.chartList = []
         }
@@ -320,24 +303,24 @@ export default {
         case 'orderDetail':
           if (val.data.orderType === '集团订单') {
             this.$router.push({// 去厂务订单详情
-              path: '/order/base/order-manage/order-detail-data?orderIdString='+ val.data.orderIds.join(',')
+              path: '/order/base/order-manage/order-detail-data?orderIdString=' + val.data.orderIds.join(',')
             })
-          }else{
+          } else {
             this.$router.push({// 去工单详情
-              path: '/core/core-work-order-detail?woIdString='+val.data.woIdString
+              path: '/core/core-work-order-detail?woIdString=' + val.data.woIdString
             })
           }
           break
         case 'qualityDetail':
           this.$router.push({
-            path: '/quality/base/quality-inspection-data/detection-information/statistical-data?woIdString='+val.data.woIdString
+            path: '/quality/base/quality-inspection-data/detection-information/statistical-data?woIdString=' + val.data.woIdString
           })
           break
         default:
-          // this.$router.push({
+        // this.$router.push({
-          //   path: '/delivery/delivery-log?orderId='+encodeURI(val.data.name)
+        //   path: '/delivery/delivery-log?orderId='+encodeURI(val.data.name)
-          // })
+        // })
-        }
+      }
     },
     toggleTab() {
       if (this.activeName === 'barChart' && this.chartList.length > 0) {
@@ -346,7 +329,7 @@ export default {
         })
       }
     }
-}
+  }
 }
 </script>
 <style lang='scss'>
@@ -360,31 +343,39 @@ export default {
     height: 2px;
     background-color: #e4e7ed;
   }
+
   .el-tabs__nav-wrap::after {
     width: 0;
   }
+
   .el-tabs__item {
     padding: 0 10px;
   }
+
   .el-tabs__item:hover {
     color: rgba(0, 0, 0, 0.85);
   }
+
   .el-tabs__item.is-active {
     color: rgba(0, 0, 0, 0.85);
   }
+
   .el-tabs__item {
     color: rgba(0, 0, 0, 0.45);
   }
+
   .searchBarBox {
     margin-bottom: 0;
   }
+
   .boxTitle {
     display: inline-block;
     font-size: 16px;
     font-weight: 400;
     color: #000000;
-    margin:0 10px 16px 0;
+    margin: 0 10px 16px 0;
   }
+
   .blueTitle {
     content: '';
     display: inline-block;

src/views/quality/base/qualityHotMaterial/add-or-updata.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-08 13:46:17
- * @LastEditTime: 2024-03-21 10:40:52
+ * @LastEditTime: 2024-03-25 08:50:25
  * @LastEditors: zhp
  * @Description:
 -->
@@ -73,12 +73,12 @@
           </el-form-item>
         </el-row>
         <el-row :gutter="24" v-for="(item,index) in ingredientList" :key="item.id">
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="成分">
               {{ item.name }}
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item :prop="'checkValueList.' + index + '.checkValue'" label="成分含量"
               :rules="[{ required: true, message: '成分含量不能为空', trigger: 'blur' }]">
               <el-input oninput="value=value.replace(/[^\d]/g,'')" :disabled="isdetail"
@@ -92,12 +92,12 @@
               </span>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="6">
             <el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最小值">
               <el-input disabled style="width: 90%;margin-right: 10px;" v-model="item.minValue"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="6">
             <el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最大值">
               <el-input disabled style="width: 90%;margin-right: 10px;" v-model="item.maxValue"></el-input>
             </el-form-item>

src/views/quality/base/qualityScrapLog/add-or-updata.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-03-20 09:38:10
+ * @LastEditTime: 2024-03-22 17:13:16
  * @LastEditors: zhp
  * @Description:
 -->
@@ -10,7 +10,7 @@
     <el-row :gutter="20">
       <el-col :span="8">
         <el-form-item label="工单号" prop="workOrderId">
-          <el-select v-model="dataForm.workOrderId" placeholder="请选择工单号">
+          <el-select filterable v-model="dataForm.workOrderId" placeholder="请选择工单号">
             <el-option v-for="dict in workOrderList" :key="dict.id" :label="dict.name" :value="dict.id" />
           </el-select>
         </el-form-item>
@@ -58,6 +58,13 @@
         </el-form-item>
       </el-col>
     </el-row>
+    <el-col :span="8">
+      <el-form-item label="来源" prop="source">
+        <el-select v-model="dataForm.source" placeholder="请选择来源" multiple>
+          <el-option v-for="dict in sourceList" :key="dict.id" :label="dict.name" :value="dict.id" />
+        </el-select>
+      </el-form-item>
+    </el-col>
     <el-col :span="8">
       <el-form-item label="备注" prop="remark">
         <el-input v-model="dataForm.remark" placeholder="备注" />

src/views/quality/monitoring/materielDateFrom/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-21 15:14:04
+ * @LastEditTime: 2024-03-25 16:07:07
  * @Description:
 -->
 <template>
@@ -64,7 +64,7 @@ const tableProps = [
   {
     prop: 'source',
     label: '数据来源',
-    filter: (val) => val == 1 ? '内部' : '外部'
+    filter: (val) => val == 1 ? '手动' : '自动'
   },
   {
     prop: 'remark',

src/views/report/glass/day.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-24 15:15:24
- * @LastEditTime: 2024-03-22 10:14:23
+ * @LastEditTime: 2024-03-22 17:05:51
  * @LastEditors: zhp
  * @Description:
 -->
@@ -66,7 +66,7 @@ export default {
 		};
 	},
 	created() {
-    this.getDict()
+    // this.getDict()
     this.getTodayStartTimeAndEndTime()
     this.getDataList()
 	},
@@ -104,6 +104,8 @@ export default {
 
     },
     async getDataList() {
+      const res = await getCorePLList()
+      this.proLineList = res.data;
       this.dataListLoading = true
       if (this.listQuery.reportTime.length == 0) {
         this.$message({
@@ -135,9 +137,9 @@ export default {
               //   item.dailyOutputTrend = null
               // }
               item.dailyOutputTrend = item.dailyOutputTrend && item.dailyOutputTrend != 0 ? this.multipliedByHundred(item.dailyOutputTrend) + '%' : item.dailyOutputTrend == 0 ? 0 : null
-              item.originalGlassStatisticsTrend = item.dailyOutputTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
+              item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
-              item.actualProductTrend = item.dailyOutputTrend &&  item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
+              item.actualProductTrend = item.actualProductTrend &&  item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
-              item.originalGlassPassTrend = item.dailyOutputTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
+              item.originalGlassPassTrend = item.originalGlassPassTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
             }
           })
         })

src/views/report/glass/month.vue

@@ -57,7 +57,7 @@ export default {
 	},
   created() {
     this.getCurrentMonthFirst()
-    this.getDict()
+    // this.getDict()
     this.getDataList()
 	},
 	methods: {
@@ -98,6 +98,8 @@ export default {
     },
 		// 获取数据列表
     async getDataList() {
+      const res = await getCorePLList()
+      this.proLineList = res.data;
       this.dataListLoading = true;
       if (this.listQuery.reportTime.length == 0) {
         this.$message({
@@ -129,9 +131,9 @@ export default {
               //   item.dailyOutputTrend = null
               // }
               item.dailyOutputTrend = item.dailyOutputTrend && item.dailyOutputTrend != 0 ? this.multipliedByHundred(item.dailyOutputTrend) + '%' : item.dailyOutputTrend == 0 ? 0 : null
-              item.originalGlassStatisticsTrend = item.dailyOutputTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
+              item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
-              item.actualProductTrend = item.dailyOutputTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
+              item.actualProductTrend = item.actualProductTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
-              item.originalGlassPassTrend = item.dailyOutputTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
+              item.originalGlassPassTrend = item.originalGlassPassTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
             }
           })
         })

src/views/report/glass/weekly.vue

@@ -86,23 +86,23 @@ export default {
 				},
 			],
 		};
-	},
+  },
+  created () {
+    // this.getDict()
+  },
 	mounted() {
 		// const day = new Date().getDay()
     // console.log('周四', day)
     this.getCurrentWeekStartTimeAndEndTime()
 		// this.changeTime(new Date(new Date().getTime() - day * 24 * 60 * 60 * 1000))
-    this.getDict()
     this.getDataList()
 	},
 	methods: {
-		async getDict() {
+		// async getDict() {
-			// 产线列表
+		// 	// 产线列表
-			await getCorePLList().then(res => {
+
-				this.proLineList = res.data;
+
-				// this.getDataList()
+    // },
-			});
-    },
     getCurrentWeekStartTimeAndEndTime() {
       this.reportTime = new Date()
       var weekday = new Array(7);
@@ -187,6 +187,8 @@ export default {
     },
 		// 获取数据列表
     async getDataList() {
+      const res = await getCorePLList()
+      this.proLineList = res.data;
       this.dataListLoading = true;
       if (this.listQuery.reportTime.length == 0) {
         this.$message({
@@ -218,9 +220,9 @@ export default {
               //   item.dailyOutputTrend = null
               // }
               item.dailyOutputTrend = item.dailyOutputTrend && item.dailyOutputTrend != 0 ? this.multipliedByHundred(item.dailyOutputTrend) + '%' : item.dailyOutputTrend == 0 ? 0 : null
-              item.originalGlassStatisticsTrend = item.dailyOutputTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
+              item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
-              item.actualProductTrend = item.dailyOutputTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
+              item.actualProductTrend = item.actualProductTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
-              item.originalGlassPassTrend = item.dailyOutputTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
+              item.originalGlassPassTrend = item.originalGlassPassTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
             }
           })
         })

src/views/report/glass/year.vue

@@ -53,7 +53,7 @@ export default {
 		};
 	},
   created() {
-		this.getDict()
+		// this.getDict()
   },
   mounted () {
     this.getCurrentYearFirst()
@@ -98,6 +98,8 @@ export default {
     },
 		// 获取数据列表
     async getDataList() {
+      const res = await getCorePLList()
+      this.proLineList = res.data;
       this.dataListLoading = true;
       if (this.listQuery.reportTime.length == 0) {
         this.$message({
@@ -129,9 +131,9 @@ export default {
               //   item.dailyOutputTrend = null
               // }
               item.dailyOutputTrend = item.dailyOutputTrend && item.dailyOutputTrend != 0 ? this.multipliedByHundred(item.dailyOutputTrend) + '%' : item.dailyOutputTrend == 0 ? 0 : null
-              item.originalGlassStatisticsTrend = item.dailyOutputTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
+              item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
-              item.actualProductTrend = item.dailyOutputTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
+              item.actualProductTrend = item.actualProductTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
-              item.originalGlassPassTrend = item.dailyOutputTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
+              item.originalGlassPassTrend = item.originalGlassPassTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
             }
           })
         })

src/views/socialLogin.vue

@@ -83,8 +83,8 @@ export default {
       captchaEnable: true,
       loginForm: {
         loginType: "uname",
-        username: "admin",
+        username: "",
-        password: "admin123",
+        password: "",
         rememberMe: false,
         captchaVerification: "",
       },
@@ -140,12 +140,12 @@ export default {
       this.$refs.verify.show()
     },
     getCookie() {
-      const username = getUsername();
+      // const username = getUsername();
-      const password = getPassword();
+      // const password = getPassword();
       const rememberMe = getRememberMe();
       this.loginForm = {
-        username: username ? username : this.loginForm.username,
+        username: this.loginForm.username,
-        password: password ? password : this.loginForm.password,
+        password: this.loginForm.password,
         rememberMe: rememberMe ? getRememberMe() : false,
         loginType: this.loginForm.loginType,
       };

src/websocket/websocket.js

@@ -42,7 +42,7 @@ export function WsConnect(url, agentData, successCallback, errCallback) {
       this.lockReconnect = true;
       this.wsCreateHandler && clearTimeout(this.wsCreateHandler);
       // 关闭心跳检查
-      // heartCheck.stop();
+      heartCheck.stop();
     }
   };
   const initWsEventHandle = () => {
@@ -50,13 +50,13 @@ export function WsConnect(url, agentData, successCallback, errCallback) {
       // 连接成功
       this.wsObj.onopen = (event) => {
         onWsOpen(event);
-        // heartCheck.start();
+        heartCheck.start();
       };
 
       // 监听服务器端返回的信息
       this.wsObj.onmessage = (event) => {
         onWsMessage(event);
-        // heartCheck.start();
+        heartCheck.start();
       };
 
       this.wsObj.onclose = (event) => {
@@ -123,7 +123,7 @@ export function WsConnect(url, agentData, successCallback, errCallback) {
     if (this.lockReconnect) {
       return;
     }
-    writeToScreen("3秒后重连");
+    writeToScreen("5秒后重连");
     this.lockReconnect = true;
     // 没连接上会一直重连，设置延迟避免请求过多
     this.wsCreateHandler && clearTimeout(this.wsCreateHandler);
@@ -132,10 +132,40 @@ export function WsConnect(url, agentData, successCallback, errCallback) {
       this.createWebSoket();
       this.lockReconnect = false;
       writeToScreen("重连完成");
-    }, 3000);
+    }, 5000);
   };
 
-  // 心跳检查（看看websocket是否还在正常连接中）
+  // 心跳检查（看看websocket是否还在正常连接中，不需要服务端返回，单向的）
+  let _this = this
+  let heartCheck = {
+    timeout: 55000,
+    timeoutObj: null,
+    // 重启
+    reset() {
+      clearTimeout(this.timeoutObj);
+      this.start();
+    },
+    // 停止
+    stop() {
+      clearTimeout(this.timeoutObj);
+    },
+    // 开启定时器
+    start() {
+      this.timeoutObj && clearTimeout(this.timeoutObj);
+      this.timeoutObj = setTimeout(() => {
+        writeToScreen("心跳检查，发送ping到后台");
+        try {
+          const datas = { ping: true };
+          _this.wsObj.send(JSON.stringify(datas));
+        } catch (err) {
+          writeToScreen("发送ping异常");
+        }
+      }, this.timeout);
+    },
+  };
+
+
+  // 心跳检查（看看websocket是否还在正常连接中,和服务端通信，双向的）
   // let heartCheck = {
   //   timeout: 15000,
   //   timeoutObj: null,
@@ -160,7 +190,7 @@ export function WsConnect(url, agentData, successCallback, errCallback) {
   //       writeToScreen("心跳检查，发送ping到后台");
   //       try {
   //         const datas = { ping: true };
-  //         this.wsObj.send(JSON.stringify(datas));
+  //         _this.wsObj.send(JSON.stringify(datas));
   //       } catch (err) {
   //         writeToScreen("发送ping异常");
   //       }

src/websocket/wsInterface.js

@@ -6,28 +6,33 @@ import store from "@/store";
 const timestr = new Date().getTime()
 const dcsConn = new WsConnect(
   // websocket地址
-  process.env.VUE_APP_Socket_Dcs_API + '/xc-screen/websocket/dcsmsg'+timestr,
+  process.env.VUE_APP_Socket_Dcs_API + '/xc-screen/websocket/dcsmsg' + timestr,
   // 传递给后台的数据
   '',
   (data) => {
     // console.log('dcs成功的回调函数, 接收到的data数据: ', data)
-    let msgData = JSON.parse(data)
+    let msgData = {}
+    try {
+      msgData = JSON.parse(data)
+    } catch (error) {
+      console.log("websocket: [unable to msgData] :  ", data);
+    }
     if (msgData == null) return;
     switch (msgData?.type) {
       case "FanFrequencyInfo": {
-        store.dispatch({type: "websocket/setFanFrequencyInfo", payload:msgData.data.FanFrequencyInfo})
+        store.dispatch({ type: "websocket/setFanFrequencyInfo", payload: msgData.data.FanFrequencyInfo })
         break;
       }
       case "KilnInfo": {
-        store.dispatch({type: "websocket/setKilnInfo", payload: msgData.data})
+        store.dispatch({ type: "websocket/setKilnInfo", payload: msgData.data })
         break;
       }
       case "GasInfo": {
-        store.dispatch({type: "websocket/setGasInfo", payload: msgData.data})
+        store.dispatch({ type: "websocket/setGasInfo", payload: msgData.data })
         break;
       }
       case "SumGasInfo": {
-        store.dispatch({type: "websocket/setSumGasInfo", payload: msgData.data})
+        store.dispatch({ type: "websocket/setSumGasInfo", payload: msgData.data })
         break;
       }
       default:
@@ -39,16 +44,20 @@ const dcsConn = new WsConnect(
 )
 // ISRA
 const mesIsra = new WsConnect(
-  process.env.VUE_APP_Socket_API + '/websocket/message?userId=KILN'+timestr,
+  process.env.VUE_APP_Socket_API + '/websocket/message?userId=KILN' + timestr,
   '',
   (data) => {
     // console.log('mes ISRA成功的回调函数, 接收到的data数据: ', data)
-    let msgData = JSON.parse(data)
+    let msgData = {}
-    // console.log(msgData)
+    try {
+      msgData = JSON.parse(data)
+    } catch (error) {
+      console.log("websocket: [unable to msgData] :  ", data);
+    }
     if (msgData == null) return;
     switch (msgData?.type) {
       case "israKiln": {
-        store.dispatch({type: "websocket/setIsraKiln", payload:msgData.detData.dayStatistic})
+        store.dispatch({ type: "websocket/setIsraKiln", payload: msgData.detData.dayStatistic })
         break;
       }
       default:
@@ -61,15 +70,20 @@ const mesIsra = new WsConnect(
 
 // 原料 MA
 const mesMA = new WsConnect(
-  process.env.VUE_APP_Socket_API + '/websocket/message?userId=MA'+timestr,
+  process.env.VUE_APP_Socket_API + '/websocket/message?userId=MA' + timestr,
   '',
   (data) => {
     // console.log('mes 原料成功的回调函数, 接收到的data数据: ', data)
-    let msgData = JSON.parse(data)
+    let msgData = {}
+    try {
+      msgData = JSON.parse(data)
+    } catch (error) {
+      console.log("websocket: [unable to msgData] :  ", data);
+    }
     if (msgData == null) return;
     switch (msgData?.type) {
       case "material": {
-        store.dispatch({type: "websocket/setMaterial", payload:msgData.data})
+        store.dispatch({ type: "websocket/setMaterial", payload: msgData.data })
         break;
       }
       default:
@@ -82,25 +96,30 @@ const mesMA = new WsConnect(
 // 能耗 EN
 const mesEN = new WsConnect(
   // websocket地址
-  process.env.VUE_APP_Socket_API + '/websocket/message?userId=ENERGY'+timestr,
+  process.env.VUE_APP_Socket_API + '/websocket/message?userId=ENERGY' + timestr,
   // 传递给后台的数据
   '',
   // 成功拿到后台返回的数据的回调函数
   (data) => {
     // console.log('mes 能耗成功的回调函数, 接收到的data数据: ', data)
-    let msgData = JSON.parse(data)
+    let msgData = {}
+    try {
+      msgData = JSON.parse(data)
+    } catch (error) {
+      console.log("websocket: [unable to msgData] :  ", data);
+    }
     if (msgData == null) return;
     switch (msgData?.type) {
       case "EnergyInfo": {
-        store.dispatch({type: "websocket/setEnergyInfo", payload:msgData.data})
+        store.dispatch({ type: "websocket/setEnergyInfo", payload: msgData.data })
         break;
       }
       case "EnergyTrend": {
-        store.dispatch({type: "websocket/setEnergyTrend", payload:msgData.data})
+        store.dispatch({ type: "websocket/setEnergyTrend", payload: msgData.data })
         break;
       }
       case "EnergyMonitoring": {
-        store.dispatch({type: "websocket/setEnergyMonitoring", payload:msgData.data})
+        store.dispatch({ type: "websocket/setEnergyMonitoring", payload: msgData.data })
         break;
       }
       default:
@@ -114,23 +133,30 @@ const mesEN = new WsConnect(
 // 烟气 GAS
 const mesGAS = new WsConnect(
   // websocket地址
-  process.env.VUE_APP_Socket_API + '/websocket/message?userId=GAS'+timestr,
+  process.env.VUE_APP_Socket_API + '/websocket/message?userId=GAS' + timestr,
   // 传递给后台的数据
   '',
   // 成功拿到后台返回的数据的回调函数
   (data) => {
     // console.log('mes 烟气成功的回调函数, 接收到的data数据: ', data)
-    let msgData = JSON.parse(data)
+    let msgData = {}
+    try {
+      msgData = JSON.parse(data)
+    } catch (error) {
+      console.log("websocket: [unable to msgData] :  ", data);
+    }
     if (msgData == null) return;
     switch (msgData?.type) {
       case "exhaustGas": {
-        store.dispatch({type: "websocket/setExhaustGasInfo", payload:msgData.realtime})
+        store.dispatch({ type: "websocket/setExhaustGasInfo", payload: msgData.realtime })
-        store.dispatch({type: "websocket/setExhaustGasChart", payload:{
+        store.dispatch({
-          dayTrend: msgData.dayTrend,
+          type: "websocket/setExhaustGasChart", payload: {
-          weekTrend: msgData.weekTrend,
+            dayTrend: msgData.dayTrend,
-          monthTrend: msgData.monthTrend,
+            weekTrend: msgData.weekTrend,
-          yearTrend: msgData.yearTrend,
+            monthTrend: msgData.monthTrend,
-        }})
+            yearTrend: msgData.yearTrend,
+          }
+        })
         break;
       }
       default:
@@ -145,23 +171,30 @@ const mesGAS = new WsConnect(
 // 缺陷分类/统计 IS
 const mesIS = new WsConnect(
   // websocket地址
-  process.env.VUE_APP_Socket_API + '/websocket/message?userId=IS'+timestr,
+  process.env.VUE_APP_Socket_API + '/websocket/message?userId=IS' + timestr,
   // 传递给后台的数据
   '',
   // 成功拿到后台返回的数据的回调函数
   (data) => {
     // console.log('mes 缺陷成功的回调函数, 接收到的data数据: ', data)
-    let msgData = JSON.parse(data)
+    let msgData = {}
+    try {
+      msgData = JSON.parse(data)
+    } catch (error) {
+      console.log("websocket: [unable to msgData] :  ", data);
+    }
     if (msgData == null) return;
     switch (msgData?.type) {
       case "isra": {
-        store.dispatch({type: "websocket/setDefectChart", payload:{
+        store.dispatch({
-          checkType: msgData.detData.checkType,
+          type: "websocket/setDefectChart", payload: {
-          dayStatistic: msgData.detData.dayStatistic,
+            checkType: msgData.detData.checkType,
-          weekStatistic: msgData.detData.weekStatistic,
+            dayStatistic: msgData.detData.dayStatistic,
-          monthStatistic: msgData.detData.monthStatistic,
+            weekStatistic: msgData.detData.weekStatistic,
-          yearStatistic: msgData.detData.yearStatistic,
+            monthStatistic: msgData.detData.monthStatistic,
-        }})
+            yearStatistic: msgData.detData.yearStatistic,
+          }
+        })
         break;
       }
       default:
@@ -176,29 +209,34 @@ const mesIS = new WsConnect(
 // 深加工生产运行驾驶舱（除能源） SJG
 const mesSJG = new WsConnect(
   // websocket地址
-  process.env.VUE_APP_Socket_API + '/websocket/message?userId=SJG'+timestr,
+  process.env.VUE_APP_Socket_API + '/websocket/message?userId=SJG' + timestr,
   // 传递给后台的数据
   '',
   // 成功拿到后台返回的数据的回调函数
   (data) => {
     // console.log('mes 产线产量及良品率成功的回调函数, 接收到的data数据: ', data)
-    let msgData = JSON.parse(data)
+    let msgData = {}
+    try {
+      msgData = JSON.parse(data)
+    } catch (error) {
+      console.log("websocket: [unable to msgData] :  ", data);
+    }
     if (msgData == null) return;
     switch (msgData?.type) {
       case "productline": {
-        store.dispatch({type: "websocket/setProductline", payload:msgData.detData})
+        store.dispatch({ type: "websocket/setProductline", payload: msgData.detData })
         break;
       }
       case "equipment": {
-        store.dispatch({type: "websocket/setSJGEq", payload:msgData.detData})
+        store.dispatch({ type: "websocket/setSJGEq", payload: msgData.detData })
         break;
       }
       case "order": {
-        store.dispatch({type: "websocket/setWorkOrder", payload:msgData.detData})
+        store.dispatch({ type: "websocket/setWorkOrder", payload: msgData.detData })
         break;
       }
       case "defectSum": {
-        store.dispatch({type: "websocket/setDefectSum", payload:msgData.detData})
+        store.dispatch({ type: "websocket/setDefectSum", payload: msgData.detData })
         break;
       }
       default:
@@ -213,18 +251,23 @@ const mesSJG = new WsConnect(
 // 订单完成情况 OV
 const mesOV = new WsConnect(
   // websocket地址
-  process.env.VUE_APP_Socket_API + '/websocket/message?userId=OV'+timestr,
+  process.env.VUE_APP_Socket_API + '/websocket/message?userId=OV' + timestr,
   // 'ws://192.168.0.33:48082/websocket/message?userId=OV'+timestr,
   // 传递给后台的数据
   '',
   // 成功拿到后台返回的数据的回调函数
   (data) => {
     // console.log('mes 产线产量及良品率成功的回调函数, 接收到的data数据: ', data)
-    let msgData = JSON.parse(data)
+    let msgData = {}
+    try {
+      msgData = JSON.parse(data)
+    } catch (error) {
+      console.log("websocket: [unable to msgData] :  ", data);
+    }
     if (msgData == null) return;
     switch (msgData?.type) {
       case "order": {
-        store.dispatch({type: "websocket/setOrder", payload:msgData.detData})
+        store.dispatch({ type: "websocket/setOrder", payload: msgData.detData })
         break;
       }
       default:
@@ -239,35 +282,39 @@ const mesOV = new WsConnect(
 // 本日生产良品率 CUTTING
 const mesCUTTING = new WsConnect(
   // websocket地址
-  process.env.VUE_APP_Socket_API + '/websocket/message?userId=CUTTING'+timestr,
+  process.env.VUE_APP_Socket_API + '/websocket/message?userId=CUTTING' + timestr,
   // 传递给后台的数据
   '',
   // 成功拿到后台返回的数据的回调函数
   (data) => {
     // console.log('mes 产线产量及良品率成功的回调函数, 接收到的data数据: ', data)
-    let msgData = JSON.parse(data)
+    let msgData = {}
+    try {
+      msgData = JSON.parse(data)
+    } catch (error) {
+      console.log("websocket: [unable to msgData] :  ", data);
+    }
     if (msgData == null) return;
-    console.log(msgData)
     switch (msgData?.type) {
       case "cutting": {
         if (msgData?.name === 'table') {
-          store.dispatch({type: "websocket/setYieldRateTable", payload:msgData.data})
+          store.dispatch({ type: "websocket/setYieldRateTable", payload: msgData.data })
           return
         }
         if (msgData?.dateType === 'day') {
-          store.dispatch({type: "websocket/setCutChartDay", payload:msgData.detData})
+          store.dispatch({ type: "websocket/setCutChartDay", payload: msgData.detData })
           return
         }
         if (msgData?.dateType === 'weekly') {
-          store.dispatch({type: "websocket/setCutChartWeek", payload:msgData.detData})
+          store.dispatch({ type: "websocket/setCutChartWeek", payload: msgData.detData })
           return
         }
         if (msgData?.dateType === 'month') {
-          store.dispatch({type: "websocket/setCutChartMonth", payload:msgData.detData})
+          store.dispatch({ type: "websocket/setCutChartMonth", payload: msgData.detData })
           return
         }
         if (msgData?.dateType === 'year') {
-          store.dispatch({type: "websocket/setCutChartYear", payload:msgData.detData})
+          store.dispatch({ type: "websocket/setCutChartYear", payload: msgData.detData })
           return
         }
         break;