更新仓库bug

Reviewed-on: #109

src/api/equipment/base/maintain/record.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-11-08 15:56:52
- * @LastEditTime: 2023-11-21 10:50:55
+ * @LastEditTime: 2023-11-23 19:10:07
  * @LastEditors: DY
  * @Description: 
  */
@@ -32,3 +32,13 @@ export function exportMaintainMonitorExcel(query) {
     responseType: 'blob'
   })
 }
+
+// 导出设备保养记录
+export function exportMaintainLogExcel(query) {
+  return request({
+    url: '/base/equipment-maintain-log/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/equipment/base/repair.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-11-10 16:09:33
- * @LastEditTime: 2023-11-16 18:57:08
+ * @LastEditTime: 2023-11-23 20:29:28
  * @LastEditors: DY
  * @Description: 
  */
@@ -31,3 +31,13 @@ export function deleteRepair(id) {
     method: 'delete'
   })
 }
+
+// 导出设备维修
+export function exportRepairLogExcel(query) {
+  return request({
+    url: '/base/equipment-repair-log/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/assets/icons/svg/return.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>rollback</title>
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="按钮与选择" transform="translate(-135.000000, -282.000000)" fill-rule="nonzero">
+            <g id="编组-3" transform="translate(127.000000, 274.000000)">
+                <g id="rollback" transform="translate(8.000000, 8.000000)">
+                    <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="16" height="16"></rect>
+                    <path d="M11.390625,3.78125 L5.71875,3.78125 L5.71875,2.625 C5.71875,2.5203125 5.5984375,2.4625 5.5171875,2.5265625 L3.2984375,4.2765625 C3.234375,4.3265625 3.234375,4.4234375 3.2984375,4.4734375 L5.5171875,6.2234375 C5.5984375,6.2875 5.71875,6.2296875 5.71875,6.125 L5.71875,4.96875 L11.203125,4.96875 C11.7554097,4.96875 12.203125,5.41646525 12.203125,5.96875 L12.203125,11.3125 C12.203125,11.8647847 11.7554097,12.3125 11.203125,12.3125 L2.93775156,12.3125 L2.93775156,12.3125 C2.55569144,12.3125 2.36466138,12.4938859 2.36466138,12.8566576 C2.36466138,13.5 2.93775156,13.5 2.93775156,13.5 C2.93775156,13.5 5.75537604,13.5 11.390625,13.5 C13,13.5 13.390625,12.8986083 13.390625,11.9909216 L13.390625,4.96875 C13.390625,4.06071182 13,3.78125 11.390625,3.78125 Z" id="路径" fill="currentColor"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

src/mixins/lb/basicPageMixin.js

@@ -33,6 +33,7 @@ export default {
 			addUrl: '',
 			pageUrl: '',
 			infoUrl: '',
+			deleteUrl: '',
 			basePath: '',
 			form: {}
 		};
@@ -60,7 +61,7 @@ export default {
 			return this.$axios({
 				url,
 				method,
-				params: method === 'get' ? payload : null,
+				params: (method === 'get' || method === 'delete') ? payload : null,
 				data: method !== 'get' ? payload : null,
 			})
 		},
@@ -77,6 +78,7 @@ export default {
 			return this.http(this.infoUrl == '' ? this.infoPath : this.infoUrl, 'get', payload);
 		},
 		del(payload) {
+			debugger;
 			return this.http(this.deleteUrl == '' ? this.deletePath : this.deleteUrl, 'delete', payload);
 		},
 

src/views/base/coreEquipment/index.vue

@@ -288,10 +288,10 @@ export default {
 				[
 					{
 						input: true,
-						label: '产品加工时间(s)',
+						label: '单件产品加工时间(s)',
 						prop: 'processingTime',
 						rules: [
-							{ required: true, message: '产品加工时间不能为空', trigger: 'blur' },
+							{ required: true, message: '单件产品加工时间不能为空', trigger: 'blur' },
 							{
 								type: 'number',
 								message: '请输入正确的数字值',
@@ -319,9 +319,16 @@ export default {
 						prop: 'description',
 					},
 				],
+				[
+					{
+						upload: true,
+						label: '上传资料',
+						prop: 'files',
+					},
+				],
 				[
 					{ input: true, label: '备注', prop: 'remark' }
-				]
+				],
 				// [
 				// 	{
 				// 		assetUpload: true,

src/views/base/coreEquipmentLineBind/index.vue

@@ -189,6 +189,10 @@ export default {
 						],
 						label: '产线统计类型',
 						prop: 'lineDataType',
+						bind: {
+							clearable: true, filterable: true
+						},
+						rules: [{ required: true, message: '产线统计类型不能为空', trigger: 'change' }],
 					},
 					{
 						select: true,
@@ -199,6 +203,10 @@ export default {
 						],
 						label: '工段统计类型',
 						prop: 'sectionDataType',
+						bind: {
+							clearable: true, filterable: true
+						},
+						rules: [{ required: true, message: '工段统计类型不能为空', trigger: 'change' }],
 					},
 				],
 			],

src/views/base/coreWorkOrder/detail.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-22 09:47:53
+ * @LastEditTime: 2023-11-23 18:45:15
  * @Description:
 -->
 <template>
@@ -49,7 +49,9 @@
 				</el-row>
 				<el-row :gutter="20">
 					<el-col :span="8">负责人:{{ dataForm.workers }}</el-col>
-					<el-col :span="8">关联产线:{{ dataForm.productLineNames }}</el-col>
+					<el-col :span="8">关联产线:
+						<span v-for="(item, index) in dataForm.productLineNames" :key="index" style="margin-right: 10px">{{ item }}</span>
+					</el-col>
 					<el-col :span="8">物料计算方式:{{ dataForm.materialMethod === 1 ? '产品基础' : dataForm.materialMethod === 2 ? '工艺扩展' : '' }}</el-col>
 				</el-row>
 				<el-row :gutter="20">

src/views/base/material/index.vue

@@ -39,6 +39,7 @@ import {
 	deleteMaterial
 } from '@/api/base/material';
 import { listData } from "@/api/system/dict/data";
+import { publicFormatter } from '@/utils/dict';
 
 const tableProps = [
 	{
@@ -59,8 +60,9 @@ const tableProps = [
 		label: '英文名称'
 	},
 	{
-		prop: 'materialType',
+		prop: 'type',
-		label: '物料类型'
+		label: '物料类型',
+		filter: publicFormatter('material_type')
 	},
 	{
 		prop: 'supplierName',

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-22 11:09:44
+ * @LastEditTime: 2023-11-23 15:00:00
  * @Description:
 -->
 <template>
@@ -311,6 +311,9 @@ export default {
 						row.mUnit = u.label
 					}
 				})
+			} else {
+				row.unit = null
+				row.mUnit = ''
 			}
 			// row.materialCode = tempList[0].code
 			// row.unit = tempList[0].unit

src/views/base/materialUseLog/index.vue

@@ -215,12 +215,33 @@ export default {
           this.$refs.addOrUpdate.init(val.data.id);
         });
       } else if (val.type === "delete") {
-        this.deleteHandle(val.data.id, val.data.materialName, val.data._pageIndex)
+        this.deleteHandle(val.data.id, val.data.materialName)
       } else if (val.type === "change") {
         this.changeStatus(val.data.id)
       } else {
         this.otherMethods(val)
       }
+    },
+		// 删除
+    deleteHandle(id, name) {
+      this.$confirm(`是否确认删除物料名称为${name}的数据项?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.urlOptions.deleteURL(id).then(({ data }) => {
+            this.$message({
+              message: "操作成功",
+              type: "success",
+              duration: 1500,
+              onClose: () => {
+                this.getDataList();
+              },
+            });
+          });
+        })
+        .catch(() => { });
     }
 	},
 };

src/views/core/analysis/balanceChart.vue

@@ -6,131 +6,150 @@
  * @Description:
 -->
 <template>
-  <div>
+	<div class="balace-chart">
-    <div style="margin: 20px">
+		<div style="margin: 20px">
-      <el-button v-for="(item, index) in buttonList" :key="index" :class="[item.actived ? 'activeButton': 'normalButton']" @click="changeChart(index)">{{ item.name }}</el-button>
+			<el-button
-    </div>
+				v-for="(item, index) in buttonList"
-    <div id="chart" ref="chartDiv" :class="className" :style="{height:height,width:width}" />
+				:key="index"
-  </div>
+				:class="[item.actived ? 'activeButton' : '']"
+				@click="changeChart(index)">
+				{{ item.name }}
+			</el-button>
+		</div>
+		<div
+			id="chart"
+			ref="chartDiv"
+			:class="className"
+			:style="{ height: height, width: width }" />
+	</div>
 </template>
 
 <script>
-import * as echarts from 'echarts'
+import * as echarts from 'echarts';
-require('echarts/theme/macarons') // echarts theme
+require('echarts/theme/macarons'); // echarts theme
 // import resize from './mixins/resize'
 
 export default {
-  // mixins: [resize],
+	// mixins: [resize],
-  props: {
+	props: {
-    className: {
+		className: {
-      type: String,
+			type: String,
-      default: 'chart'
+			default: 'chart',
-    },
+		},
-    width: {
+		width: {
-      type: String,
+			type: String,
-      default: '100%'
+			default: '100%',
-    },
+		},
-    height: {
+		height: {
-      type: String,
+			type: String,
-      default: '350px'
+			default: '350px',
-    },
+		},
-    // autoResize: {
+		// autoResize: {
-    //   type: Boolean,
+		//   type: Boolean,
-    //   default: true
+		//   default: true
-    // }
+		// }
-  },
+	},
-  data() {
+	data() {
-    return {
+		return {
-      chart: null,
+			chart: null,
-      dataArray: [],
+			dataArray: [],
-      xDatas: [],
+			xDatas: [],
-      buttonList: []
+			buttonList: [],
-    }
+		};
-  },
+	},
-  mounted() {
+	mounted() {
-    // this.initChart()
+		// this.initChart()
-  },
+		this.$nextTick(() => {
-  methods: {
+			this.changeChart(0);
-    changeChart(index) {
+		});
-      this.setOptions(this.xDatas, this.dataArray[index])
+	},
-      this.buttonList.forEach((item, s) => {
+	methods: {
-        if (index === s) {
+		changeChart(index) {
-          // item.actived = true
+			this.setOptions(this.xDatas, this.dataArray[index]);
-          this.$nextTick(() =>{
+			this.buttonList.forEach((item, s) => {
-            // item.actived = true
+				if (index === s) {
-            this.$set(item, 'actived', true)
+					// item.actived = true
-          })
+					this.$nextTick(() => {
-        } else {
+						// item.actived = true
-          // item.actived = false
+						this.$set(item, 'actived', true);
-          this.$nextTick(() =>{
+					});
-            // item.actived = false
+				} else {
-            this.$set(item, 'actived', false)
+					// item.actived = false
-          })
+					this.$nextTick(() => {
-          // this.$set(item, 'actived', false)
+						// item.actived = false
-        }
+						this.$set(item, 'actived', false);
-      })
+					});
-      console.log('看一下数22222据', this.dataArray)
+					// this.$set(item, 'actived', false)
-    },
+				}
-    initChart(xData, yData, lineName) {
+			});
-      this.dataArray = yData
+			console.log('看一下数22222据', this.dataArray);
-      this.buttonList = this.dataArray.map((item, index) => {
+		},
-        return {
+		initChart(xData, yData, lineName) {
-          'name': item.name,
+			this.dataArray = yData;
-          'actived': index === 0 ? true : false
+			this.buttonList = this.dataArray.map((item, index) => {
-        }
+				return {
-      })
+					name: item.name,
-      console.log('看一下数据', this.dataArray)
+					actived: index === 0 ? true : false,
-      this.xDatas = xData
+				};
-      this.chart = echarts.init(this.$refs.chartDiv, 'macarons')
+			});
-      // this.chart = echarts.init(document.getElementById('chart'), 'macarons')
+			console.log('看一下数据', this.dataArray);
-      // this.setOptions(xData, yData[0], lineName)
+			this.xDatas = xData;
-    },
+			this.chart = echarts.init(this.$refs.chartDiv, 'macarons');
-    setOptions(xData, dataList, lineName) {
+			// this.chart = echarts.init(document.getElementById('chart'), 'macarons')
-      // let seriesData = []
+			// this.setOptions(xData, yData[0], lineName)
-        // lineName.forEach((item,index) => {
+		},
-        //   seriesData.push({
+		setOptions(xData, dataList, lineName) {
-        //     name: item,
+			// let seriesData = []
-        //     data: yData[index],
+			// lineName.forEach((item,index) => {
-        //     type: 'line',
+			//   seriesData.push({
-        //   })
+			//     name: item,
-        // })
+			//     data: yData[index],
-      this.chart.setOption({
+			//     type: 'line',
-        xAxis: {
+			//   })
-          type: 'category',
+			// })
-          data: xData
+			this.chart.setOption({
-        },
+				xAxis: {
-        tooltip: {
+					type: 'category',
-          trigger: 'axis'
+					data: xData,
-        },
+				},
-        legend: {
+				tooltip: {
-          data:lineName
+					trigger: 'axis',
-        },
+				},
-        yAxis: {
+				legend: {
-          type: 'value'
+					data: lineName,
-        },
+				},
-        series: [
+				yAxis: {
-          {
+					type: 'value',
-            name: '设备CT',
+				},
-            data: dataList.eqData,
+				series: [
-            type: 'line',
+					{
-          },
+						name: '设备CT',
-          {
+						data: dataList.eqData,
-            name: '产线CT',
+						type: 'line',
-            data: dataList.plData,
+					},
-            type: 'line',
+					{
-          }
+						name: '产线CT',
-        ]
+						data: dataList.plData,
-      })
+						type: 'line',
-    }
+					},
-  }
+				],
-}
+			});
+		},
+	},
+};
 </script>
 
 <style scoped>
-.activeButton {
+.balace-chart >>> .el-button {
-  background-color: rgb(93,159,255);
+	background: #e3e3e3;
-}
+	color: #333;
-.normalButton {
+	transition: all 0.3s;
-  background-color: none;
+	border: none;
+
+	&.activeButton,
+	&:hover {
+		background: #0b58ff;
+		color: #fff;
+	}
 }
 </style>

src/views/delivery/deliveryLog/components/addOrUpdate.vue

@@ -1,7 +1,7 @@
 <template>
-  <el-form ref="addOrUpdate" :rules="rules" label-width="130px" :model="form">
+  <el-form ref="addOrUpdate" :rules="rules" label-width="130px" :model="form" label-position='top'>
-    <el-row>
+    <el-row :gutter="20">
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="订单名" prop="orderId">
           <el-select v-model="form.orderId" placeholder="请选择" style="width: 100%;">
             <el-option
@@ -13,14 +13,12 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="发货单名称" prop="name">
           <el-input v-model="form.name"></el-input>
         </el-form-item>
       </el-col>
-    </el-row>
+      <el-col :span='6'>
-    <el-row>
-      <el-col :span='12'>
         <el-form-item label="发货时间" prop="deliveryTime">
           <el-date-picker
             v-model="form.deliveryTime"
@@ -32,14 +30,14 @@
           </el-date-picker>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="发货单号" prop="code">
           <el-input v-model="form.code"></el-input>
         </el-form-item>
       </el-col>
     </el-row>
-    <el-row>
+    <el-row :gutter="20">
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="发货负责人" prop="deliveryPersonId">
           <el-select v-model="form.deliveryPersonId" placeholder="请选择" style="width: 100%;">
             <el-option
@@ -51,21 +49,19 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="运输负责人" prop="principal">
           <el-input v-model="form.principal"></el-input>
         </el-form-item>
       </el-col>
-    </el-row>
+      <el-col :span='6'>
-    <el-row>
-      <el-col :span='12'>
         <el-form-item label="运输联系方式" prop="principalCall">
           <el-input v-model="form.principalCall"></el-input>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="运输费用" prop="principalCost">
-          <el-input-number v-model="form.principalCost" :min="0" :max='9999999999' :precision='2'></el-input-number>
+          <el-input-number v-model="form.principalCost" :min="0" :max='9999999999' :precision='2' style='width: 100%;'></el-input-number>
         </el-form-item>
       </el-col>
     </el-row>

src/views/delivery/deliveryLog/components/deliveryLogDetail.vue

@@ -2,10 +2,11 @@
   <div>
     <el-drawer
       title="发货清单详情"
-      size="60%"
+      size="65%"
       :append-to-body="true"
       :visible.sync="centervisible"
-      @close='close'>
+      @close='close'
+      :show-close='false'>
       <div class="box1">
         <el-row>
           <el-col :span='12'>
@@ -90,7 +91,7 @@ const tableProps = [
   {
     prop: 'packagingSize',
     label: '装箱规格(片/箱)',
-    width: 120
+    width: 150
   },
   {
     prop: 'packagingNum',

src/views/delivery/deliveryLog/components/loadedPage.vue

@@ -1,19 +1,17 @@
 <template>
-  <el-form ref="addOrUpdate" :rules="rules" label-width="130px" :model="form">
+  <el-form ref="addOrUpdate" :rules="rules" label-width="130px" :model="form" label-position='top'>
-    <el-row>
+    <el-row :gutter="20">
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="发货单号">
           <el-input v-model="code" disabled></el-input>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="装车单号" prop="deliveryCarCode">
           <el-input v-model="form.deliveryCarCode"></el-input>
         </el-form-item>
       </el-col>
-    </el-row>
+      <el-col :span='6'>
-    <el-row>
-      <el-col :span='12'>
         <el-form-item label="装车时间" prop="loadTime">
           <el-date-picker
             v-model="form.loadTime"
@@ -25,19 +23,19 @@
           </el-date-picker>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="车辆联系人" prop="contactPerson">
           <el-input v-model="form.contactPerson"></el-input>
         </el-form-item>
       </el-col>
     </el-row>
-    <el-row>
+    <el-row :gutter="20">
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="联系方式" prop="contactPersonCall">
           <el-input v-model="form.contactPersonCall"></el-input>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="装车产品" prop="productId">
           <el-select v-model="form.productId" disabled placeholder="请选择" style="width: 100%;">
             <el-option
@@ -49,26 +47,24 @@
           </el-select>
         </el-form-item>
       </el-col>
-    </el-row>
+      <el-col :span='6'>
-    <el-row>
-      <el-col :span='12'>
         <el-form-item label="装箱规格(片/箱)" prop="packagingSize">
           <el-input-number v-model="form.packagingSize" :min="0" :max='9999999999' style="width:100%"></el-input-number>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="产品批次" prop="productDate">
           <el-input v-model="form.productDate" placeholder="多个批次用','隔开"></el-input>
         </el-form-item>
       </el-col>
     </el-row>
-    <el-row>
+    <el-row :gutter="20">
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="箱/托数" prop="packagingNum">
           <el-input-number v-model="form.packagingNum" :min="0" :max='9999999999' style="width:100%"></el-input-number>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="装车总量" prop="quantity">
           <el-input-number v-model="form.quantity" :min="0" :max='9999999999' style="width:100%"></el-input-number>
         </el-form-item>

src/views/delivery/deliveryLog/index.vue

@@ -103,7 +103,8 @@ const tableProps = [
   },
   {
     prop: 'principalCost',
-    label: '运输费用'
+    label: '运输费用',
+    align: 'right'
   },
   {
     prop: 'remark',
@@ -225,7 +226,11 @@ export default {
     },
     getList() {
       deliveryLogPage({...this.queryParams}).then(res => {
-        this.list = res.data.list || []
+        let arr = res.data.list || []
+        arr && arr.map(item => {
+          item.principalCost = item.principalCost.toFixed(2)
+        })
+        this.list = arr
         this.total = res.data.total || 0
       })
     },

src/views/delivery/deliveryLogDet/components/deliveryLogDetDetail.vue

@@ -4,7 +4,8 @@
     :visible.sync="centervisible"
     size="80%"
     class="deliveryLogDetail"
-    @close='closeA'>
+    @close='closeA'
+    :show-close='false'>
     <div class="box1">
       <div class="box_col">
         <div class="blodTip">订单名</div>
@@ -77,7 +78,8 @@
       size="60%"
       :append-to-body="true"
       :visible.sync="innerDrawer"
-      @close='closeB'>
+      @close='closeB'
+      :show-close='false'>
       <div class="box3">
         <el-row>
           <el-col :span='12'>

src/views/energy/analysis/contrastAnalysis/components/searchArea.vue

@@ -2,7 +2,7 @@
   <div class="searchBarBox divHeight" ref="searchBarRef" :style="{ paddingRight: isFold ? '55px' : '0px' }">
     <el-form :inline="true" class="demo-form-inline">
       <span class="blue-block"></span>
-      <el-form-item label="能源类型">
+      <el-form-item label="能源类型" required>
         <el-select v-model="queryParams.energyTypeId" placeholder="请选择" style="width: 100px;" size="small">
           <el-option
             v-for="item in energyTypeList"
@@ -12,7 +12,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="时间维度">
+      <el-form-item label="时间维度" required>
         <el-select v-model="queryParams.timeDim" placeholder="请选择" style="width: 80px;" size="small">
           <el-option
             v-for="item in getDictDatas(this.DICT_TYPE.TIME_DIM)"
@@ -22,7 +22,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="时间范围">
+      <el-form-item label="时间范围" required>
         <div v-show="queryParams.timeDim === '1'">
           <el-date-picker
             v-model="timeValue"
@@ -124,7 +124,7 @@
           </el-date-picker>
         </div>
       </el-form-item>
-      <el-form-item label="对象维度">
+      <el-form-item label="对象维度" required>
         <el-select v-model="queryParams.objType" placeholder="请选择" style="width: 80px;" @change="selectObjs" size="small">
           <el-option
             v-for="item in getDictDatas(this.DICT_TYPE.OBJECT_TYPE)"
@@ -134,7 +134,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="对象选择">
+      <el-form-item label="对象选择" required>
         <el-select v-model="queryParams.objIds" placeholder="请选择" multiple :multiple-limit='5' collapse-tags style="width: 200px;" size="small">
           <el-option
             v-for="item in objectList"
@@ -148,6 +148,8 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" size="small" @click="search">查询</el-button>
+        <span class="separateStyle"></span>
+        <el-button size="small" @click="resetBtn">重置</el-button>
       </el-form-item>
     </el-form>
     <span v-if="isFold" class="foldClass" @click='switchMode'>
@@ -400,6 +402,19 @@ export default {
       console.log(this.queryParams)
       this.$emit('submit', this.queryParams)
     },
+    resetBtn() {
+      this.queryParams.energyTypeId = null
+      this.queryParams.timeDim = this.getDictDatas(this.DICT_TYPE.TIME_DIM)[0].value // 默认时
+      this.queryParams.objIds = []
+      this.queryParams.objType = ''
+      this.timeValue = []
+      this.dateValue = []
+      this.weekValue1 = null
+      this.weekValue2 = null
+      this.monthValue = []
+      this.yearValue1 = null
+      this.yearValue2 = null
+    },
     transformTime(timeStamp) {// 本月最后一天
       let year = moment(timeStamp).format('YYYY')
       let month = moment(timeStamp).format('MM')
@@ -471,4 +486,12 @@ export default {
   height: 45px;
   overflow: hidden;
 }
+.separateStyle {
+  display: inline-block;
+  width: 1px;
+  height: 24px;
+  background: #E8E8E8;
+  vertical-align: middle;
+  margin: 0 10px;
+}
 </style>

src/views/energy/analysis/contrastAnalysis/index.vue

@@ -34,10 +34,10 @@ export default {
   mounted() {
     window.addEventListener('resize', () => {
       this.tableH = this.tableHeight(260)
-      this.isFold = this.searchBarWidth('contrastAnalysisBox', 1310)
+      this.isFold = this.searchBarWidth('contrastAnalysisBox', 1437)
       // console.log(document.getElementById("contrastAnalysisBox").offsetWidth)
     })
-    this.isFold = this.searchBarWidth('contrastAnalysisBox', 1310)
+    this.isFold = this.searchBarWidth('contrastAnalysisBox', 1437)
   },
   methods: {
     getList(params) {

src/views/energy/analysis/qoqAnalysis/components/searchArea.vue

@@ -1,7 +1,7 @@
 <template>
   <el-form :inline="true" class="demo-form-inline">
     <span class="blue-block"></span>
-    <el-form-item label="对象选择">
+    <el-form-item label="对象选择" required>
       <el-cascader
         v-model="objArr"
         :options="objList"
@@ -11,7 +11,7 @@
         style="width: 250px;"
         clearable></el-cascader>
     </el-form-item>
-    <el-form-item label="时间维度">
+    <el-form-item label="时间维度" required>
       <el-select v-model="queryParams.type" placeholder="请选择" style="width: 80px;" size="small">
         <el-option
           v-for="item in timeType"
@@ -22,7 +22,7 @@
         </el-option>
       </el-select>
     </el-form-item>
-    <el-form-item label="时间">
+    <el-form-item label="时间" required>
       <div v-show="queryParams.type === 1">
         <el-date-picker
           v-model="monthValue"
@@ -129,7 +129,7 @@ export default {
     },
     // 查询
     search() {
-      if (!this.objArr.length === 0) {
+      if (this.objArr.length === 0) {
         this.$modal.msgError('请选择对象')
         return false
       } else {

src/views/energy/analysis/trendAnalysis/components/searchArea.vue

@@ -2,7 +2,7 @@
   <div class="searchBarBox divHeight" ref="searchBarRef" :style="{ paddingRight: isFold ? '55px' : '0px' }">
     <el-form :inline="true" class="demo-form-inline">
       <span class="blue-block"></span>
-      <el-form-item label="能源类型">
+      <el-form-item label="能源类型" required>
         <el-select v-model="queryParams.energyTypeId" placeholder="请选择" style="width: 100px;" size="small">
           <el-option
             v-for="item in energyTypeList"
@@ -12,7 +12,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="对象选择">
+      <el-form-item label="对象选择" required>
         <el-cascader
           v-model="objArr"
           :options="objList"
@@ -21,7 +21,7 @@
           size="small"
           clearable></el-cascader>
       </el-form-item>
-      <el-form-item label="时间维度">
+      <el-form-item label="时间维度" required>
         <el-select v-model="queryParams.timeDim" placeholder="请选择" style="width: 80px;" size="small">
           <el-option
             v-for="item in getDictDatas(this.DICT_TYPE.TIME_DIM)"
@@ -32,7 +32,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="时间范围">
+      <el-form-item label="时间范围" required>
         <div v-show="queryParams.timeDim === '1'">
           <el-date-picker
             v-model="timeValue"
@@ -129,6 +129,8 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" size="small" @click="search">查询</el-button>
+        <span class="separateStyle"></span>
+        <el-button size="small" @click="resetBtn">重置</el-button>
       </el-form-item>
     </el-form>
     <span v-if="isFold" class="foldClass" @click='switchMode'>
@@ -360,6 +362,14 @@ export default {
       this.queryParams.endTime = this.queryParams.endTime + ''
       this.$emit('submit', this.queryParams)
     },
+    // 重置
+    resetBtn() {
+      this.queryParams.energyTypeId = null
+      this.queryParams.objId = null
+      this.objArr = []
+      this.queryParams.timeDim = this.getDictDatas(this.DICT_TYPE.TIME_DIM)[0].value // 默认时
+      this.timeValue = [moment().startOf('day'), moment().endOf('day')-59*61*1000]
+    },
     transformTime(timeStamp) {// 本月最后一天
       let year = moment(timeStamp).format('YYYY')
       let month = moment(timeStamp).format('MM')
@@ -435,4 +445,12 @@ export default {
   height: 45px;
   overflow: hidden;
 }
+.separateStyle {
+  display: inline-block;
+  width: 1px;
+  height: 24px;
+  background: #E8E8E8;
+  vertical-align: middle;
+  margin: 0 10px;
+}
 </style>

src/views/energy/analysis/trendAnalysis/index.vue

@@ -34,9 +34,9 @@ export default {
   mounted() {
     window.addEventListener('resize', () => {
       this.tableH = this.tableHeight(260)
-      this.isFold = this.searchBarWidth('trendAnalysisBox', 1146)
+      this.isFold = this.searchBarWidth('trendAnalysisBox', 1263)
     })
-    this.isFold = this.searchBarWidth('trendAnalysisBox', 1146)
+    this.isFold = this.searchBarWidth('trendAnalysisBox', 1263)
   },
   methods: {
     getList(params) {

src/views/energy/analysis/yoyAnalysis/components/searchArea.vue

@@ -1,7 +1,7 @@
 <template>
   <el-form :inline="true" class="demo-form-inline">
     <span class="blue-block"></span>
-    <el-form-item label="对象选择">
+    <el-form-item label="对象选择" required>
       <el-cascader
         v-model="objArr"
         :options="objList"
@@ -10,7 +10,7 @@
         size="small"
         clearable></el-cascader>
     </el-form-item>
-    <el-form-item label="时间维度">
+    <el-form-item label="时间维度" required>
       <el-select v-model="queryParams.type" placeholder="请选择" style="width: 80px;" size="small">
         <el-option
           v-for="item in timeType"
@@ -21,7 +21,7 @@
         </el-option>
       </el-select>
     </el-form-item>
-    <el-form-item label="时间">
+    <el-form-item label="时间" required>
       <div v-show="queryParams.type === 1 || queryParams.type === 2">
         <el-date-picker
           v-model="yearValue"
@@ -103,7 +103,7 @@ export default {
     },
     // 查询
     search() {
-      if (!this.objArr.length === 0) {
+      if (this.objArr.length === 0) {
         this.$modal.msgError('请选择对象')
         return false
       } else {

src/views/energy/base/energyPlc/components/energyPlcAdd.vue

@@ -25,18 +25,16 @@
       </el-col>
     </el-row>
     <el-row>
-      <el-col :span="24">
+      <el-col :span="12">
-        <el-form-item label="描述" prop="description">
-          <el-input v-model="form.description"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="24">
         <el-form-item label="是否采集" prop="collection">
           <el-switch v-model="form.collection"></el-switch>
         </el-form-item>
       </el-col>
+      <el-col :span="12">
+        <el-form-item label="描述" prop="description">
+          <el-input v-model="form.description"></el-input>
+        </el-form-item>
+      </el-col>
     </el-row>
   </el-form>
 </template>

src/views/energy/base/energyPlcConnect/components/energyPlcParam.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-drawer :title="drawerTitle" :visible.sync="visible" size="70%" @close='closeD'>
+    <el-drawer :title="drawerTitle" :visible.sync="visible" size="70%" @close='closeD' :show-close='false'>
       <div class="box">
         <el-form :inline="true">
           <el-form-item label="关联表名">

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

@@ -27,7 +27,7 @@
 </template>
 
 <script>
-import { getEnergyQuantityRealtimePage, exportEnergyQuantityRealtimeExcel } from "@/api/base/energyQuantityRealtime"
+import { getEnergyQuantityRealtimePage } from "@/api/base/energyQuantityRealtime"
 import { getEnergyTypeListAll } from "@/api/base/energyType"
 // import { publicFormatter } from '@/utils/dict'
 import FileSaver from "file-saver"
@@ -140,18 +140,16 @@ export default {
           break
         default:
           this.exportTable()
-          // this.$modal.confirm('是否确认导出').then(() => {
-          //     return exportEnergyQuantityRealtimeExcel({...this.queryParams});
-          //   }).then(response => {
-          //     console.log(response)
-          //     this.$download.excel(response, '能源抄表.xls');
-          //   }).catch(() => {})
       }
     },
     /** 查询列表 */
     getList() {
       getEnergyQuantityRealtimePage(this.queryParams).then(response => {
-        this.list = response.data.list || []
+        let arr = response.data.list || []
+        arr && arr.map(item => {
+          item.amount = item.amount ? (!isNaN(parseFloat(item.amount)) && isFinite(item.amount) ? item.amount.toFixed(2) : '') : ''
+        })
+        this.list = arr
         this.total = response.data.total;
         this.exportList = []
       });

src/views/energy/base/energyType/components/InnerTable.vue

@@ -5,7 +5,8 @@
         v-for='item in tableProps'
         :key="item.prop"
         :prop="item.prop" 
-        :label="item.label" 
+        :label="item.label"
+        :align="item.align ? item.align : 'left'" 
         width="120">
       </el-table-column>
     </el-table>

src/views/energy/monitoring/energyStatistics/components/energyStatisticsDet.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-drawer :title="drawerTitle" :visible.sync="visible" size="70%" @close='closeD'>
+    <el-drawer :title="drawerTitle" :visible.sync="visible" size="70%" @close='closeD' :show-close='false'>
       <div class="box">
         <el-form :inline="true">
           <el-form-item label="方案名称">

src/views/energy/monitoring/energyStatistics/components/energyStatisticsDetAdd.vue

@@ -3,7 +3,8 @@
     title="新增"
     :visible.sync="centervisible"
     size="60%"
-    @close='closeA'>
+    @close='closeA'
+    :show-close='false'>
     <div class="box">
       <!-- 搜索工作栏 -->
       <search-bar

src/views/equipment/analysis/Statistics/index.vue

@@ -28,59 +28,96 @@
 
 <script>
 import basicPage from '../../../core/mixins/basic-page';
-import { parseTime } from '../../../core/mixins/code-filter';
+import moment from 'moment';
 import {
 	getEqAnalysis,
-	exportEqAnalysisExcel
+	exportEqAnalysisExcel,
 } from '@/api/equipment/analysis/statistics';
 
 const tableProps = [
 	{
 		prop: 'recordTime',
 		label: '时间段',
-		filter: parseTime
+		filter: (val) => {
+			if (val && val.length > 0) {
+				return (
+					moment(val[0]).format('YYYY-MM-DD HH:mm:ss') +
+					' ~ ' +
+					moment(val[1]).format('YYYY-MM-DD HH:mm:ss')
+				);
+			}
+			return '-';
+		},
 	},
 	{
 		prop: 'lineName',
-		label: '产线'
+		label: '产线',
 	},
 	{
 		prop: 'sectionName',
-		label: '工段'
+		label: '工段',
 	},
 	{
 		prop: 'equipmentName',
-		label: '设备名称'
+		label: '设备名称',
 	},
 	{
 		prop: 'equipmentType',
-		label: '设备类型'
+		label: '设备类型',
 	},
 	{
 		prop: 'workTime',
-		label: '工作时间累积(h)'
+		label: '工作时间累积(h)',
 	},
 	{
 		prop: 'repairCount',
-		label: '维修次数'
+		label: '维修次数',
 	},
 	{
 		prop: 'maintainCount',
-		label: '保养次数'
+		label: '保养次数',
-	}
+	},
 ];
 
 export default {
 	mixins: [basicPage],
 	data() {
+		const today = new Date();
+
+		const todayStart = new Date(
+			today.getFullYear(),
+			today.getMonth(),
+			today.getDate(),
+			0,
+			0,
+			0
+		);
+		const todayEnd = new Date(
+			today.getFullYear(),
+			today.getMonth(),
+			today.getDate(),
+			23,
+			59,
+			59
+		);
+
 		return {
 			urlOptions: {
 				getDataListURL: getEqAnalysis,
 				exportURL: exportEqAnalysisExcel,
 			},
 			tableProps,
-			tableBtn: [].filter((v)=>v),
+			tableBtn: [].filter((v) => v),
 			tableData: [],
+			listQuery: {
+				pageSize: 10,
+				pageNo: 1,
+				total: 1,
+				recordTime: [
+					moment(todayStart).format('YYYY-MM-DD HH:mm:ss'),
+					moment(todayEnd).format('YYYY-MM-DD HH:mm:ss'),
+				],
+			},
 			formConfig: [
 				{
 					type: 'input',
@@ -101,7 +138,10 @@ export default {
 					endPlaceholder: '结束日期',
 					defaultTime: ['00:00:00', '23:59:59'],
 					param: 'recordTime',
-					defaultSelect: [],
+					defaultSelect: [
+						moment(todayStart).format('YYYY-MM-DD HH:mm:ss'),
+						moment(todayEnd).format('YYYY-MM-DD HH:mm:ss'),
+					],
 				},
 				{
 					type: 'button',
@@ -113,33 +153,38 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:analysis-statistics:export') ? 'button' : '',
+					type: this.$auth.hasPermi('equipment:analysis-statistics:export')
+						? 'button'
+						: '',
 					btnName: '导出',
 					name: 'export',
 					color: 'warning',
-					plain: true
+					plain: true,
 				},
 			],
 		};
 	},
 	created() {},
+	mounted() {},
 	methods: {
 		// 获取数据列表
-    getDataList() {
+		getDataList() {
-      this.dataListLoading = true;
+			this.dataListLoading = true;
-      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+			this.urlOptions.getDataListURL(this.listQuery).then((response) => {
-        this.tableData = response.data.list;
+				this.tableData = response.data.list;
-        this.listQuery.total = response.data.total;
+				this.listQuery.total = response.data.total;
-        this.dataListLoading = false;
+				this.dataListLoading = false;
-      });
+			});
-    },
+		},
 		buttonClick(val) {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
 					this.listQuery.pageSize = 10;
 					this.listQuery.equipmentName = val.name ? val.name : undefined;
-					this.listQuery.recordTime = val.recordTime ? val.recordTime : undefined;
+					this.listQuery.recordTime = val.recordTime
+						? val.recordTime
+						: undefined;
 					this.getDataList();
 					break;
 				case 'reset':
@@ -158,20 +203,24 @@ export default {
 					console.log(val);
 			}
 		},
-		 /** 导出按钮操作 */
+		/** 导出按钮操作 */
-    handleExport() {
+		handleExport() {
-      // 处理查询参数
+			// 处理查询参数
-      let params = { ...this.listQuery };
+			let params = { ...this.listQuery };
-      params.pageNo = undefined;
+			params.pageNo = undefined;
-      params.pageSize = undefined;
+			params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+			this.$modal
-        this.exportLoading = true;
+				.confirm('是否确认导出所有数据项?')
-        return this.urlOptions.exportURL(params);
+				.then(() => {
-      }).then(response => {
+					this.exportLoading = true;
-        this.$download.excel(response, '设备统计分析.xls');
+					return this.urlOptions.exportURL(params);
-        this.exportLoading = false;
+				})
-      }).catch(() => { });
+				.then((response) => {
-    }
+					this.$download.excel(response, '设备统计分析.xls');
+					this.exportLoading = false;
+				})
+				.catch(() => {});
+		},
 	},
 };
 </script>

src/views/equipment/analysis/efficiency/index.vue

@@ -237,6 +237,7 @@ export default {
 					label: '工厂',
 					placeholder: '请选择工厂',
 					param: 'factoryId',
+					filterable: true,
 					selectOptions: [],
 				},
 				{
@@ -244,6 +245,7 @@ export default {
 					label: '产线',
 					placeholder: '请选择产线',
 					param: 'lineId',
+					filterable: true,
 					selectOptions: [],
 				},
 				// 选项切换

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

@@ -310,7 +310,7 @@ export default {
 			this.$modal
 				.confirm('是否确认删除记录"' + row.name + '"?')
 				.then(function () {
-					return this.delete({ id });
+					return this.del({ id });
 				})
 				.then(() => {
 					this.getList();

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

@@ -198,26 +198,23 @@ export default {
 					prop: 'createTime',
 					label: '添加时间',
 					fixed: true,
-					width: 180,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
-				{ width: 240, prop: 'code', label: '报警编码' },
+				{ prop: 'code', label: '报警编码' },
 				{
-					width: 100,
 					prop: 'type',
 					label: '报警类型',
 					filter: (val) =>
 						val != null ? ['-', '字符型', '布尔型', '-'][val] : '-',
 				},
 				{
-					width: 90,
 					prop: 'grade',
 					label: '报警级别',
 					filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL),
 				},
-				{ width: 180, prop: 'alarmCode', label: '设备报警编码' },
+				{ prop: 'alarmCode', label: '设备报警编码' },
-				{ width: 128, prop: 'plcParamName', label: '参数列名' },
+				{ prop: 'plcParamName', label: '参数列名' },
-				{ width: 128, prop: 'alarmContent', label: '报警内容' },
+				{ prop: 'alarmContent', label: '报警内容' },
 			],
 			alarmForm: {
 				id: undefined,

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

@@ -52,7 +52,7 @@
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { publicFormatter } from '@/utils/dict';
-import { deleteCheck } from "@/api/equipment/base/inspection/settings";
+import { deleteCheck } from '@/api/equipment/base/inspection/settings';
 
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
@@ -128,15 +128,21 @@ export default {
 						label: '巡检内容编号',
 						prop: 'code',
 						url: '/base/equipment-check/getCode',
-						rules: [{ required: true, message: '巡检内容编号不能为空', trigger: 'blur' }],
+						rules: [
+							{
+								required: true,
+								message: '巡检内容编号不能为空',
+								trigger: 'blur',
+							},
+						],
 					},
-				],
-				[
 					{
 						input: true,
 						label: '巡检项目',
 						prop: 'program',
-						rules: [{ required: true, message: '巡检项目不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '巡检项目不能为空', trigger: 'blur' },
+						],
 					},
 				],
 				[
@@ -144,10 +150,10 @@ export default {
 						input: true,
 						label: '巡检内容',
 						prop: 'content',
-						rules: [{ required: true, message: '巡检内容不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '巡检内容不能为空', trigger: 'blur' },
+						],
 					},
-				],
-				[
 					{
 						input: true,
 						label: '备注',
@@ -168,7 +174,7 @@ export default {
 				code: '',
 				program: '',
 				id: undefined,
-				content: ''
+				content: '',
 			},
 			basePath: '/base/equipment-check',
 			mode: null,
@@ -271,10 +277,10 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除巡检项目名称为"' + row.program + '"的数据项?')
+				.confirm('是否确认删除该巡检项目?')
 				.then(function () {
-					// return this.delete({ id });
+					// return this.del({ id });
-					return deleteCheck(id)
+					return deleteCheck(id);
 				})
 				.then(() => {
 					this.getList();

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

@@ -105,6 +105,7 @@ export default {
 					label: '设备',
 					placeholder: '请选择设备',
 					param: 'equipmentId',
+					filterable: true
 				},
 				// 开始结束时间 
 				{

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

@@ -54,7 +54,6 @@
 </template>
 
 <script>
-import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import addOrUpdata from './add-or-updata.vue';
 // import { publicFormatter } from '@/utils/dict';
@@ -101,9 +100,9 @@ export default {
 				{ prop: 'lineName', label: '产线' },
 				{ prop: 'sectionName', label: '工段' },
 				{ prop: 'equipmentName', label: '设备' },
+				{ prop: 'equipmentCode', label: '设备编码' },
 				{ prop: 'responsible', label: '负责人' },
-				{ prop: 'equipmentCode', label: '描述' },
+				{ prop: 'checkNumber', label: '巡检条数' }, // TODO: 操作 选项，四个，群里询问
-				{ prop: 'checkNumber', label: '巡检条数' } // TODO: 操作 选项，四个，群里询问
 			],
 			searchBarFormConfig: [
 				{
@@ -151,14 +150,18 @@ export default {
 						input: true,
 						label: '配置名称',
 						prop: 'name',
-						rules: [{ required: true, message: '配置名称不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '配置名称不能为空', trigger: 'blur' },
+						],
 					},
 					{
 						input: true,
 						label: '配置编码',
 						prop: 'code',
 						url: '/base/equipment-check-config/getCode',
-						rules: [{ required: true, message: '配置编码不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '配置编码不能为空', trigger: 'blur' },
+						],
 					},
 				],
 				[
@@ -167,7 +170,9 @@ export default {
 						label: '设备名称',
 						prop: 'equipmentId',
 						url: '/base/core-equipment/listAll',
-						rules: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '设备名称不能为空', trigger: 'blur' },
+						],
 					},
 					{
 						input: true,
@@ -288,9 +293,9 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除记录"' + row.name + '"?')
+				.confirm('是否确认删除该巡检记录?')
-				.then(function () {
+				.then(() => {
-					return this.delete({ id });
+					return this.del({ id });
 				})
 				.then(() => {
 					this.getList();
@@ -317,14 +322,14 @@ export default {
 		},
 		handleDetail({ id }) {
 			this.addOrUpdateVisible = true;
-			this.addOrEditTitle = "详情";
+			this.addOrEditTitle = '详情';
 			this.$nextTick(() => {
 				this.$refs.addOrUpdate.init(id, true);
 			});
 		},
 		handleAddDetail({ id }) {
 			this.addOrUpdateVisible = true;
-			this.addOrEditTitle = "添加巡检";
+			this.addOrEditTitle = '添加巡检';
 			this.$nextTick(() => {
 				this.$refs.addOrUpdate.init(id);
 			});

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

@@ -52,6 +52,7 @@ import { publicFormatter } from '@/utils/dict';
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { exportMaintainMonitorExcel } from '@/api/equipment/base/maintain/record'
+import { parseTime } from '@/utils/ruoyi'
 
 const remainBox = {
 	name: 'RemainBox',
@@ -99,7 +100,7 @@ const btn = {
 	render: function (h) {
 		return (
 			<el-button type="text" onClick={this.handleClick}>
-				{this.injectData.label}
+				{this.injectData.name}
 			</el-button>
 		);
 	},
@@ -113,16 +114,16 @@ export default {
 		return {
 			searchBarKeys: ['planId', 'equipmentId'],
 			tableProps: [
-				{
+				// {
-					prop: 'createTime',
+				// 	prop: 'createTime',
-					label: '添加时间',
+				// 	label: '添加时间',
-					fixed: true,
+				// 	fixed: true,
-					width: 180,
+				// 	width: 180,
-					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+				// 	filter: parseTime(createTime),
-				},
+				// },
 				{ prop: 'name', label: '保养计划' },
-				{ prop: 'lineName', label: '产线' },
+				{ prop: 'lineName', label: '产线名' },
-				{ prop: 'sectionName', label: '工段' },
+				{ prop: 'sectionName', label: '工段名' },
 				{ prop: 'equipmentName', label: '设备名称' },
 				{ prop: 'equipmentCode', label: '设备编码' },
 				{ prop: 'maintenancePeriod', label: '保养频率' },
@@ -134,16 +135,16 @@ export default {
 				{
 					prop: 'lastMaintainTime',
 					label: '上次保养时间',
-					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+					filter: parseTime,
 				},
-				{ prop: 'nextMaintainTime', label: '计划下次保养时间' },
+				{ prop: 'nextMaintainTime', label: '计划下次保养时间', filter: parseTime },
 				{
 					prop: 'remainDays',
 					label: '距离保养时间(天)',
 					subcomponent: remainBox,
 				},
-				{ prop: 'opt1', label: '设备保养', subcomponent: btn },
+				{ prop: 'opt1', label: '设备保养', name: '操作', subcomponent: btn },
-				{ prop: 'opt2', label: '保养记录', subcomponent: btn },
+				{ prop: 'opt2', label: '保养记录', name: '查看详情', subcomponent: btn },
 			],
 			searchBarFormConfig: [
 				{
@@ -243,15 +244,16 @@ export default {
  			switch (action) {
 				// 查看详情
 				case '设备保养':
-					this.$router.push({ path: '/equipment/base/maintain/plan-config',query: {
+					this.$router.push({ path: '/equipment/base/maintain/record',query: {
-						equipmentId: value.equipmentId,
+						addRecord: 1,
-						equipmentName: value.equipmentName
+						row: value
 					} })
 					break;
 				case '保养记录':
 					const queryData = {
 					equipmentId: value.equipmentId,
-					maintainPlanId: value.id
+					maintainPlanId: value.id,
+					relatePlan: value.lastMaintainTime ? 1 : 2
 				}
 				this.$router.push({ path: '/equipment/base/maintain/record',query: queryData })
 				break;

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

@@ -51,6 +51,7 @@
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { deleteEqMaintainPlan } from '@/api/equipment/base/maintain/record'
+import { publicFormatter } from '@/utils/dict';
 
 export default {
 	name: 'PlanConfig',
@@ -95,7 +96,7 @@ export default {
 				{ prop: 'equipmentName', label: '设备名称' },
 				{ prop: 'maintainDuration', label: '计划保养用时(h)' },
 				{ prop: 'maintenancePeriod', label: '保养频率(天/次)' },
-				{ prop: 'maintainType', label: '保养类型' },
+				{ prop: 'maintainType', label: '保养类型', filter: publicFormatter('maintain_type') },
 				{ prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
@@ -106,37 +107,37 @@ export default {
 					param: 'equipmentName',
 				},
 				// 时间段
-				{
+				// {
-					type: 'datePicker',
+				// 	type: 'datePicker',
-					label: '时间段',
+				// 	label: '时间段',
-					dateType: 'daterange', // datetimerange
+				// 	dateType: 'daterange', // datetimerange
-					format: 'yyyy-MM-dd',
+				// 	format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+				// 	valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					// valueFormat: 'timestamp',
+				// 	// valueFormat: 'timestamp',
-					rangeSeparator: '-',
+				// 	rangeSeparator: '-',
-					startPlaceholder: '开始日期',
+				// 	startPlaceholder: '开始日期',
-					endPlaceholder: '结束日期',
+				// 	endPlaceholder: '结束日期',
-					defaultTime: ['00:00:00', '23:59:59'],
+				// 	defaultTime: ['00:00:00', '23:59:59'],
-					param: 'createTime',
+				// 	param: 'createTime',
-					// defaultSelect: [
+				// 	// defaultSelect: [
-					// 	new Date(y, m, d)
+				// 	// 	new Date(y, m, d)
-					// 		.toLocaleString()
+				// 	// 		.toLocaleString()
-					// 		.split('/')
+				// 	// 		.split('/')
-					// 		.map((item, index) => {
+				// 	// 		.map((item, index) => {
-					// 			if (index == 1 || index == 2) return item.padStart(2, '0');
+				// 	// 			if (index == 1 || index == 2) return item.padStart(2, '0');
-					// 			return item;
+				// 	// 			return item;
-					// 		})
+				// 	// 		})
-					// 		.join('-'),
+				// 	// 		.join('-'),
-					// 	new Date(y, m, d, 23, 59, 59)
+				// 	// 	new Date(y, m, d, 23, 59, 59)
-					// 		.toLocaleString()
+				// 	// 		.toLocaleString()
-					// 		.split('/')
+				// 	// 		.split('/')
-					// 		.map((item, index) => {
+				// 	// 		.map((item, index) => {
-					// 			if (index == 1 || index == 2) return item.padStart(2, '0');
+				// 	// 			if (index == 1 || index == 2) return item.padStart(2, '0');
-					// 			return item;
+				// 	// 			return item;
-					// 		})
+				// 	// 		})
-					// 		.join('-'),
+				// 	// 		.join('-'),
-					// ],
+				// 	// ],
-				},
+				// },
 				{
 					type: 'button',
 					btnName: '查询',
@@ -224,6 +225,17 @@ export default {
 						rules: [{ required: true, message: '保养频率不能为空', trigger: 'blur' }],
 					},
 				],
+				[
+					{
+						switch: true,
+						label: '启用状态',
+						prop: 'enabled',
+						bind: {
+							'active-value': 1,
+							'inactive-value': 0,
+						},
+					}
+				],
 				[{ input: true, label: '备注', prop: 'remark' }],
 			],
 			// 是否显示弹出层
@@ -300,7 +312,8 @@ export default {
 				const queryData = {
 					equipmentId: row.equipmentId,
 					maintainPlanId: row.id,
-					relatePlan: row.enabled
+					isAdd: 1
+					// relatePlan: row.enabled
 				}
 				if (this.queryParams.createTime) {
 					queryData.createTime = this.queryParams.createTime

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

@@ -53,7 +53,7 @@
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import Editor from '@/components/Editor';
-import { deleteEqMaintainLog } from '@/api/equipment/base/maintain/record';
+import { deleteEqMaintainLog, exportMaintainLogExcel } from '@/api/equipment/base/maintain/record';
 
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
@@ -121,14 +121,14 @@ export default {
 				},
 				{
 					type: 'select',
-					label: '保养计划',
+					label: '计划名称',
-					placeholder: '请选择保养计划',
+					placeholder: '请选择计划名称',
 					param: 'maintainPlanId',
 				},
 				// 开始结束时间
 				{
 					type: 'datePicker',
-					label: '时间段',
+					label: '保养开始时间',
 					dateType: 'daterange', // datetimerange
 					format: 'yyyy-MM-dd',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
@@ -311,13 +311,16 @@ export default {
 			this.searchBarFormConfig[0].defaultSelect =
 				this.$route.query.equipmentId ?? undefined;
 			this.searchBarFormConfig[1].defaultSelect =
-				Number(this.$route.query.maintainPlanId) ?? undefined;
+				this.$route.query.maintainPlanId ?? undefined;
 			this.searchBarFormConfig[2].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()
+		}
 	},
 	methods: {
 		initSearchBar() {
@@ -398,6 +401,19 @@ export default {
 		/** 新增按钮操作 */
 		handleAdd() {
 			this.reset();
+			if (this.$route.query.addRecord) {
+				// 赋值
+				const tempRow = this.$route.query.row
+				this.form.equipmentId	= tempRow.equipmentId
+				this.form.relatePlan = tempRow.nextMaintainTime ? 1 : 2
+				this.form.startTime = tempRow.nextMaintainTime
+				this.form.maintainPlanId	= tempRow.id
+			}
+			if (this.$route.query.isAdd) {
+				// 赋值
+				this.form.equipmentId	= this.$route.query.equipmentId
+				this.form.maintainPlanId	= this.$route.query.maintainPlanId
+			}
 			this.open = true;
 			this.title = '添加保养记录';
 		},
@@ -440,7 +456,7 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否删除设备名称为"' + row.equipmentName + '"的数据项?')
+				.confirm('是否确认删除设备名称为"' + row.equipmentName + '"的数据项?')
 				.then(function () {
 					return deleteEqMaintainLog(id);
 				})
@@ -456,7 +472,7 @@ export default {
 			this.info({ id }).then((response) => {
 				this.form = response.data;
 				this.open = true;
-				this.title = '修改保养记录';
+				this.title = '查看保养记录详情';
 			});
 		},
 		/** 导出按钮操作 */
@@ -469,10 +485,10 @@ export default {
 				.confirm('是否确认导出所有保养记录?')
 				.then(() => {
 					this.exportLoading = true;
-					return exportEquipmentTypeExcel(params);
+					return exportMaintainLogExcel(params);
 				})
 				.then((response) => {
-					this.$download.excel(response, '保养记录.xls');
+					this.$download.excel(response, '设备保养记录.xls');
 					this.exportLoading = false;
 				})
 				.catch(() => {});

src/views/equipment/base/repair/CustomDialogForm.vue

@@ -41,12 +41,12 @@
 			<el-row :gutter="20">
 				<el-col :span="8">
 					<el-form-item label="故障发生时间" prop="faultTime">
-						<span>{{ dataForm.faultTime }}</span>
+						<span>{{ parseTime(dataForm.faultTime) }}</span>
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
 					<el-form-item label="故障级别" prop="faultLevel">
-						<span>{{ dataForm.faultLevel }}</span>
+						<span>{{ getDictDataLabel('fault-level', dataForm.faultLevel) }}</span>
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">
@@ -164,11 +164,11 @@
 		</el-form>
 
 		<div class="drawer-body__footer">
-			<el-button style="" @click="goback()">取消</el-button>
+			<el-button style="" @click="goback()">{{ disabled ? '返回' : '取消' }}</el-button>
-			<el-button v-if="disabled" type="primary" @click="goEdit()">
+			<!-- <el-button v-if="disabled" type="primary" @click="goEdit()">
 				编辑
-			</el-button>
+			</el-button> -->
-			<el-button v-else type="primary" @click="dataFormSubmit()">确定</el-button>
+			<el-button v-if="!disabled" type="primary" @click="dataFormSubmit()">确定</el-button>
 		</div>
 	</el-drawer>
 </template>
@@ -179,6 +179,8 @@ import { getEqRepair, updateEqRepair } from '@/api/equipment/base/repair'
 import Editor from "@/components/Editor";
 import FileUpload from "@/components/FileUpload";
 import { getDictDatas } from "@/utils/dict";
+import { parseTime } from '@/utils/ruoyi'
+import { getDictDataLabel } from '@/utils/dict';
 
 export default {
 	name: 'DialogForm',

src/views/equipment/base/repair/index.vue

@@ -53,12 +53,12 @@
 </template>
 
 <script>
-import moment from 'moment';
+// import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import CustomDialogForm from './CustomDialogForm.vue';
-import { deleteRepair } from '@/api/equipment/base/repair'
+import { deleteRepair, exportRepairLogExcel } from '@/api/equipment/base/repair'
-
+import { parseTime } from '@/utils/ruoyi'
-const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
+// const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
 export default {
 	name: 'EquipmentRepair',
@@ -100,14 +100,14 @@ export default {
 					label: '添加时间',
 					fixed: true,
 					width: 180,
-					filter: timeFilter,
+					filter: parseTime,
 				},
 				{ prop: 'repairOrderNumber', label: '设备维修单号' },
-				{ prop: 'maintenanceStartTime', label: '开始时间', filter: timeFilter },
+				{ prop: 'maintenanceStartTime', label: '开始时间', filter: parseTime },
 				{
 					prop: 'maintenanceFinishTime',
 					label: '结束时间',
-					filter: timeFilter,
+					filter: parseTime,
 				},
 				{
 					prop: 'maintenanceStatus',
@@ -129,6 +129,7 @@ export default {
 					label: '设备',
 					placeholder: '请选择设备',
 					param: 'equipmentId',
+					filterable: true,
 				},
 				{
 					type: 'select',
@@ -417,10 +418,10 @@ export default {
 				.confirm('是否确认导出所有维修记录?')
 				.then(() => {
 					this.exportLoading = true;
-					return exportEquipmentTypeExcel(params);
+					return exportRepairLogExcel(params);
 				})
 				.then((response) => {
-					this.$download.excel(response, '维修记录.xls');
+					this.$download.excel(response, '设备维修.xls');
 					this.exportLoading = false;
 				})
 				.catch(() => {});

src/views/equipment/base/spareParts/Config/htmls.vue

@@ -0,0 +1,36 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-11-08 14:00:52
+ * @LastEditTime: 2023-11-24 09:12:36
+ * @LastEditors: DY
+ * @Description:
+-->
+<template>
+  <div v-html="content" />
+</template>
+
+<script>
+export default {
+  props: {
+    injectData: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      content: ''
+    }
+  },
+  mounted() {
+    this.getContent()
+    console.log('12', this.injectData)
+  },
+
+  methods: {
+    getContent() {
+      this.content = this.injectData.description ?? ''
+    }
+  }
+}
+</script>

src/views/equipment/base/spareParts/Config/index.vue

@@ -60,8 +60,9 @@ import { publicFormatter } from '@/utils/dict';
 import Editor from '@/components/Editor';
 import addSparts from './addSparts.vue';
 import { deleteConfig } from '@/api/equipment/base/spare-parts/config'
+import htmls from './htmls.vue'
 
-const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
+// const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
 export default {
 	name: 'EquipmentSparePartsConfig',
@@ -111,7 +112,7 @@ export default {
 				{ prop: 'equipmentCode', label: '设备编码' },
 				{ prop: 'responsible', label: '负责人' },
 				// { prop: 'unit', label: '单位', filter: publicFormatter('unit_dict') },
-				{ prop: 'description', label: '描述' },
+				{ prop: 'description', label: '描述', subcomponent: htmls },
 				{ prop: 'sparePartNumber', label: '备品备件数量' },
 				// { prop: 'remark', label: '备注' },
 			],

src/views/equipment/base/spareParts/List/index.vue

@@ -52,7 +52,7 @@
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { publicFormatter } from '@/utils/dict';
-import { deleteSparePart } from '@/api/equipment/base/spare-parts/list'
+import { deleteSparePart } from '@/api/equipment/base/spare-parts/list';
 
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
@@ -95,7 +95,7 @@ export default {
 			searchBarFormConfig: [
 				{
 					type: 'input',
-					label: '关键字',
+					label: '备件名称',
 					placeholder: '请输入备件名称',
 					param: 'name',
 				},
@@ -132,20 +132,33 @@ export default {
 						input: true,
 						label: '备件名称',
 						prop: 'name',
-						rules: [{ required: true, message: '备件名称不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '备件名称不能为空', trigger: 'blur' },
+						],
 					},
 					{
 						input: true,
-						label: '备件型号',
+						label: '备件编码',
-						prop: 'model',
+						prop: 'code',
+						url: '/base/equipment-spare-part/getCode',
+						rules: [
+							{ required: true, message: '备件编码不能为空', trigger: 'blur' },
+						],
 					},
 				],
 				[
+					{
+						input: true,
+						label: '备件型号',
+						prop: 'model',
+					},
 					{
 						input: true,
 						label: '规格',
 						prop: 'specifications',
 					},
+				],
+				[
 					{
 						select: true,
 						label: '供应商',
@@ -155,10 +168,10 @@ export default {
 							filterable: true,
 							clearable: true,
 						},
-						rules: [{ required: true, message: '供应商不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '供应商不能为空', trigger: 'blur' },
+						],
 					},
-				],
-				[
 					{
 						select: true,
 						label: '物料类型',
@@ -169,8 +182,12 @@ export default {
 							filterable: true,
 							clearable: true,
 						},
-						rules: [{ required: true, message: '物料类型不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '物料类型不能为空', trigger: 'blur' },
+						],
 					},
+				],
+				[
 					{
 						input: true,
 						label: '使用寿命',
@@ -184,14 +201,14 @@ export default {
 							},
 						],
 					},
-				],
-				[
 					{
 						select: true,
 						label: '单位',
 						prop: 'unit', // 数据字典
 						options: this.getDictDatas(this.DICT_TYPE.UNIT_DICT),
 					},
+				],
+				[
 					{
 						input: true,
 						label: '备注',

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

@@ -72,10 +72,10 @@ const remainBox = {
 	},
 	computed: {
 		value() {
-			const temp = this.injectData[this.injectData.prop] || null
+			const temp = this.injectData[this.injectData.prop] || null;
 			if (temp) {
-				console.log('12', temp)
+				console.log('12', temp);
-				return temp === 'Green' ? 'green' : 'red'
+				return temp === 'Green' ? 'green' : 'red';
 			}
 			return this.injectData[this.injectData.prop] || null;
 		},
@@ -83,7 +83,7 @@ const remainBox = {
 			if (this.value) {
 				// const v = +this.value;
 				// return v < 0 ? 'red' : v >= 0 && v < 2 ? 'yellow' : 'green';
-				return this.value
+				return this.value;
 			}
 			return 'unset';
 		},
@@ -95,8 +95,7 @@ const remainBox = {
 					this.color
 					// this.color == 'Green' ? 'green' : this.color == 'Red' ? 'red' : 'yellow'
 				}; position:absolute; inset: 0; padding: 0 10px; display: flex; align-items: center; color: ${
-					'unset'
+					this.color == 'red' || this.color == 'green' ? '#fff' : 'unset'
-					// this.color == 'red' ? '#fff' : 'unset'
 				}`}>
 				{this.injectData[this.injectData.prop] || ''}
 			</div>
@@ -112,7 +111,10 @@ const btn = {
 	},
 	methods: {
 		handleClick() {
-			this.$emit('emitData', { action: this.injectData.name, value: this.injectData });
+			this.$emit('emitData', {
+				action: this.injectData.name,
+				value: this.injectData,
+			});
 		},
 	},
 	render: function (h) {
@@ -124,8 +126,6 @@ const btn = {
 	},
 };
 
-
-
 export default {
 	name: 'EquipmentSparePartsMonitor',
 	components: { addSparts },
@@ -162,7 +162,12 @@ export default {
 				{ prop: 'responsible', label: '负责人' },
 				{ prop: 'color', label: '是否超期', subcomponent: remainBox },
 				{ prop: 'opt1', label: '备件更换', name: '操作', subcomponent: btn },
-				{ prop: 'opt2', label: '更换记录', name: '更新记录', subcomponent: btn },  // TODO: 是否换成按钮， 群里问
+				{
+					prop: 'opt2',
+					label: '更换记录',
+					name: '更新记录',
+					subcomponent: btn,
+				}, // TODO: 是否换成按钮， 群里问
 				// { prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
@@ -171,12 +176,14 @@ export default {
 					label: '产线',
 					placeholder: '请选择产线',
 					param: 'lineId',
+					filterable: true,
 				},
 				{
 					type: 'select',
 					label: '设备',
 					placeholder: '请选择设备',
 					param: 'equipmentId',
+					filterable: true,
 				},
 				{
 					type: 'button',
@@ -211,7 +218,9 @@ export default {
 						input: true,
 						label: '配置名称',
 						prop: 'name',
-						rules: [{ required: true, message: '配置名称不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '配置名称不能为空', trigger: 'blur' },
+						],
 					},
 				],
 				[
@@ -224,7 +233,9 @@ export default {
 							filterable: true,
 							clearable: true,
 						},
-						rules: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '设备名称不能为空', trigger: 'blur' },
+						],
 					},
 				],
 				[
@@ -281,29 +292,29 @@ export default {
 			}
 		},
 		eqOperation({ id }) {
-			this.addOrUpdateVisible = true
+			this.addOrUpdateVisible = true;
 			this.$nextTick(() => {
 				this.$refs.addOrUpdate.init(id);
 			});
 		},
 		updateLog({ id }) {
-			this.addOrUpdateVisible = true
+			this.addOrUpdateVisible = true;
 			this.$nextTick(() => {
 				this.$refs.addOrUpdate.init(id, true);
 			});
 		},
 		initSearchBar() {
 			// 产线列表
-			getCorePLList().then(res => {
+			getCorePLList().then((res) => {
 				this.$set(
 					this.searchBarFormConfig[0],
 					'selectOptions',
 					res.data.map((item) => ({
 						name: item.name,
-						id: item.id
+						id: item.id,
 					}))
 				);
-			})
+			});
 			this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
 				this.$set(
 					this.searchBarFormConfig[1],
@@ -319,7 +330,11 @@ export default {
 		getList() {
 			this.loading = true;
 			// 执行查询
-			this.http('/base/equipment-spare-part-config/monitor', 'get', this.queryParams).then((response) => {
+			this.http(
+				'/base/equipment-spare-part-config/monitor',
+				'get',
+				this.queryParams
+			).then((response) => {
 				this.list = response.data.list;
 				this.total = response.data.total;
 				this.loading = false;
@@ -338,7 +353,7 @@ export default {
 				name: null,
 				equipmentId: null,
 				description: null,
-				responsible: null
+				responsible: null,
 			};
 			this.resetForm('form');
 		},
@@ -397,7 +412,7 @@ export default {
 			this.$modal
 				.confirm('是否确认删除记录"' + row.name + '"?')
 				.then(function () {
-					return this.delete({ id });
+					return this.del({ id });
 				})
 				.then(() => {
 					this.getList();

src/views/equipment/monitor/SearchBar.vue

@@ -0,0 +1,138 @@
+<!-- 
+    filename: SearchBar.vue
+    author: liubin
+    date: 2023-11-23 14:01:17
+    description: 
+-->
+
+<template>
+	<div class="search-bar">
+		<div class="vertical-blue-line"></div>
+		<el-form
+			:inline="true"
+			ref="search-bar__form"
+			:model="form"
+			class="search-bar__form">
+			<el-form-item :label="'产线'" prop="productionLineId">
+				<el-select
+					size="small"
+					placeholder="请选择产线"
+					@change="getEquipmentByLineId"
+					v-model="form.productionLineId">
+					<el-option
+						v-for="item in listLine"
+						:key="item.id"
+						:label="item.name"
+						:value="item.id"></el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item :label="'设备'" prop="equipmentId">
+				<el-select
+					size="small"
+					placeholder="请选择设备"
+					v-model="form.equipmentId">
+					<el-option
+						v-for="item in listEq"
+						:key="item.id"
+						:label="item.name"
+						:value="item.id"></el-option>
+				</el-select>
+			</el-form-item>
+		</el-form>
+		<el-button type="primary" @click="handleSearch" size="small">
+			查询
+		</el-button>
+	</div>
+</template>
+
+<script>
+export default {
+	name: 'SearchBar',
+	model: {
+		prop: 'value',
+		event: 'change',
+	},
+	props: {
+		value: {
+			type: Object,
+			default: () => {},
+		},
+	},
+	data() {
+		return {
+			listLine: [],
+			listEq: [],
+		};
+	},
+	computed: {
+		form: {
+			set(val) {
+				this.emit(val);
+			},
+			get() {
+				return this.value;
+			},
+		},
+	},
+	mounted() {
+		this.getLine();
+	},
+	methods: {
+		emit(newValue) {
+			debugger;
+			this.$emit('update', { ...this.form, ...newValue });
+		},
+		async getLine() {
+			const { data, code } = await this.$axios({
+				url: '/base/core-production-line/listAll',
+			});
+			if (code == 0) {
+				this.listLine = data;
+				return;
+			}
+			this.listLine.splice(0);
+		},
+		async getEquipmentByLineId(id) {
+			const { data, code } = await this.$axios({
+				url: '/base/core-equipment/listByLine',
+				params: {
+					id,
+				},
+			});
+			if (code == 0) {
+				this.listEq = data;
+				return;
+			}
+			this.listEq.splice(0);
+		},
+		handleSearch() {},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.search-bar {
+	padding: 12px 0;
+	font-size: 16px;
+	position: relative;
+	display: flex;
+	align-items: center;
+	gap: 12px;
+
+	:deep(.el-form-item) {
+		margin-bottom: 0 !important;
+		margin-right: 0;
+
+		&:not(:last-child) {
+			margin-right: 18px;
+		}
+	}
+}
+
+.vertical-blue-line {
+	width: 4px;
+	height: 18px;
+	background: #0b58ff;
+	border-radius: 2px;
+}
+</style>

src/views/equipment/monitor/StatusAndParams/index.vue

@@ -1,10 +1,7 @@
 <template>
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
-		<SearchBar
+		<SearchBarNew v-model="searchBarForm" />
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
 
 		<!-- 列表 -->
 		<base-table
@@ -13,13 +10,13 @@
 			:limit="queryParams.pageSize"
 			:table-data="list"
 			@emitFun="handleEmitFun">
-			<method-btn
+			<!-- <method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				label="操作"
 				:width="120"
 				:method-list="tableBtn"
-				@clickBtn="handleTableBtnClick" />
+				@clickBtn="handleTableBtnClick" /> -->
 		</base-table>
 
 		<!-- 分页组件 -->
@@ -50,22 +47,23 @@
 </template>
 
 <script>
-import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import { publicFormatter } from '@/utils/dict';
+import { parseTime } from '@/utils/ruoyi';
-import { parseTime } from '@/utils/ruoyi'
+import SearchBarNew from '../SearchBar.vue';
-// const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
-
 
 const btn = {
 	name: 'tableBtn',
 	props: ['injectData'],
+	components: {},
 	data() {
 		return {};
 	},
 	methods: {
 		handleClick() {
-			this.$emit('emitData', { action: this.injectData.label, value: this.injectData });
+			this.$emit('emitData', {
+				action: this.injectData.label,
+				value: this.injectData,
+			});
 		},
 	},
 	render: function (h) {
@@ -77,134 +75,62 @@ const btn = {
 	},
 };
 
-
+// monitoring/equipment-monitor/realtime-page
 export default {
 	name: 'StatusAndParams',
 	mixins: [basicPageMixin],
+	components: { SearchBarNew },
 	data() {
 		return {
-			searchBarKeys: ['equipmentName', 'recordTime'],
-			tableBtn: [
-				// this.$auth.hasPermi('equipment:spare-parts-config:update')
-				// 	? {
-				// 			type: 'detail',
-				// 			btnName: '详情',
-				// 	  }
-				// 	: undefined,
-				// this.$auth.hasPermi('equipment:spare-parts-config:update')
-				// 	? {
-				// 			type: 'edit',
-				// 			btnName: '修改',
-				// 	  }
-				// 	: undefined,
-				// this.$auth.hasPermi('equipment:spare-parts-config:delete')
-				// 	? {
-				// 			type: 'delete',
-				// 			btnName: '删除',
-				// 	  }
-				// 	: undefined,
-			].filter((v) => v),
 			tableProps: [
-				{ prop: 'productionLine', label: '设备名称' },
+				{ prop: 'equipmentName', label: '设备名称' },
-				{ prop: 'workshopSection', label: '设备编码' },
+				{ prop: 'equipmentCode', label: '设备编码' },
-				{ prop: 'equipment', label: '投入数' },
+				{ prop: 'inQuantity', label: '投入数' },
-				{ prop: 'productionLine', label: '产出数' },
+				{ prop: 'outQuantity', label: '产出数' },
-				{ prop: 'workshopSection', label: '是否运行' },
+				{
-				{ prop: 'equipment22', label: '状态' },
+					prop: 'run',
-				// { prop: 'alarmGrade', label: '报警级别', filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL) },
+					label: '是否运行',
-				{ prop: 'productionLine', label: '是否故障' },
+					filter: (val) => (val != null ? (val ? '是' : '否') : ''),
-				{ prop: 'workshopSection', label: '生产量记录时间', filter: parseTime },
+				},
-				{ prop: 'equipment1', label: '状态记录时间', filter: parseTime },
+				{
+					prop: 'status',
+					label: '状态',
+					filter: (val) =>
+						val != null ? ['正常', '计划停机', '故障'][val] : '',
+				},
+				{
+					prop: 'error',
+					label: '是否故障',
+					filter: (val) => (val != null ? (val ? '是' : '否') : ''),
+				},
+				{
+					prop: 'quantityRecordTime',
+					label: '生产量记录时间',
+					filter: parseTime,
+				},
+				{ prop: 'statusRecordTime', label: '状态记录时间', filter: parseTime },
 				{ prop: 'opt1', label: '状态可视化', name: '查看', subcomponent: btn },
-				{ prop: 'opt2', label: '参数监控', name: '查看', subcomponent: btn }  // TODO: 是否换成按钮， 群里问
+				{ prop: 'opt2', label: '参数监控', name: '查看', subcomponent: btn },
-				// { prop: 'remark', label: '备注' },
-			],
-			searchBarFormConfig: [
-				{
-					type: 'input',
-					label: '设备名',
-					placeholder: '请输入设备名称',
-					param: 'equipmentName',
-				},
-				// 时间段
-				{
-					type: 'datePicker',
-					label: '时间段',
-					dateType: 'daterange', // datetimerange
-					// format: 'yyyy-MM-dd HH:mm:ss',
-					format: 'yyyy-MM-dd',
-					// valueFormat: 'timestamp',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始日期',
-					endPlaceholder: '结束日期',
-					defaultTime: ['00:00:00', '23:59:59'],
-					param: 'recordTime',
-					// defaultSelect: [
-					// 	new Date(y, m, d)
-					// 		.toLocaleString()
-					// 		.split('/')
-					// 		.map((item, index) => {
-					// 			if (index == 1 || index == 2) return item.padStart(2, '0');
-					// 			return item;
-					// 		})
-					// 		.join('-'),
-					// 	new Date(y, m, d, 23, 59, 59)
-					// 		.toLocaleString()
-					// 		.split('/')
-					// 		.map((item, index) => {
-					// 			if (index == 1 || index == 2) return item.padStart(2, '0');
-					// 			return item;
-					// 		})
-					// 		.join('-'),
-					// ],
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				// {
-				// 	type: 'separate',
-				// },
-				// {
-				// 	type: this.$auth.hasPermi('equipment:spare-parts-config:create')
-				// 		? 'button'
-				// 		: '',
-				// 	btnName: '新增',
-				// 	name: 'add',
-				// 	plain: true,
-				// 	color: 'success',
-				// },
-				// {
-				// 	type: this.$auth.hasPermi('equipment:spare-parts-config:export')
-				// 		? 'button'
-				// 		: '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
 			],
+			searchBarForm: {
+				productionLineId: null,
+				equipmentId: null,
+			},
 			// 是否显示弹出层
 			open: false,
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
 				pageSize: 10,
-				lineId: null,
 				equipmentId: null,
+				productionLineId: null,
 			},
-			basePath: '/base/equipment-alarm-log',
+			list: [],
-			list: []
 		};
 	},
-	created() {
-		// this.getList();
-	},
 	methods: {
 		handleEmitFun(val) {
-			console.log('你好', val)
+			console.log('你好', val);
 			if (val.action === '状态可视化') {
 				// 状态可视化
 			} else {
@@ -215,16 +141,20 @@ export default {
 		getList() {
 			this.loading = true;
 			// 执行查询
-			this.recv(this.queryParams).then((response) => {
+			this.http(
+				'/monitoring/equipment-monitor/realtime-page',
+				'get',
+				this.queryParams
+			).then((response) => {
 				this.list = response.data.list;
 				this.total = response.data.total;
 				this.loading = false;
 			});
 		},
 		successSubmit() {
-      this.cancel()
+			this.cancel();
-      this.getList()
+			this.getList();
-    },
+		},
 		/** 取消按钮 */
 		cancel() {
 			this.open = false;
@@ -270,7 +200,7 @@ export default {
 		},
 		/** 提交按钮 */
 		submitForm() {
-			this.$refs.addOrUpdate.dataFormSubmit()
+			this.$refs.addOrUpdate.dataFormSubmit();
 			// this.$refs['form'].validate((valid) => {
 			// 	if (!valid) {
 			// 		return;
@@ -297,8 +227,8 @@ export default {
 			const id = row.id;
 			this.$modal
 				.confirm('是否确认删除记录"' + row.name + '"?')
-				.then(function () {
+				.then(() => {
-					return this.delete({ id });
+					return this.del({ id });
 				})
 				.then(() => {
 					this.getList();

src/views/equipment/timing-diagram/output/index.vue

@@ -61,6 +61,8 @@
 				v-if="open"
 				style="width: 100%"
 				v-model="queryParams.equipmentId"
+				filterable
+				clearable
 				placeholder="请选择一个设备">
 				<el-option
 					v-for="eq in eqList"

src/views/equipment/timing-diagram/status/index.vue

@@ -94,12 +94,19 @@
 
 <script>
 import Gantt from './chart';
+import moment from 'moment';
 
 export default {
 	name: 'SGStatus',
 	components: {},
 	props: {},
 	data() {
+		const today = new Date();
+		const todayStart = new Date(
+			today.getFullYear(),
+			today.getMonth(),
+			today.getDate()
+		);
 		return {
 			chart: null,
 			searchBarFormConfig: [
@@ -129,6 +136,7 @@ export default {
 					placeholder: '选择日期',
 					param: 'recordTime',
 					required: true,
+					defaultSelect: moment(todayStart).format('YYYY-MM-DD HH:mm:ss'),
 				},
 				{
 					type: 'button',
@@ -369,7 +377,10 @@ export default {
 			const { code, data } = await this.$axios({
 				url: '/monitoring/equipment-monitor/status-series',
 				method: 'get',
-				params: this.queryParams,
+				params: {
+					recordTime: this.queryParams.recordTime,
+					equipmentId: this.queryParams.equipmentId,
+				},
 			});
 			if (code == 0) {
 				const newEqlist = this.objectToArray(data);

src/views/group/base/groupClasses/components/groupClassAdd.vue

@@ -156,7 +156,7 @@ export default {
               }
             })
           } else {
-            createGroupClasses({ ...obj }).then((res) => {
+            createGroupClasses({ ...this.form }).then((res) => {
               if (res.code === 0) {
                 this.$modal.msgSuccess("操作成功");
                 this.$emit('successSubmit')

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-drawer :title="title" :visible.sync="visible" size="70%" @close='closeD'>
+    <el-drawer :title="title" :visible.sync="visible" size="70%" @close='closeD' :show-close='false'>
       <div class="box">
         <el-row class="topBox">
           <el-col :span="6">
@@ -59,6 +59,7 @@
       @cancel="handleCancel"
       @confirm="handleConfirm"
       :before-close="handleCancel"
+      width='40%'
     >
       <worker-team-add ref="workerTeamAdd" @successSubmit="successSubmit" />
     </base-dialog>

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

@@ -38,6 +38,7 @@
       @cancel="handleCancel"
       @confirm="handleConfirm"
       :before-close="handleCancel"
+      width='40%'
     >
       <group-team-add ref="groupList" @successSubmit="successSubmit" />
     </base-dialog>
@@ -50,9 +51,9 @@
 import { getGroupTeamPage, deleteGroupTeam, updateGroupTeam } from "@/api/base/groupTeam";
 import { parseTime } from '@/utils/ruoyi'
 import GroupTeamAdd from './components/groupTeamAdd'
-import StatusBtn from './components/statusBtn.vue'
+import StatusBtn from './components/statusBtn'
-import WorkerOperate from './components/workerOperate.vue'
+import WorkerOperate from './components/workerOperate'
-import WorkerEdit from './components/workerEdit.vue';
+import WorkerEdit from './components/workerEdit'
 const tableProps = [
   {
     prop: 'createTime',

src/views/order/base/orderManage/components/addWorkOrder.vue

@@ -1,7 +1,7 @@
 <template>
-  <el-form ref="addWorkOrder" :rules="rules" label-width="130px" :model="form">
+  <el-form ref="addWorkOrder" :rules="rules" label-width="130px" :model="form" label-position='top'>
-    <el-row>
+    <el-row :gutter="20">
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="工单名称" prop="name" v-if='!isBind'>
           <el-input v-model="form.name"></el-input>
         </el-form-item>
@@ -16,14 +16,12 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="工单编码" prop="code">
           <el-input v-model="form.code" disabled></el-input>
         </el-form-item>
       </el-col>
-    </el-row>
+      <el-col :span='6'>
-    <el-row>
-      <el-col :span='12'>
         <el-form-item label="产品名称" prop="planProductId">
           <el-select v-model="form.planProductId" placeholder="请选择" disabled  style="width: 100%;">
             <el-option
@@ -37,7 +35,7 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="计划开始时间">
           <el-date-picker
             v-model="planStartTime"
@@ -50,8 +48,8 @@
         </el-form-item>
       </el-col>
     </el-row>
-    <el-row>
+    <el-row :gutter="20">
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="计划完成时间">
           <el-date-picker
             v-model="planFinishTime"
@@ -63,19 +61,17 @@
           </el-date-picker>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="计划投入数量" prop="planAssignQuantity">
           <el-input-number v-model="form.planAssignQuantity" :min="0" :max="9999999999999" :disabled="isBind" style="width: 100%;"></el-input-number>
         </el-form-item>
       </el-col>
-    </el-row>
+      <el-col :span='6'>
-    <el-row>
-      <el-col :span='12'>
         <el-form-item label="计划生产数量" prop="planQuantity">
           <el-input-number v-model="form.planQuantity" :min="0" :max="9999999999999" :disabled="isBind" style="width: 100%;"></el-input-number>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="关联工艺" prop="processFlowId">
           <el-select v-model="form.processFlowId" placeholder="请选择" disabled style="width: 100%;">
             <el-option
@@ -88,16 +84,16 @@
         </el-form-item>
       </el-col>
     </el-row>
-    <el-row>
+    <el-row :gutter="20">
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="物料计算方式" prop="materialMethod">
-          <el-radio-group v-model="form.materialMethod" disabled>
+          <el-select v-model="form.materialMethod" placeholder="请选择" style="width: 100%;" disabled>
-            <el-radio :label="1">产品基础BOM</el-radio>
+            <el-option label="产品基础BOM" :value="1"></el-option>
-            <el-radio :label="2">工艺扩展BOM</el-radio>
+            <el-option label="工艺扩展BOM" :value="2"></el-option>
-          </el-radio-group>
+          </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="优先级" prop="priority">
           <el-select v-model="form.priority" placeholder="请选择" style="width: 100%;" :disabled="isBind">
             <el-option
@@ -109,9 +105,7 @@
           </el-select>
         </el-form-item>
       </el-col>
-    </el-row>
+      <el-col :span='6'>
-    <el-row>
-      <el-col :span='12'>
         <el-form-item label="工单类型" prop="type">
           <el-select v-model="form.type" placeholder="请选择" style="width: 100%;" :disabled="isBind">
             <el-option
@@ -123,7 +117,7 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="关联产线" prop="productLineId">
           <el-select v-model="form.productLineId" placeholder="请选择" multiple style="width: 100%;" :disabled="isBind">
             <el-option
@@ -136,15 +130,13 @@
         </el-form-item>
       </el-col>
     </el-row>
-    <el-row>
+    <el-row :gutter="20">
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="负责人" prop="workers">
           <el-input v-model="form.workers" :disabled="isBind"></el-input>
         </el-form-item>
       </el-col>
-    </el-row>
+      <el-col :span='6'>
-    <el-row>
-      <el-col :span='12'>
         <el-form-item label="计划分配订单量" prop="planAssignmentQuantity">
           <el-input-number v-model="form.planAssignmentQuantity" :min="0" :max="9999999999999" style="width: 100%;"></el-input-number>
         </el-form-item>

src/views/order/base/orderManage/components/orderAdd.vue

@@ -1,24 +1,22 @@
 <template>
-  <el-form ref="orderAddForm" :rules="rules" label-width="130px" :model="form">
+  <el-form ref="orderAddForm" :rules="rules" label-width="130px" :model="form" label-position='top'>
-    <el-row>
+    <el-row :gutter="20">
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="订单名称" prop="name">
           <el-input v-model="form.name"></el-input>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="订单号" prop="code">
           <el-input v-model="form.code"></el-input>
         </el-form-item>
       </el-col>
-    </el-row>
+      <el-col :span='6'>
-    <el-row>
-      <el-col :span='12'>
         <el-form-item label="计划加工数量" prop="planQuantity">
           <el-input-number v-model="form.planQuantity" :min="0" :max="9999999999999" style="width: 100%;"></el-input-number>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="产品名称" prop="planProductId">
           <el-select v-model="form.planProductId" placeholder="请选择" style="width: 100%;">
             <el-option
@@ -33,13 +31,13 @@
         </el-form-item>
       </el-col>
     </el-row>
-    <el-row>
+    <el-row :gutter="20">
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="单价" prop="price">
           <el-input-number v-model="form.price" :min="0" :max="9999999999999" :precision='2' style="width: 100%;"></el-input-number>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="客户" prop="customerId">
           <el-select v-model="form.customerId" placeholder="请选择" style="width: 100%;" clearable>
             <el-option
@@ -51,9 +49,7 @@
           </el-select>
         </el-form-item>
       </el-col>
-    </el-row>
+      <el-col :span='6'>
-    <el-row>
-      <el-col :span='12'>
         <el-form-item label="优先级" prop="priority">
           <el-select v-model="form.priority" placeholder="请选择" style="width: 100%;" clearable>
             <el-option
@@ -65,7 +61,7 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="包装规格" prop="packSpec">
           <el-select v-model="form.packSpec" placeholder="请选择" style="width: 100%;" clearable>
             <el-option
@@ -78,13 +74,13 @@
         </el-form-item>
       </el-col>
     </el-row>
-    <el-row>
+    <el-row :gutter="20">
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="负责人" prop="workers">
           <el-input v-model="form.workers"></el-input>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="关联工艺" prop="processFlowId">
           <el-select v-model="form.processFlowId" placeholder="请选择" style="width: 100%;" clearable @change="processFlowIdChange">
             <el-option
@@ -96,17 +92,15 @@
           </el-select>
         </el-form-item>
       </el-col>
-    </el-row>
+      <el-col :span='6'>
-    <el-row>
-      <el-col :span='12'>
         <el-form-item label="物料计算方式" prop="materialMethod">
-          <el-radio-group v-model="form.materialMethod" @change='materialMethodChange'>
+          <el-select v-model="form.materialMethod" placeholder="请选择" style="width: 100%;" @change='materialMethodChange'>
-            <el-radio :label="1">产品基础BOM</el-radio>
+            <el-option label="产品基础BOM" :value="1"></el-option>
-            <el-radio :label="2">工艺扩展BOM</el-radio>
+            <el-option label="工艺扩展BOM" :value="2"></el-option>
-          </el-radio-group>
+          </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="订单计划开始时间" prop="planStartTime">
           <el-date-picker
             v-model="form.planStartTime"
@@ -119,8 +113,8 @@
         </el-form-item>
       </el-col>
     </el-row>
-    <el-row>
+    <el-row :gutter="20">
-      <el-col :span='12'>
+      <el-col :span='6'>
         <el-form-item label="订单计划完成时间" prop="planFinishTime">
           <el-date-picker
             v-model="form.planFinishTime"
@@ -138,20 +132,19 @@
         </el-form-item>
       </el-col>
     </el-row>
-    <el-row>
+    <!-- <el-row>
       <el-col :span='24'>
         <el-form-item label="描述信息" prop="description">
           <el-input v-model="form.description"></el-input>
         </el-form-item>
       </el-col>
-    </el-row>
+    </el-row> -->
   </el-form>
 </template>
 <script>
 import { getOrderCode, getOrderById, getProcessFlowList, orderUpdate, orderCreate } from '@/api/base/orderManage'
 import { getProductAll } from '@/api/base/product'
 import { getCustomerList } from '@/api/base/customer'
-import moment from 'moment'
 export default {
   name: 'OrderAdd',
   data() {
@@ -170,12 +163,13 @@ export default {
         processFlowId: '',
         materialMethod: 1,
         remark: '',
-        description: '',
+        // description: '',
         planStartTime: '',
         planFinishTime: ''
       },
       rules: {
         name: [{ required: true, message: "订单名称不能为空", trigger: "blur" }],
+        code: [{ required: true, message: "订单号不能为空", trigger: "blur" }],
         planQuantity: [{ required: true, message: "计划加工数量不能为空", trigger: "blur" }],
         planProductId: [{ required: true, message: "产品名称不能为空", trigger: "change" }]
       },
@@ -207,7 +201,7 @@ export default {
             this.form.materialMethod = res.data.materialMethod
             this.form.planFinishTime = res.data.planFinishTime ? res.data.planFinishTime : null
             this.form.remark = res.data.remark
-            this.form.description = res.data.description
+            // this.form.description = res.data.description
           }
         })
       } else {

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

@@ -36,7 +36,7 @@
       @cancel="handleCancel"
       @confirm="handleConfirm"
       :before-close="handleCancel"
-      width='70%'
+      width='60%'
     >
       <order-add ref="orderAdd" @successSubmit="successSubmit" />
     </base-dialog>
@@ -120,7 +120,8 @@ const tableProps = [
   },
   {
     prop: 'price',
-    label: '单价(元)'
+    label: '单价(元)',
+    align: 'right'
   },
   {
     prop: 'workOrderNum',

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

@@ -5,7 +5,7 @@
         <span class="blueTitle"></span>
         <span>订单编码: {{orderMsg.code}}</span>
       </div>
-      <el-button type="primary" plain size="small" style="float: right;" @click="returnOrderManage">返回</el-button>
+      <el-button type="primary" plain size="small" style="float: right;" @click="returnOrderManage"><svg-icon icon-class="return"/> 返回</el-button>
       <div style="padding-left: 14px;">
         <el-row>
           <el-col :span='3'>
@@ -259,7 +259,8 @@ export default {
             let arr = res2.data
             arr.map(item => {
               if (item) {
-                item.num = item.num * this.orderMsg.remainingQuantity
+                let a = item.num * this.orderMsg.remainingQuantity
+                item.num = !isNaN(parseFloat(a)) && isFinite(a) ? a : ''
               }
             })
             this.list2 = arr

src/views/warehouse/chart/BarChart.vue

@@ -1,5 +1,5 @@
 <template>
-	<div :class="className" :style="{ height: height, width: width }" />
+	<div :class="className" :style="{ height: height, width: width,marginLeft: '10px' }" />
 </template>
 
 <script>
@@ -97,7 +97,7 @@ export default {
 					{
 						containLabel: true,
 						top: 40,
-						left: '2%',
+						left: '4%',
 						right: '2%',
 						bottom: '3%',
 						bottom: '55%',
@@ -105,7 +105,7 @@ export default {
 					{
 						containLabel: true,
 						top: 40,
-						left: '2%',
+						left: '4%',
 						right: '2%',
 						bottom: '3%',
 						top: '55%',

src/views/warehouse/end-material/warehouseRealtimeLocation/index.vue

@@ -2,7 +2,6 @@
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
 		<search-bar
-			:isFold="true"
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />

src/views/warehouse/out-material/warehouseRealtimeLocation/index.vue

@@ -2,7 +2,6 @@
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
 		<search-bar
-			:isFold="true"
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />

src/views/warehouse/package-material/warehouseRealtimeLocation/index.vue

@@ -2,7 +2,6 @@
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
 		<search-bar
-			:isFold="true"
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />

src/views/warehouse/part-material/warehouseRealtimeLocation/index.vue

@@ -2,7 +2,6 @@
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
 		<search-bar
-			:isFold="true"
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />

src/views/warehouse/raw-material/warehouseRealtimeLocation/index.vue

@@ -2,7 +2,6 @@
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
 		<search-bar
-			:isFold="true"
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />