.env.dev

@@ -13,11 +13,7 @@ VUE_APP_TITLE = MES系统
 
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://100.64.0.26:48082'
-
 # VUE_APP_BASE_API = 'http://192.168.0.33:48082'
-
-# VUE_APP_BASE_API = 'http://10.70.2.2:8080'
-
 # VUE_APP_BASE_API = 'http://192.168.4.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.49:48082'
@@ -30,7 +26,7 @@ VUE_APP_TITLE = MES系统
 
 VUE_APP_BASE_API = 'http://100.64.0.23:48082'
 # 积木报表指向地址
-VUE_APP_JIMU_API = 'http://10.70.2.22:8080'
+VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.prod

@@ -15,11 +15,11 @@ VUE_APP_TITLE = MES系统
 VUE_APP_BASE_API = '/prod-api'
 
 # 积木报表指向地址
-VUE_APP_JIMU_API = 'http://10.70.2.2:8080'
+VUE_APP_JIMU_API = 'http://10.70.2.22:8080'
 
 
 # 根据服务器或域名修改
-PUBLIC_PATH = ''
+PUBLIC_PATH = 'http://10.70.2.32'
 
 # 二级部署路径
 # VUE_APP_APP_NAME ='yudao-admin'

src/views/OperationalOverview/coldBoard.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2023-12-29 16:41:18
+ * @LastEditTime: 2023-12-28 11:52:08
  * @Description:
 -->
 <template>
@@ -83,14 +83,10 @@
               <top-radio-group />
             </div> -->
             <!-- 像下面这样表格里的limit值，也许可以用js动态计算出来 -->
-            <el-col :span="6">
+            <el-col :span="12">
-              <base-table1 :page="1" :limit="9" :show-index="false" :table-config="EqMonitoringPropsFun"
+              <base-table1 :page="1" :limit="9" :show-index="false" :table-config="EqMonitoringProps"
                 :table-data="funList" />
             </el-col>
-            <el-col :span="6">
-              <base-table1 :page="1" :limit="9" :show-index="false" :table-config="EqMonitoringPropsFun"
-                :table-data="annealFunList" />
-            </el-col>
             <el-col :span="12" style="float: right;">
               <base-table1 :page="1" :limit="9" :show-index="false" :table-config="EqMonitoringProps"
                 :table-data="realEqList" />
@@ -136,15 +132,9 @@ import doubleYChart from './components/doubleYChart '
 // import elementResizeDetectorMaker from 'element-resize-detector';
 // var erd = elementResizeDetectorMaker(); //创建实例
 // let resizeFun = null
-import { parseTime } from '../core/mixins/code-filter';
-
 
 import LinearBarChart from './components/linearBarChart'
 const qualityYearTableProps= []
-const EqMonitoringPropsFun = [
-  { prop: 'equipmentName', label: '设备名称' },
-  { prop: 'status', label: '运行状态', width: 80}
-]
 const EqMonitoringProps = [
   { prop: 'productLine', label: '产线' },
   { prop: 'equipmentName', label: '设备名称' },
@@ -162,15 +152,12 @@ const EqMonitoringProps = [
   },
 ]
 const cutProps = [
-  { prop: 'lineName', label: '产线', width: 50 },
+  { prop: 'lineName', label: '产线' },
-  {
+  { prop: 'time', label: '时间' },
-    prop: 'time', label: '时间',
-    filter: parseTime
-  },
   { prop: 'size', label: '规格' },
-  { prop: 'productArea', label: '良品面积', width: 80 },
+  { prop: 'productArea', label: '良品面积' },
-  { prop: 'wasteArea', label: '废片面积', width: 80 },
+  { prop: 'wasteArea', label: '废片面积' },
-  { prop: 'product', label: '良品率', width: 80 },
+  { prop: 'product', label: '良品率' },
 ]
 const cxNameList = ['周一', '周二', '周三', '周四', '周五']
 
