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

Reviewed-on: #246

.env.dev

@@ -1,7 +1,7 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-03-05 09:48:49
+ # @LastEditTime: 2024-03-13 14:57:16
  # @LastEditors: zhp
  # @Description:
 ###

src/api/equipment/base/config/config.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Do not edit
  * @Date: 2024-02-21 13:43:02
- * @LastEditTime: 2024-02-21 15:00:17
+ * @LastEditTime: 2024-03-14 19:12:31
  * @LastEditors: DY
  * @Description: 
  */
@@ -33,3 +33,21 @@ export function listByParentId(query) {
     params: query
   })
 }
+
+// 获得产线工段设备树形结构
+export function getTree(query) {
+  return request({
+    url: '/base/core-factory/getTree',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得设备分组列表
+export function getgroupAllList(query) {
+  return request({
+    url: '/base/equipment-group/listAll',
+    method: 'get',
+    params: query
+  })
+}

src/utils/request.js

@@ -1,10 +1,10 @@
 import axios from 'axios'
-import {Message, MessageBox, Notification, Loading} from 'element-ui'
+import { Message, MessageBox, Notification, Loading } from 'element-ui'
 import store from '@/store'
-import {getAccessToken, getRefreshToken, getTenantId, setToken} from '@/utils/auth'
+import { getAccessToken, getRefreshToken, getTenantId, setToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
-import {getPath, getTenantEnable} from "@/utils/ruoyi";
-import {refreshToken} from "@/api/login";
+import { getPath, getTenantEnable } from "@/utils/ruoyi";
+import { refreshToken } from "@/api/login";
 
 // 需要忽略的提示。忽略后，自动 Promise.reject('error')
 const ignoreMsgs = [
@@ -42,7 +42,7 @@ const service = axios.create({
 let loadingInstance = null
 function startLoading() {
   loadingInstance = Loading.service({
-    fullscreen: false,
+    fullscreen: true,
     text: '拼命加载中...',
     background: 'rgba(0, 0, 0, 0.1)'
   })
@@ -86,7 +86,7 @@ service.interceptors.request.use(config => {
     for (const propName of Object.keys(config.params)) {
       const value = config.params[propName];
       const part = encodeURIComponent(propName) + '='
-      if (value !== null && typeof(value) !== "undefined") {
+      if (value !== null && typeof (value) !== "undefined") {
         if (typeof value === 'object') {
           for (const key of Object.keys(value)) {
             let params = propName + '[' + key + ']';
@@ -104,9 +104,9 @@ service.interceptors.request.use(config => {
   }
   return config
 }, error => {
-    tryHideFullScreenLoading()
-    console.log(error)
-    Promise.reject(error)
+  tryHideFullScreenLoading()
+  console.log(error)
+  Promise.reject(error)
 })
 
 // 响应拦截器
@@ -189,23 +189,23 @@ service.interceptors.response.use(async res => {
     return res.data
   }
 }, error => {
-    tryHideFullScreenLoading()
-    console.log('err' + error)
-    let {message} = error;
-    if (message === "Network Error") {
-      message = "后端接口连接异常";
-    } else if (message.includes("timeout")) {
-      message = "系统接口请求超时";
-    } else if (message.includes("Request failed with status code")) {
-      message = "系统接口" + message.substr(message.length - 3) + "异常";
-    }
-    Message({
-      message: message,
-      type: 'error',
-      duration: 5 * 1000
-    })
-    return Promise.reject(error)
+  tryHideFullScreenLoading()
+  console.log('err' + error)
+  let { message } = error;
+  if (message === "Network Error") {
+    message = "后端接口连接异常";
+  } else if (message.includes("timeout")) {
+    message = "系统接口请求超时";
+  } else if (message.includes("Request failed with status code")) {
+    message = "系统接口" + message.substr(message.length - 3) + "异常";
   }
+  Message({
+    message: message,
+    type: 'error',
+    duration: 5 * 1000
+  })
+  return Promise.reject(error)
+}
 )
 
 export function getBaseHeader() {
@@ -219,10 +219,10 @@ function handleAuthorized() {
   if (!isRelogin.show) {
     isRelogin.show = true;
     MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
-        confirmButtonText: '重新登录',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }
+      confirmButtonText: '重新登录',
+      cancelButtonText: '取消',
+      type: 'warning'
+    }
     ).then(() => {
       isRelogin.show = false;
       store.dispatch('LogOut').then(() => {

src/views/OperationalOverview/coldBoard.vue

@@ -1,17 +1,11 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-29 16:50:26
- * @LastEditTime: 2024-02-29 15:48:11
+ * @LastEditTime: 2024-03-13 09:07:37
  * @LastEditors: zhp
  * @Description:
 -->
-<!--
- * @Author: zwq
- * @Date: 2021-07-19 15:18:30
- * @LastEditors: zhp
- * @LastEditTime: 2024-01-29 17:05:37
- * @Description:
--->
+
 <template>
   <div id="container" ref="container" class="visual-container" :style="styles">
     <el-row class="container-title" :style="{
@@ -19,7 +13,7 @@
       lineHeight: 88 + 'px',
       fontSize: 31 + 'px'
     }">
-      <img src="../../assets/img/logo.png" style="width:1.1em;position:relative;top:.4em" alt="">
+      <img src="../../assets/img/logo.png" style="width:1.1em;position:relative;top:.22em" alt="">
       许昌安彩冷端看板
       <h3 class="unit">单位：河南汇融数字科技有限公司</h3>
       <h3 class="time">{{ times }}</h3>
@@ -715,7 +709,7 @@ export default {
           `<span style="color:rgba(255,255,255,0.7)">${this.getSize(item.size) || ''}</span>`,
           `<span style="color:rgba(255,255,255,0.7)">${item.productArea + '㎡' || ''}</span>`,
           `<span style="color:rgba(255,255,255,0.7)">${item.wasteArea + '㎡' || ''}</span>`,
-          `<div style = "${(item.product * 100).toFixed(2) > 91 ? 'display:block;color:rgba(255,255,255,0.7)' : 'display:none;'}">${(item.product * 100).toFixed(2) + '%' || ''}</div>
+          `<div style = "${(item.product * 100).toFixed(2) > 91 ? 'display:block;color:#00FFF7' : 'display:none;'}">${(item.product * 100).toFixed(2) + '%' || ''}</div>
            <div style = "${(item.product * 100).toFixed(2) < 91 ? 'display:block; color:rgba(255, 209, 96, 1)' : 'display:none;'}">${(item.product * 100).toFixed(2) + '%' || ''}</div>`
         ])
         this.cutConfig.data = cutArr

src/views/OperationalOverview/components/ISRAChart.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-29 13:45:56
- * @LastEditTime: 2024-02-18 14:20:01
+ * @LastEditTime: 2024-03-13 08:58:01
  * @LastEditors: zhp
  * @Description:
 -->
@@ -87,7 +87,7 @@ export default {
 				legend: {
 					bottom: '10%',
 					left: 'center',
-					itemWidth: 20,
+					itemWidth: 12,
 					itemHeight:12,
           icon: 'rect',
 					textStyle: {

src/views/OperationalOverview/components/doubleYChart .vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-09-21 09:06:28
- * @LastEditTime: 2024-02-01 15:52:41
+ * @LastEditTime: 2024-03-13 08:51:12
  * @LastEditors: zhp
  * @Description:
 -->
@@ -172,7 +172,7 @@ export default {
           axisLine: {
             lineStyle: {
               type: 'solid',
-              color: '#213259', // 左边线的颜色
+              color: '#25528f',
               width: '1' // 坐标线的宽度
             }
           },
@@ -186,7 +186,7 @@ export default {
           },
           splitLine: {
             lineStyle: {
-              color: '#213259'
+              color: '#25528f'
             }
           },
           data: nameList
@@ -215,7 +215,7 @@ export default {
               show: true,
               lineStyle: {
                 type: 'solid',
-                color: '#213259', // 左边线的颜色
+                color: '#25528f',
                 width: '1' // 坐标线的宽度
               }
             },
@@ -228,7 +228,7 @@ export default {
             },
             splitLine: {
               lineStyle: {
-                color: '#213259'
+                color: '#25528f'
               }
             }
             // type: 'value'
@@ -260,7 +260,7 @@ export default {
               show: true,
               lineStyle: {
                 type: 'solid',
-                color: '#213259', // 左边线的颜色
+                color: '#25528f', // 左边线的颜色
                 width: '1' // 坐标线的宽度
               }
             },
@@ -275,7 +275,7 @@ export default {
             },
             splitLine: {
               lineStyle: {
-                color: '#213259'
+                color: '#25528f'
               }
             }
             // type: 'value'

src/views/OperationalOverview/components/linearBarChart.vue

@@ -145,7 +145,7 @@ export default {
           axisLine: {
             lineStyle: {
               type: 'solid',
-              color: '#213259', // 左边线的颜色
+              color: '#25528f', // 左边线的颜色
               width: '1' // 坐标线的宽度
             }
           },
@@ -156,7 +156,7 @@ export default {
           },
           splitLine: {
             lineStyle: {
-              color: '#213259'
+              color: '#25528f'
             }
           },
           data: this.nameList
@@ -172,17 +172,17 @@ export default {
           axisLabel: {
             color: "#fff",
             fontSize: 12,
-            formatter: '{value}/kwh'
+            // formatter: '{value}/kwh'
           },
           axisLine: {
             show: true,
             lineStyle: {
-              color: "#213259",
+              color: "#25528f",
             },
           },
           splitLine: {
             lineStyle: {
-              color: "#213259a0",
+              color: "#25528f",
             },
           }
         },

src/views/OperationalOverview/components/pileBarChart.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-27 13:54:52
- * @LastEditTime: 2024-02-21 14:38:54
+ * @LastEditTime: 2024-03-13 09:04:11
  * @LastEditors: zhp
  * @Description:
 -->
@@ -170,8 +170,8 @@ export default {
       // }
       this.chart.setOption({
         legend: {
-          // top: '2.5%',
-          // right: '20px',
+          itemWidth: 12,
+          itemHeight: 12,
           icon: 'rect',
           textStyle: {
             color: '#ffffff'

src/views/base/coreAlarmLog/index.vue

@@ -32,7 +32,7 @@ import { parseTime } from '../../core/mixins/code-filter';
 import {
 	getcoreAlarmLogPage
 } from '@/api/base/coreAlarmLog';
-import {DICT_TYPE, getDictDatas} from "@/utils/dict";
+import {DICT_TYPE, getDictDatas, publicFormatter } from "@/utils/dict";
 
 const tableProps = [
 	{
@@ -50,7 +50,8 @@ const tableProps = [
 	},
 	{
 		prop: 'alarmGrade',
-		label: '报警级别'
+		label: '报警级别',
+		filter: publicFormatter(DICT_TYPE.EQU_ALARM_LEVEL)
 	},
 	{
 		prop: 'alarmReason',

src/views/base/coreEquipment/components/EquipmentDrawer.vue

@@ -7,10 +7,11 @@
 
 <template>
 	<el-drawer
-		:visible="visible"
+		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapper-closable="true"
 		class="drawer"
+		:before-close="beforeClose"
 		custom-class="mes-drawer"
 		size="60%"
 		@closed="$emit('destroy')">
@@ -81,12 +82,12 @@
 				</section>
 			</div>
 
-			<div class="drawer-body__footer">
+			<div v-if="mode == 'edit'" class="drawer-body__footer">
 				<el-button style="" @click="handleCancel">取消</el-button>
-				<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+				<!-- <el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
 					编辑
-				</el-button>
-				<el-button v-else type="primary" @click="handleConfirm">保存</el-button>
+				</el-button> -->
+				<el-button type="primary" @click="handleConfirm">保存</el-button>
 				<!-- sections的第二项必须是 属性列表  -->
 				<!-- <el-button
 						v-if="sections[1].allowAdd"
@@ -298,6 +299,17 @@ export default {
 		}
 	},
 	methods: {
+		beforeClose(done) {
+			if (this.mode.includes('edit')) {
+				this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+          })
+          .catch(_ => {});
+			} else {
+				done()
+			}
+		},
 		handleTableBtnClick({ type, data }) {
 			switch (type) {
 				case 'edit':

src/views/base/coreEquipment/index.vue

@@ -486,6 +486,7 @@ export default {
 				pageSize: 10,
 				code: '',
 				name: '',
+				special: false
 			},
 			// 表单参数
 			form: {

src/views/base/coreEquipmentLineBind/index.vue

@@ -298,9 +298,9 @@ export default {
 				// 工段排序
 				sort: undefined,
 				// 产线统计类型
-				lineDataType: undefined,
+				lineDataType: 0,
 				// 工段统计类型
-				sectionDataType: undefined,
+				sectionDataType: 0,
 			};
 			this.resetForm('form');
 		},

src/views/base/coreHotMaterial/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-12-14 13:52:42
+ * @LastEditTime: 2024-03-14 10:02:53
  * @Description:
 -->
 <template>
@@ -169,7 +169,7 @@ export default {
         // 修改的提交
         if (this.dataForm.id) {
           this.urlOptions.updateURL(this.dataForm).then(response => {
-						if (this.test.length > 1 || this.test[0].name) {
+						if (this.test.length > 1 || this.test[0]?.name) {
 							this.test.forEach(check => {
 								check.hotMaterialId = this.dataForm.id
 								if (check.id) {
@@ -191,7 +191,7 @@ export default {
         }
         // 添加的提交
         this.urlOptions.createURL(this.dataForm).then(response => {
-					if (this.test.length > 1 || this.test[0].name) {
+					if (this.test.length > 1 || this.test[0]?.name) {
 						this.test.forEach(check => {
 							check.hotMaterialId = response.data
 							createHotMaterialCheck(check).then(res => {

src/views/base/coreProduct/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-02-29 15:01:25
+ * @LastEditTime: 2024-03-13 13:54:01
  * @Description:
 -->
 <template>
@@ -254,7 +254,7 @@ export default {
 			dataRule: {
         code: [{ required: true, message: "产品编码不能为空", trigger: "blur" }],
         name: [{ required: true, message: "产品名称不能为空", trigger: "blur" }],
-				specifications: [{ required: true, message: "规格不能为空", trigger: "blur" }],
+				specifications: [{ required: false, message: "规格不能为空", trigger: "blur" }],
 				materialType: [{ required: true, message: "物料类型不能为空", trigger: "change" }],
 				productType: [{ required: true, message: "产品类型不能为空", trigger: "change" }]
       }

src/views/base/coreProductionLine/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-03-01 19:52:55
+ * @LastEditTime: 2024-03-13 13:54:48
  * @Description:
 -->
 <template>
@@ -33,6 +33,7 @@
 					<el-select
 						v-model="dataForm.roomNameDict"
 						filterable
+						clearable
 						style="width: 100%"
 						placeholder="请选择车间名称">
 						<el-option

src/views/base/coreWorkOrder/addWorkOrder.vue

@@ -84,7 +84,7 @@
             <el-radio :label="1">产品基础BOM</el-radio>
             <el-radio :label="2">工艺扩展BOM</el-radio>
           </el-radio-group> -->
-          <el-select v-model="dataForm.materialMethod" placeholder="请选择物料计算方式" style="width: 100%;" @change="materialMethodChange">
+          <el-select v-model="dataForm.materialMethod" placeholder="请选择物料计算方式" style="width: 100%;" clearable @change="materialMethodChange">
             <el-option key="1" label="产品基础BOM" :value="1" />
             <el-option key="2" label="工艺扩展BOM" :value="2" />
           </el-select>
@@ -92,7 +92,7 @@
       </el-col>
       <el-col :span='8'>
         <el-form-item label="优先级" prop="priority">
-          <el-select v-model="dataForm.priority" placeholder="请选择优先级" style="width: 100%;">
+          <el-select v-model="dataForm.priority" clearable placeholder="请选择优先级" style="width: 100%;">
             <el-option
               v-for="item in getDictDatas(DICT_TYPE.ORDER_PRIORITY)"
               :key="item.value"
@@ -104,7 +104,7 @@
       </el-col>
       <el-col :span='8'>
         <el-form-item label="工单类型" prop="type">
-          <el-select v-model="dataForm.type" placeholder="请选择工单类型" style="width: 100%;">
+          <el-select v-model="dataForm.type" clearable placeholder="请选择工单类型" style="width: 100%;">
             <el-option
               v-for="item in workOrderTypeList"
               :key="item.id"
@@ -121,6 +121,7 @@
 					<el-select
 						v-model="dataForm.roomNameDict"
 						filterable
+            clearable
 						style="width: 100%"
 						placeholder="请选择车间名称">
 						<el-option
@@ -133,7 +134,7 @@
       </el-col>
       <el-col :span='8'>
         <el-form-item label="关联产线" prop="productLineIds">
-          <el-select v-model="dataForm.productLineIds" placeholder="请选择关联产线" multiple style="width: 100%;">
+          <el-select v-model="dataForm.productLineIds" clearable placeholder="请选择关联产线" multiple style="width: 100%;">
             <el-option
               v-for="item in productLineList"
               :key="item.id"
@@ -145,7 +146,7 @@
       </el-col>
       <el-col :span='8'>
         <el-form-item label="负责人" prop="workers">
-          <el-input v-model="dataForm.workers" placeholder="请输入负责人"></el-input>
+          <el-input v-model="dataForm.workers" clearable placeholder="请输入负责人"></el-input>
         </el-form-item>
       </el-col>
     </el-row>
@@ -204,7 +205,8 @@ export default {
         planAssignQuantity: [{ required: true, message: "计划投入数量不能为空", trigger: "blur" }],
         planQuantity: [{ required: true, message: "计划生产数量不能为空", trigger: "blur" }],
         roomNameDict: [{ required: true, message: "车间名称不能为空", trigger: "blur" }],
-        productLineIds: [{ required: true, message: "关联产线不能为空", trigger: "change" }]
+        productLineIds: [{ required: true, message: "关联产线不能为空", trigger: "change" }],
+        materialMethod: [{ required: true, message: "物料计算方式不能为空", trigger: "change" }]
       },
       productList: [],
       processFlowList: [],

src/views/base/coreWorkOrder/allocation.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-02-29 10:01:52
+ * @LastEditTime: 2024-03-13 14:47:44
  * @Description:
 -->
 <template>
@@ -18,15 +18,28 @@
 		<div class="content">
 			<div class="formContent">
 				<el-row :gutter="20">
-					<el-col :span="12">工单名称:{{ dataForm.name }}</el-col>
-					<el-col :span="12">工单编码:{{ dataForm.code }}</el-col>
+					<el-col :span="8">
+						<div class="blodTip">工单名称</div>
+						<div class="lightTip">{{ dataForm.name }}</div>
+					</el-col>
+					<el-col :span="8">
+						<div class="blodTip">工单编码</div>
+						<div class="lightTip">{{ dataForm.code }}</div>
+					</el-col>
+					<el-col :span="8">
+						<div class="blodTip">产品名称</div>
+						<div class="lightTip">{{ dataForm.productName }}</div>
+					</el-col>
 				</el-row>
 				<el-row :gutter="20">
-					<el-col :span="12">产品名称:{{ dataForm.productName }}</el-col>
-					<el-col :span="12">产品规格:{{ dataForm.specifications }}</el-col>
-				</el-row>
-				<el-row :gutter="20">
-					<el-col :span="12">实际生产数量:{{ dataForm.expectedTime }}</el-col>
+					<el-col :span="8">
+						<div class="blodTip">产品规格</div>
+						<div class="lightTip">{{ dataForm.specifications }}</div>
+					</el-col>
+					<el-col :span="8">
+						<div class="blodTip">实际生产数量</div>
+						<div class="lightTip">{{ dataForm.expectedTime }}</div>
+					</el-col>
 				</el-row>
 			</div>
 
@@ -296,4 +309,18 @@ export default {
 	margin-bottom: 10px;
 	width: 100%;
 }
+.blodTip {
+	height: 16px;
+	font-size: 14px;
+	font-weight: 600;
+	color: rgba(0,0,0,0.85);
+	margin-bottom: 8px;
+}
+.lightTip {
+	/* height: 16px; */
+	font-size: 14px;
+	font-weight: 400;
+	color: rgba(102,102,102,0.75);
+	margin-bottom: 12px;
+}
 </style>

src/views/base/coreWorkOrder/detail.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-02-29 15:35:02
+ * @LastEditTime: 2024-03-13 14:42:32
  * @Description:
 -->
 <template>
@@ -274,6 +274,10 @@ const tableProps1 = [
 		prop: 'remaining',
 		label: '剩余生产预计消耗'
 	},
+	{
+		prop: 'num',
+		label: '库存数量'
+	}
 ];
 
 export default {

src/views/equipment/base/config/AlarmGroup/components/dialogForm.vue

@@ -28,7 +28,7 @@
 				<el-form-item
 					label="报警级别"
 					prop="grade"
-					:rules="[{ required: true, message: '报警级别不能为空', trigger: 'blur' }]">
+					:rules="[{ required: false, message: '报警级别不能为空', trigger: 'blur' }]">
 					<el-select
 						:disabled="disabled"
 						v-model="dataForm.grade"

src/views/equipment/base/config/BindGroup/components/BasicDrawer.vue

@@ -7,10 +7,11 @@
 
 <template>
 	<el-drawer
-		:visible="visible"
+		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapper-closable="true"
 		class="drawer"
+		:before-close="beforeClose"
 		custom-class="mes-drawer"
 		:size="size || '50%'"
 		@closed="$emit('destroy')">
@@ -43,7 +44,51 @@
 							:rows="formRows" /> -->
 
 						<!-- <el-row v-if="mode.includes('detail')" style="margin-bottom: 24px"> -->
-						<el-row style="margin-bottom: 24px">
+						<el-form
+							ref="form"
+							:model="dataForm"
+							label-width="100px"
+							v-loading="formLoading">
+							<el-row :gutter="20">
+								<el-col :span="12">
+									<el-form-item
+										label="设备"
+										prop="equipmentId"
+										:rules="[{ required: true, message: '设备不能为空', trigger: 'change' }]">
+										<el-select
+											:disabled="isdetail"
+											v-model="dataForm.equipmentId"
+											placeholder="请选择设备"
+											@change="$emit('update', dataForm)">
+											<el-option
+												v-for="opt in equipmentList"
+												:key="opt.id"
+												:label="opt.name"
+												:value="opt.id" />
+										</el-select>
+									</el-form-item>
+								</el-col>
+								<el-col :span="12">
+									<el-form-item
+										label="报警分组"
+										prop="groupId"
+										:rules="[{ required: true, message: '报警分组不能为空', trigger: 'change' }]">
+										<el-select
+											:disabled="isdetail"
+											v-model="dataForm.groupId"
+											placeholder="请选择报警分组"
+											@change="$emit('update', dataForm)">
+											<el-option
+												v-for="opt in grouList"
+												:key="opt.id"
+												:label="opt.name"
+												:value="opt.id" />
+										</el-select>
+									</el-form-item>
+								</el-col>
+							</el-row>
+						</el-form>
+						<!-- <el-row style="margin-bottom: 24px">
 							<el-col :span="8">
 								<div
 									class="title"
@@ -62,7 +107,7 @@
 									{{ form.code }}
 								</div>
 							</el-col>
-						</el-row>
+						</el-row> -->
 						<!-- <el-row v-else style="margin-bottom: 24px" :gutter="20">
 							<el-form ref="form" :model="form">
 								<el-col :span="8">
@@ -128,12 +173,11 @@
 				</section>
 			</div>
 
-			<div class="drawer-body__footer">
+			<div v-if="!mode.includes('detail')" class="drawer-body__footer">
 				<el-button style="" @click="handleCancel">取消</el-button>
 				<el-button
 					type="primary"
-					v-if="!mode.includes('detail')"
-					@click="handleCancel">
+					@click="handleSave">
 					确定
 				</el-button>
 			</div>
@@ -163,6 +207,8 @@
 <script>
 import BaseInfoForm from '@/components/DialogForm';
 import DialogForm from './dialogForm';
+import { getEquipmentList, getgroupAllList } from '@/api/equipment/base/config/config'
+import { updateEquipmentBindGroup } from '@/api/base/equipmentBindGroup';
 
 const SmallTitle = {
 	name: 'SmallTitle',
@@ -191,16 +237,21 @@ const SmallTitle = {
 
 export default {
 	components: { SmallTitle, DialogForm, BaseInfoForm },
-	props: ['sections', 'defaultMode', 'dataId', 'size'], // dataId 作为一个通用的存放id的字段
+	props: ['sections', 'defaultMode', 'dataId', 'size', 'equipmentId', 'id'], // dataId 作为一个通用的存放id的字段
 	data() {
 		return {
 			mode: '',
 			visible: false,
 			showForm: false,
+			isdetail: false,
+			formLoading: false,
+			grouList: [],
+			equipmentList: [],
 			total: 0,
 			form: {},
 			list: [],
 			attrTitle: '',
+			dataForm: {},
 			attrForm: {
 				id: null,
 				equipmentGroupId: '',
@@ -325,6 +376,34 @@ export default {
 		}
 	},
 	methods: {
+		// handleSave() {
+		// 	updateEquipmentBindGroup(this.form).then((response) => {
+		// 		this.$modal.msgSuccess('修改成功');
+		// 		this.open = false;
+		// 		this.getList();
+		// 	});
+		// },
+		async getDict() {
+			const res = await getEquipmentList({
+				pageNo: 1,
+				pageSize: 100,
+				special: false
+			})
+			this.equipmentList = res.data.list
+			const groupRes = await getgroupAllList()
+			this.grouList = groupRes.data
+		},
+		beforeClose(done) {
+			if (this.mode.includes('edit')) {
+				this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+          })
+          .catch(_ => {});
+			} else {
+				done()
+			}
+		},
 		handleTableBtnClick({ type, data }) {
 			switch (type) {
 				case 'edit':
@@ -342,6 +421,16 @@ export default {
 
 		init() {
 			this.visible = true;
+			// 设备分组传值
+			// this.dataForm = {
+			// 	equipmentId: this.equipmentId,
+			// 	groupId: this.dataId
+			// }
+			this.getDict()
+			this.$set(this.dataForm, 'equipmentId', this.equipmentId)
+			this.$set(this.dataForm, 'groupId', this.dataId)
+			this.$set(this.dataForm, 'id', this.id)
+			this.isdetail = this.mode === 'detail' ? true : false
 		},
 
 		async getAttrList() {
@@ -360,9 +449,9 @@ export default {
 				if (valid) {
 					const isEdit = !this.mode.includes('detail');
 					await this.$axios({
-						url: this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
+						url: '/base/equipment-bind-group/update',
 						method: isEdit ? 'put' : 'post',
-						data: this.form,
+						data: this.dataForm,
 					});
 					this.$modal.msgSuccess(`${isEdit ? '更新' : '创建'}成功`);
 					this.visible = false;

src/views/equipment/base/config/BindGroup/index.vue

@@ -48,6 +48,8 @@
 			size="45%"
 			:default-mode="editMode"
 			:data-id="alarmForm.id"
+			:equipment-id="equipmentId"
+			:id="id"
 			:sections="[
 				{
 					name: '基本信息',
@@ -220,7 +222,7 @@ export default {
 					{
 						select: true,
 						label: '设备',
-						url: '/base/core-equipment/page?pageNo=1&pageSize=100',
+						url: '/base/core-equipment/page?pageNo=1&pageSize=100&special=false',
 						prop: 'equipmentId',
 						bind: {
 							filterable: true,
@@ -266,6 +268,8 @@ export default {
 				equipmentGroupCode: undefined,
 				equipmentGroupName: undefined,
 			},
+			equipmentId: undefined,
+			id: undefined,
 			editVisible: false,
 			editMode: '',
 			drawerBaseInfoRows: [
@@ -440,6 +444,8 @@ export default {
 			this.alarmForm.id = groupId;
 			this.alarmForm.equipmentGroupCode = groupCode;
 			this.alarmForm.equipmentGroupName = groupName;
+			this.equipmentId = equipmentId;
+			this.id = id;
 			this.editVisible = true;
 			this.$nextTick(() => {
 				this.$refs['drawer'].init();

src/views/equipment/base/config/DataCollection/CollectionConfig.vue

@@ -379,7 +379,7 @@ export default {
 					});
 					this.searchBarFormConfig[1].selectOptions = plcList.map((item) => {
 						return {
-							name: item.name,
+							name: item.code,
 							id: item.id,
 						};
 					});
@@ -463,7 +463,8 @@ export default {
 		handleAdd() {
 			this.reset();
 			this.open = true;
-			this.title = '添加设备与实时采集关系表（一对多）';
+			this.title = '添加设备采集配置';
+			this.$refs.addOrUpdate.init()
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
@@ -472,7 +473,7 @@ export default {
 			getEquipmentPlcConnect(id).then((response) => {
 				this.form = response.data;
 				this.open = true;
-				this.title = '修改设备与实时采集关系表（一对多）';
+				this.title = '修改设备采集配置';
 			});
 		},
 		/** 提交按钮 */

src/views/equipment/base/config/DataCollection/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-02-22 10:08:13
+ * @LastEditTime: 2024-03-13 16:47:02
  * @Description:
 -->
 <template>
@@ -39,9 +39,9 @@
 
 <script>
 import basicAdd from '../../../../core/mixins/basic-add';
-import { createCorePL, updateCorePL, getCorePL, getCode, getCorePLList } from "@/api/base/coreProductionLine";
+import { createCorePL, updateCorePL, getCorePL, getCode } from "@/api/base/coreProductionLine";
 import { createEquipmentPlcConnect, updateEquipmentPlcConnect } from '@/api/base/equipmentPlcConnect';
-import { getplcAllList, listByParentId } from "@/api/equipment/base/config/config";
+import { getplcAllList, getTree } from "@/api/equipment/base/config/config";
 
 export default {
 	mixins: [basicAdd],
@@ -95,22 +95,29 @@ export default {
 		this.getDict()
 	},
 	methods: {
+		init() {
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields()
+			})
+		},
 		async getDict() {
 			// 关联表名列表
 			const res = await getplcAllList();
 			this.plcList = res.data;
-			// 产线列表
-			const res1 = await getCorePLList();
+			// 树形结构
+			const res1 = await getTree();
 			this.plLineList = res1.data;
-			this.plLineList.forEach(item => {
-				listByParentId({ id: item.id }).then(resp => {
-					if (resp.data.length > 0) {
-						// item.children = resp.data
-						this.$set(item, 'children', resp.data)
-						// this.$forceUpdate()
-					}
-				})
-			})
+			// const res1 = await getCorePLList();
+			// this.plLineList = res1.data;
+			// this.plLineList.forEach(item => {
+			// 	listByParentId({ id: item.id }).then(resp => {
+			// 		if (resp.data.length > 0) {
+			// 			// item.children = resp.data
+			// 			this.$set(item, 'children', resp.data)
+			// 			// this.$forceUpdate()
+			// 		}
+			// 	})
+			// })
 		},
 		// 表单提交
     dataFormSubmit() {

src/views/equipment/base/inspection/Record/index.vue

@@ -98,12 +98,12 @@ export default {
 			addContent: false,
 			searchBarKeys: ['name', 'actualCheckTime'],
 			tableBtn: [
-				// this.$auth.hasPermi('equipment:check-record:detail')
-				// 	? {
-				// 			type: 'detail',
-				// 			btnName: '详情',
-				// 	  }
-				// 	: undefined,
+				this.$auth.hasPermi('equipment:check-record:detail')
+					? {
+							type: 'detail',
+							btnName: '详情',
+					  }
+					: undefined,
 				// this.$auth.hasPermi('equipment:check-record:update')
 				// 	? {
 				// 			type: 'edit',
@@ -122,7 +122,7 @@ export default {
 				{ prop: 'department', label: '部门' },
 				{ prop: 'actualCheckTime', label: '巡检时间', filter: parseTime },
 				{ prop: 'groupClass', label: '班次' },
-				{ prop: 'opt', label: '巡检内容', name: '详情', subcomponent: btn },
+				// { prop: 'opt', label: '巡检内容', name: '详情', subcomponent: btn },
 				{ prop: 'remark', label: '备注' }
 				// { prop: 'origin', label: '数据来源', filter: (val) => ['', '手动', 'PDA'][val] },
 				// { prop: 'sectionName', label: '计划巡检时间' },
@@ -416,10 +416,14 @@ export default {
 				.catch(() => {});
 		},
 		handleDetail({ id }) {
-			this.addOrUpdateVisible = true
+			this.addContent = true;
 			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init(id, true);
+				this.$refs.addContent.init(id, true);
 			});
+			// this.addOrUpdateVisible = true
+			// this.$nextTick(() => {
+			// 	this.$refs.addOrUpdate.init(id, true);
+			// });
 		},
 		/** 导出按钮操作 */
 		handleExport() {

src/views/equipment/base/maintain/Monitor/index.vue

@@ -73,7 +73,7 @@ const remainBox = {
 		color() {
 			if (this.value) {
 				const v = +this.value;
-				return v < 0 ? 'red' : v >= 0 && v < 2 ? 'yellow' : 'green';
+				return v <= 1 ? 'red' : v > 1 && v <= 2 ? 'yellow' : 'green';
 			}
 			return 'unset';
 		},
@@ -84,9 +84,10 @@ const remainBox = {
 				style={`background: ${
 					this.color
 				}; position:absolute; inset: 0; padding: 0 10px; display: flex; align-items: center; color: ${
-					this.color == 'red' ? '#fff' : 'unset'
+					// this.color == 'red' ? '#fff' : 'unset'
+					'#fff'
 				}`}>
-				{this.injectData[this.injectData.prop] || ''}
+				{this.injectData[this.injectData.prop]?.toFixed(0) || ''}
 			</div>
 		);
 	},
@@ -128,22 +129,26 @@ export default {
 				// 	width: 180,
 				// 	filter: parseTime(createTime),
 				// },
-				{ prop: 'code', label: '保养计划单号' },
-				{ prop: 'name', label: '保养计划名称' },
-				{ prop: 'departmentName', label: '部门' },
-				{ prop: 'lineName', label: '产线名' },
+				{ prop: 'code', label: '保养计划单号', minWidth: 118, showOverflowtooltip: true },
+				{ prop: 'name', label: '保养计划名称', minWidth: 118, showOverflowtooltip: true },
+				{ prop: 'departmentName', label: '部门', minWidth: 100, showOverflowtooltip: true },
+				{ prop: 'lineName', label: '产线名', minWidth: 100, showOverflowtooltip: true },
 				{
 					prop: 'lastPlanMaintainTime',
 					label: '上次计划保养时间',
 					filter: parseTime,
+					minWidth: 160,
+					showOverflowtooltip: true
 				},
 				{
 					prop: 'lastMaintainTime',
 					label: '上次实际保养时间',
 					filter: parseTime,
+					minWidth: 160,
+					showOverflowtooltip: true
 				},
-				{ prop: 'nextPlanMaintainTime', label: '下次计划保养时间', filter: parseTime },
-				{ prop: 'maintainer', label: '计划保养人员' },
+				{ prop: 'nextPlanMaintainTime', label: '下次计划保养时间', filter: parseTime, minWidth: 160, showOverflowtooltip: true },
+				{ prop: 'maintainer', label: '计划保养人员', minWidth: 160, showOverflowtooltip: true },
 				// { prop: 'equipmentName', label: '设备名称' },
 				// { prop: 'equipmentCode', label: '设备编码' },
 				// { prop: 'maintenancePeriod', label: '保养频率' },
@@ -153,11 +158,12 @@ export default {
 				// 	filter: publicFormatter(this.DICT_TYPE.MAINTAIN_TYPE),
 				// },
 				// { prop: 'opt1', label: '设备保养', name: '操作', subcomponent: btn },
-				{ prop: 'opt2', label: '保养内容', name: '详情', subcomponent: btn },
+				{ prop: 'opt2', label: '保养内容', name: '详情', subcomponent: btn, width: 100 },
 				{
 					prop: 'remainDays',
 					label: '距离下次保养剩余时间(天)',
 					subcomponent: remainBox,
+					minWidth: 210,
 				}
 			],
 			searchBarFormConfig: [
@@ -232,23 +238,24 @@ export default {
 				.catch(() => { });
 		},
 		initSearchBar() {
-			this.http('/base/core-equipment/page', 'get', {
-				special: false,
-				pageNo: 1,
-				pageSize: 99
-			}).then(({ data }) => {
-				this.$set(
-					this.searchBarFormConfig[1],
-					'selectOptions',
-					(data?.list || []).map((item) => ({
-						name: item.name,
-						id: item.id,
-					}))
-				);
-			});
+			// this.http('/base/core-equipment/page', 'get', {
+			// 	special: false,
+			// 	pageNo: 1,
+			// 	pageSize: 99
+			// }).then(({ data }) => {
+			// 	this.$set(
+			// 		this.searchBarFormConfig[1],
+			// 		'selectOptions',
+			// 		(data?.list || []).map((item) => ({
+			// 			name: item.name,
+			// 			id: item.id,
+			// 		}))
+			// 	);
+			// });
 			this.http('/base/equipment-maintain-plan/page', 'get', {
 				pageNo: 1,
 				pageSize: 100,
+				special: false
 			}).then(({ data }) => {
 				this.$set(
 					this.searchBarFormConfig[0],

src/views/equipment/base/maintain/PlanConfig/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-02-28 19:52:13
+ * @LastEditTime: 2024-03-13 15:55:36
  * @Description:
 -->
 <template>
@@ -67,7 +67,7 @@
 					</el-col>
 					<el-col :span="8">
 						<el-form-item label="确认时限(h)" prop="confirmTimeLimit">
-							<el-input-number v-model="dataForm.confirmTimeLimit" :min="0" controls-position="right" style="width: 100%" :disabled="isdetail" clearable placeholder="请输入单位平方数" />
+							<el-input-number v-model="dataForm.confirmTimeLimit" :min="0" controls-position="right" style="width: 100%" :disabled="isdetail" clearable placeholder="请输入确认时限" />
 						</el-form-item>
 					</el-col>
 				</el-row>

src/views/equipment/base/maintain/Record/index.vue

@@ -64,6 +64,7 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import Editor from '@/components/Editor';
 import { deleteEqMaintainLog, exportMaintainLogExcel } from '@/api/equipment/base/maintain/record';
 import AddContent from './addContent.vue';
+import { parseTime } from '../../../../core/mixins/code-filter';
 
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
@@ -174,6 +175,7 @@ export default {
 					endPlaceholder: '结束日期',
 					defaultTime: ['00:00:00', '23:59:59'],
 					param: 'startTime',
+					defaultSelect: []
 					// width: 350,
 				},
 				// {
@@ -349,23 +351,28 @@ export default {
 		};
 	},
 	created() {
+		let end = moment().format('YYYY-MM-DD 08:00:00')
+		const current = new Date()
+    let start = parseTime(new Date(current.getFullYear(), current.getMonth(), current.getDate() - 3, 8, 0, 0))
+    this.searchBarFormConfig[1].defaultSelect = [start, end]
+		this.queryParams.startTime = [start, end]
 		this.initSearchBar();
-		if (this.$route.query) {
-			// 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.equipmentId ?? undefined;
-			this.searchBarFormConfig[0].defaultSelect =
-				this.$route.query.maintainPlanId ?? undefined;
-			this.searchBarFormConfig[1].defaultSelect =
-				this.$route.query?.createTime ?? undefined;
-			// this.searchBarFormConfig[3].defaultSelect =
-			// 	Number(this.$route.query.relatePlan) ?? undefined;
-		}
+		// if (this.$route.query) {
+		// 	// 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.equipmentId ?? undefined;
+		// 	this.searchBarFormConfig[0].defaultSelect =
+		// 		this.$route.query.maintainPlanId ?? undefined;
+		// 	this.searchBarFormConfig[1].defaultSelect =
+		// 		this.$route.query?.createTime ?? undefined;
+		// 	// this.searchBarFormConfig[3].defaultSelect =
+		// 	// 	Number(this.$route.query.relatePlan) ?? undefined;
+		// }
 		this.getList();
 		if (this.$route.query.addRecord) {
 			this.handleAdd()

src/views/group/base/groupTeam/components/workerTeamAdd.vue

@@ -2,11 +2,7 @@
   <el-form ref="form" :rules="rules" label-width="100px" :model="form">
     <el-form-item label="员工" prop="workerId" v-if='!isEdit'>
       <el-select v-model="form.workerId" placeholder="请选择" filterable style="width: 100%;" @change="selectWorker()">
-        <el-option
-          v-for="item in workerList"
-          :key="item.id"
-          :label="item.name"
-          :value="item.id">
+        <el-option v-for="item in workerList" :key="item.id" :label="item.name" :value="item.id">
         </el-option>
       </el-select>
     </el-form-item>
@@ -48,12 +44,12 @@ export default {
       this.form.teamId = param.teamId
       this.form.majorName = param.majorName
       this.workName = param.workName
-      otherWorkerList({teamId:this.form.teamId}).then(res => {
+      otherWorkerList({ teamId: this.form.teamId }).then(res => {
         this.workerList = res.data || []
         if (param.id) {
           this.isEdit = true
           this.form.id = param.id
-          groupTeamDet({id: this.form.id}).then((res) => {
+          groupTeamDet({ id: this.form.id }).then((res) => {
             if (res.code === 0) {
               this.form.workerId = res.data.workerId
               this.form.remark = res.data.remark
@@ -72,7 +68,7 @@ export default {
             this.form.majorName = item.majorName
           }
         })
-      }else{
+      } else {
         this.form.majorName = ''
       }
     },

src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue

@@ -9,18 +9,15 @@
           </el-col>
           <el-col :span="6">
             <p class="boldTitle">车间名称</p>
-            <p class="lightText">{{ (queryParams.roomNameDict || queryParams.roomNameDict === 0) ? getDictDataLabel('workshop',queryParams.roomNameDict) : '-' }}</p>
+            <p class="lightText">{{ (queryParams.roomNameDict || queryParams.roomNameDict === 0) ?
+      getDictDataLabel('workshop', queryParams.roomNameDict) : '-' }}</p>
           </el-col>
           <el-col :span="6">
             <p class="boldTitle">班组名称</p>
             <p class="lightText">{{ queryParams.teamName ? queryParams.teamName : '-' }}</p>
           </el-col>
         </el-row>
-        <base-table
-          :table-props="tableProps"
-          :table-data="tableData"
-          :max-height="tableH"
-        />
+        <base-table :table-props="tableProps" :table-data="tableData" :max-height="tableH" :page="1" :limit="1000000" />
       </div>
     </el-drawer>
   </div>
@@ -47,7 +44,7 @@ const tableProps = [
   },
   {
     prop: 'workTime',
-    label: '工作时长'
+    label: '工作时长(h)'
   }
 ]
 export default {
@@ -83,21 +80,24 @@ export default {
 <style lang="scss" scoped>
 .box {
   padding: 0 32px;
+
   .topBox {
     padding-bottom: 30px;
     margin-bottom: 30px;
     border-bottom: 1px solid #E9E9E9;
+
     .boldTitle {
       font-size: 14px;
       font-weight: 600;
-      color: rgba(0,0,0,0.85);
+      color: rgba(0, 0, 0, 0.85);
       margin: 0;
       margin-bottom: 10px;
     }
+
     .lightText {
       font-size: 14px;
       font-weight: 400;
-      color: rgba(102,102,102,0.75);
+      color: rgba(102, 102, 102, 0.75);
       margin: 0;
     }
   }

src/views/group/monitoring/teamProduction/components/searchArea.vue

@@ -2,28 +2,20 @@
   <el-form :inline="true" class="demo-form-inline">
     <span class="blue-block"></span>
     <el-form-item label="班次信息">
-      <el-select v-model="queryParams.classesId" placeholder="班次信息" style="width: 200px;" size="small" clearable>
-        <el-option
-          v-for="item in classesArr"
-          :key="item.id"
-          :label="(item.roomName?item.roomName:'')+'-'+item.name"
-          :value="item.id">
-          <span>{{ item.roomName }}-{{item.name}}</span>
+      <el-select v-model="queryParams.classesId" placeholder="班次信息" style="width: 200px;" size="small" clearable
+        filterable>
+        <el-option v-for="item in classesArr" :key="item.id"
+          :label="(item.roomName ? item.roomName : '') + '-' + item.name" :value="item.id">
+          <span>{{ item.roomName }}-{{ item.name }}</span>
         </el-option>
       </el-select>
     </el-form-item>
     <el-form-item label="班组信息">
       <el-input v-model="queryParams.teamName" placeholder="班组信息" style="width: 200px;" clearable></el-input>
     </el-form-item>
-    <el-form-item label="上班时间">
-      <el-date-picker
-        v-model="queryParams.tiemStr"
-        type="daterange"
-        format='yyyy-MM-dd'
-        value-format='yyyy-MM-dd'
-        range-separator='-'
-        style="width: 250px;"
-        size="small">
+    <el-form-item label="上班日期">
+      <el-date-picker v-model="queryParams.tiemStr" type="daterange" format='yyyy-MM-dd' value-format='yyyy-MM-dd'
+        range-separator='-' style="width: 250px;" size="small">
       </el-date-picker>
     </el-form-item>
     <el-form-item>
@@ -69,6 +61,7 @@ export default {
     font-size: 16px;
     color: #0B58FF;
   }
+
   .el-input__prefix .el-icon-date {
     font-size: 16px;
     color: #0B58FF;
@@ -83,6 +76,7 @@ export default {
   background: #E8E8E8;
   vertical-align: middle;
 }
+
 .demo-form-inline {
   .blue-block {
     display: inline-block;

src/views/group/monitoring/teamProduction/components/teamProductionDetail.vue

@@ -1,12 +1,8 @@
 <template>
   <div>
-    <el-drawer title="查看详情" :visible.sync="visible" size="70%" :wrapperClosable='false' @closed="closeDrawer">
+    <el-drawer title="生产情况" :visible.sync="visible" size="70%" @closed="closeDrawer" :show-close='false'>
       <div class="box">
-        <base-table
-          :table-props="tableProps"
-          :table-data="tableData"
-          :max-height="tableH"
-        />
+        <base-table :table-props="tableProps" :table-data="tableData" :max-height="tableH" />
       </div>
     </el-drawer>
   </div>
@@ -53,7 +49,7 @@ export default {
     init(params) {
       this.visible = true
       // console.log(params)
-      getByScheduling({id:params.id}).then(res => {
+      getByScheduling({ id: params.id }).then(res => {
         let dataList1 = []
         let dataList2 = []
         if (res.data.nameData && res.data.nameData.length > 0) {
@@ -90,11 +86,11 @@ export default {
             timeArr.push(this.parseTime(item.name))
             tablePropsObj.prop = item.name
             tablePropsObj.label = this.parseTime(item.name)
-            tablePropsObj.children[0].prop = item.name+'sumInput'
-            tablePropsObj.children[1].prop = item.name+'sumOutput'
-            tablePropsObj.children[2].prop = item.name+'goodArea'
-            tablePropsObj.children[3].prop = item.name+'dynamicValue'
-            tablePropsObj.children[4].prop = item.name+'dynamicRatio'
+            tablePropsObj.children[0].prop = item.name + 'sumInput'
+            tablePropsObj.children[1].prop = item.name + 'sumOutput'
+            tablePropsObj.children[2].prop = item.name + 'goodArea'
+            tablePropsObj.children[3].prop = item.name + 'dynamicValue'
+            tablePropsObj.children[4].prop = item.name + 'dynamicRatio'
             this.tableProps.push(tablePropsObj)
           })
           getSchedulingMonitoringRecord({
@@ -111,15 +107,15 @@ export default {
               obj.workOrderList = dataList1.data[i].workOrderList
               let subData1 = dataList1.data[i].data
               for (let ii = 0; ii < subData1.length; ii++) {
-                obj[subData1[ii].dynamicName+'sumInput'] = subData1[ii].dynamicValue.sumInput
-                obj[subData1[ii].dynamicName+'sumOutput'] = subData1[ii].dynamicValue.sumOutput
-                obj[subData1[ii].dynamicName+'goodArea'] = subData1[ii].dynamicValue.goodArea
+                obj[subData1[ii].dynamicName + 'sumInput'] = subData1[ii].dynamicValue.sumInput
+                obj[subData1[ii].dynamicName + 'sumOutput'] = subData1[ii].dynamicValue.sumOutput
+                obj[subData1[ii].dynamicName + 'goodArea'] = subData1[ii].dynamicValue.goodArea
               }
               for (let j = 0; j < dataList2.data.length; j++) {
                 let subData2 = dataList2.data[j].data
                 for (let jj = 0; jj < subData2.length; jj++) {
-                  obj[subData2[jj].dynamicName+'dynamicValue'] = subData2[jj].dynamicValue
-                  obj[subData2[jj].dynamicName+'dynamicRatio'] = obj[subData2[jj].dynamicName+'dynamicValue'] / obj[subData2[jj].dynamicName+'sumOutput']
+                  obj[subData2[jj].dynamicName + 'dynamicValue'] = subData2[jj].dynamicValue
+                  obj[subData2[jj].dynamicName + 'dynamicRatio'] = obj[subData2[jj].dynamicName + 'dynamicValue'] / obj[subData2[jj].dynamicName + 'sumOutput']
                 }
               }
               this.tableData.push(obj)

src/views/group/monitoring/teamProduction/index.vue

@@ -1,37 +1,22 @@
 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-    <search-area @submit="buttonClick"/>
+    <search-area @submit="buttonClick" />
     <!-- <search-bar
       :formConfigs="formConfig"
       ref="searchBarForm"
       @headBtnClick="buttonClick"
     /> -->
     <!-- 列表 -->
-    <base-table
-      :page="queryParams.pageNo"
-      :limit="queryParams.pageSize"
-      :table-props="tableProps"
-      :table-data="list"
-      :max-height="tableH"
-    >
-      <method-btn
-        v-if="tableBtn.length"
-        slot="handleBtn"
-        :width="80"
-        label="操作"
-        :method-list="tableBtn"
-        @clickBtn="handleClick"
-      />
+    <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
+      :max-height="tableH">
+      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="80" label="操作" :method-list="tableBtn"
+        @clickBtn="handleClick" />
     </base-table>
-    <pagination
-      :page.sync="queryParams.pageNo"
-      :limit.sync="queryParams.pageSize"
-      :total="total"
-      @pagination="getList"
-    />
+    <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
+      @pagination="getList" />
     <!-- 查看生产情况 -->
-    <team-production-detail v-if='paramVisible' ref='schedulingMonitoringDetail'/>
+    <team-production-detail v-if='paramVisible' ref='schedulingMonitoringDetail' />
   </div>
 </template>
 <script>
@@ -86,38 +71,6 @@ export default {
   name: 'GroupTeamScheduling',
   data() {
     return {
-      formConfig: [
-        {
-          type: 'select',
-          label: '班次信息',
-          selectOptions: [],
-          param: 'classesId'
-        },
-        {
-          type: 'input',
-          label: '班组信息',
-          placeholder: '班组信息',
-          param: 'teamName'
-        },
-        {
-          type: 'datePicker',
-          label: '上班日期',
-          dateType: 'daterange',
-          format: 'yyyy-MM-dd',
-          valueFormat: 'yyyy-MM-dd',
-          rangeSeparator: '-',
-          // valueFormat: "timestamp",
-          param: 'tiemStr',
-          defaultSelect: '',
-          width: 250
-        },
-        {
-          type: 'button',
-          btnName: '查询',
-          name: 'search',
-          color: 'primary'
-        }
-      ],
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -128,11 +81,12 @@ export default {
       },
       tableProps,
       tableBtn: [
-      this.$auth.hasPermi('base:team-production:detail')
+        this.$auth.hasPermi('base:team-production:detail')
           ? {
-              type: 'detail',
-              btnName: '详情'
-            }
+            type: 'productionDetail',
+            btnName: '查看',
+            showTip: '生产情况'
+          }
           : undefined
       ].filter((v) => v),
       list: [],
@@ -158,7 +112,7 @@ export default {
       this.getList()
     },
     getList() {
-      groupTeamSchedulingPage({...this.queryParams}).then(res => {
+      groupTeamSchedulingPage({ ...this.queryParams }).then(res => {
         console.log(res)
         this.list = res.data.list || []
         this.total = res.data.total || 0

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-01 15:22:06
+ * @LastEditTime: 2024-03-12 14:54:05
  * @LastEditors: zhp
  * @Description:
 -->
@@ -58,7 +58,8 @@
           <el-col :span="8">
             <el-form-item label="检测时间" prop="checkTime"
               :rules="[{ required: true, message: '检测时间不能为空', trigger: 'change' }]">
-              <el-date-picker v-model="dataForm.checkTime" type="datetime" placeholder="选择检测时间">
+              <el-date-picker value-format="timestamp" v-model="dataForm.checkTime" type="datetime"
+                placeholder="选择检测时间">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -80,7 +81,7 @@
           <el-col :span="8">
             <el-form-item :prop="'checkValueList.' + index + '.checkValue'" label="成分含量"
               :rules="[{ required: true, message: '成分含量不能为空', trigger: 'blur' }]">
-              <el-input  oninput="value=value.replace(/[^\d]/g,'')" :disabled="isdetail"
+              <el-input oninput="value=value.replace(/[^\d]/g,'')" :disabled="isdetail"
                 style="width: 90%;margin-right: 10px;" :max="item.maxValue" :min='item.minValue'
                 v-model.number="dataForm.checkValueList[index].checkValue"
                 @change="judgeValue(arguments[0],item.minValue,item.maxValue,index)"></el-input>

src/views/report/glass/day.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-24 15:15:24
- * @LastEditTime: 2024-03-11 15:51:20
+ * @LastEditTime: 2024-03-13 15:21:30
  * @LastEditors: zhp
  * @Description:
 -->
@@ -100,11 +100,13 @@ export default {
       await this.urlOptions.getDataListURL(this.listQuery).then(response => {
         this.tableData = response.data.filter(item => {
 					this.proLineList.forEach(it => {
-						if (item.lineId === it.id) {
+            if (item.lineId === it.id) {
               item.lineName = it.name
-              item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? item.originalGlassStatisticsTrend + '%' : null
-              item.actualProductTrend = item.actualProductTrend ? item.actualProductTrend + '%' : null
-              item.originalGlassPassTrend = item.originalGlassPassTrend ? item.originalGlassPassTrend * 100 + '%' : null
+
+              item.dailyOutputTrend = item.dailyOutputTrend ? parseFloat((item.dailyOutputTrend * 100).toFixed(2)) + '%' : null
+              item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null
+              item.actualProductTrend = item.actualProductTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2))  + '%' : null
+              item.originalGlassPassTrend = item.originalGlassPassTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null
 						}
 					})
 					if (item.det === false) {

src/views/report/glass/inputTable.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: Do not edit
  * @Date: 2023-12-13 14:10:04
- * @LastEditTime: 2024-03-11 16:10:25
+ * @LastEditTime: 2024-03-13 15:27:43
  * @LastEditors: zhp
  * @Description:
 -->
@@ -197,6 +197,12 @@ const cols = [
     },
     methods: {
       updateData() {
+        this.data.forEach((ele, index) => {
+          delete ele.dailyOutputTrend
+          delete ele.originalGlassStatisticsTrend
+          delete ele.actualProductTrend
+          delete ele.originalGlassPassTrend
+        });
         updateGlass(this.data).then(response => {
           updateGlassRemark(this.sum).then(res => {
             this.$modal.msgSuccess("修改成功");

src/views/report/glass/month.vue

@@ -81,9 +81,10 @@ export default {
 					this.proLineList.forEach(it => {
 						if (item.lineId === it.id) {
               item.lineName = it.name
-              item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? item.originalGlassStatisticsTrend + '%' : null
-              item.actualProductTrend = item.actualProductTrend ? item.actualProductTrend + '%' : null
-              item.originalGlassPassTrend = item.originalGlassPassTrend ? item.originalGlassPassTrend * 100 + '%' : null
+              item.dailyOutputTrend = item.dailyOutputTrend ? parseFloat((item.dailyOutputTrend * 100).toFixed(2)) + '%' : null
+              item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null
+              item.actualProductTrend = item.actualProductTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null
+              item.originalGlassPassTrend = item.originalGlassPassTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null
 						}
 					})
 					if (item.det === false) {

src/views/report/glass/weekly.vue

@@ -172,9 +172,10 @@ export default {
 					this.proLineList.forEach(it => {
 						if (item.lineId === it.id) {
               item.lineName = it.name
-              item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? item.originalGlassStatisticsTrend + '%' : null
-              item.actualProductTrend = item.actualProductTrend ? item.actualProductTrend + '%' : null
-              item.originalGlassPassTrend = item.originalGlassPassTrend ? item.originalGlassPassTrend * 100 + '%' : null
+              item.dailyOutputTrend = item.dailyOutputTrend ? parseFloat((item.dailyOutputTrend * 100).toFixed(2)) + '%' : null
+              item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null
+              item.actualProductTrend = item.actualProductTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null
+              item.originalGlassPassTrend = item.originalGlassPassTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null
 						}
 					})
 					if (item.det === false) {

src/views/report/glass/year.vue

@@ -82,9 +82,10 @@ export default {
         this.tableData = response.data.filter(item => {
 					this.proLineList.forEach(it => {
             if (item.lineId === it.id) {
-              item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? item.originalGlassStatisticsTrend + '%' : null
-              item.actualProductTrend = item.actualProductTrend ? item.actualProductTrend + '%' : null
-              item.originalGlassPassTrend = item.originalGlassPassTrend ? item.originalGlassPassTrend * 100 + '%' : null
+              item.dailyOutputTrend = item.dailyOutputTrend ? parseFloat((item.dailyOutputTrend * 100).toFixed(2)) + '%' : null
+              item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null
+              item.actualProductTrend = item.actualProductTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null
+              item.originalGlassPassTrend = item.originalGlassPassTrend ? parseFloat((item.originalGlassStatisticsTrend * 100).toFixed(2)) + '%' : null
 							item.lineName = it.name
 						}
 					})

src/views/report/productionDayReport/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-03-12 11:17:53
+ * @LastEditTime: 2024-03-13 15:28:18
  * @LastEditors: zhp
  * @Description:
 -->
@@ -47,7 +47,8 @@
           <el-table-column prop="inputTrend" label="增减" align="center">
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="disabled"></el-input>
-              <span v-else>{{ scope.row.inputTrend ? scope.row.inputTrend + '%' : undefined}} </span>
+              <span v-else>{{ scope.row.inputTrend ? parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' :
+              undefined}} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -70,7 +71,8 @@
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="disabled">
               </el-input>
-              <span v-else>{{ scope.row.goodProductTrend ? scope.row.goodProductTrend + '%' : undefined }} </span>
+              <span v-else>{{ scope.row.goodProductTrend ? parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) +
+              '%' : undefined }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -91,7 +93,8 @@
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="disabled">
               </el-input>
-              <span v-else>{{ scope.row.missCheckTrend ? scope.row.missCheckTrend + '%' : undefined }} </span>
+              <span v-else>{{ scope.row.missCheckTrend ? parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' :
+              undefined }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -114,7 +117,9 @@
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled">
               </el-input>
-              <span v-else>{{ scope.row.goodProductPassTrend ? scope.row.goodProductPassTrend + '%' : undefined }}
+              <span v-else>{{ scope.row.goodProductPassTrend ? parseFloat((scope.row.goodProductPassTrend *
+              100).toFixed(2)) +
+              '%' : undefined }}
               </span>
             </template>
           </el-table-column>
@@ -527,10 +532,16 @@ export default {
         }
       })
       let updateArr = this.list
+      updateArr.forEach((ele, index) => {
+        delete ele.inputTrend
+        delete ele.goodProductTrend
+        delete ele.missCheckTrend
+        delete ele.goodProductPassTrend
+      });
       // console.log(JSON.stringify(updateArr[1]))
       const result = await Promise.all([
         await updateSumProductionDataList(obj),
-        await updateProductionDataList(updateArr),
+        await updateProductionDataList(updateArr)
       ])
       console.log(result);
       if (result[0].data == true && result[1].data == true) {

src/views/report/productionMonthReport/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-03-12 11:14:04
+ * @LastEditTime: 2024-03-13 15:29:17
  * @LastEditors: zhp
  * @Description:
 -->
@@ -49,7 +49,8 @@
           <el-table-column prop="inputTrend" label="增减" align="center">
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="disabled"></el-input>
-              <span v-else>{{ scope.row.inputTrend ? scope.row.inputTrend + '%' : undefined }} </span>
+              <span v-else>{{ scope.row.inputTrend ? parseFloat((scope.row.inputTrend *
+              100).toFixed(2)) + '%' : undefined }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -72,7 +73,8 @@
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="disabled">
               </el-input>
-              <span v-else>{{ scope.row.goodProductTrend ? scope.row.goodProductTrend + '%' : undefined }} </span>
+              <span v-else>{{ scope.row.goodProductTrend ? parseFloat((scope.row.goodProductTrend *
+              100).toFixed(2)) + '%' : undefined }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -93,7 +95,8 @@
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="disabled">
               </el-input>
-              <span v-else>{{ scope.row.missCheckTrend ? scope.row.missCheckTrend +'%' : undefined }} </span>
+              <span v-else>{{ scope.row.missCheckTrend ? parseFloat((scope.row.missCheckTrend *
+              100).toFixed(2)) +'%' : undefined }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -116,7 +119,8 @@
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled">
               </el-input>
-              <span v-else>{{ scope.row.goodProductPassTrend ? scope.row.goodProductPassTrend + '%' :undefined }}
+              <span v-else>{{ scope.row.goodProductPassTrend ? parseFloat((scope.row.goodProductPassTrend *
+              100).toFixed(2))+ '%' :undefined }}
               </span>
             </template>
           </el-table-column>
@@ -531,6 +535,12 @@ export default {
         }
       })
       let updateArr = this.list
+      updateArr.forEach((ele, index) => {
+        delete ele.inputTrend
+        delete ele.goodProductTrend
+        delete ele.missCheckTrend
+        delete ele.goodProductPassTrend
+      });
       // console.log(JSON.stringify(updateArr[1]))
       const result = await Promise.all([
         await updateSumProductionDataList(obj),

src/views/report/productionShipmentsReport/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-03-12 11:17:14
+ * @LastEditTime: 2024-03-14 13:46:39
  * @LastEditors: zhp
  * @Description:
 -->
@@ -9,9 +9,7 @@
   <div class="app-container">
     <el-form :inline="true" :model="dataForm" class="demo-form-inline">
       <el-form-item>
-        <el-date-picker clearable v-model="monthValue" type="monthrange" range-separator="至" start-placeholder="开始日期"
-          end-placeholder="结束日期" value-format="timestamp" :clearable="false" :picker-options="pickerOptions"
-          size="small" style='width:350px;' @change="timeSelect">
+        <el-date-picker clearable v-model="reportTime" @change="changeTime" type="date" placeholder="选择日期">
         </el-date-picker>
       </el-form-item>
       <el-button type="primary" @click="getDataList()">查询</el-button>
@@ -431,7 +429,8 @@ export default {
 			// 	explainText: undefined,
 			// 	remark: undefined,
 			// },
-			// 查询参数
+      // 查询参数
+      reportTime:'',
       dataForm: {
         // pageSize: 100,
         // pageNo:1,
@@ -449,10 +448,41 @@ export default {
 		// this.getProductLineList();
   },
   mounted() {
+    this.getTodayStartTimeAndEndTime()
     this.getDataList()
     this.getDict()
   },
   methods: {
+    format(shijianchuo) {
+      //shijianchuo是整数，否则要parseInt转换
+      var time = moment(new Date(shijianchuo)).format('YYYY-MM-DD HH:mm:ss')
+      // console.log(time)
+      // var y = time.getFullYear();
+      // var m = time.getMonth() + 1;
+      // var d = time.getDate();
+      // var h = time.getHours();
+      // var mm = time.getMinutes();
+      // var s = time.getSeconds();
+      return time
+    },
+    getTodayStartTimeAndEndTime() {
+      this.reportTime = new Date()
+      this.changeTime(this.reportTime)
+    },
+    changeTime(val) {
+      console.log(val)
+      if (val) {
+        // console.log(val)
+        // console.log(val.setHours(7, 0, 0))
+        // console.log(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000)
+        // let time = this.format(val.setHours(7, 0, 0))
+        this.dataForm.reportTime[0] = this.format(val.setHours(7, 0, 1)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
+        this.dataForm.reportTime[1] = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
+        console.log(this.dataForm.reportTime);
+      } else {
+        this.dataForm.reportTime = []
+      }
+    },
     async getDict() {
       // 产线列表
       const res = await getCorePLList()
@@ -530,18 +560,7 @@ export default {
       }
     },
     async getDataList() {
-      if (this.monthValue.length > 0) {
-        console.log(this.monthValue)
-        this.dataForm.reportTime[0] = this.transformTime(this.monthValue[0])
-        // this.queryParams.startTime = this.monthValue[0]
-        this.dataForm.reportTime[1] = this.transformTime(this.monthValue[1])
-        this.timeTips = moment(this.monthValue[0]).format('YYYY-MM-DD') + ' - ' + moment(this.monthValue[1]).format('YYYY-MM-DD')
-        console.log(this.timeTips);
-      } else {
-        // this.$modal.msgError('月范围不能为空')
-        // return false
-      }
-
+      this.timeTips = moment(new Date()).format('YYYY-MM-DD') + ' - ' + moment(new Date().setHours(7, 0, 0) + 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
       console.log(this.dataForm);
       const res = await this.$axios({
         url: 'base/report-auto-delive/listPlus',

src/views/report/productionWeekReport/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-03-12 11:14:55
+ * @LastEditTime: 2024-03-13 15:29:26
  * @LastEditors: zhp
  * @Description:
 -->
@@ -10,7 +10,7 @@
     <el-form :inline="true" :model="dataForm" class="demo-form-inline">
       <el-form-item>
         <el-date-picker v-model="reportTime" type="week" size="small" @change="changeTime"
-          :picker-options="{firstDayOfWeek: 5}" :format="'yyyy 第 WW 周' + '\u3000' + startTimeStamp + '-' + endTimeStamp"
+          :picker-options="{firstDayOfWeek: 4}" :format="'yyyy 第 WW 周' + '\u3000' + startTimeStamp + '-' + endTimeStamp"
           style="width: 350px" placeholder="选择周">
         </el-date-picker>
       </el-form-item>
@@ -50,7 +50,8 @@
           <el-table-column prop="inputTrend" label="增减" align="center">
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="disabled"></el-input>
-              <span v-else>{{ scope.row.inputTrend ? scope.row.inputTrend + '%' : undefined }} </span>
+              <span v-else>{{ scope.row.inputTrend ? parseFloat((scope.row.inputTrend *
+              100).toFixed(2)) + '%' : undefined }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -73,7 +74,8 @@
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="disabled">
               </el-input>
-              <span v-else>{{ scope.row.goodProductTrend ? scope.row.goodProductTrend + '%' : undefined }} </span>
+              <span v-else>{{ scope.row.goodProductTrend ? parseFloat((scope.row.goodProductTrend *
+              100).toFixed(2)) + '%' : undefined }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -94,7 +96,8 @@
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="disabled">
               </el-input>
-              <span v-else>{{ scope.row.missCheckTrend ? scope.row.missCheckTrend + '%' : undefined }} </span>
+              <span v-else>{{ scope.row.missCheckTrend ? parseFloat((scope.row.missCheckTrend *
+              100).toFixed(2)) + '%' : undefined }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -117,7 +120,8 @@
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled">
               </el-input>
-              <span v-else>{{ scope.row.goodProductPassTrend ? scope.row.goodProductPassTrend + '%' : undefined }}
+              <span v-else>{{ scope.row.goodProductPassTrend ? parseFloat((scope.row.goodProductPassTrend *
+              100).toFixed(2)) + '%' :undefined }}
               </span>
             </template>
           </el-table-column>
@@ -501,6 +505,12 @@ export default {
         }
       })
       let updateArr = this.list
+      updateArr.forEach((ele, index) => {
+        delete ele.inputTrend
+        delete ele.goodProductTrend
+        delete ele.missCheckTrend
+        delete ele.goodProductPassTrend
+      });
       // console.log(JSON.stringify(updateArr[1]))
       const result = await Promise.all([
         await updateSumProductionDataList(obj),

src/views/report/productionYearReport/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-03-12 11:15:05
+ * @LastEditTime: 2024-03-13 15:29:35
  * @LastEditors: zhp
  * @Description:
 -->
@@ -52,7 +52,8 @@
           <el-table-column prop="inputTrend" label="增减" align="center">
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="disabled"></el-input>
-              <span v-else>{{ scope.row.inputTrend ? scope.row.inputTrend + '%' : undefined }} </span>
+              <span v-else>{{ scope.row.inputTrend ? parseFloat((scope.row.inputTrend *
+              100).toFixed(2)) + '%' : undefined }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -75,7 +76,8 @@
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="disabled">
               </el-input>
-              <span v-else>{{ scope.row.goodProductTrend ? scope.row.goodProductTrend + '%' : undefined }} </span>
+              <span v-else>{{ scope.row.goodProductTrend ? parseFloat((scope.row.goodProductTrend *
+              100).toFixed(2)) + '%' : undefined }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -96,7 +98,8 @@
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="disabled">
               </el-input>
-              <span v-else>{{ scope.row.missCheckTrend ? scope.row.missCheckTrend + '%' : undefined }}
+              <span v-else>{{ scope.row.missCheckTrend ? parseFloat((scope.row.missCheckTrend *
+              100).toFixed(2)) + '%' : undefined }}
               </span>
             </template>
           </el-table-column>
@@ -120,7 +123,8 @@
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled">
               </el-input>
-              <span v-else>{{ scope.row.goodProductPassTrend ? scope.row.goodProductPassTrend + '%' : undefined }}
+              <span v-else>{{ scope.row.goodProductPassTrend ? parseFloat((scope.row.goodProductPassTrend *
+              100).toFixed(2)) + '%' : undefined }}
               </span>
             </template>
           </el-table-column>
@@ -445,6 +449,12 @@ export default {
         }
       })
       let updateArr = this.list
+      updateArr.forEach((ele, index) => {
+        delete ele.inputTrend
+        delete ele.goodProductTrend
+        delete ele.missCheckTrend
+        delete ele.goodProductPassTrend
+      });
       // console.log(JSON.stringify(updateArr[1]))
       const result = await Promise.all([
         await updateSumProductionDataList(obj),

src/views/specialEquipment/basic/FireFighthing.vue

@@ -117,12 +117,12 @@
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import EquipmentDrawer from '../components/firefightingDrawer';
+import BaseDialogWrapper from '../components/BaseDialogWrapper.vue';
 
 import {
 	createEquipment,
 	updateEquipment,
 	deleteEquipment,
-	getEquipment,
 	getEquipmentPage,
 	exportEquipmentExcel,
 } from '@/api/base/equipment';
@@ -134,6 +134,7 @@ export default {
 	components: {
 		Editor,
 		EquipmentDrawer,
+		BaseDialog: BaseDialogWrapper
 	},
 	mixins: [basicPageMixin],
 	data() {

src/views/specialEquipment/basic/Manage.vue

@@ -116,12 +116,12 @@
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import EquipmentDrawer from '../components/manageDrawer';
+import BaseDialogWrapper from '../components/BaseDialogWrapper.vue';
 
 import {
 	createEquipment,
 	updateEquipment,
 	deleteEquipment,
-	getEquipment,
 	getEquipmentPage,
 	exportEquipmentExcel,
 } from '@/api/base/equipment';
@@ -133,6 +133,7 @@ export default {
 	components: {
 		Editor,
 		EquipmentDrawer,
+		BaseDialog: BaseDialogWrapper
 	},
 	mixins: [basicPageMixin],
 	data() {

src/views/specialEquipment/basic/Safety.vue

@@ -126,12 +126,14 @@ import {
 } from '@/api/base/equipment';
 import Editor from '@/components/Editor';
 import AssetsUpload from '../components/AssetsUpload.vue';
+import BaseDialogWrapper from '../components/BaseDialogWrapper.vue';
 
 export default {
 	name: 'SpecialEquipmentForSafety',
 	components: {
 		Editor,
 		EquipmentDrawer,
+		BaseDialog: BaseDialogWrapper,
 	},
 	mixins: [basicPageMixin],
 	data() {

src/views/specialEquipment/check/Config.vue

@@ -51,7 +51,8 @@
 		<addOrUpdata
 			v-if="addOrUpdateVisible"
 			ref="addOrUpdate"
-			@refreshDataList="getList" />
+			@refreshDataList="getList"
+			@destroy="addOrUpdateVisible = false" />
 	</div>
 </template>
 
@@ -60,10 +61,11 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import addOrUpdata from './add-or-updata.vue';
 import add from './add.vue';
 import { parseTime } from '../../core/mixins/code-filter';
+import BaseDialogWrapperVue from '../components/BaseDialogWrapper.vue';
 
 export default {
 	name: 'SpecialEquipmentCheckConfig',
-	components: { addOrUpdata, add },
+	components: { addOrUpdata, add, BaseDialog: BaseDialogWrapperVue },
 	mixins: [basicPageMixin],
 	data() {
 		return {
@@ -188,6 +190,7 @@ export default {
 				pageSize: 10,
 				name: null,
 				status: 0,
+				special: true,
 			},
 			// 表单参数
 			form: {},

src/views/specialEquipment/check/Content-edit.vue

@@ -9,7 +9,9 @@
 	<el-drawer
 		:visible="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapperClosable="true"
+		:close-on-click-modal="true"
+		:before-close="handleConfirmClose"
 		class="drawer"
 		custom-class="mes-drawer"
 		size="60%"
@@ -171,7 +173,7 @@
 			</div>
 
 			<div class="drawer-body__footer">
-				<el-button style="" @click="handleCancel">
+				<el-button v-if="!disableEdit" @click="handleCancel">
 					{{ disableEdit ? '返回' : '取消' }}
 				</el-button>
 				<el-button
@@ -206,35 +208,11 @@
 <script>
 import DialogForm from '../../../components/DialogForm/index.vue';
 import { groupConnectWorkshop } from '@/utils/equipment-module';
-
-const SmallTitle = {
-	name: 'SmallTitle',
-	props: ['size'],
-	components: {},
-	data() {
-		return {};
-	},
-	methods: {},
-	render: function (h) {
-		return h(
-			'span',
-			{
-				class: 'small-title',
-				style: {
-					fontSize: '18px',
-					lineHeight:
-						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
-					fontWeight: 500,
-					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
-				},
-			},
-			this.$slots.default
-		);
-	},
-};
+import BaseDialogWrapperVue from '../components/BaseDialogWrapper.vue';
+import SmallTitle from '../components/SmallTitle.js';
 
 export default {
-	components: { SmallTitle, DialogForm },
+	components: { SmallTitle, DialogForm, BaseDialog: BaseDialogWrapperVue },
 	props: ['dataId'], // dataId 作为一个通用的存放id的字段
 	data() {
 		return {
@@ -411,6 +389,35 @@ export default {
 		this.getList('inspector');
 	},
 	methods: {
+		/** 确认是否关闭 */
+		async handleConfirmClose() {
+			if (this.disableEdit) return this.handleCancel();
+
+			try {
+				if (
+					await this.$confirm(
+						<div style="position: relative; margin-bottom: 26px; overflow: visible;">
+							<h1 style="font-size: 16px; font-weight: bold; color: #000c;">
+								确认要关闭页面吗?
+							</h1>
+							<p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
+								确定关闭将不保留编辑内容
+							</p>
+						</div>,
+						{
+							confirmButtonText: '确 定',
+							cancelButtonText: '取 消',
+							type: 'warning',
+						}
+					)
+				) {
+					this.handleCancel();
+				}
+			} catch (err) {
+				return false;
+			}
+		},
+
 		handleSearchBarBtnClick(btn) {
 			switch (btn.btnName) {
 				case 'search':

src/views/specialEquipment/check/Content.vue

@@ -64,10 +64,18 @@ import { parseTime } from '../../core/mixins/code-filter';
 import CheckOrderListTable from './CheckOrderListTable.vue';
 import edit from './Content-edit.vue';
 import AddCheckDet from './Content-add_detail.vue';
+import BaseDialogWrapperVue from '../components/BaseDialogWrapper.vue';
 
 export default {
 	name: 'SpecialEquipmentCheckConfig',
-	components: { addOrUpdata, add, edit, AddCheckDet, CheckOrderListTable },
+	components: {
+		addOrUpdata,
+		add,
+		edit,
+		AddCheckDet,
+		BaseDialog: BaseDialogWrapperVue,
+		CheckOrderListTable,
+	},
 	mixins: [basicPageMixin],
 	data() {
 		return {
@@ -86,7 +94,7 @@ export default {
 					? {
 							type: 'edit',
 							btnName: '修改',
-						}
+					  }
 					: undefined,
 				{
 					type: 'detail',
@@ -96,7 +104,7 @@ export default {
 					? {
 							type: 'delete',
 							btnName: '删除',
-						}
+					  }
 					: undefined,
 			].filter((v) => v),
 			tableProps: [
@@ -334,9 +342,8 @@ export default {
 					}
 
 					return this.$axios({
-						url:
-							`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
-							// + checkPersonParam,
+						url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
+						// + checkPersonParam,
 						// '/base/equipment-check-order/confirm?ids=' + JSON.stringify([id]).replaceAll("\"", ''),
 						method: 'put',
 						data: [id],

src/views/specialEquipment/check/Record-detail.vue

@@ -7,9 +7,10 @@
 
 <template>
 	<el-drawer
-		:visible="visible"
+		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapper-closable="true"
+		:close-on-click-modal="true"
 		class="drawer"
 		custom-class="mes-drawer"
 		size="60%"
@@ -30,13 +31,13 @@
 						<el-row :gutter="20">
 							<el-col :span="8">
 								<el-form-item label="巡检单名称" prop="name">
-									<div style="">{{ form.name }}</div>
+									<div style="">{{ form.name || '---' }}</div>
 								</el-form-item>
 							</el-col>
 
 							<el-col :span="8">
 								<el-form-item label="部门" prop="department">
-									<div style="">{{ form.department }}</div>
+									<div style="">{{ form.department || '---' }}</div>
 								</el-form-item>
 							</el-col>
 
@@ -111,7 +112,7 @@
 			</div>
 
 			<div class="drawer-body__footer">
-				<el-button style="" @click="handleCancel">
+				<el-button v-if="!disableEdit" @click="handleCancel">
 					{{ disableEdit ? '返回' : '取消' }}
 				</el-button>
 				<el-button
@@ -146,35 +147,11 @@
 <script>
 import { parseTime } from '../../core/mixins/code-filter';
 import DialogForm from '../../../components/DialogForm/index.vue';
-
-const SmallTitle = {
-	name: 'SmallTitle',
-	props: ['size'],
-	components: {},
-	data() {
-		return {};
-	},
-	methods: {},
-	render: function (h) {
-		return h(
-			'span',
-			{
-				class: 'small-title',
-				style: {
-					fontSize: '18px',
-					lineHeight:
-						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
-					fontWeight: 500,
-					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
-				},
-			},
-			this.$slots.default
-		);
-	},
-};
+import BaseDialogWrapperVue from '../components/BaseDialogWrapper.vue';
+import SmallTitle from '../components/SmallTitle.js';
 
 export default {
-	components: { SmallTitle, DialogForm },
+	components: { SmallTitle, DialogForm, BaseDialog: BaseDialogWrapperVue },
 	props: ['dataId'], // dataId 作为一个通用的存放id的字段
 	filters: { parseTime },
 	data() {

src/views/specialEquipment/check/Record.vue

@@ -49,12 +49,21 @@
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { parseTime } from '../../core/mixins/code-filter';
 import RecordDetail from './Record-detail.vue';
+import moment from 'moment';
 
 export default {
 	name: 'SpecialEquipmentCheckRecord',
 	components: { RecordDetail },
 	mixins: [basicPageMixin],
 	data() {
+		const today = new Date();
+		const twoDaysAgo = new Date(today.getTime() - 2 * 24 * 60 * 60 * 1000);
+		twoDaysAgo.setHours(0, 0, 0, 0);
+		const t = [
+			moment(twoDaysAgo).format('yyyy-MM-DD HH:mm:ss'),
+			moment(today).format('yyyy-MM-DD HH:mm:ss'),
+		];
+
 		return {
 			detailOpen: false,
 			addOrUpdateVisible: false,
@@ -151,6 +160,7 @@ export default {
 					endPlaceholder: '结束日期',
 					defaultTime: ['00:00:00', '23:59:59'],
 					param: 'actualCheckTime',
+					defaultSelect: t,
 					// width: 350,
 				},
 				{
@@ -189,6 +199,7 @@ export default {
 				pageSize: 10,
 				special: true,
 				status: 2,
+				actualCheckTime: t,
 			},
 			// 表单参数
 			form: {},
@@ -204,7 +215,7 @@ export default {
 		getList() {
 			this.loading = true;
 			// 执行查询
-			this.recv(this.queryParams).then((response) => {
+			this.recv({ ...this.queryParams }).then((response) => {
 				this.list = response.data.list;
 				this.total = response.data.total;
 				this.loading = false;

src/views/specialEquipment/check/add-or-updata.vue

@@ -9,7 +9,9 @@
 	<el-drawer
 		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="true"
+		:wrapperClosable="true"
+		:close-on-click-modal="true"
+		@closed="$emit('destroy')"
 		class="drawer"
 		size="50%">
 		<small-title slot="title" :no-padding="true">
@@ -37,12 +39,12 @@
 						</el-col> -->
 						<el-col :span="8">
 							<el-form-item label="巡检单名称" prop="name">
-								{{ dataForm.name }}
+								{{ dataForm.name || '---' }}
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="部门" prop="department">
-								{{ dataForm.department }}
+								{{ dataForm.department || '---' }}
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
@@ -94,7 +96,7 @@
 					@pagination="getList" />
 
 				<!-- <div class="drawer-body__footer">
-					<el-button type="primary" @click="goback()">关闭</el-button>
+					<el-button type="primary" @click="goback()">返回</el-button>
 				</div> -->
 			</div>
 		</div>
@@ -111,7 +113,7 @@
 <script>
 import SmallTitle from './SmallTitle';
 import attrAdd from './attr-add';
-import { DICT_TYPE, getDictDatas } from '@/utils/dict';
+// import { DICT_TYPE, getDictDatas } from '@/utils/dict';
 import { parseTime } from '../../core/mixins/code-filter';
 
 const tableBtn = [
@@ -183,6 +185,33 @@ export default {
 	},
 	mounted() {},
 	methods: {
+		/** 确认是否关闭 */
+		async handleConfirmClose() {
+			try {
+				if (
+					await this.$confirm(
+						<div style="position: relative; margin-bottom: 26px; overflow: visible;">
+							<h1 style="font-size: 16px; font-weight: bold; color: #000c;">
+								确认要关闭页面吗?
+							</h1>
+							<p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
+								确定关闭将不保留编辑内容
+							</p>
+						</div>,
+						{
+							confirmButtonText: '确 定',
+							cancelButtonText: '取 消',
+							type: 'warning',
+						}
+					)
+				) {
+					this.visible = false;
+				}
+			} catch (err) {
+				return false;
+			}
+		},
+
 		initData() {
 			this.checkDetList.splice(0);
 			this.checkDetList.total = 0;
@@ -245,7 +274,7 @@ export default {
 			});
 		},
 		goback() {
-			this.$emit('refreshDataList');
+			// this.$emit('refreshDataList');
 			this.visible = false;
 			// this.initData();
 		},

src/views/specialEquipment/check/attr-add.vue

@@ -51,7 +51,7 @@
 
 		<el-row style="text-align: right">
 			<el-button @click="visible = false">取消</el-button>
-			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">保存</el-button>
 		</el-row>
 	</el-dialog>
 </template>

src/views/specialEquipment/components/BaseDialogWrapper.vue

@@ -0,0 +1,59 @@
+<!-- 
+    filename: BaseDialogWrapper.vue
+    author: liubin
+    date: 2024-03-13 13:51:14
+    description: 对BaseDialog的封装，自定义保存、取消按钮
+-->
+
+<template>
+	<base-dialog
+		:dialogTitle="dialogTitle"
+		:dialogVisible="dialogVisible"
+		:width="width"
+		:custom-class="customClass"
+		:append-to-body="appendToBody"
+		@close="$emit('close')">
+		<slot />
+		<template #footer>
+			<el-row slot="footer" type="flex" justify="end">
+				<el-col :span="24">
+					<el-button size="small" class="btnTextStyle" @click="$emit('cancel')">
+						取消
+					</el-button>
+					<el-button
+						type="primary"
+						class="btnTextStyle"
+						size="small"
+						@click="$emit('confirm')">
+						保存
+					</el-button>
+				</el-col>
+			</el-row>
+		</template>
+	</base-dialog>
+</template>
+
+<script>
+export default {
+	name: 'BaseDialogWrapper',
+	components: {},
+	props: [
+		'dialogTitle',
+		'dialogVisible',
+		'appendToBody',
+		'width',
+		'customClass',
+	],
+	data() {
+		return {};
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.baseDialog .btnTextStyle {
+	letter-spacing: 6px;
+	padding: 9px 10px 9px 16px;
+	font-size: 14px;
+}
+</style>

src/views/specialEquipment/components/SmallTitle.js

@@ -0,0 +1,32 @@
+// <!--
+//     filename: SmallTitle.js
+//     author: liubin
+//     date: 2024-03-13 14:21:01
+//     description:
+// -->
+
+export default {
+	name: 'SmallTitle',
+	props: ['size'],
+	components: {},
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};

src/views/specialEquipment/components/firefightingDrawer.vue

@@ -121,35 +121,16 @@
 <script>
 import DialogForm from './DialogForm';
 import EquipmentInfoForm from './EquipmentInfoForm.vue';
-
-const SmallTitle = {
-	name: 'SmallTitle',
-	props: ['size'],
-	components: {},
-	data() {
-		return {};
-	},
-	methods: {},
-	render: function (h) {
-		return h(
-			'span',
-			{
-				class: 'small-title',
-				style: {
-					fontSize: '18px',
-					lineHeight:
-						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
-					fontWeight: 500,
-					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
-				},
-			},
-			this.$slots.default
-		);
-	},
-};
+import BaseDialogWrapper from './BaseDialogWrapper.vue';
+import SmallTitle from './SmallTitle.js';
 
 export default {
-	components: { SmallTitle, DialogForm, EquipmentInfoForm },
+	components: {
+		SmallTitle,
+		DialogForm,
+		EquipmentInfoForm,
+		BaseDialog: BaseDialogWrapper,
+	},
 	props: ['sections', 'mode', 'dataId', 'isFireEquipment'], // dataId 作为一个通用的存放id的字段
 	data() {
 		return {

src/views/specialEquipment/components/manageDrawer.vue

@@ -5,7 +5,6 @@
     description: 
 -->
 
-
 <template>
 	<el-drawer
 		:visible="visible"
@@ -122,35 +121,16 @@
 <script>
 import DialogForm from './DialogForm';
 import EquipmentInfoForm from './manageDrawerForm.vue';
-
-const SmallTitle = {
-	name: 'SmallTitle',
-	props: ['size'],
-	components: {},
-	data() {
-		return {};
-	},
-	methods: {},
-	render: function (h) {
-		return h(
-			'span',
-			{
-				class: 'small-title',
-				style: {
-					fontSize: '18px',
-					lineHeight:
-						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
-					fontWeight: 500,
-					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
-				},
-			},
-			this.$slots.default
-		);
-	},
-};
+import BaseDialogWrapper from './BaseDialogWrapper.vue';
+import SmallTitle from './SmallTitle.js';
 
 export default {
-	components: { SmallTitle, DialogForm, EquipmentInfoForm },
+	components: {
+		SmallTitle,
+		DialogForm,
+		EquipmentInfoForm,
+		BaseDialog: BaseDialogWrapper,
+	},
 	props: ['sections', 'mode', 'dataId', 'isFireEquipment'], // dataId 作为一个通用的存放id的字段
 	data() {
 		return {

src/views/specialEquipment/components/safetyDrawer.vue

@@ -5,7 +5,6 @@
     description: 
 -->
 
-
 <template>
 	<el-drawer
 		:visible="visible"
@@ -122,35 +121,16 @@
 <script>
 import DialogForm from './DialogForm';
 import EquipmentInfoForm from './EquipmentInfoForm.vue';
-
-const SmallTitle = {
-	name: 'SmallTitle',
-	props: ['size'],
-	components: {},
-	data() {
-		return {};
-	},
-	methods: {},
-	render: function (h) {
-		return h(
-			'span',
-			{
-				class: 'small-title',
-				style: {
-					fontSize: '18px',
-					lineHeight:
-						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
-					fontWeight: 500,
-					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
-				},
-			},
-			this.$slots.default
-		);
-	},
-};
+import BaseDialogWrapper from './BaseDialogWrapper.vue';
+import SmallTitle from './SmallTitle.js';
 
 export default {
-	components: { SmallTitle, DialogForm, EquipmentInfoForm },
+	components: {
+		SmallTitle,
+		DialogForm,
+		EquipmentInfoForm,
+		BaseDialog: BaseDialogWrapper,
+	},
 	props: ['sections', 'mode', 'dataId', 'isFireEquipment'], // dataId 作为一个通用的存放id的字段
 	data() {
 		return {

src/views/specialEquipment/maintain/Monitor--detail.vue

@@ -9,7 +9,9 @@
 	<el-drawer
 		:visible="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapperClosable="true"
+		:close-on-click-modal="true"
+		:before-close="handleConfirmClose"
 		class="drawer"
 		custom-class="mes-drawer"
 		size="60%"
@@ -115,7 +117,7 @@
 		</div>
 
 		<div class="drawer-body__footer">
-			<el-button style="" @click="cancel">返回</el-button>
+			<!-- <el-button style="" @click="cancel">返回</el-button> -->
 			<!-- <el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
 				编辑
 			</el-button>
@@ -143,32 +145,7 @@
 
 <script>
 import DialogForm from '@/components/DialogForm';
-
-const SmallTitle = {
-	name: 'SmallTitle',
-	props: ['size'],
-	components: {},
-	data() {
-		return {};
-	},
-	methods: {},
-	render: function (h) {
-		return h(
-			'span',
-			{
-				class: 'small-title',
-				style: {
-					fontSize: '18px',
-					lineHeight:
-						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
-					fontWeight: 500,
-					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
-				},
-			},
-			this.$slots.default
-		);
-	},
-};
+import SmallTitle from '../components/SmallTitle.js';
 
 export default {
 	name: 'PlanConfig--addContent',
@@ -263,6 +240,35 @@ export default {
 		this.loadEquipments();
 	},
 	methods: {
+		/** 确认是否关闭 */
+		async handleConfirmClose() {
+			if (this.mode.includes('detail')) return this.cancel();
+
+			try {
+				if (
+					await this.$confirm(
+						<div style="position: relative; margin-bottom: 26px; overflow: visible;">
+							<h1 style="font-size: 16px; font-weight: bold; color: #000c;">
+								确认要关闭页面吗?
+							</h1>
+							<p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
+								确定关闭将不保留编辑内容
+							</p>
+						</div>,
+						{
+							confirmButtonText: '确 定',
+							cancelButtonText: '取 消',
+							type: 'warning',
+						}
+					)
+				) {
+					this.cancel();
+				}
+			} catch (err) {
+				return false;
+			}
+		},
+
 		show({
 			departmentName,
 			id,

src/views/specialEquipment/maintain/Monitor.vue

@@ -61,7 +61,7 @@
 </template>
 
 <script>
-import { publicFormatter } from '@/utils/dict';
+// import { publicFormatter } from '@/utils/dict';
 // import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { exportMaintainMonitorExcel } from '@/api/equipment/base/maintain/record';

src/views/specialEquipment/maintain/PlanConfig--add.vue

@@ -123,7 +123,8 @@
 							type: 'number',
 							message: '请输入正确的数字',
 							trigger: 'blur',
-							transform: (val) => Number(val) && parseInt(val) === Number(val),
+							transform: (val) =>
+								Number(val) && parseInt(val) === Number(val) && Number(val),
 						},
 						{ required: true, message: '保养频率不能为空', trigger: 'blur' },
 					]">

src/views/specialEquipment/maintain/PlanConfig--addContent.vue

@@ -2,14 +2,16 @@
     filename: PlanConfig--addContent.vue
     author: liubin
     date: 2024-02-04 09:40:04
-    description: 
+    description: 计划配置-添加内容
 -->
 
 <template>
 	<el-drawer
-		:visible="visible"
+		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapperClosable="true"
+		:close-on-click-modal="true"
+		:before-close="handleConfirmClose"
 		class="drawer"
 		custom-class="mes-drawer"
 		size="60%"
@@ -19,7 +21,7 @@
 				mode.includes('detail')
 					? '详情'
 					: mode.includes('edit')
-					? '编辑'
+					? '添加内容'
 					: '新增'
 			}}
 		</SmallTitle>
@@ -38,37 +40,37 @@
 							<el-row :gutter="20">
 								<el-col :span="8">
 									<el-form-item label="保养计划名称" prop="name">
-										<span>{{ form.name }}</span>
+										<span>{{ form.name || '---' }}</span>
 									</el-form-item>
 								</el-col>
 
 								<el-col :span="8">
 									<el-form-item label="部门" prop="departmentName">
-										<span>{{ form.departmentName }}</span>
+										<span>{{ form.departmentName || '---' }}</span>
 									</el-form-item>
 								</el-col>
 
 								<el-col :span="8">
 									<el-form-item label="产线名" prop="lineName">
-										<span>{{ form.lineName }}</span>
+										<span>{{ form.lineName || '---' }}</span>
 									</el-form-item>
 								</el-col>
 
 								<el-col :span="8">
 									<el-form-item label="保养频率" prop="maintenancePeriod">
-										<span>{{ form.maintenancePeriod }}</span>
+										<span>{{ form.maintenancePeriod || '---' }}</span>
 									</el-form-item>
 								</el-col>
 
 								<el-col :span="8">
 									<el-form-item label="保养时长" prop="maintainDuration">
-										<span>{{ form.maintainDuration }}</span>
+										<span>{{ form.maintainDuration || '---' }}</span>
 									</el-form-item>
 								</el-col>
 
 								<el-col :span="8">
 									<el-form-item label="计划保养人员" prop="maintainer">
-										<span>{{ form.maintainer }}</span>
+										<span>{{ form.maintainer || '---' }}</span>
 									</el-form-item>
 								</el-col>
 							</el-row>
@@ -143,36 +145,12 @@
 
 <script>
 import DialogForm from '@/components/DialogForm';
-
-const SmallTitle = {
-	name: 'SmallTitle',
-	props: ['size'],
-	components: {},
-	data() {
-		return {};
-	},
-	methods: {},
-	render: function (h) {
-		return h(
-			'span',
-			{
-				class: 'small-title',
-				style: {
-					fontSize: '18px',
-					lineHeight:
-						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
-					fontWeight: 500,
-					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
-				},
-			},
-			this.$slots.default
-		);
-	},
-};
+import BaseDialogWrapper from '../components/BaseDialogWrapper.vue';
+import SmallTitle from '../components/SmallTitle.js';
 
 export default {
 	name: 'PlanConfig--addContent',
-	components: { SmallTitle, DialogForm },
+	components: { SmallTitle, DialogForm, BaseDialog: BaseDialogWrapper },
 	props: ['maintainData'],
 	data() {
 		return {
@@ -263,6 +241,35 @@ export default {
 		this.loadEquipments();
 	},
 	methods: {
+		/** 确认是否关闭 */
+		async handleConfirmClose() {
+			if (this.mode.includes('detail')) return this.cancel();
+			if (document.querySelector('.small-title').innerText.includes('添加内容')) return this.cancel();
+			try {
+				if (
+					await this.$confirm(
+						<div style="position: relative; margin-bottom: 26px; overflow: visible;">
+							<h1 style="font-size: 16px; font-weight: bold; color: #000c;">
+								确认要关闭页面吗?
+							</h1>
+							<p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
+								确定关闭将不保留编辑内容
+							</p>
+						</div>,
+						{
+							confirmButtonText: '确 定',
+							cancelButtonText: '取 消',
+							type: 'warning',
+						}
+					)
+				) {
+					this.cancel();
+				}
+			} catch (err) {
+				return false;
+			}
+		},
+
 		show({
 			departmentName,
 			id,

src/views/specialEquipment/maintain/PlanConfig.vue

@@ -65,10 +65,15 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { deleteEqMaintainPlan } from '@/api/equipment/base/maintain/record';
 import PlanConfigAdd from './PlanConfig--add.vue';
 import PlanConfigAddContent from './PlanConfig--addContent.vue';
+import BaseDialogWrapper from '../components/BaseDialogWrapper.vue';
 
 export default {
 	name: 'SpecialEquipmentPlanConfig',
-	components: { DialogForm: PlanConfigAdd, PlanConfigAddContent },
+	components: {
+		BaseDialog: BaseDialogWrapper,
+		DialogForm: PlanConfigAdd,
+		PlanConfigAddContent,
+	},
 	mixins: [basicPageMixin],
 	data() {
 		const t = new Date();
@@ -98,7 +103,7 @@ export default {
 					: undefined,
 			].filter((v) => v),
 			tableProps: [
-				{ prop: 'name', label: '计划名称' },
+				{ prop: 'name', label: '保养计划名称' },
 				{ prop: 'departmentName', label: '部门' },
 				{ width: 144, prop: 'lineName', label: '产线名' },
 				{ width: 132, prop: 'maintenancePeriod', label: '保养频率(天/次)' },

src/views/specialEquipment/maintain/Record--detail.vue

@@ -9,7 +9,9 @@
 	<el-drawer
 		:visible="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapperClosable="true"
+		:close-on-click-modal="true"
+		:before-close="handleConfirmClose"
 		class="drawer"
 		custom-class="mes-drawer"
 		size="60%"
@@ -84,7 +86,7 @@
 		</div>
 
 		<div class="drawer-body__footer">
-			<el-button style="" @click="cancel">返回</el-button>
+			<!-- <el-button style="" @click="cancel">返回</el-button> -->
 			<!-- <el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
 				编辑
 			</el-button>
@@ -112,36 +114,12 @@
 
 <script>
 import DialogForm from '@/components/DialogForm';
-
-const SmallTitle = {
-	name: 'SmallTitle',
-	props: ['size'],
-	components: {},
-	data() {
-		return {};
-	},
-	methods: {},
-	render: function (h) {
-		return h(
-			'span',
-			{
-				class: 'small-title',
-				style: {
-					fontSize: '18px',
-					lineHeight:
-						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
-					fontWeight: 500,
-					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
-				},
-			},
-			this.$slots.default
-		);
-	},
-};
+import SmallTitle from '../components/SmallTitle.js';
+import BaseDialogWrapper from '../components/BaseDialogWrapper';
 
 export default {
 	name: 'PlanConfig--addContent',
-	components: { SmallTitle, DialogForm },
+	components: { SmallTitle, DialogForm, BaseDialog: BaseDialogWrapper },
 	props: ['maintainData'],
 	data() {
 		return {
@@ -229,6 +207,35 @@ export default {
 		this.loadEquipments();
 	},
 	methods: {
+		/** 确认是否关闭 */
+		async handleConfirmClose() {
+			if (this.mode.includes('detail')) return this.cancel();
+
+			try {
+				if (
+					await this.$confirm(
+						<div style="position: relative; margin-bottom: 26px; overflow: visible;">
+							<h1 style="font-size: 16px; font-weight: bold; color: #000c;">
+								确认要关闭页面吗?
+							</h1>
+							<p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
+								确定关闭将不保留编辑内容
+							</p>
+						</div>,
+						{
+							confirmButtonText: '确 定',
+							cancelButtonText: '取 消',
+							type: 'warning',
+						}
+					)
+				) {
+					this.cancel();
+				}
+			} catch (err) {
+				return false;
+			}
+		},
+
 		show({ planMaintainWorker, id, maintainWorker }) {
 			this.form = Object.assign(
 				{},
@@ -305,17 +312,14 @@ export default {
 			}
 
 			try {
-				const res = await this.$axios(
-					'/base/equipment-maintain-log-det/page',
-					{
-						params: {
-							pageNo: this.detailTableQuery.pageNo,
-							pageSize: this.detailTableQuery.pageSize,
-							// planId: this.form.id,
-							logId: this.form.id,
-						},
-					}
-				);
+				const res = await this.$axios('/base/equipment-maintain-log-det/page', {
+					params: {
+						pageNo: this.detailTableQuery.pageNo,
+						pageSize: this.detailTableQuery.pageSize,
+						// planId: this.form.id,
+						logId: this.form.id,
+					},
+				});
 				this.detailList = res.data?.list || [];
 				this.detailTotal = res.data?.total || 0;
 				this.detailLoading = false;

src/views/specialEquipment/maintain/Record.vue

@@ -108,6 +108,14 @@ export default {
 	components: { DialogForm, RecordDetail },
 	mixins: [basicPageMixin],
 	data() {
+		const today = new Date();
+		const twoDaysAgo = new Date(today.getTime() - 2 * 24 * 60 * 60 * 1000);
+		twoDaysAgo.setHours(0, 0, 0, 0);
+		const t = [
+			moment(twoDaysAgo).format('yyyy-MM-DD HH:mm:ss'),
+			moment(today).format('yyyy-MM-DD HH:mm:ss'),
+		];
+
 		return {
 			recordDetailVisible: false,
 			searchBarKeys: [
@@ -301,7 +309,7 @@ export default {
 					endPlaceholder: '结束日期',
 					defaultTime: ['00:00:00', '23:59:59'],
 					param: 'startTime',
-					defaultSelect: null,
+					defaultSelect: t,
 					// width: 350,
 				},
 				// {
@@ -500,7 +508,7 @@ export default {
 				pageNo: 1,
 				pageSize: 10,
 				maintainPlanId: null,
-				startTime: null,
+				startTime: t,
 				// relatePlan: null,
 				// equipmentId: null,
 				special: true,

src/views/specialEquipment/maintain/Repair.vue

@@ -70,10 +70,11 @@ import {
 import { parseTime } from '@/utils/ruoyi';
 import htmls from './htmls.vue';
 import DialogForm from './Repair--add.vue';
+import BaseDialogWrapperVue from '../components/BaseDialogWrapper.vue';
 
 export default {
 	name: 'SpecialEquipmentRepair',
-	components: { DetailDrawer, DialogForm },
+	components: { DetailDrawer, DialogForm, BaseDialog: BaseDialogWrapperVue },
 	mixins: [basicPageMixin],
 	data() {
 		return {

src/views/specialEquipment/maintain/WaitingList.vue

@@ -97,42 +97,39 @@
 </template>
 
 <script>
-import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import DialogFormUnplanned from './WaitingList--add--unplanned.vue';
 import UnplannedEditDrawer from './WaitingListUnplanned--edit.vue';
 import PlannedEditDrawer from './WaitingListPlanned--edit.vue';
 import UnplannedAddDet from './WaitingListUnplanned--add_detail.vue';
-import {
-	exportMaintainLogExcel,
-} from '@/api/equipment/base/maintain/record';
+import { exportMaintainLogExcel } from '@/api/equipment/base/maintain/record';
 import WaitingListTable from './WaitingListTable.vue';
 import RecordDetail from './Record--detail.vue';
+import BaseDialogWrapper from '../components/BaseDialogWrapper.vue';
 
-const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
-
-const btn = {
-	name: 'tableBtn',
-	props: ['injectData'],
-	data() {
-		return {};
-	},
-	methods: {
-		handleClick() {
-			this.$emit('emitData', {
-				action: this.injectData.label,
-				value: this.injectData,
-			});
-		},
-	},
-	render: function (h) {
-		return (
-			<el-button type="text" onClick={this.handleClick}>
-				{this.injectData.name}
-			</el-button>
-		);
-	},
-};
+// const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
+// const btn = {
+// 	name: 'tableBtn',
+// 	props: ['injectData'],
+// 	data() {
+// 		return {};
+// 	},
+// 	methods: {
+// 		handleClick() {
+// 			this.$emit('emitData', {
+// 				action: this.injectData.label,
+// 				value: this.injectData,
+// 			});
+// 		},
+// 	},
+// 	render: function (h) {
+// 		return (
+// 			<el-button type="text" onClick={this.handleClick}>
+// 				{this.injectData.name}
+// 			</el-button>
+// 		);
+// 	},
+// };
 
 export default {
 	name: 'SpecialEquipmentMaintainRecord',
@@ -143,6 +140,7 @@ export default {
 		UnplannedEditDrawer,
 		UnplannedAddDet,
 		PlannedEditDrawer,
+		BaseDialog: BaseDialogWrapper,
 	},
 	mixins: [basicPageMixin],
 	data() {

src/views/specialEquipment/maintain/WaitingListPlanned--edit.vue

@@ -9,7 +9,9 @@
 	<el-drawer
 		:visible="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapperClosable="true"
+		:close-on-click-modal="true"
+		:before-close="handleConfirmClose"
 		class="drawer"
 		custom-class="mes-drawer"
 		size="60%"
@@ -482,6 +484,33 @@ export default {
 		this.getList('line');
 	},
 	methods: {
+		/** 确认是否关闭 */
+		async handleConfirmClose() {
+			try {
+				if (
+					await this.$confirm(
+						<div style="position: relative; margin-bottom: 26px; overflow: visible;">
+							<h1 style="font-size: 16px; font-weight: bold; color: #000c;">
+								确认要关闭页面吗?
+							</h1>
+							<p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
+								确定关闭将不保留编辑内容
+							</p>
+						</div>,
+						{
+							confirmButtonText: '确 定',
+							cancelButtonText: '取 消',
+							type: 'warning',
+						}
+					)
+				) {
+					this.handleCancel();
+				}
+			} catch (err) {
+				return false;
+			}
+		},
+
 		handleSearchBarBtnClick(btn) {
 			switch (btn.btnName) {
 				case 'search':

src/views/specialEquipment/maintain/WaitingListUnplanned--edit.vue

@@ -9,7 +9,9 @@
 	<el-drawer
 		:visible="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapperClosable="true"
+		:close-on-click-modal="true"
+		:before-close="handleConfirmClose"
 		class="drawer"
 		custom-class="mes-drawer"
 		size="60%"
@@ -419,6 +421,34 @@ export default {
 		this.getList('line');
 	},
 	methods: {
+		
+		/** 确认是否关闭 */
+		async handleConfirmClose() {
+			try {
+				if (
+					await this.$confirm(
+						<div style="position: relative; margin-bottom: 26px; overflow: visible;">
+							<h1 style="font-size: 16px; font-weight: bold; color: #000c;">
+								确认要关闭页面吗?
+							</h1>
+							<p style="font-size: 14px; color: #0008; position: absolute; top: 24px;">
+								确定关闭将不保留编辑内容
+							</p>
+						</div>,
+						{
+							confirmButtonText: '确 定',
+							cancelButtonText: '取 消',
+							type: 'warning',
+						}
+					)
+				) {
+					this.handleCancel();
+				}
+			} catch (err) {
+				return false;
+			}
+		},
+
 		handleSearchBarBtnClick(btn) {
 			console.log('btn', btn);
 			switch (btn.btnName) {