From 069b28eeaedcb4d4cea036a7bd1555830ceaff71 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Tue, 19 Dec 2023 14:09:37 +0800
Subject: [PATCH 1/4] update login

---
 src/assets/styles/login.scss | 6 +++---
 src/views/login.vue          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/assets/styles/login.scss b/src/assets/styles/login.scss
index 78d18bba..ab43c3a6 100644
--- a/src/assets/styles/login.scss
+++ b/src/assets/styles/login.scss
@@ -139,7 +139,7 @@ $base1px: 0.15vh; // 1px / 1080px;
 
 				.title {
 					margin: 0;
-					margin-left: calc(28 * 0.12vh);
+					margin-left: calc(18px * 0.12vh);
 					font-weight: 400;
 					user-select: none;
 					color: #000;
@@ -148,8 +148,8 @@ $base1px: 0.15vh; // 1px / 1080px;
 					letter-spacing: calc(2 * 0.12vh);
 
 					.cnbm_logo {
-						height: calc(144 * 0.12vh);
-						width: calc(160 * 0.12vh);
+						height: calc(160 * 0.12vh);
+						width: calc(182 * 0.12vh);
 						position: relative;
 						top: calc(8 * 0.12vh);
 						right: calc(8 * 0.12vh);
diff --git a/src/views/login.vue b/src/views/login.vue
index e2a0f0f0..baa1dd27 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -166,7 +166,7 @@
 
 				<!-- footer -->
 				<div class="footer">
-					Copyright © 2023 许昌安彩新能科技有限公司 All Rights Reserved.
+					Copyright © 2023 中建材智能自动化研究院有限公司 All Rights Reserved.
 				</div>
 			</div>
 		</div>

From 553d19db89f86d79abf45fcfab69614f552f33bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Tue, 19 Dec 2023 16:32:12 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |  4 +-
 src/views/OperationalOverview/coldBoard.vue   | 42 ++++++++-
 .../OperationalOverview/processingBoard.vue   | 94 +++++++++++--------
 .../monitoring/statisticalData/index.vue      |  9 +-
 4 files changed, 104 insertions(+), 45 deletions(-)

diff --git a/.env.dev b/.env.dev
index b1305aa6..40a1806e 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,12 +1,12 @@
 ###
  # @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:
 ###
 # 开发环境配置
-ENV = 'development'
+ENV = 'development' 
 
 # 页面标题
 VUE_APP_TITLE = MES系统
diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue
index 13b9dfec..3127d186 100644
--- a/src/views/OperationalOverview/coldBoard.vue
+++ b/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;
diff --git a/src/views/OperationalOverview/processingBoard.vue b/src/views/OperationalOverview/processingBoard.vue
index 33cbe729..76e95645 100644
--- a/src/views/OperationalOverview/processingBoard.vue
+++ b/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
-      class="container-title"
-      :style="{
+    <el-row 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"
@@ -30,14 +29,9 @@
     <el-row class="container-main flex-col" type="flex">
       <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
-              :page="1"
-              :limit="9"
-              :show-index="false"
-              :table-config="qualityYearTableProps"
-              :table-data="qualityYearList"
-            />
+          <base-container :title="'设备报警'" :title-icon="'5_1'">
+            <base-table1 :page="1" :limit="9" :show-index="false" :table-config="qualityYearTableProps"
+              :table-data="qualityYearList" />
           </base-container>
         </el-col>
 
@@ -48,19 +42,13 @@
                 <el-option key="1" value="钢1线" label="钢1线" default />
               </el-select>
             </div>
-            <base-table1
-              :page="1"
-              :limit="9"
-              :show-index="false"
-
-              :table-config="qualityMonthTableProps"
-              :table-data="qualityMonthList"
-            />
+            <base-table1 :page="1" :limit="9" :show-index="false" :table-config="qualityMonthTableProps"
+              :table-data="qualityMonthList" />
           </base-container>
         </el-col>
 
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8">
-          <base-container  :title="'设备监控'" :title-icon="'5_3'">
+          <base-container :title="'设备监控'" :title-icon="'5_3'">
             <!-- <div style="width: 45%;position: absolute; top: 3em; right: 3em;">
               <top-radio-group />
             </div> -->
@@ -110,19 +98,13 @@
 
       <el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="12" type="flex" class="flex-1">
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
-          <base-container  :height="256" :title="'能源监控'" :title-icon="'5_5'">
+          <base-container :height="256" :title="'能源监控'" :title-icon="'5_5'">
             <div style="width: 45%;position: absolute; top: 3em; right: 3em;">
               <top-radio-group />
             </div>
             <el-row :gutter="9">
               <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="24">
-                <linear-bar-chart
-                  :name-list="cxNameList"
-                  :data-list="cxDataList"
-                  :height="359"
-
-                  :show-legend="true"
-                />
+                <linear-bar-chart :name-list="cxNameList" :data-list="cxDataList" :height="359" :show-legend="true" />
               </el-col>
               <!-- <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
                 <base-table3
@@ -137,19 +119,13 @@
           </base-container>
         </el-col>
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
-          <base-container  :height="318 + 338 + 16" :title="'产线产量及良品率'" :title-icon="'5_4'">
+          <base-container :height="318 + 338 + 16" :title="'产线产量及良品率'" :title-icon="'5_4'">
             <div style="width: 45%;position: absolute; top: 3em; right: 3em;">
               <top-radio-group />
             </div>
             <!-- 像下面这样表格里的limit值，也许可以用js动态计算出来 -->
-            <double-y-chart
-              :id=" 'doubleYChart' "
-              :name-list="cxNameList"
-              :data-list="cxDataList"
-              :height="359"
-
-              :show-legend="true"
-            />
+            <double-y-chart :id=" 'doubleYChart' " :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;
diff --git a/src/views/quality/monitoring/statisticalData/index.vue b/src/views/quality/monitoring/statisticalData/index.vue
index 4fcb15db..be6ec9c3 100644
--- a/src/views/quality/monitoring/statisticalData/index.vue
+++ b/src/views/quality/monitoring/statisticalData/index.vue
@@ -99,7 +99,8 @@ export default {
 					rangeSeparator: '-',
 					startPlaceholder: '开始日期',
 					endPlaceholder: '结束日期',
-					defaultTime: ['00:00:00', '23:59:59'],
+          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,

From 9561dc27e332c62f73ad325aa8601286d32a1123 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Wed, 20 Dec 2023 10:26:38 +0800
Subject: [PATCH 3/4] fix some bugs

---
 src/components/DialogForm/index.vue           | 24 +++++++++++++++++--
 .../specialEquipment/basic/FireFighthing.vue  |  8 +++----
 src/views/specialEquipment/basic/Safety.vue   |  4 ++--
 .../specialEquipment/check/Record-add.vue     |  3 +++
 .../specialEquipment/maintain/PlanConfig.vue  |  2 +-
 .../specialEquipment/maintain/Record.vue      | 13 ++++++++++
 6 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/src/components/DialogForm/index.vue b/src/components/DialogForm/index.vue
index 3248ce17..ac7e32ac 100644
--- a/src/components/DialogForm/index.vue
+++ b/src/components/DialogForm/index.vue
@@ -101,7 +101,9 @@
 								}
 							"
 							v-bind="col.bind">
-							<el-button size="mini" :disabled="disabled || col.bind?.disabled || false">
+							<el-button
+								size="mini"
+								:disabled="disabled || col.bind?.disabled || false">
 								<svg-icon
 									icon-class="icon-upload"
 									style="color: inherit"></svg-icon>
@@ -410,8 +412,26 @@ export default {
 			}
 			if (!promiseList.length) this.formLoading = false;
 		},
+
 		// 上传成功的特殊处理
-		beforeUpload() {},
+		beforeUpload(file) {
+			const checkFileSize = () => {
+				const isLt2M = file.size / 1024 / 1024 < 2;
+				if (!isLt2M) {
+					this.$modal.msgError('上传文件大小不能超过 2MB!');
+				}
+				return isLt2M;
+			};
+			const checkFileType = () => {
+				const isJPG =
+					file.type === 'image/jpeg' ||
+					file.type === 'image/png' ||
+					file.type === 'image/jpg';
+				return isJPG;
+			};
+			return checkFileSize() && checkFileType();
+		},
+
 		// 上传前的验证规则可通过 bind 属性传入
 		handleUploadSuccess(response, file, prop) {
 			console.log('[handleUploadSuccess]', response, file, prop);
diff --git a/src/views/specialEquipment/basic/FireFighthing.vue b/src/views/specialEquipment/basic/FireFighthing.vue
index 341d4883..9f925444 100644
--- a/src/views/specialEquipment/basic/FireFighthing.vue
+++ b/src/views/specialEquipment/basic/FireFighthing.vue
@@ -170,19 +170,19 @@ export default {
 				{ width: 256, prop: 'code', label: '设备编码' },
 				{ prop: 'location', label: '位置' },
 				{ prop: 'responsiblePeopleName', label: '负责人' },
-				{ prop: 'dueDate', label: '有效期至' },
+				{ prop: 'dueTime', label: '有效期至' },
 				{ prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
 				{
 					type: 'input',
-					label: '名称',
+					label: '设备名称',
 					placeholder: '请输入设备名称',
 					param: 'name',
 				},
 				{
 					type: 'input',
-					label: '编码',
+					label: '设备编码',
 					placeholder: '请输入设备编码',
 					param: 'code',
 				},
@@ -251,7 +251,7 @@ export default {
 					{
 						datetime: true,
 						label: '有效期至',
-						prop: 'dueDate',
+						prop: 'dueTime',
 						bind: { clearable: true },
 					},
 					{},
diff --git a/src/views/specialEquipment/basic/Safety.vue b/src/views/specialEquipment/basic/Safety.vue
index 25cd5a61..b91767fb 100644
--- a/src/views/specialEquipment/basic/Safety.vue
+++ b/src/views/specialEquipment/basic/Safety.vue
@@ -175,13 +175,13 @@ export default {
 			searchBarFormConfig: [
 				{
 					type: 'input',
-					label: '名称',
+					label: '设备名称',
 					placeholder: '请输入设备名称',
 					param: 'name',
 				},
 				{
 					type: 'input',
-					label: '编码',
+					label: '设备编码',
 					placeholder: '请输入设备编码',
 					param: 'code',
 				},
diff --git a/src/views/specialEquipment/check/Record-add.vue b/src/views/specialEquipment/check/Record-add.vue
index c5935113..79e9c659 100644
--- a/src/views/specialEquipment/check/Record-add.vue
+++ b/src/views/specialEquipment/check/Record-add.vue
@@ -54,6 +54,7 @@
 						<el-select
 							v-model="dataForm.equipmentId"
 							filterable
+							clearable
 							:disabled="isdetail"
 							style="width: 100%"
 							placeholder="请选择设备名称"
@@ -74,6 +75,7 @@
 						<el-select
 							v-model="dataForm.configId"
 							filterable
+							clearable
 							:disabled="isdetail"
 							style="width: 100%"
 							placeholder="请选择巡检配置"
@@ -121,6 +123,7 @@
 						<el-select
 							v-model="dataForm.origin"
 							filterable
+							clearable
 							:disabled="isdetail"
 							style="width: 100%"
 							placeholder="请选择数据来源">
diff --git a/src/views/specialEquipment/maintain/PlanConfig.vue b/src/views/specialEquipment/maintain/PlanConfig.vue
index 217e61fe..c4559687 100644
--- a/src/views/specialEquipment/maintain/PlanConfig.vue
+++ b/src/views/specialEquipment/maintain/PlanConfig.vue
@@ -353,7 +353,7 @@ export default {
 				queryData.createTime = this.queryParams.createTime;
 			}
 			this.$router.push({
-				path: '/equipment/base/maintain/record',
+				path: '/safety-environmental/special-equipment/equipment-maintain/maintain-record',
 				query: queryData,
 			});
 			// this.$router.push({ path: '/equipment/base/maintain/record', query: { orderNo: row.orderNo }})
diff --git a/src/views/specialEquipment/maintain/Record.vue b/src/views/specialEquipment/maintain/Record.vue
index 3d18b73e..bf33d9a0 100644
--- a/src/views/specialEquipment/maintain/Record.vue
+++ b/src/views/specialEquipment/maintain/Record.vue
@@ -556,6 +556,19 @@ export default {
 				this.form.relatePlan = tempRow.nextMaintainTime ? 1 : 2;
 				this.form.startTime = tempRow.nextMaintainTime;
 				this.form.maintainPlanId = tempRow.id;
+				// await (() => {
+				// 	return new Promise((acpt, rejt) => {
+				// 		this.form.relatePlan =
+				// 			this.$route.query.relatePlan ||
+				// 			(tempRow.nextMaintainTime ? 1 : 2);
+				// 		this.form.startTime = tempRow.nextMaintainTime;
+				// 		acpt();
+				// 	});
+				// })();
+				// this.$nextTick(() => {
+				// 	this.form.maintainPlanId = tempRow.id;
+				// 	this.form.equipmentId = tempRow.equipmentId;
+				// });
 			}
 			if (this.$route.query.isAdd) {
 				// 赋值

From a764e20bd4497a7b3f336346e8ef468e5510fd52 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Wed, 20 Dec 2023 10:45:00 +0800
Subject: [PATCH 4/4] update

---
 src/views/specialEquipment/check/Record-add.vue | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/views/specialEquipment/check/Record-add.vue b/src/views/specialEquipment/check/Record-add.vue
index 79e9c659..3da17625 100644
--- a/src/views/specialEquipment/check/Record-add.vue
+++ b/src/views/specialEquipment/check/Record-add.vue
@@ -50,7 +50,12 @@
 				</el-col>
 
 				<el-col :span="8">
-					<el-form-item label="设备名称" prop="equipmentId">
+					<el-form-item
+						label="设备名称"
+						prop="equipmentId"
+						:rules="[
+							{ required: true, message: '设备不能为空', trigger: 'blur' },
+						]">
 						<el-select
 							v-model="dataForm.equipmentId"
 							filterable
@@ -71,7 +76,12 @@
 					<!-- <el-form-item label="物料名称" prop="name">
 						<el-input v-model="dataForm.name" :disabled="isdetail" clearable placeholder="请输入物料名称" />
 					</el-form-item> -->
-					<el-form-item label="巡检配置名称" prop="configId">
+					<el-form-item
+						label="巡检配置名称"
+						prop="configId"
+						:rules="[
+							{ required: true, message: '巡检配置不能为空', trigger: 'blur' },
+						]">
 						<el-select
 							v-model="dataForm.configId"
 							filterable