@@ -254,7 +241,6 @@ export default {
       beilv: 1,
       value: 100,
       EqMonitoringProps,
-      EqMonitoringPropsFun,
       realEqList:[],
       qualityYearTableProps,
       ISRATableProps,
@@ -272,13 +258,9 @@ export default {
       clientWidth: 0,
       containerWidth: 111111,
       isFullScreen: false,
-      cutWsData: {},
-      funWsData: {},
-      SJGWsData: {},
       // orderProcessList: [],
       dateType: '0',
       funList:[],
-      annealFunList: [],
       queryParams: {
         pageNo: 1,
         pageSize: 10,
@@ -321,10 +303,7 @@ export default {
     this.init()
   },
   mounted() {
-    this.funInitWebSocket()
+    this.initWebSocket()
-    this.CutInitWebSocket()
-    this.SJGInitWebSocket()
-
     this.getTimes()
     const _this = this;
     _this.beilv2 = document.documentElement.clientWidth / 1920
@@ -347,6 +326,7 @@ export default {
     //   this.beilv2 = window.innerWidth / 1920
     // })
     // erd.listenTo(document, (element) => {
+    //   console.log(element.offsetWidth)
     //   this.beilv2 = element.offsetWidth / 1920
 
     //   // var width = element.offsetWidth;
@@ -364,6 +344,7 @@ export default {
       // 执行查询
       // let data = '{ "data": { "FanFrequencyInfo": { "1#10处拐角冷却风机": "0", "1#L型吊墙冷却风机": "0", "1#助燃风机": "44.8", "1#澄清带池壁风机": "40", "1#融化带池壁风机": "43", "1#钢碹碴小炉垛风机": "48", "2#10处拐角冷却风机": "50", "2#L型吊墙冷却风机": "49.7", "2#助燃风机": "0", "2#澄清带池壁风机": "0", "2#融化带池壁风机": "0", "2#钢碹碴小炉垛风机": "48", "3#澄清带池壁风机": "0", "3#融化带池壁风机": "0", "4#澄清带池壁风机": "40", "4#融化带池壁风机": "43" } }, "type": "FanFrequencyInfo" }'
       // let obj = JSON.parse(data)
+      // console.log('data', obj.data.FanFrequencyInfo)
       // // for()
       // let arr = []
       // for (let i in obj.data.FanFrequencyInfo) {
@@ -372,12 +353,13 @@ export default {
       //     status: obj.data.FanFrequencyInfo[i]
       //   })
       // }
-      // this.funList = arr``
+      this.funList = arr``
       this.$axios.get(
         '/monitoring/equipment-monitor/realtime-page',
         'get',
         this.queryParams
       ).then((res) => {
+        console.log(res);
         this.realEqList = res.data.list;
         // this.total = response.data.total;
         // this.loading = false;
@@ -407,14 +389,15 @@ export default {
       //拼接格式化当前时间
       this.times = year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds;
     },
-    SJGInitWebSocket() {
+    initWebSocket() {
       if (typeof (WebSocket) === 'undefined') {
         alert('您的浏览器不支持WebSocket')
       } else {
         // const wsUrl = 'ws://192.168.1.74:48080/websocket/message?userId=EN111'
         // const wsUrl = 'ws://192.168.1.104:48082/websocket/message?userId=SJG'
         let date = new Date().valueOf()
-        const SJGWsUrl = `ws://10.70.2.2:8080/websocket/message?userId=COLD${date}`
+        console.log(date);
+        const SJGWsUrl = `ws://192.168.0.33:48082/websocket/message?userId=COLD${date}`
         this.SJGWebsocket = new WebSocket(SJGWsUrl)
         // 监听 WebSocket 连接
         this.SJGWebsocket.onopen = this.SJGWebsocketOnOpen
@@ -424,16 +407,7 @@ export default {
         this.SJGWebsocket.onmessage = this.SJGWebsocketOnMessage
         // 监听 webSocket 断开信息
         this.SJGWebsocket.onclose = this.SJGWebsocketClose
-      }
+        const cutWsUrl = `ws://192.168.0.33:48082/websocket/message?userId=CUTTING${date}`
-    },
-    CutInitWebSocket() {
-      if (typeof (WebSocket) === 'undefined') {
-        alert('您的浏览器不支持WebSocket')
-      } else {
-        // const wsUrl = 'ws://192.168.1.74:48080/websocket/message?userId=EN111'
-        // const wsUrl = 'ws://192.168.1.104:48082/websocket/message?userId=SJG'
-        let date = new Date().valueOf()
-        const cutWsUrl = `ws://10.70.2.2:8080/websocket/message?userId=CUTTING${date}`
 
         this.cutWebsocket = new WebSocket(cutWsUrl)
         // 监听 WebSocket 连接
@@ -444,15 +418,6 @@ export default {
         this.cutWebsocket.onmessage = this.cutWebsocketOnMessage
         // 监听 webSocket 断开信息
         this.cutWebsocket.onclose = this.cutWebsocketClose
-      }
-    },
-    funInitWebSocket() {
-      if (typeof (WebSocket) === 'undefined') {
-        alert('您的浏览器不支持WebSocket')
-      } else {
-        // const wsUrl = 'ws://192.168.1.74:48080/websocket/message?userId=EN111'
-        // const wsUrl = 'ws://192.168.1.104:48082/websocket/message?userId=SJG'
-        let date = new Date().valueOf()
         const funWsUrl = `ws://10.70.180.10:8081/xc-screen/websocket/${date}`
         this.funWebsocket = new WebSocket(funWsUrl)
         // 监听 WebSocket 连接
@@ -463,54 +428,64 @@ export default {
         this.funWebsocket.onmessage = this.funWebsocketOnMessage
         // 监听 webSocket 断开信息
         this.funWebsocket.onclose = this.funWebsocketClose
+        // const wsUrl = 'ws://192.168.0.33:48082/websocket/message?userId=EN111'
+        // 实例化 WebSocket
+        // this.websocket = new WebSocket(wsUrl)
+        // // 监听 WebSocket 连接
+        // this.websocket.onopen = this.websocketOnOpen
+        // // 监听 WebSocket 错误信息
+        // this.websocket.onerror = this.websocketOnError
+        // // 监听 WebSocket 消息
+        // this.websocket.onmessage = this.websocketOnMessage
+        // // 监听 webSocket 断开信息
+        // this.websocket.onclose = this.websocketClose
       }
     },
     funWebsocketOnOpen() {
       console.log('socket连接成功')
+      // console.log(this.SJGWebsocket.onmessage);
       this.SJGWebsocket.onmessage()
     },
     // 连接建立失败重连
     funWebsocketOnError(e) {
-      this.funInitWebSocket()
+      console.log('222222', e)
+      this.initWebSocket()
     },
     // 数据接收
     funWebsocketOnMessage(e) {
-      this.funWsData = e?.data ? JSON.parse(e?.data) : {}
+      // console.log(1111, e)
-      // FanInfo
+      // console.log(this.wsData)
-      if (this.funWsData.type === 'AnnealFanInfo') {
+      // console.log('22222', this.wsData.data)
-        let arr = []
+      this.wsData = JSON.parse(e.data)
-        for (let i in this.funWsData.data.annealFanInfo) {
+      if (this.wsData.type === 'FanFrequencyInfo') {
-          arr.push({
+        // let arr = []
-            equipmentName: i,
+        // for (let i in this.wsData.FanFrequencyInfo) {
-            status: this.funWsData.data.annealFanInfo[i]
+        //   arr.push({
-          })
+        //     equipmentName: i,
-        }
+        //     status: obj.data.FanFrequencyInfo[i]
-        this.annealFunList = arr
+        //   })
-      }
+        // }
-      if (this.funWsData.type === 'FanInfo') {
+        // this.funList = arr
-        let arr = []
-        for (let i in this.funWsData.data.fanInfo) {
-          arr.push({
-            equipmentName: i,
-            status: this.funWsData.data.fanInfo[i]
-          })
-        }
-        this.funList = arr
       }
     },
     cutWebsocketOnOpen() {
       console.log('socket连接成功')
+      // console.log(this.SJGWebsocket.onmessage);
       this.SJGWebsocket.onmessage()
     },
     // 连接建立失败重连
     cutWebsocketOnError(e) {
-      this.CutInitWebSocket()
+      console.log('11111', e)
+      this.initWebSocket()
     },
     // 数据接收
     cutWebsocketOnMessage(e) {
-      this.cutWsData = e?.data ? JSON.parse(e?.data) : {}
+      // console.log(1111, e)
-      if (this.cutWsData.type === 'cutting' && this.cutWsData.name === 'table') {
+      this.wsData = JSON.parse(e.data)
-        this.cutTableDataList = this.cutWsData.productHourData.map((ele, index) => {
+      console.log(this.wsData)
+      // console.log('22222', this.wsData.data)
+      if (this.wsData.type === 'cutting' && this.wsData.name === 'table' ) {
+        this.cutTableDataList = this.wsData.productHourData.map((ele, index) => {
           // if (ele.progressRate != 1) {
           return {
             id: ele.id,
@@ -519,12 +494,13 @@ export default {
             size: ele.size,
             productArea: ele.productArea + '㎡',
             wasteArea: ele.wasteArea + '㎡',
-            product: (ele.product * 100).toFixed(2) + '%'
+            product: (ele.product *100).toFixed + '%'
 
           }
           // }
         });
-      } else if (this.cutWsData.type === 'cutting' && this.cutWsData.name === 'chart' && this.cutWsData.dateType === 'day') {
+        // console.log(this.orderList)
+      } else if (this.wsData.type === 'cutting' && this.wsData.name === 'chart') {
         let nameList = []
         let nameWasteList = []
         let topNameList = []
@@ -532,35 +508,41 @@ export default {
         let wasteList = []
         let sumAreaList = []
         let yieldList = []
-        // this.cutTableDataList = 
+        this.cutTableDataList = this.wsData.detData.forEach((ele, index) => {
-        this.cutWsData.coldDetData.forEach((ele, index) => {
           nameList.push(ele.lineName)
-          topNameList.push('产线: ' + ele.lineName + '   ' + '总面积:' + ele.sumArea)
+          topNameList.push(ele.lineName + '   ' + '总面积' + ele.sumArea)
           productList.push(ele.productArea)
           wasteList.push(ele.wastArea)
-          nameWasteList.push('缺陷面积:' + ele.wastArea)
+          nameWasteList.push('缺陷面积:'+ele.wastArea)
-          sumAreaList.push(ele.sumArea)
-          yieldList.push((ele.yield *100).toFixed(3))
         })
         this.$refs.pileChart.initChart(nameList, topNameList, nameWasteList, productList, wasteList)
         this.$refs.productChart.initChart(nameList, yieldList, sumAreaList)
+        // this.$refs.pileChart.initWebSocket
+        // console.log(this.orderList)
       }
     },
     SJGWebsocketOnOpen() {
       console.log('socket连接成功')
+      // console.log(this.SJGWebsocket.onmessage);
       this.SJGWebsocket.onmessage()
     },
     // 连接建立失败重连
     SJGWebsocketOnError(e) {
-      this.SJGInitWebSocket()
+      console.log('11111', e)
+      this.initWebSocket()
     },
     // 数据接收
     SJGWebsocketOnMessage(e) {
+      console.log(e);
+      // console.log(1111, e)
       // let data = { "data": { "FanFrequencyInfo": { "1#10处拐角冷却风机": "0", "1#L型吊墙冷却风机": "0", "1#助燃风机": "44.8", "1#澄清带池壁风机": "40", "1#融化带池壁风机": "43", "1#钢碹碴小炉垛风机": "48", "2#10处拐角冷却风机": "50", "2#L型吊墙冷却风机": "49.7", "2#助燃风机": "0", "2#澄清带池壁风机": "0", "2#融化带池壁风机": "0", "2#钢碹碴小炉垛风机": "48", "3#澄清带池壁风机": "0", "3#融化带池壁风机": "0", "4#澄清带池壁风机": "40", "4#融化带池壁风机": "43" } }, "type": "FanFrequencyInfo" }
       // let obj = JSON.parse(data.data)
-      this.SJGWsData = e?.data ? JSON.parse(e?.data) : {}
+      // console.log(obj);
-      if (this.SJGWsData.type === 'isra') {
+      this.wsData = JSON.parse(e.data)
-        this.ISRAList = this.SJGWsData.detData.map((ele, index) => {
+      console.log(this.wsData)
+      // console.log('22222', this.wsData.data)
+      if (this.wsData.type === 'isra') {
+        this.ISRAList = this.wsData.detData.map((ele, index) => {
           // if (ele.progressRate != 1) {
           return {
             id: ele.id,
@@ -572,8 +554,66 @@ export default {
           }
           // }
         });
+        // console.log(this.orderList)
       }
     },
+    // 数据发送
+    // SJGWebsocketSend() {
+    //   this.websocket.send('11111')
+    // },
+    // // 关闭
+    // SJGWebsocketClose(e) {
+    //   console.log('WebSocket 断开连接', e)
+    // },
+    // // 连接建立之后执行send方法发送数据
+    // websocketOnOpen() {
+    //   console.log('socket连接成功')
+    //   this.websocket.onmessage()
+    // },
+    // // 连接建立失败重连
+    // websocketOnError(e) {
+    //   console.log('11111', e)
+    //   this.initWebSocket()
+    // },
+    // // 数据接收
+    // websocketOnMessage(e) {
+    //   console.log(1111, e)
+    //   this.wsData = JSON.parse(e.data)
+    //   // console.log('22222', this.wsData.data)
+    //   if (this.wsData.type === 'EnergyMonitoring') {
+    //     let EnergyNameList = []
+    //     this.wsData.data.forEach((ele) => {
+    //       EnergyNameList.push(ele.lineName)
+    //     })
+    //     this.EnergyMonitoringNameList = EnergyNameList
+    //     let EnergyDataList = []
+    //     this.wsData.data.forEach((ele) => {
+    //       EnergyDataList.push(ele.useQuantity
+    //         // {
+    //         //   type: 'bar',
+    //         //   data: ele.useQuantity,
+    //         //   barWidth: 6
+
+    //         // }
+    //       )
+    //     })
+    //     this.EnergyMonitoringList = EnergyDataList
+    //     console.log(EnergyDataList)
+    //     // console.log(this.EnergyMonitoringNameList)
+    //     // console.log(this.EnergyMonitoringList)
+    //     // this.$nextTick(() => {
+    //     this.$refs.EnergyMonitoringChart.initChart(this.EnergyMonitoringNameList, this.EnergyMonitoringList)
+    //     // })
+    //   }
+    // },
+    // // 数据发送
+    // websocketSend() {
+    //   this.websocket.send('11111')
+    // },
+    // // 关闭
+    // websocketClose(e) {
+    //   console.log('WebSocket 断开连接', e)
+    // },
     windowWidth(value) {
       this.clientWidth = value
       this.beilv2 = this.clientWidth / 1920

src/views/OperationalOverview/components/baseTable.vue

@@ -18,7 +18,7 @@
       <el-table-column
         prop="_pageIndex"
         label="序号"
-        :width="50"
+        :width="70"
         align="center"
       />
       <el-table-column

src/views/OperationalOverview/components/doubleYChart .vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-09-21 09:06:28
- * @LastEditTime: 2023-12-29 16:18:17
+ * @LastEditTime: 2023-12-27 18:28:45
  * @LastEditors: zhp
  * @Description:
 -->
@@ -60,6 +60,7 @@ export default {
   data() {
     return {
       chart: null,
+      nameList: [],
       series: [{
         type: 'bar',
         data: [],
@@ -137,7 +138,7 @@ export default {
           }
         },
         grid: {
-          left: "4%",
+          left: "3%",
           right: "4%",
           bottom: "3%",
           width: 'auto',
@@ -226,7 +227,7 @@ export default {
             },
             scale: true,
             type: 'value',
-            name: '产量/㎡', // y轴上方的单位
+            name: '产量/片', // y轴上方的单位
             nameTextStyle: {// y轴上方单位的颜色
               color: '#fff'
             },

src/views/OperationalOverview/components/pileBarChart.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-27 13:54:52
- * @LastEditTime: 2023-12-29 16:28:26
+ * @LastEditTime: 2023-12-27 19:47:27
  * @LastEditors: zhp
  * @Description:
 -->
@@ -93,50 +93,54 @@ export default {
     initChart(nameList, topNameList, nameWasteList, passRateList, wasteList) {
       // console.log(1)
       this.chart = echarts.init(document.getElementById(this.id))
-      let series = [
+      let series = [{
-        {
+        name: '成品面积',
-          // 辅助系列
-          name: '良品',
         type: 'bar',
         stack: 'total',
-          // silent: true,
+        // label: {
-          // itemStyle: {
+        //   show: true
-            color: '#0fdedb',
         // },
-          barWidth: 10,
+        emphasis: {
-          data: passRateList
+          focus: 'series'
+        },
+        data: passRateList,
+        itemStyle: {
+          normal: { color: '#2359ec' }
+        }
       },
       {
+        name: '废片面积',
         type: 'bar',
         stack: 'total',
-          name: '废品',
-          data: wasteList,
-          barWidth: 10,
-          // barWidth: 15,
         // label: {
-          //   position: [10, 10],
+        //   show: true
-          //   normal: {
-          //     position: [800, -24],
-          //     show: true,
-          //     textStyle: {
-          //       color: '#2359ec',
-          //       fontSize: 16,
-          //     },
-          //   },
         // },
+        emphasis: {
+          focus: 'series'
+        },
+        barWidth: 12,
+        data: wasteList,
+        itemStyle: {
+          normal: { color: '#745fe4' }
         }
-      ]
+      },]
       // for (i = 0; i < 5; i++) {
       //   series.push({
 
       //   })
       // }
+      const yAxisDataLeft = topNameList;
+      // const yAxisDataRight = ['服装', '矿产', '服务业', '建筑业', '金融业'];
+      const yAxisDataRight = nameWasteList
       this.chart.setOption({
-        legend: {
+        tooltip: {
-          textStyle: {
+          trigger: 'axis',
-            color: '#ffffff'
+          axisPointer: {
+            // Use axis to trigger tooltip
+            type: 'shadow' // 'shadow' as default; can also be 'line' or 'shadow'
           }
         },
+        // legend: {},
         grid: {
           left: '3%',
           right: '4%',
@@ -145,38 +149,43 @@ export default {
           height: 'auto',
           containLabel: true
         },
+        xAxis: {
+          type: 'value',
+          show: false, // 不显示坐标轴线、坐标轴刻度线和坐标轴上的文字
+          axisTick: {
+            show: false // 不显示坐标轴刻度线
+          },
+          axisLine: {
+            show: false, // 不显示坐标轴线
+          },
+          axisLabel: {
+            show: false, // 不显示坐标轴上的文字
+          },
+          splitLine: {
+            show: false // 不显示网格线
+          },
+        },
         yAxis: [
           {
-            type: 'category',
             inverse: true,
-            splitLine: {
+            data: yAxisDataLeft,
-              show: false
-            },
-            axisTick: {
-              show: false
-            },
-            axisLine: {
-              show: false
-            },
             axisLabel: {
               show: true,
               inside: true,
-              interval: 0, //横轴信息全部显
-              splitNumber: 50,
-              // boundaryGap: [20, 20],
               textStyle: {
                 color: '#ffffff',
-                verticalAlign: 'bottom',
                 fontSize: 12,
                 align: 'left',
-                padding: [0, 0, 15, -5]
+              },
+              formatter: '{value}\n{a|占位}\n{a|占位}',
+              rich: {
+                a: {
+                  color: 'transparent',
+                  lineHeight: 24,
+                }
               }
             },
-            data: topNameList
+            //offset: 30,
-          },
-          {
-            type: 'category',
-            inverse: true,
             splitLine: {
               show: false
             },
@@ -185,29 +194,40 @@ export default {
             },
             axisLine: {
               show: false
+            }
           },
+          {
+            inverse: false,
+            data: yAxisDataRight,
             axisLabel: {
-              show: true,
               inside: true,
-              interval: 0, //横轴信息全部显
-              splitNumber: 50,
-              // boundaryGap: [20, 20],
               textStyle: {
                 color: '#ffffff',
-                verticalAlign: 'bottom',
                 fontSize: 12,
                 align: 'right',
-                padding: [0, 0, 15, -5]
+              },
+              formatter: '{value}\n{a|占位}\n{a|占位}',
+              rich: {
+                a: {
+                  color: 'transparent',
+                  lineHeight: 24,
+                  fontFamily: 'digital'
+                }
               }
             },
-            data: nameWasteList
+            offset: 0,
+            splitLine: {
+              show: false
+            },
+            axisTick: {
+              show: false
+            },
+            axisLine: {
+              show: false
+            }
           }
         ],
-        xAxis: {
+        series: series
-          // max: 120,
-          show: false,
-        },
-        series:series
       })
     }
   }

src/views/OperationalOverview/processingBoard.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2023-12-29 15:15:50
+ * @LastEditTime: 2023-12-28 10:22:06
  * @Description:
 -->
 <template>
@@ -557,7 +557,6 @@ export default {
   mounted() {
     this.getList()
     this.initWebSocket()
-    this.SJGInitWebSocket()
     this.getTimes()
     const _this = this;
     _this.beilv2 = document.documentElement.clientWidth / 1920
@@ -598,14 +597,14 @@ export default {
         'get',
         this.queryParams
       ).then((res) => {
-        // console.log('11111', res);
+        console.log('11111', res);
         this.productLineList = res.data
       })
       this.$axios.get(
         'base/quality-inspection-record/dayStatistics',
         'get',
       ).then((res) => {
-        // console.log('11111', res);
+        console.log('11111', res);
         this.qualityMonthList = res.data
       })
     },
@@ -637,10 +636,21 @@ export default {
       if (typeof (WebSocket) === 'undefined') {
         alert('您的浏览器不支持WebSocket')
       } else {
-        const wsUrl = `ws://10.70.2.2:8080/websocket/message?userId=EN${date}`
+        const wsUrl = `ws://192.168.0.33:48082/websocket/message?userId=EN${date}`
         // const wsUrl = 'ws://192.168.1.104:48082/websocket/message?userId=SJG'
         let date = new Date().valueOf()
-        // const wsUrl = 'ws://10.70.2.2:8080/websocket/message?userId=EN111'
+        console.log(date);
+        const SJGWsUrl = `ws://192.168.0.33:48082/websocket/message?userId=SJG${date}`
+        this.SJGWebsocket = new WebSocket(SJGWsUrl)
+        // 监听 WebSocket 连接
+        this.SJGWebsocket.onopen = this.SJGWebsocketOnOpen
+        // 监听 WebSocket 错误信息
+        this.SJGWebsocket.onerror = this.SJGWebsocketOnError
+        // 监听 WebSocket 消息
+        this.SJGWebsocket.onmessage = this.SJGWebsocketOnMessage
+        // 监听 webSocket 断开信息
+        this.SJGWebsocket.onclose = this.SJGWebsocketClose
+        // const wsUrl = 'ws://192.168.0.33:48082/websocket/message?userId=EN111'
         // 实例化 WebSocket
         this.websocket = new WebSocket(wsUrl)
         // 监听 WebSocket 连接
@@ -653,26 +663,6 @@ export default {
         this.websocket.onclose = this.websocketClose
       }
     },
-    SJGInitWebSocket() {
-      if (typeof (WebSocket) === 'undefined') {
-        alert('您的浏览器不支持WebSocket')
-      } else {
-        // const wsUrl = `ws://10.70.2.2:8080/websocket/message?userId=EN${date}`
-        // const wsUrl = 'ws://192.168.1.104:48082/websocket/message?userId=SJG'
-        let date = new Date().valueOf()
-        // console.log(date);
-        const SJGWsUrl = `ws://10.70.2.2:8080/websocket/message?userId=SJG${date}`
-        this.SJGWebsocket = new WebSocket(SJGWsUrl)
-        // 监听 WebSocket 连接
-        this.SJGWebsocket.onopen = this.SJGWebsocketOnOpen
-        // 监听 WebSocket 错误信息
-        this.SJGWebsocket.onerror = this.SJGWebsocketOnError
-        // 监听 WebSocket 消息
-        this.SJGWebsocket.onmessage = this.SJGWebsocketOnMessage
-        // 监听 webSocket 断开信息
-        this.SJGWebsocket.onclose = this.SJGWebsocketClose
-      }
-    },
     SJGWebsocketOnOpen() {
       console.log('socket连接成功')
       console.log(this.SJGWebsocket.onmessage);
@@ -681,16 +671,16 @@ export default {
     // 连接建立失败重连
     SJGWebsocketOnError(e) {
       // console.log('11111', e)
-      this.SJGInitWebSocket()
+      this.initWebSocket()
     },
     // 数据接收
     SJGWebsocketOnMessage(e) {
       // console.log(1111, e)
-      this.SJGWsData = JSON.parse(e.data)
+      this.wsData = JSON.parse(e.data)
       // console.log(this.wsData.detData);
       // console.log('22222', this.wsData.data)
-      if (this.SJGWsData.type === 'order') {
+      if (this.wsData.type === 'order') {
-        this.orderList = this.SJGWsData.detData.map((ele, index) => {
+        this.orderList = this.wsData.detData.map((ele, index) => {
           if (ele.progressRate != 1) {
             return {
               id: ele.id,
@@ -700,8 +690,8 @@ export default {
           }
         });
         console.log(this.orderList)
-      } else if (this.SJGWsData.type === 'equipment') {
+      } else if (this.wsData.type === 'equipment') {
-        this.equipmentList = this.SJGWsData.detData.map((ele, index) => {
+        this.equipmentList = this.wsData.detData.map((ele, index) => {
           // if (ele.progressRate != 1) {
             return {
               id: ele.id,
@@ -712,16 +702,16 @@ export default {
             }
           // }
         });
-        // console.log(SJGWsData.orderList)
+        // console.log(this.orderList)
-      } else if (this.SJGWsData.type === 'productline') {
+      } else if (this.wsData.type === 'productline') {
-        // console.log(this.wsData.detData);
+        console.log(this.wsData.detData);
         let nameList = []
         let passRateList = []
         let outputNumList = []
 
         // console.log('2222222222', this.productLineList);
         this.productLineList.forEach((item) => {
-          this.SJGWsData.detData.forEach((ele) => {
+          this.wsData.detData.forEach((ele) => {
             if (item.id == ele.productionLineId) {
               nameList.push(item.name)
             }
@@ -730,11 +720,11 @@ export default {
         console.log(Array.from(new Set(nameList)))
         // progressRateList = EnergyNameList
         // let EnergyDataList = []
-        this.SJGWsData.detData.forEach((ele) => {
+        this.wsData.detData.forEach((ele) => {
           passRateList.push(ele.passRate *100
           )
         })
-        this.SJGWsData.detData.forEach((ele) => {
+        this.wsData.detData.forEach((ele) => {
           outputNumList.push(ele.outputNum
           )
         })

src/views/login.vue

@@ -47,7 +47,7 @@
 						向世界先进水平挑战，为人类社会文明做贡献
 					</p>
 				</div>
-				<!-- <video
+				<video
 					src="/static/videos/login.webm"
 					muted
 					autoplay
@@ -58,7 +58,7 @@
 						top: 28%;
 						width: 100%;
 						height: 70%;
-					"></video> -->
+					"></video>
 			</div>
 			<!-- 表单 -->
 			<div class="field">

src/views/specialEquipment/basic/FireFighthing.vue

@@ -170,12 +170,7 @@ export default {
 				{ width: 256, prop: 'code', label: '设备编码' },
 				{ prop: 'location', label: '位置' },
 				{ prop: 'responsiblePeopleName', label: '负责人' },
-				{
+				{ prop: 'dueTime', label: '有效期至' },
-					prop: 'dueDate',
-					label: '有效期至',
-					filter: (val) =>
-						val != null ? moment(val).format('yyyy-MM-DD HH:mm:ss') : '--',
-				},
 				{ prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
@@ -255,8 +250,8 @@ export default {
 				[
 					{
 						datetime: true,
-						label: '有效期',
+						label: '有效期至',
-						prop: 'dueDate',
+						prop: 'dueTime',
 						bind: { clearable: true },
 					},
 					{},

src/views/specialEquipment/maintain/Record.vue

@@ -195,21 +195,18 @@ export default {
 						{ id: 3, name: '特种设备' },
 					],
 					filterable: true,
-					defaultSelect: null
 				},
 				{
 					type: 'select',
 					label: '设备',
 					placeholder: '请选择设备',
 					param: 'equipmentId',
-					defaultSelect: null
 				},
 				{
 					type: 'select',
 					label: '计划名称',
 					placeholder: '请选择计划名称',
 					param: 'maintainPlanId',
-					defaultSelect: null
 				},
 				// 开始结束时间
 				{
@@ -223,7 +220,6 @@ export default {
 					endPlaceholder: '结束日期',
 					defaultTime: ['00:00:00', '23:59:59'],
 					param: 'startTime',
-					defaultSelect: null
 					// width: 350,
 				},
 				{
@@ -233,7 +229,6 @@ export default {
 						{ name: '是', id: 1 },
 						{ name: '否', id: 2 },
 					],
-					defaultSelect: null,
 					param: 'relatePlan',
 				},
 				{
@@ -439,16 +434,12 @@ export default {
 	created() {
 		this.initSearchBar();
 		if (this.$route.query) {
-			this.queryParams.specialType =
-				this.$route.query?.specialType ?? undefined;
 			this.queryParams.equipmentId =
 				this.$route.query?.equipmentId ?? undefined;
 			this.queryParams.maintainPlanId =
 				this.$route.query?.maintainPlanId ?? undefined;
 			this.queryParams.relatePlan = this.$route.query?.relatePlan ?? undefined;
 			this.queryParams.startTime = this.$route.query?.createTime ?? undefined;
-			this.searchBarFormConfig[0].defaultSelect =
-				this.$route.query.specialType ?? undefined;
 			this.searchBarFormConfig[1].defaultSelect =
 				this.$route.query.equipmentId ?? undefined;
 			this.searchBarFormConfig[2].defaultSelect =