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

.env.dev

@@ -1,7 +1,7 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2023-12-15 16:28:20
+ # @LastEditTime: 2023-12-18 13:35:00
  # @LastEditors: zhp
  # @Description:
 ###

src/views/OperationalOverview/coldBoard.vue

@@ -7,6 +7,8 @@
       }">
       <img src="../../assets/img/logo.png" style="width:1.1em;position:relative;top:.4em" alt="">
       许昌安彩冷端看板
+      <h3 class="unit">单位：河南汇融科技服务有限公司</h3>
+      <h3 class="time">{{ times }}</h3>
       <!-- <el-button type="text" class="title-button" :style="{ right: 33 + 'px', top: 37 + 'px' }"
         @click="changeFullScreen">
         <svg-icon v-if="isFullScreen" icon-class="unFullScreenView" />
@@ -616,6 +618,7 @@ export default {
       modelMonth: '',
       cplNameList,
       cplDataList,
+      times:'',
       plInput: {},
       plOutput: {},
       plRate: {},
@@ -658,7 +661,7 @@ export default {
     this.windowWidth(document.documentElement.clientWidth)
   },
   mounted() {
-    console.log(1111);
+    this.getTimes()
     const _this = this;
     _this.beilv2 = document.documentElement.clientWidth / 1920
     window.onresize = () => {
@@ -685,6 +688,30 @@ export default {
   //   removeEventListener('resize', resizeFun)
   // },
   methods: {
+    getTimes() {
+      setInterval(this.getTimesInterval, 1000);
+    },
+    getTimesInterval: function () {
+      let _this = this;
+      let year = new Date().getFullYear(); //获取当前时间的年份
+      let month = new Date().getMonth() + 1; //获取当前时间的月份
+      let day = new Date().getDate(); //获取当前时间的天数
+      let hours = new Date().getHours(); //获取当前时间的小时
+      let minutes = new Date().getMinutes(); //获取当前时间的分数
+      let seconds = new Date().getSeconds(); //获取当前时间的秒数
+      //当小于 10 的是时候，在前面加 0
+      if (hours < 10) {
+        hours = "0" + hours;
+      }
+      if (minutes < 10) {
+        minutes = "0" + minutes;
+      }
+      if (seconds < 10) {
+        seconds = "0" + seconds;
+      }
+      //拼接格式化当前时间
+      this.times = year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds;
+    },
     windowWidth(value) {
       this.clientWidth = value
       this.beilv2 = this.clientWidth / 1920
@@ -1010,7 +1037,18 @@ export default {
     background-size: 100% 100%;
     color: #00fff0;
     text-align: center;
-
+   .unit {
+      position: absolute;
+      left: 260px;
+      top: 25px;
+      font-size: 20px;
+    }
+    .time {
+      position: absolute;
+      left: 1360px;
+      top: 25px;
+      font-size: 20px;
+    }
     .title-button {
       color: #00fff0;
       font-size: 20px;

src/views/OperationalOverview/processingBoard.vue

@@ -2,21 +2,20 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2023-11-23 11:11:35
+ * @LastEditTime: 2023-12-19 14:25:07
  * @Description:
 -->
 <template>
   <div id="container" ref="container" class="visual-container" :style="styles">
-    <el-row
+    <el-row class="container-title" :style="{
-      class="container-title"
-      :style="{
         height: 88 + 'px',
         lineHeight: 88 + 'px',
         fontSize: 31 + 'px'
-      }"
+      }">
-    >
       <img src="../../assets/img/logo.png" style="width:1.1em;position:relative;top:.4em" alt="">
       许昌安彩深加工看板
+      <h3 class="unit">单位：河南汇融科技服务有限公司</h3>
+      <h3 class="time">{{ times }}</h3>
       <!-- <el-button
         type="text"
         class="title-button"
@@ -31,13 +30,8 @@
       <el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="15" type="flex" class="flex-1">
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8">
           <base-container :title="'设备报警'" :title-icon="'5_1'">
-            <base-table1
+            <base-table1 :page="1" :limit="9" :show-index="false" :table-config="qualityYearTableProps"
-              :page="1"
+              :table-data="qualityYearList" />
-              :limit="9"
-              :show-index="false"
-              :table-config="qualityYearTableProps"
-              :table-data="qualityYearList"
-            />
           </base-container>
         </el-col>
 
@@ -48,14 +42,8 @@
                 <el-option key="1" value="钢1线" label="钢1线" default />
               </el-select>
             </div>
-            <base-table1
+            <base-table1 :page="1" :limit="9" :show-index="false" :table-config="qualityMonthTableProps"
-              :page="1"
+              :table-data="qualityMonthList" />
-              :limit="9"
-              :show-index="false"
-
-              :table-config="qualityMonthTableProps"
-              :table-data="qualityMonthList"
-            />
           </base-container>
         </el-col>
 
@@ -116,13 +104,7 @@
             </div>
             <el-row :gutter="9">
               <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="24">
-                <linear-bar-chart
+                <linear-bar-chart :name-list="cxNameList" :data-list="cxDataList" :height="359" :show-legend="true" />
-                  :name-list="cxNameList"
-                  :data-list="cxDataList"
-                  :height="359"
-
-                  :show-legend="true"
-                />
               </el-col>
               <!-- <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
                 <base-table3
@@ -142,14 +124,8 @@
               <top-radio-group />
             </div>
             <!-- 像下面这样表格里的limit值，也许可以用js动态计算出来 -->
-            <double-y-chart
+            <double-y-chart :id=" 'doubleYChart' " :name-list="cxNameList" :data-list="cxDataList" :height="359"
-              :id=" 'doubleYChart' "
+              :show-legend="true" />
-              :name-list="cxNameList"
-              :data-list="cxDataList"
-              :height="359"
-
-              :show-legend="true"
-            />
           </base-container>
         </el-col>
       </el-row>
@@ -685,6 +661,7 @@ export default {
       beilv2: 1,
       beilv: 1,
       value: 100,
+      times:'',
       // offsetWidth: null,
       qualityYearTableProps,
       cxNameList,
@@ -742,6 +719,7 @@ export default {
     this.init()
   },
   mounted() {
+    this.getTimes()
     this.windowWidth(document.documentElement.clientWidth)
     // const _this = this;
     // window.onresize = () => {
@@ -768,6 +746,30 @@ export default {
   //   removeEventListener('resize', resizeFun)
   // },
   methods: {
+    getTimes() {
+      setInterval(this.getTimesInterval, 1000);
+    },
+    getTimesInterval: function () {
+      let _this = this;
+      let year = new Date().getFullYear(); //获取当前时间的年份
+      let month = new Date().getMonth() + 1; //获取当前时间的月份
+      let day = new Date().getDate(); //获取当前时间的天数
+      let hours = new Date().getHours(); //获取当前时间的小时
+      let minutes = new Date().getMinutes(); //获取当前时间的分数
+      let seconds = new Date().getSeconds(); //获取当前时间的秒数
+      //当小于 10 的是时候，在前面加 0
+      if (hours < 10) {
+        hours = "0" + hours;
+      }
+      if (minutes < 10) {
+        minutes = "0" + minutes;
+      }
+      if (seconds < 10) {
+        seconds = "0" + seconds;
+      }
+      //拼接格式化当前时间
+      this.times = year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds;
+    },
     windowWidth(value) {
       this.clientWidth = value
       this.beilv2 = this.clientWidth / 1920
@@ -838,7 +840,19 @@ export default {
     background-size: 100% 100%;
     color: #00fff0;
     text-align: center;
+      .unit {
+          position: absolute;
+          left: 260px;
+          top: 25px;
+          font-size: 20px;
+        }
 
+        .time {
+          position: absolute;
+          left: 1360px;
+          top: 25px;
+          font-size: 20px;
+        }
     .title-button {
       color: #00fff0;
       font-size: 20px;

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

@@ -100,6 +100,7 @@ export default {
 					startPlaceholder: '开始日期',
 					endPlaceholder: '结束日期',
           defaultTime: ['00:00:00', '23:59:59'],
+          defaultSelect: [],
 					param: 'checkTime',
 					// width: 350,
 				},
@@ -263,6 +264,12 @@ export default {
       this.searchBarFormConfig[0].defaultSelect = this.$route.query.woIdString.split(',')
       console.log(this.searchBarFormConfig[0].defaultSelect);
     }
+    if (this.$route.query.startTime && this.$route.query.endTime) {
+      // console.log(this.$route.query.startTime);
+      this.searchBarFormConfig[2].defaultSelect = [moment(Number(this.$route.query.startTime)).format('yyyy-MM-DD HH:mm:ss'), moment(Number(this.$route.query.endTime)).format('yyyy-MM-DD HH:mm:ss'),]
+      this.queryParams.startTime = moment(Number(this.$route.query.startTime)).format('yyyy-MM-DD HH:mm:ss')
+      this.queryParams.endTime = moment(Number(this.$route.query.endTime)).format('yyyy-MM-DD HH:mm:ss')
+    }
     // if (this.$route.params.startTime && this.$route.params.endTime) {
     //   this.searchBarFormConfig[0].defaultSelect = [
     //     this.$route.params.startTime,