修改bug

src/api/base/materialProductBom.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2023-10-26 20:06:29
+ * @LastEditTime: 2023-11-27 17:54:28
  * @LastEditors: DY
  * @Description: 
  */
@@ -110,3 +110,11 @@ export function deleteMaterialPBDet(id) {
     method: 'delete'
   })
 }
+
+// 获得产品Bom详细
+export function getMaterialPBDet(id) {
+  return request({
+    url: '/base/material-product-bom-det/get?id=' + id,
+    method: 'get'
+  })
+}

src/api/equipment/base/inspection/settings.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-11-08 15:56:52
- * @LastEditTime: 2023-11-20 16:38:18
+ * @LastEditTime: 2023-11-25 16:22:49
  * @LastEditors: DY
  * @Description: 
  */
@@ -74,3 +74,29 @@ export function deleteCheck(id) {
     method: 'delete'
   })
 }
+
+// 获得设备巡检设置code
+export function getCode() {
+  return request({
+    url: '/base/equipment-check-config/getCode',
+    method: 'get'
+  })
+}
+
+// 创建巡检配置
+export function createCheckConfig(data) {
+  return request({
+    url: '/base/equipment-check-config/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新巡检配置
+export function updateCheckConfig(data) {
+  return request({
+    url: '/base/equipment-check-config/update',
+    method: 'put',
+    data: data
+  })
+}

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/assets/icons/svg/table_edit.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">
+    <g id="1_基础资料" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="1-1工厂信息" transform="translate(-1834.000000, -253.000000)">
+            <g id="icon/界面内/编辑" transform="translate(1834.000000, 253.000000)">
+                <rect id="矩形" x="0" y="0" width="16" height="16"></rect>
+                <g id="常用购票人／编辑32" fill-rule="nonzero">
+                    <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="16" height="16"></rect>
+                    <path d="M13.5,7.8285 C13.5,7.55235763 13.7238576,7.3285 14,7.3285 C14.2761424,7.3285 14.5,7.55235763 14.5,7.8285 L14.5,12 C14.5,13.3807119 13.3807119,14.5 12,14.5 L4,14.5 C2.61928813,14.5 1.5,13.3807119 1.5,12 L1.5,4 C1.5,2.61928813 2.61928813,1.5 4,1.5 L8.759,1.5 C8.9376328,1.5 9.10269631,1.59529946 9.19201271,1.75 C9.28132911,1.90470054 9.28132911,2.09529946 9.19201271,2.25 C9.10269631,2.40470054 8.9376328,2.5 8.759,2.5 L4,2.5 C3.17157288,2.5 2.5,3.17157288 2.5,4 L2.5,12 C2.5,12.8284271 3.17157288,13.5 4,13.5 L12,13.5 C12.8284271,13.5 13.5,12.8284271 13.5,12 L13.5,7.8285 Z M13.284,2.312 C13.4738226,2.11757837 13.784168,2.11034095 13.9828473,2.2957025 C14.1815266,2.48106405 14.1958051,2.79116533 14.015,2.994 L8.56,8.845 C8.43817243,8.97566989 8.25588756,9.03141962 8.08181033,8.9912488 C7.90773311,8.95107798 7.76830999,8.82108951 7.71606033,8.65024879 C7.66381067,8.47940808 7.70667243,8.29366989 7.8285,8.163 L13.284,2.312 Z" id="形状" stroke="#0B58FF" stroke-width="0.1" fill="#0B58FF"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

src/components/DialogForm/index.vue

@@ -76,6 +76,7 @@
 						class="upload-area"
 						:class="uploadOpen ? '' : 'height-48'"
 						ref="uploadArea"
+						:key="col.prop"
 						v-if="col.upload">
 						<span class="close-icon" :class="uploadOpen ? 'open' : ''">
 							<el-button
@@ -87,13 +88,18 @@
 						<el-upload
 							class="upload-in-dialog"
 							v-if="col.upload"
+							:key="col.prop + '__el-upload'"
 							:action="uploadUrl"
 							:headers="uploadHeaders"
 							:show-file-list="false"
 							icon="el-icon-upload2"
 							:disabled="disabled"
 							:before-upload="beforeUpload"
-							:on-success="handleUploadSuccess"
+							:on-success="
+								(response, file, fileList) => {
+									handleUploadSuccess(response, file, col.prop);
+								}
+							"
 							v-bind="col.bind">
 							<el-button size="mini" :disabled="col.bind?.disabled || false">
 								<svg-icon
@@ -108,10 +114,10 @@
 
 						<uploadedFile
 							class="file"
-							v-for="file in form[col.prop] || []"
+							v-for="file in form[col.prop]"
 							:file="file"
 							:key="file.fileUrl"
-							@delete="!disabled && handleDeleteFile(file)" />
+							@delete="!disabled && handleDeleteFile(file, col.prop)" />
 					</div>
 				</el-form-item>
 			</el-col>
@@ -152,12 +158,30 @@ const uploadedFile = {
 		handleDelete() {
 			this.$emit('delete', this.file);
 		},
+		async handleDownload() {
+			const data = await this.$axios({
+				url: this.file.fileUrl,
+				method: 'get',
+				responseType: 'blob',
+			});
+
+			await this.$message.success('开始下载');
+			// create download link
+			const url = window.URL.createObjectURL(data);
+			const link = document.createElement('a');
+			link.href = url;
+			link.download = this.file.fileName;
+			document.body.appendChild(link);
+			link.click();
+			document.body.removeChild(link);
+		},
 	},
 	mounted() {},
 	render: function (h) {
 		return (
 			<div
 				title={this.file.fileName}
+				onClick={this.handleDownload}
 				style={{
 					background: `url(${tupleImg}) no-repeat`,
 					backgroundSize: '14px',
@@ -205,7 +229,7 @@ export default {
 			default: false,
 		},
 		hasFiles: {
-			type: Boolean,
+			type: Boolean | Array,
 			default: false,
 		},
 		labelPosition: {
@@ -251,7 +275,13 @@ export default {
 			handler(val) {
 				this.form = JSON.parse(JSON.stringify(val));
 				if (this.hasFiles) {
-					this.form.files = this.form.files ?? [];
+					if (typeof this.hasFiles == 'boolean' && this.hasFiles) {
+						this.form.files = this.form.files ?? [];
+					} else if (Array.isArray(this.hasFiles)) {
+						this.hasFiles.forEach((prop) => {
+							this.form[prop] = this.form[prop] ?? [];
+						});
+					}
 				}
 			},
 			deep: true,
@@ -348,7 +378,7 @@ export default {
 									// 处理输入框数据
 									this.form[opt.prop] = response.data;
 									// 更新下外部的 dataForm，防止code字段有数据也报空的bug
-									this.$emit('update', this.form)
+									this.$emit('update', this.form);
 								}
 							});
 						}
@@ -377,11 +407,12 @@ export default {
 		// 上传成功的特殊处理
 		beforeUpload() {},
 		// 上传前的验证规则可通过 bind 属性传入
-		handleUploadSuccess(response, file, fileList) {
+		handleUploadSuccess(response, file, prop) {
-			this.form.files.push({
+			console.log('[handleUploadSuccess]', response, file, prop);
+			this.form[prop].push({
 				fileName: file.name,
 				fileUrl: response.data,
-				fileType: 2,
+				fileType: prop == 'files' ? 2 : 1,
 			});
 			this.$modal.msgSuccess('上传成功');
 			this.$emit('update', this.form);
@@ -395,8 +426,8 @@ export default {
 			this.uploadOpen = !this.uploadOpen;
 		},
 
-		handleDeleteFile(file) {
+		handleDeleteFile(file, prop) {
-			this.form.files = this.form.files.filter(
+			this.form[prop] = this.form[prop].filter(
 				(item) => item.fileUrl != file.fileUrl
 			);
 			this.$emit('update', this.form);

src/components/Editor/index.vue

@@ -124,9 +124,9 @@ export default {
 			this.Quill = new Quill(editor, this.options);
 			// 取消自动聚焦 start
 			this.$nextTick(() => {
-				this.Quill.blur();
+				this.Quill?.blur();
 				if (!this.readOnly) {
-					this.Quill.enable();
+					this.Quill?.enable();
 				}
 			});
 			// 如果设置了上传地址则自定义图片上传事件

src/components/FileUpload/index.vue

@@ -29,10 +29,10 @@
     <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
       <li :key="file.url" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList">
         <el-link :href="`${file.url}`" :underline="false" target="_blank">
-          <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
+          <span class="el-icon-document"> {{ fileName }} </span>
         </el-link>
         <div class="ele-upload-list__item-content-action">
-          <el-link :underline="false" @click="handleDelete(index)" type="danger">删除</el-link>
+          <el-link :underline="false" @click="handleDelete(index)" :disabled="disabled" type="danger">删除</el-link>
         </div>
       </li>
     </transition-group>
@@ -71,6 +71,11 @@ export default {
     disabled: {
       type: Boolean,
       default: false
+    },
+    //文件名称
+    fName: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -81,6 +86,7 @@ export default {
       uploadFileUrl: process.env.VUE_APP_BASE_API + "/admin-api/infra/file/upload", // 请求地址
       headers: { Authorization: "Bearer " + getAccessToken() }, // 设置上传的请求头部
       fileList: [],
+      fileName: ''
     };
   },
   watch: {
@@ -105,6 +111,14 @@ export default {
       },
       deep: true,
       immediate: true
+    },
+    fName: {
+      handler(val) {
+        if (val) {
+          console.log('11', val)
+          this.fileName = val
+        }
+      }
     }
   },
   computed: {
@@ -117,6 +131,7 @@ export default {
     // 上传前校检格式和大小
     handleBeforeUpload(file) {
       // 校检文件类型
+      this.fileName = file.name
       if (this.fileType) {
         let fileExtension = "";
         if (file.name.lastIndexOf(".") > -1) {
@@ -150,7 +165,7 @@ export default {
     },
     // 上传失败
     handleUploadError(err) {
-      this.$modal.msgError("上传图片失败，请重试");
+      this.$modal.msgError("上传文件失败，请重试");
       this.$modal.closeLoading()
     },
     // 上传成功回调
@@ -180,8 +195,12 @@ export default {
         this.number = 0;
         this.$emit("input", this.listToString(this.fileList));
         this.$modal.closeLoading();
+        this.returnFileName()
       }
     },
+    returnFileName() {
+      this.$emit('name', this.fileName)
+    },
     // 获取文件名称
     getFileName(name) {
       console.log('你好', name)

src/layout/components/DialogWithMenu.vue

@@ -1,978 +0,0 @@
-<template>
-  <el-dialog class="dialog-with-menu" :visible="dialogVisible" :destroy-on-close="false" @close="handleClose"
-    :close-on-click-modal="configs.clickModalToClose ?? true">
-    <!-- title  -->
-    <div slot="title" class="dialog-title">
-      <h1 class="">
-        {{ detailMode ? "查看详情" : dataForm.id ? "编辑" : "新增" }}
-      </h1>
-    </div>
-
-    <div class="dialog-body__inner relative">
-      <!-- v-if="dataForm.id && !detailMode && /属性|详情/.test(activeMenu) && $hasPermission()" -->
-      <el-button v-if="configs.allowAdd ?? (dataForm.id && !detailMode && /属性|详情|参数/.test(activeMenu))" plain
-        type="primary" size="small" class="at-right-top" style="margin-bottom: 16px" @click="handleAddParam()">+
-        添加</el-button>
-      <template v-if="dataForm.id && !detailMode && /附件/.test(activeMenu)">
-        <el-upload style="position: absolute; width: 100%; height: 0" name="files" :action="uploadUrl"
-          :show-file-list="false" :headers="uploadHeaders" :on-success="handleUploadSuccess"
-          :before-upload="handleUploadCheck">
-          <el-button plain type="primary" size="small" class="at-right-top" style=""> <i class="el-icon-upload"></i> 上传
-          </el-button>
-        </el-upload>
-      </template>
-
-      <!-- menu  -->
-      <el-tabs v-model="activeMenu" type="card" @tab-click="handleTabClick">
-        <!-- <el-tab-pane v-for="(tab, index) in configs.menu" :key="index" :label="tab.name" :name="tab.name"> -->
-        <el-tab-pane v-for="(tab, index) in actualMenus" :key="index" :name="tab.name">
-          <span class="slot" slot="label">
-            <i :class="{
-              'el-icon-edit': tab.key === 'info',
-              'el-icon-s-data': tab.key === 'attr',
-              'el-icon-folder-opened': tab.key === 'attachment',
-            }"></i>
-            {{ tab.name }}
-          </span>
-
-          <!-- 表单标签页 -->
-          <div v-if="tab.key === 'info'">
-            <!-- form  -->
-            <el-form ref="dataForm" :model="dataForm" v-loading="loadingStatus">
-              <el-row v-for="(row, rowIndex) in configs.form.rows" :key="'row_' + rowIndex" :gutter="20">
-                <el-col v-for="(col, colIndex) in row" :key="colIndex" :span="24 / row.length">
-                  <el-form-item :label="col.label" :prop="col.prop" :rules="col.rules || null"
-                    v-show="!col.forceDisabled || (col.forceDisabled && dataForm.id)">
-                    <div v-if="col.forceDisabled && dataForm.id" class="force-disabled">
-                      <el-tag :key="col.key" :type="col.type">{{ dataForm[col.prop] || "-" }}</el-tag>
-                    </div>
-                    <el-input v-if="col.input" v-model="dataForm[col.prop]" clearable
-                      :disabled="disableCondition(col.prop)" v-bind="col.elparams" />
-                    <el-cascader v-if="col.cascader" v-model="dataForm[col.prop]" :options="col.options"
-                      :disabled="detailMode" v-bind="col.elparams"></el-cascader>
-                    <el-select v-if="col.select" v-model="dataForm[col.prop]" clearable
-                      :disabled="disableCondition(col.prop)" v-bind="col.elparams"
-                      @change="handleSelectChange(col, $event)">
-                      <el-option v-for="(opt, optIdx) in col.options" :key="'option_' + optIdx" :label="opt.label"
-                        :value="opt.value" />
-                    </el-select>
-                    <el-switch v-if="col.switch" v-model="dataForm[col.prop]" :active-value="1" :inactive-value="0"
-                      @change="handleSwitchChange" :disabled="disableCondition(col.prop)" />
-                    <el-input v-if="col.textarea" type="textarea" v-model="dataForm[col.prop]"
-                      :disabled="disableCondition(col.prop)" v-bind="col.elparams" />
-                    <quillEditor v-if="col.richInput" ref="quill-editor" v-model="dataForm[col.prop]"
-                      :options="col.quillConfig ?? defaultQuillConfig" style="margin-top: 42px"
-                      :disabled="disableCondition(col.prop)" />
-
-                    <div class="" v-if="col.component" style="margin: 42px 0 0">
-                      <!-- 下面这个 component 几乎是为 富文本 quill 定制的了... TODO：后续可能会根据业务需求创建新的版本  -->
-                      <component :is="col.component" :key="'component_' + col.prop"
-                        @update:modelValue="handleComponentModelUpdate(col.prop, $event)" :modelValue="dataForm[col.prop]"
-                        :mode="detailMode ? 'detail' : dataForm.id ? 'edit' : 'create'" />
-                    </div>
-                    <!-- add more...  -->
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </div>
-
-          <!-- 表格标签页 -->
-          <div v-if="dataForm.id && tab.key === 'attr'" key="attr-list">
-            <BaseListTable :table-config="null" :column-config="filteredTableProps" :table-data="subList"
-              @operate-event="handleTableRowOperate" :current-page="attrPage" :current-size="attrSize"
-              :refresh-layout-key="Math.random()" v-loading="loadingStatus" />
-            <!-- paginator  -->
-            <el-pagination class="" style="text-align: left" background @size-change="handleSizeChange"
-              @current-change="handlePageChange" :current-page.sync="attrPage" :page-sizes="[5, 10, 20]"
-              :page-size="attrSize" :total="attrTotal" layout="total, sizes, prev, next"></el-pagination>
-          </div>
-
-          <!-- 附件标签页 -->
-          <div v-if="dataForm.id && tab.key === 'attachment'" key="attachment">
-            <div class="upload-tips" style="font-size: 0.8em; margin-bottom: 12px">文件大小不要超过 2MB</div>
-            <!-- 附件列表 -->
-            <div class="" v-loading="loadingStatus">
-              <ul class="file-list">
-                <li v-for="(file, index) in fileList" :key="index">
-                  <span class="file-name">{{ file.name }}</span>
-                  <span class="file-operations">
-                    <span class="file-icon preview" @click="handleFileClick('view', file)">
-                      <i class="el-icon-view" style="cursor: pointer"></i>
-                    </span>
-                    <span class="file-icon download" @click="handleFileClick('download', file)">
-                      <i class="el-icon-download" style="color: #0b58ff; cursor: pointer"></i>
-                    </span>
-                    <span class="file-icon delete" @click="handleFileClick('delete', file)">
-                      <i class="el-icon-delete" style="color: red; cursor: pointer"></i>
-                    </span>
-                  </span>
-                </li>
-              </ul>
-            </div>
-            <!-- img preview dialog  -->
-            <el-dialog key="image-preview-dialog" class="image-preview-dialog" :visible.sync="imgPreviewDialogVisible"
-              :append-to-body="true">
-              <div class="img-container">
-                <img width="100%" :src="currentImgUrl" alt="" />
-              </div>
-            </el-dialog>
-          </div>
-        </el-tab-pane>
-      </el-tabs>
-    </div>
-
-    <!-- sub dialog  -->
-    <small-dialog :append-to-body="true" v-if="showSubDialog" ref="subDialog" :url="urls.subase"
-      :configs="configs.subDialog" :related-id="dataForm.id" @refreshDataList="getSubList"></small-dialog>
-
-    <!-- footer  -->
-    <div slot="footer">
-      <template v-for="(operate, index) in configs.form.operations">
-        <el-button v-if="showButton(operate)" :key="'operation_' + index" :type="operate.type"
-          @click="handleBtnClick(operate)"
-          :loading="(operate.name === 'add' || operate.name === 'update') && btnLoading">{{ operate.label }}</el-button>
-      </template>
-      <el-button @click="handleBtnClick({ name: 'cancel' })">取消</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { pick as __pick } from "@/utils/filters";
-import SmallDialog from "@/components/SmallDialog.vue";
-import BaseListTable from "@/components/BaseListTable.vue";
-import Cookies from "js-cookie";
-import "quill/dist/quill.core.css";
-import "quill/dist/quill.snow.css";
-import "quill/dist/quill.bubble.css";
-
-import { quillEditor } from "vue-quill-editor";
-
-function reConstructTreeData(listObj) {
-  const entry = [];
-  Object.keys(listObj).map((key) => {
-    const currentNode = listObj[key];
-    currentNode.label = currentNode.name;
-    currentNode.value = currentNode.id;
-    if (currentNode.parentId === "0") {
-      entry.push(listObj[key]);
-      return; // return { label: currentNode.name, value: currentNode.id, children: currentNode.children ?? [] };
-    }
-    const parentNode = listObj[currentNode.parentId];
-    if (!parentNode.children) {
-      parentNode.children = [];
-    }
-    parentNode.children.push(currentNode);
-  });
-  return entry;
-}
-
-export default {
-  name: "DialogWithMenu",
-  components: { SmallDialog, BaseListTable, quillEditor },
-  props: {
-    configs: {
-      type: Object,
-      default: () => ({}),
-    },
-    dialogVisible: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  inject: ["urls"],
-  data() {
-    const dataForm = {};
-    const autoDisabledQueue = [];
-    const watingToRefreshQueue = [];
-    const cached = {}
-
-    this.configs.form.rows.forEach((row) => {
-      row.forEach((col) => {
-        if (col.upload) dataForm[col.prop] = col.default ?? [];
-        else dataForm[col.prop] = col.default ?? null;
-
-        if (col.autoDisabled) autoDisabledQueue.push(col.prop);
-        if (!!col.refreshOptionsAfterConfirm) watingToRefreshQueue.push(col);
-
-        if (col.fetchData)
-          col.fetchData().then(({ data: res }) => {
-            console.log("[Fetch Data]", "list" in res.data, res.data, res.data.list);
-            if (res.code === 0) {
-              if (col.cacheFetchedData) {
-                // cache fetched data
-                cached[col.prop] = 'list' in res.data ? res.data.list : (Array.isArray(res.data) ? res.data : [])
-              }
-
-              if (!col.options || !col.options.length) {
-                this.$set(
-                  col,
-                  "options",
-                  "list" in res.data
-                    ? res.data.list.map((i) => ({
-                      label: col.optionLabel ? i[col.optionLabel] : i.name,
-                      value: col.optionValue ? i[col.optionValue] : i.id,
-                    }))
-                    : res.data.map((i) => ({
-                      label: col.optionLabel ? i[col.optionLabel] : i.name,
-                      value: col.optionValue ? i[col.optionValue] : i.id,
-                    }))
-                );
-              }
-              // col.options = res.data.list;
-              else if (col.options.length) {
-                "list" in res.data ? res.data.list.unshift(...col.options) : res.data.unshift(...col.options);
-                this.$set(
-                  col,
-                  "options",
-                  "list" in res.data
-                    ? res.data.list.map((i) => ({
-                      label: col.optionLabel ? i[col.optionLabel] : i.name,
-                      value: col.optionValue ? i[col.optionValue] : i.id,
-                    }))
-                    : res.data.map((i) => ({
-                      label: col.optionLabel ? i[col.optionLabel] : i.name,
-                      value: col.optionValue ? i[col.optionValue] : i.id,
-                    }))
-                );
-              }
-            } else {
-              col.options.splice(0);
-            }
-            // dataForm[col.prop] = col.default ?? null; // not perfect!
-          });
-        else if (col.fetchTreeData) {
-          // 获取设备类型时触发的，用于前端构建属性结构，约定，parentId 为0时是顶级节点
-          col.fetchTreeData().then(({ data: res }) => {
-            console.log("[Fetch Tree Data]", res.data);
-            if (res.code === 0) {
-              // 先把数据先重构成一个对象
-              const obj = {};
-
-              if ("list" in res.data) {
-                res.data.list.map((item) => {
-                  obj[item.id] = item;
-                });
-              } else if (Array.isArray(res.data)) {
-                res.data.map((item) => {
-                  obj[item.id] = item;
-                });
-              }
-              // 再过滤这个对象
-              let filteredList = reConstructTreeData(obj);
-              console.log("** filteredList **", filteredList);
-              // 最后设置 options
-              this.$set(col, "options", filteredList);
-            } else {
-              col.options.splice(0);
-              this.$message.error(res.msg);
-            }
-          });
-        }
-      });
-    });
-
-    return {
-      // configs,
-      btnLoading: false,
-      loadingStatus: false,
-      activeMenu: this.configs.menu[0].name,
-      dataForm,
-      detailMode: false,
-      autoDisabledQueue,
-      watingToRefreshQueue,
-      cached,
-      showBaseDialog: false,
-      baseDialogConfig: null,
-      subList: [],
-      showSubDialog: false,
-      disableXXX: false,
-      defaultQuillConfig: {
-        modules: {
-          toolbar: [
-            [{ font: [] }],
-            [{ size: ["small", false, "large", "huge"] }], // custom dropdown
-            ["bold", "italic", "underline", "strike"], // toggled buttons
-            [{ color: [] }, { background: [] }], // dropdown with defaults from theme
-            ["blockquote", "code-block"],
-            [{ header: 1 }, { header: 2 }], // custom button values
-            [{ list: "ordered" }, { list: "bullet" }],
-            // [{ 'script': 'sub'}, { 'script': 'super' }],      // superscript/subscript
-            [{ indent: "-1" }, { indent: "+1" }], // outdent/indent
-            // [{ 'direction': 'rtl' }],                         // text direction
-            // [{ 'header': [1, 2, 3, 4, 5, 6, false] }],
-            // [{ 'align': [] }],
-            // ['clean']                                         // remove formatting button
-          ],
-        },
-        theme: "snow",
-        readOnly: false,
-        placeholder: "在这里输入描述信息...",
-        scrollingContainer: null,
-      },
-      attrPage: 1,
-      attrSize: 10,
-      attrTotal: 0,
-      fileList: [],
-      imgPreviewDialogVisible: false,
-      currentImgUrl: "",
-    };
-  },
-  mounted() {
-    this.configs.form.rows.forEach((row) => {
-      row.forEach((col) => {
-        if (col.changeReflects && typeof col.changeReflects === 'object' && 'fromKey' in col.changeReflects && 'toProp' in col.changeReflects) {
-          this.$watch(
-            () => this.dataForm[col.prop],
-            val => {
-              if (val && (col.prop in this.cached)) {
-                console.log("here changeReflects", col.prop, col.changeReflects.toProp, this.cached[col.prop])
-                if (typeof col.changeReflects.fromKey === 'string') {
-                  this.dataForm[col.changeReflects.toProp] = this.cached[col.prop].find(item => item.id === val)?.[col.changeReflects.fromKey]
-                } else if (Array.isArray(col.changeReflects.fromKey) && col.changeReflects.delimiter) {
-                  const foundItem = this.dataForm[col.changeReflects.toProp] = this.cached[col.prop].find(item => item.id === val)
-                  if (foundItem) {
-                    const values = col.changeReflects.fromKey.map(key => foundItem[key])
-                    this.dataForm[col.changeReflects.toProp] = values.join(col.changeReflects.delimiter)
-                  } else {
-                    this.dataForm[col.changeReflects.toProp] = col.changeReflects.delimiter
-                    console.log("[DialogWithMenu] mounted() 没找到对应数据")
-                  }
-                }
-              }
-            },
-            {
-              immediate: false
-            }
-          )
-        }
-      });
-    });
-  },
-
-  watch: {
-    dialogVisible: function (val) {
-      if (!!val) {
-        this.attrPage = 1
-        this.attrSize = 10
-      }
-    },
-  },
-  computed: {
-    actualMenus() {
-      return this.configs.menu.filter((m) => {
-        if (m.onlyEditMode && !this.dataForm.id) {
-          return false;
-        }
-        return true;
-      });
-    },
-    filteredTableProps() {
-      return this.detailMode ? this.configs.table.props.filter((v) => v.prop !== "operations") : this.configs.table.props;
-    },
-    uploadHeaders() {
-      return {
-        token: Cookies.get("token") || "",
-      };
-    },
-    uploadUrl() {
-      return this.configs.menu.find((item) => item.key === "attachment")?.actionUrl || "#";
-    },
-  },
-
-  methods: {
-    disableCondition(prop) {
-      return this.detailMode || (this.disableXXX && this.autoDisabledQueue.indexOf(prop) !== -1);
-    },
-    /** utitilities */
-    showButton(operate) {
-      const notDetailMode = !this.detailMode;
-      const showAlways = operate.showAlways ?? false;
-      const editMode = operate.showOnEdit && this.dataForm.id;
-      const addMode = !operate.showOnEdit && !this.dataForm.id;
-      const permission = operate.permission ? this.$hasPermission(operate.permission) : true;
-      const currentMenuKey = this.configs.menu.find((item) => item.name === this.activeMenu)?.key;
-      return notDetailMode && (showAlways || ((editMode || addMode) && permission)) && currentMenuKey === "info";
-    },
-
-    resetForm(excludeId = false, immediate = false) {
-      setTimeout(
-        () => {
-          Object.keys(this.dataForm).forEach((key) => {
-            if (excludeId && key === "id") return;
-            if ("files" in this.dataForm) this.dataForm.files = [];
-            if ("fileIds" in this.dataForm) this.dataForm.fileIds = [];
-            else this.dataForm[key] = null;
-            if (Array.isArray(this.fileList)) {
-              this.fileList = [];
-            }
-          });
-          this.activeMenu = this.configs.menu[0].name;
-          this.$refs.dataForm[0].clearValidate();
-        },
-        immediate ? 0 : 200
-      );
-    },
-
-    updateOptions() {
-      return new Promise((resolve, reject) => {
-        if (this.watingToRefreshQueue.length) {
-          this.watingToRefreshQueue.forEach((opt) => {
-            console.log("[刷新数据, ", opt, "]");
-            if ("fetchData" in opt) {
-              opt.fetchData(this.dataForm.id ? this.dataForm.id : -1).then(({ data: res }) => {
-                if (res.code === 0) {
-                  this.$set(
-                    opt,
-                    "options",
-                    "list" in res.data
-                      ? res.data.list.map((i) => ({ label: i.code, value: i.id }))
-                      : res.data.map((i) => ({ label: i.code, value: i.id }))
-                  );
-
-                  resolve({ done: true });
-                } else {
-                  this.$message({
-                    message: `${res.code}: ${res.msg}`,
-                    type: "error",
-                    duration: 1500,
-                  });
-
-                  resolve({ done: false });
-                }
-              });
-            }
-          });
-        } else resolve(null);
-      });
-    },
-
-    /** init **/
-    init(id, detailMode, menu) {
-      // this.dialogVisible = true;
-      if (this.$refs.dataForm && this.$refs.dataForm.length) {
-        // 当不是首次渲染dialog的时候，一开始就清空验证信息，本组件的循环里只有一个 dataForm 所以只用取 [0] 即可
-        this.$refs.dataForm[0].clearValidate();
-      }
-      console.log("[dialog] DialogWithHead init():", id, detailMode);
-
-      this.detailMode = detailMode ?? false;
-      this.$nextTick(() => {
-        this.dataForm.id = id || null;
-        if (this.dataForm.id) {
-          // 如果是编辑
-          this.loadingStatus = true;
-          // 提前获取属性列表
-          this.getSubList();
-          // 获取详情
-          this.updateOptions().then((result) => {
-            if (result === null || (typeof result === "object" && result.done)) {
-              this.$http.get(this.urls.base + `/${this.dataForm.id}`).then(({ data: res }) => {
-                if (res && res.code === 0) {
-                  const dataFormKeys = Object.keys(this.dataForm);
-                  this.dataForm = __pick(res.data, dataFormKeys);
-                  if ("files" in res.data) {
-                    console.log("[DialogWithMenu] fileList===>", res.data.files, this.fileList);
-                    /** 返回的文件列表 */
-                    this.fileList = res.data.files
-                      ? res.data.files.map((file) => ({
-                        id: file.id,
-                        name: file.fileUrl.split("/").pop(),
-                        url: file.fileUrl,
-                        typeCode: file.typeCode,
-                      }))
-                      : [];
-                  }
-                }
-                this.loadingStatus = false;
-                // 是否要跳转到附件页
-                if (menu && menu.key) {
-                  this.activeMenu = this.configs.menu.find((item) => item.key === menu.key)?.name;
-                }
-              });
-            }
-          });
-        } else {
-          // 如果不是编辑
-          this.updateOptions();
-        }
-      });
-    },
-
-    /** handlers */
-    handleFileClick(type, file) {
-      switch (type) {
-        case "view": {
-          // 加载图片
-          this.$http
-            .get("/pms/attachment/downloadFile", {
-              params: {
-                attachmentId: file.id,
-                type: 0, // 0 预览，1 下载
-              },
-              responseType: "blob",
-            })
-            .then(({ data: res }) => {
-              console.log("preivew", res);
-              if (/image/i.test(res.type)) {
-                // 显示图片
-                this.currentImgUrl = URL.createObjectURL(res);
-                this.imgPreviewDialogVisible = true;
-              } else if (/pdf/i.test(res.type)) {
-                // 预览pdf 
-                let a = document.createElement('a')
-                a.setAttribute('target', '_blank')
-                a.href = URL.createObjectURL(res)
-                a.click()
-                console.log('before remove a ', a)
-                a.remove()
-                console.log('removed a ', a)
-              } else {
-                this.$message({
-                  message: "非图片和PDF文件请下载后预览",
-                  type: "error",
-                  duration: 1500,
-                });
-              }
-            });
-          break;
-        }
-
-        case "download": {
-          // 下载图片
-          this.$http
-            .get("/pms/attachment/downloadFile", {
-              params: {
-                attachmentId: file.id,
-                type: 1, // 0 预览，1 下载
-              },
-              responseType: "blob",
-            })
-            .then(({ data: res }) => {
-              const blob = new Blob([res]);
-
-              /** 通知 */
-              this.$notify({
-                title: "成功",
-                message: "开始下载",
-                type: "success",
-                duration: 1200,
-              });
-
-              if ("download" in document.createElement("a")) {
-                const alink = document.createElement("a");
-                alink.download = file.name;
-                alink.style.display = "none";
-                alink.target = "_blank";
-                alink.href = URL.createObjectURL(blob);
-                document.body.appendChild(alink);
-                alink.click();
-                URL.revokeObjectURL(alink.href);
-                document.body.removeChild(alink);
-              } else {
-                navigator.msSaveBlob(blob, fileName);
-              }
-            });
-
-          break;
-        }
-
-        case "delete": {
-          return this.$confirm(`确定删除图片: ${file.name}`, "提示", {
-            confirmButtonText: "确认",
-            cancelButtonText: "我再想想",
-            type: "warning",
-          })
-            .then(() => {
-              this.loadingStatus = true;
-              const newFilelist = this.fileList.filter((f) => f.id !== file.id);
-              this.updateRemoteFiles(newFilelist).then((msg) => {
-                if (msg && msg === "success") {
-                  this.fileList = newFilelist;
-                  this.loadingStatus = false;
-                  /** 通知 */
-                  this.$notify({
-                    title: "成功",
-                    message: "已删除",
-                    type: "success",
-                    duration: 1200,
-                  });
-                }
-              });
-            })
-            .catch((err) => { });
-        }
-      }
-    },
-
-    handleUploadSuccess(response, file, fileList) {
-      console.log("[DialogWithMenu] uploadedFileList", response, file, fileList);
-
-      if (response.code === 0) {
-        const uploadedFile = response.data[0];
-        const fileItem = {
-          id: uploadedFile.id,
-          name: uploadedFile.fileUrl.split("/").pop(),
-          url: uploadedFile.fileUrl,
-          typeCode: file.typeCode,
-        };
-
-        this.loadingStatus = true;
-        this.updateRemoteFiles([...this.fileList, fileItem]).then((msg) => {
-          if (msg && msg === "success") {
-            this.fileList.push(fileItem);
-            this.loadingStatus = false;
-            /** 通知 */
-            this.$notify({
-              title: "成功",
-              message: "上传成功",
-              type: "success",
-              duration: 1200,
-            });
-          }
-        });
-      }
-    },
-
-    updateRemoteFiles(filelist) {
-      return this.$http
-        .put("/pms/product", {
-          id: "id" in this.dataForm ? this.dataForm.id : "DEFAULT_ID",
-          fileIds: filelist.map((f) => f.id),
-        })
-        .then(({ data: res }) => {
-          if (res.code === 0) return "success";
-        });
-    },
-
-    handleUploadCheck(file) {
-      console.log("[before upload]", file);
-      const LIMIT = 2 * 1024 * 1024; // bytes
-      if (file.size > LIMIT) {
-        this.$message({
-          message: "文件大小不能超过 2MB",
-          type: "error",
-          duration: 1500,
-        });
-        return false;
-      } else return true;
-    },
-
-    handleComponentModelUpdate(propName, { subject, payload: { data } }) {
-      this.dataForm[propName] = JSON.stringify(data);
-      console.log("[DialogJustForm] handleComponentModelUpdate", this.dataForm[propName]);
-    },
-    handleSelectChange(col, eventValue) {
-      console.log("[dialog] select change: ", col, eventValue);
-    },
-    handleSwitchChange(val) {
-      console.log("[dialog] switch change: ", val, this.dataForm);
-    },
-    handleBtnClick(payload) {
-      console.log("btn click payload: ", payload);
-
-      if ("name" in payload) {
-        switch (payload.name) {
-          case "cancel":
-            this.handleClose();
-            break;
-          case "reset":
-            this.resetForm(true, true); // true means exclude id
-            break;
-          case "add":
-          case "update": {
-            this.$refs.dataForm[0].validate((passed, result) => {
-              if (passed) {
-                // 如果通过验证
-                this.btnLoading = true
-                this.loadingStatus = true;
-                const method = payload.name === "add" ? "POST" : "PUT";
-
-                // 判断是否有附件选项
-                const hasAttachment = !!this.configs.menu.find((item) => item.key === "attachment");
-                if (hasAttachment) {
-                  const fileIds = this.fileList.map((item) => item.id);
-                  this.$set(this.dataForm, "fileIds", fileIds);
-                }
-
-                // 加载额外需要的 id
-                let extraIds = {};
-                if (this.configs.extraIds && typeof this.configs.extraIds === "object") {
-                  // 如果配置里，有 extraIds 选项
-                  Object.entries(this.configs.extraIds).forEach(([key, value]) => {
-                    extraIds[key] = value;
-                  });
-                }
-
-                // 实际发送请求
-                this.btnLoading = true
-                this.$http({
-                  url: this.urls.base,
-                  method,
-                  data: {
-                    ...extraIds,
-                    ...this.dataForm,
-                  },
-                })
-                  .then(({ data: res }) => {
-                    this.btnLoading = false
-                    this.loadingStatus = false;
-                    console.log("[add&update] res is: ", res);
-                    if (res.code === 0) {
-                      this.$message.success(payload.name === "add" ? "添加成功" : "更新成功");
-                      this.$emit("refreshDataList");
-
-                      // 如果 watingToRefreshQueue 队列里有数据
-                      // if (this.watingToRefreshQueue.length) {
-                      //   // 刷新队列
-                      //   this.watingToRefreshQueue.forEach((opt) => {
-                      //     console.log("[刷新数据, ", opt, "]");
-                      //     if ("fetchData" in opt) {
-                      //       opt.fetchData().then(({ data: res }) => {
-                      //         if (res.code === 0) {
-                      //           this.$set(
-                      //             opt,
-                      //             "options",
-                      //             "list" in res.data
-                      //               ? res.data.list.map((i) => ({ label: i.name, value: i.id }))
-                      //               : res.data.map((i) => ({ label: i.name, value: i.id }))
-                      //           );
-                      //         }
-                      //       });
-                      //     }
-                      //   });
-                      // }
-
-                      this.handleClose();
-                    } else {
-                      this.$message({
-                        message: `${res.code}: ${res.msg}`,
-                        type: "error",
-                        duration: 2000,
-                      });
-                      if (this.btnLoading) this.btnLoading = false
-                    }
-                  })
-                  .catch((errMsg) => {
-                    this.$message.error("参数错误：" + errMsg);
-                    if (this.loadingStatus) this.loadingStatus = false;
-                    if (this.btnLoading) this.btnLoading = false
-                  });
-              } else {
-                this.$message.error("请核查字段信息");
-              }
-            });
-          }
-        }
-      }
-    },
-    handleTabClick(payload) {
-      //   console.log("tab click payload: ", this.activeMenu);
-      //   if (this.activeMenu === this.configs.menu[1].name) {
-      //     // 获取数据
-      //     this.getSubList();
-      //   }
-    },
-
-    handlePageChange(val) {
-      this.getSubList(val, this.attrSize);
-    },
-    handleSizeChange(val) {
-      this.attrPage = 1;
-      this.attrSize = val
-      this.getSubList(1, val);
-    },
-
-    getSubList(page, size) {
-      const params = {};
-      params.page = page ?? this.attrPage;
-      params.limit = size ?? this.attrSize;
-
-      const requiredParams = this.configs.table.extraParams;
-      if (requiredParams) {
-        if (Array.isArray(requiredParams)) {
-          requiredParams.forEach((str) => {
-            if (/id/i.test(str)) {
-              params[str] = this.dataForm.id;
-            } else {
-              params[str] = "";
-            }
-          });
-        } else if (typeof requiredParams === "string") {
-          // 如果需要额外参数，一般肯定需要
-          params[this.configs.table.extraParams] = this.dataForm.id;
-          // 此时 dataForm.id 一定是存在的
-        }
-      }
-      this.$http.get(this.urls.subpage, { params }).then(({ data: res }) => {
-        console.log("[DialogWithMenu] getSubList:", res);
-        if (res.code === 0 && res.data?.list) {
-          // 有数据
-          this.subList = res.data.list;
-          this.attrTotal = res.data.total;
-        } else {
-          this.subList.splice(0);
-          this.attrTotal = 0;
-        }
-      });
-    },
-
-    handleAddParam(id) {
-      this.showSubDialog = true;
-      this.$nextTick(() => {
-        this.$refs.subDialog.init(id ?? null);
-      });
-    },
-
-    handleClose() {
-      this.resetForm();
-      this.$emit("update:dialogVisible", false);
-    },
-
-    /** 列表handlers */
-    handleAddItem() {
-      // console.log('[dialog] handleAddItem ot list...');
-      this.showBaseDialog = true;
-      this.$nextTick(() => {
-        console.log("[sub-dialog] ", this.$refs["sub-dialog"].init());
-      });
-    },
-    handleTableRowOperate({ type, data }) {
-      console.log("handleTableRowOperate", type, data);
-
-      switch (type) {
-        case "delete": {
-          // 确认是否删除
-          console.log('delete....', data)
-          const itemName = typeof data === 'object' ? (data.attrName || data.name || data.material || data.id) : data
-          return this.$confirm(`是否删除条目: ${itemName}`, "提示", {
-            confirmButtonText: "确认",
-            cancelButtonText: "我再想想",
-            type: "warning",
-          })
-            .then(() => {
-              // this.$http.delete(this.urls.base + `/${data}`).then((res) => {
-              this.$http({
-                url: this.urls.subase,
-                method: "DELETE",
-                data: [`${data.id}`],
-              }).then(({ data: res }) => {
-                if (res.code === 0) {
-                  this.$message.success({
-                    message: "删除成功!",
-                    duration: 1000,
-                    onClose: () => {
-                      this.getSubList(1, 20);
-                    },
-                  });
-                }
-              });
-            })
-            .catch((err) => { });
-        }
-        case "edit": {
-          this.handleAddParam(data); /** data is ==> id */
-          break;
-        }
-        // case 'view-detail-action':
-        // 	this.openDialog(data, true);
-        // 	break;
-      }
-    },
-  },
-};
-</script>
-
-<style scoped>
-.el-menu {
-  margin: 16px 0 !important;
-}
-
-.el-menu.el-menu--horizontal {
-  border: none !important;
-  /* background: #0f02 !important; */
-}
-
-/* .el-menu--horizontal > .el-menu-item.is-active { */
-/* border-bottom-color: #0b58ff; */
-/* } */
-
-.dialog-with-menu>>>.el-dialog__body {
-  /* padding-top: 16px !important;
-  padding-bottom: 16px !important; */
-  padding-top: 0 !important;
-  padding-bottom: 0 !important;
-}
-
-.el-select,
-.el-cascader {
-  width: 100% !important;
-}
-
-.dialog-with-menu>>>.el-dialog__header {
-  padding: 10px 20px 10px;
-  /* background: linear-gradient(to bottom, rgba(0, 0, 0, 0.25), white); */
-}
-
-.relative {
-  position: relative;
-}
-
-.at-right-top {
-  position: absolute;
-  top: 0;
-  right: 0;
-  z-index: 10000;
-}
-
-ul.file-list,
-ul.file-list>li {
-  padding: 0;
-  margin: 0;
-  list-style: none;
-}
-
-.file-list {
-  max-height: 20vh;
-  overflow-y: auto;
-  margin-top: 12px;
-  /* width: 240px; */
-  display: flex;
-  flex-direction: column;
-}
-
-ul.file-list>li {
-  border-radius: 4px;
-  background-color: #edededd2;
-  padding: 8px;
-  margin-bottom: 2px;
-  display: flex;
-  justify-content: space-between;
-}
-
-ul.file-list>li:hover {
-  background-color: #ededed;
-}
-
-.file-operations {
-  display: flex;
-}
-
-.file-icon {
-  margin-right: 8px;
-  font-size: 16px;
-  line-height: 1;
-  display: flex;
-  place-content: center;
-  width: 16px;
-  height: 16px;
-}
-
-/* .image-preview-dialog {
-} */
-
-.force-disabled {
-  margin-top: 42px;
-}
-</style>

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/styles/index.scss

@@ -163,7 +163,7 @@ input, textarea{
 }
 
 ::-webkit-scrollbar-thumb {
-  background-color: rgba(144,147,153,.5);
+  background-color: #EDEDED;
   background-clip: padding-box;
   min-height: 28px;
   -webkit-border-radius: 2em;
@@ -174,7 +174,7 @@ input, textarea{
 }
 
 ::-webkit-scrollbar-thumb:hover {
-  background-color: rgba(144,147,153,.3);
+  background-color: #D9D9D9;
 }
 
 // 抽屉head区域---start

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

@@ -2,43 +2,45 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-22 10:32:10
+ * @LastEditTime: 2023-11-25 18:09:05
  * @Description:
 -->
 <template>
-	<el-form
+	<div class="dialog">
-		:model="dataForm"
+		<el-form
-		:rules="dataRule"
+			:model="dataForm"
-		ref="dataForm"
+			:rules="dataRule"
-		@keyup.enter.native="dataFormSubmit()"
+			ref="dataForm"
-		label-width="80px">
+			@keyup.enter.native="dataFormSubmit()"
-		<el-row :gutter="20">
+			label-width="80px">
-			<el-col :span="12">
+			<el-row :gutter="20">
-				<el-form-item label="部门名称" prop="name">
+				<el-col :span="12">
-					<el-input v-model="dataForm.name" clearable placeholder="请输入部门名称" />
+					<el-form-item label="部门名称" prop="name">
-				</el-form-item>
+						<el-input v-model="dataForm.name" clearable placeholder="请输入部门名称" />
-			</el-col>
+					</el-form-item>
-			<el-col :span="12">
+				</el-col>
-				<el-form-item label="部门编码" prop="code">
+				<el-col :span="12">
-					<el-input v-model="dataForm.code" clearable placeholder="请输入部门编码" />
+					<el-form-item label="部门编码" prop="code">
-				</el-form-item>
+						<el-input v-model="dataForm.code" clearable placeholder="请输入部门编码" />
-			</el-col>
+					</el-form-item>
-		</el-row>
+				</el-col>
-		<el-row :gutter="20">
+			</el-row>
-			<el-col :span="12">
+			<el-row :gutter="20">
-				<el-form-item label="上级部门" prop="parentId">
+				<el-col :span="12">
-					<treeselect v-model="dataForm.parentId" :options="menuOptions" :normalizer="normalizer" :show-count="true" placeholder="选择上级部门"/>
+					<el-form-item label="上级部门" prop="parentId">
-				</el-form-item>
+						<treeselect v-model="dataForm.parentId" :options="menuOptions" :normalizer="normalizer" :show-count="true" placeholder="选择上级部门" />
-			</el-col>
+					</el-form-item>
-			<el-col :span="12">
+				</el-col>
-				<el-form-item label="备注" prop="remark">
+				<el-col :span="12">
-					<el-input
+					<el-form-item label="备注" prop="remark">
-						v-model="dataForm.remark"
+						<el-input
-						placeholder="请输入备注" />
+							v-model="dataForm.remark"
-				</el-form-item>
+							placeholder="请输入备注" />
-			</el-col>
+					</el-form-item>
-		</el-row>
+				</el-col>
-	</el-form>
+			</el-row>
+		</el-form>
+	</div>
 </template>
 
 <script>
@@ -68,6 +70,7 @@ export default {
 			},
 			departmentlList: [],
 			menuOptions: [],
+			isChoosed: false,
 			dataRule: {
         code: [{ required: true, message: "部门编码不能为空", trigger: "blur" }],
         name: [{ required: true, message: "部门名称不能为空", trigger: "blur" }],
@@ -104,3 +107,9 @@ export default {
 	},
 };
 </script>
+
+<style scoped>
+.dialog {
+	min-height: 180px;
+}
+</style>

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

@@ -46,35 +46,36 @@
 					}}文件大小不超过2MB
 				</div>
 			</el-upload>
-			<!-- <div
-				class="file-list__item"
-				v-for="n in 9"
-				:key="n"
-				:style="{
-					display: n > 4 && !expand ? 'none' : 'block',
-				}"
-				:data-name="n"
-				:class="{ 'default-icon': !isPicMode }">
-				<i class="el-icon-delete"></i>
-			</div> -->
 			<div
-				class="file-list__item"
 				v-for="(file, index) in files"
 				:key="file.fileName"
-				:style="{
+				style="width: 100%">
-					background: isPicMode
+				<div
-						? `url(${file.fileUrl}) no-repeat`
+					class="file-list__item"
-						: `url(${defaultBg}) no-repeat`,
+					v-if="!isPicMode"
-					backgroundSize: isPicMode ? '100% 100%' : '64px',
+					:style="{
-					backgroundPosition: isPicMode ? '0% 0%' : 'center',
+						background: isPicMode
-				}"
+							? `url(${file.fileUrl}) no-repeat`
-				:data-name="file.fileName">
+							: `url(${defaultBg}) no-repeat`,
-				<el-button
+						backgroundSize: isPicMode ? '100% 100%' : '64px',
-					v-if="!disabled"
+						backgroundPosition: isPicMode ? '0% 0%' : 'center',
-					type="text"
+					}"
-					class="el-icon-delete"
+					@click="handleDownload(file)"
-					style="padding: 0"
+					:data-name="file.fileName">
-					@click="(e) => handleDelete(file)" />
+					<el-button
+						v-if="!disabled"
+						type="text"
+						class="el-icon-delete"
+						style="padding: 0"
+						@click="(e) => handleDelete(file)" />
+				</div>
+
+				<el-image
+					v-else
+					class="file-list__item"
+					style="width: 100%"
+					:src="file.fileUrl"
+					:preview-src-list="files.map((item) => item.fileUrl)"></el-image>
 			</div>
 		</section>
 	</div>
@@ -189,6 +190,32 @@ export default {
 			}, 500);
 		},
 
+		async handleDownload(file) {
+			if (this.isPicMode) {
+				// this.$emit('preview', file);
+				const link = document.createElement('a');
+				link.href = file.fileUrl;
+				link.target = '_blank';
+				document.body.appendChild(link);
+				link.click();
+				document.body.removeChild(link);
+			} else {
+				// this.$emit('download', file);
+				const data = await this.$axios({
+					url: file.fileUrl,
+					method: 'get',
+					responseType: 'blob',
+				});
+				const link = document.createElement('a');
+				link.href = window.URL.createObjectURL(new Blob([data]));
+				link.download = file.fileName;
+				document.body.appendChild(link);
+				link.click();
+				document.body.removeChild(link);
+				window.URL.revokeObjectURL(link.href);
+			}
+		},
+
 		emitFilelist() {
 			this.$emit('update', this.files);
 		},

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

@@ -42,16 +42,26 @@
 							v-model="form" />
 					</div>
 
-					<div v-if="section.key == 'attrs'" style="margin-top: 12px">
+					<div
+						v-if="section.key == 'attrs'"
+						style="margin-top: 12px; position: relative">
+						<div
+							v-if="!mode.includes('detail')"
+							style="position: absolute; top: -40px; right: 0">
+							<el-button @click="handleAddAttr" type="text">
+								<i class="el-icon-plus"></i>
+								添加属性
+							</el-button>
+						</div>
 						<base-table
 							v-loading="attrListLoading"
 							:table-props="section.props"
 							:page="attrQuery?.params.pageNo || 1"
 							:limit="attrQuery?.params.pageSize || 10"
 							:table-data="list"
-							:add-button-show="mode.includes('detail') ? null : '添加属性'"
-							@emitButtonClick="handleAddAttr"
 							@emitFun="handleEmitFun">
+							<!-- :add-button-show="mode.includes('detail') ? null : '添加属性'"
+							@emitButtonClick="handleAddAttr" -->
 							<method-btn
 								v-if="section.tableBtn"
 								slot="handleBtn"
@@ -76,7 +86,7 @@
 				<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
 					编辑
 				</el-button>
-				<el-button v-else type="primary" @click="handleConfirm">确定</el-button>
+				<el-button v-else type="primary" @click="handleConfirm">保存</el-button>
 				<!-- sections的第二项必须是 属性列表  -->
 				<!-- <el-button
 						v-if="sections[1].allowAdd"
@@ -162,7 +172,9 @@ export default {
 						input: true,
 						label: '属性名称',
 						prop: 'name',
-						rules: [{ required: true, message: '属性名称不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '属性名称不能为空', trigger: 'blur' },
+						],
 					},
 				],
 				[

src/views/base/coreEquipment/index.vue

@@ -1,29 +1,62 @@
 <template>
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
-		<SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="handleSearchBarBtnClick" />
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
 
 		<!-- 列表 -->
-		<base-table :table-props="tableProps" :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-data="list"
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
 			@emitFun="handleEmitFun">
-			<method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" />
 		</base-table>
 
 		<!-- 分页组件 -->
-		<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
 			@pagination="getList" />
 
 		<!-- 对话框(添加) -->
-		<base-dialog :dialogTitle="title" :dialogVisible="open" @close="cancel" @cancel="cancel" width="60%"
+		<base-dialog
+			:dialogTitle="title"
+			:dialogVisible="open"
+			@close="cancel"
+			@cancel="cancel"
+			width="60%"
 			@confirm="submitForm">
-			<DialogForm v-if="open" key="index-dialog-form" ref="form" label-position="top" size="small" v-model="form"
+			<DialogForm
+				v-if="open"
+				key="index-dialog-form"
+				ref="form"
+				label-position="top"
+				size="small"
+				v-model="form"
+				:has-files="['files', 'files2']"
 				:rows="computedRows" />
 		</base-dialog>
 
 		<!-- 设备 详情 - 编辑 -->
-		<EquipmentDrawer v-if="editVisible" ref="drawer" :mode="editMode" @update-mode="editMode = $event"
+		<EquipmentDrawer
-			:data-id="form.id" :sections="[
+			v-if="editVisible"
+			ref="drawer"
+			:mode="editMode"
+			@update-mode="editMode = $event"
+			:data-id="form.id"
+			:sections="[
 				{
 					name: '基本信息',
 					key: 'base',
@@ -50,20 +83,23 @@
 					tableBtn: [
 						this.$auth.hasPermi('base:core-equipment-attr:update')
 							? {
-								type: 'edit',
+									type: 'edit',
-								btnName: '修改',
+									btnName: '修改',
-							}
+							  }
 							: undefined,
 						this.$auth.hasPermi('base:core-equipment-attr:delete')
 							? {
-								type: 'delete',
+									type: 'delete',
-								btnName: '删除',
+									btnName: '删除',
-							}
+							  }
 							: undefined,
 					].filter((v) => v),
 					allowAdd: true,
 				},
-			]" @refreshDataList="getList" @cancel="cancelEdit" @destroy="cancelEdit" />
+			]"
+			@refreshDataList="getList"
+			@cancel="cancelEdit"
+			@destroy="cancelEdit" />
 	</div>
 </template>
 
@@ -96,21 +132,21 @@ export default {
 			tableBtn: [
 				this.$auth.hasPermi(`base:core-equipment:update`)
 					? {
-						type: 'detail',
+							type: 'detail',
-						btnName: '详情',
+							btnName: '详情',
-					}
+					  }
 					: undefined,
 				this.$auth.hasPermi('base:core-equipment:update')
 					? {
-						type: 'edit',
+							type: 'edit',
-						btnName: '修改',
+							btnName: '修改',
-					}
+					  }
 					: undefined,
 				this.$auth.hasPermi('base:core-equipment:delete')
 					? {
-						type: 'delete',
+							type: 'delete',
-						btnName: '删除',
+							btnName: '删除',
-					}
+					  }
 					: undefined,
 			].filter((v) => v),
 			tableProps: [
@@ -176,14 +212,18 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('base:core-equipment:export') ? 'button' : '',
+					type: this.$auth.hasPermi('base:core-equipment:export')
+						? 'button'
+						: '',
 					btnName: '导出',
 					name: 'export',
 					plain: true,
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:core-equipment:create') ? 'button' : '',
+					type: this.$auth.hasPermi('base:core-equipment:create')
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					plain: true,
@@ -196,7 +236,9 @@ export default {
 						input: true,
 						label: '设备名称',
 						prop: 'name',
-						rules: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '设备名称不能为空', trigger: 'blur' },
+						],
 						// bind: {
 						// 	disabled: this.editMode == 'detail', // some condition, like detail mode...
 						// }
@@ -225,7 +267,9 @@ export default {
 						label: '设备类型',
 						prop: 'equipmentTypeId',
 						url: '/base/core-equipment-type/page?pageNo=1&pageSize=100',
-						rules: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '设备类型不能为空', trigger: 'blur' },
+						],
 						bind: {
 							filterable: true,
 						},
@@ -235,7 +279,11 @@ export default {
 						label: '预计生产时间(min/天)',
 						prop: 'workTime',
 						rules: [
-							{ required: true, message: '预计生产时间不能为空', trigger: 'blur' },
+							{
+								required: true,
+								message: '预计生产时间不能为空',
+								trigger: 'blur',
+							},
 							{
 								type: 'number',
 								message: '请输入正确的数字值',
@@ -288,10 +336,14 @@ export default {
 				[
 					{
 						input: true,
-						label: '产品加工时间(s)',
+						label: '单件产品加工时间(s)',
 						prop: 'processingTime',
 						rules: [
-							{ required: true, message: '产品加工时间不能为空', trigger: 'blur' },
+							{
+								required: true,
+								message: '单件产品加工时间不能为空',
+								trigger: 'blur',
+							},
 							{
 								type: 'number',
 								message: '请输入正确的数字值',
@@ -320,8 +372,21 @@ export default {
 					},
 				],
 				[
-					{ input: true, label: '备注', prop: 'remark' }
+					{
-				]
+						upload: true,
+						label: '设备资料',
+						prop: 'files',
+					},
+				],
+				[
+					{
+						upload: true,
+						label: '设备图片',
+						prop: 'files2',
+						fileType: 1,
+					},
+				],
+				[{ input: true, label: '备注', prop: 'remark' }],
 				// [
 				// 	{
 				// 		assetUpload: true,
@@ -422,7 +487,7 @@ export default {
 			// 表单参数
 			form: {
 				id: null,
-				files: []
+				files: [],
 			},
 			showUploadComponents: false, // 是否显示上传组件
 		};
@@ -434,36 +499,36 @@ export default {
 		computedRows() {
 			return this.showUploadComponents
 				? [
-					...this.rows,
+						...this.rows,
-					[
+						[
-						{
+							{
-							assetUpload: true,
+								assetUpload: true,
-							key: 'eq-assets', // 用于区分不同的上传组件
+								key: 'eq-assets', // 用于区分不同的上传组件
-							label: '上传资料',
+								label: '上传资料',
-							fieldName: 'assets',
+								fieldName: 'assets',
-							subcomponent: AssetsUpload,
+								subcomponent: AssetsUpload,
-							prop: 'uploadedAssets',
+								prop: 'uploadedAssets',
-							default: [],
+								default: [],
-							bind: {
+								bind: {
-								'is-pic-mode': false,
+									'is-pic-mode': false,
+								},
 							},
-						},
+						],
-					],
+						[
-					[
+							{
-						{
+								assetUpload: true,
-							assetUpload: true,
+								key: 'eq-pics', // 用于区分不同的上传组件
-							key: 'eq-pics', // 用于区分不同的上传组件
+								label: '上传图片',
-							label: '上传图片',
+								fieldName: 'images',
-							fieldName: 'images',
+								subcomponent: AssetsUpload,
-							subcomponent: AssetsUpload,
+								// prop: '',
-							// prop: '',
+								// default: [],
-							// default: [],
+								bind: {
-							bind: {
+									'is-pic-mode': true,
-								'is-pic-mode': true,
+								},
 							},
-						},
+						],
-					],
+				  ]
-				]
 				: this.rows;
 		},
 	},
@@ -505,7 +570,8 @@ export default {
 				spec: undefined,
 				description: undefined,
 				remark: undefined,
-				files: []
+				files: [],
+				files2: [],
 			};
 			this.resetForm('form');
 		},
@@ -533,9 +599,12 @@ export default {
 				if (!valid) {
 					return;
 				}
+				const payload = Object.assign({}, this.form);
+				payload.files = [...payload.files, ...payload.files2];
+				delete payload.files2;
 				// 修改的提交
 				if (this.form.id != null) {
-					updateEquipment(this.form).then((response) => {
+					updateEquipment(payload).then((response) => {
 						this.$modal.msgSuccess('修改成功');
 						this.open = false;
 						this.getList();
@@ -543,7 +612,7 @@ export default {
 					return;
 				}
 				// 添加的提交
-				createEquipment(this.form).then((response) => {
+				createEquipment(payload).then((response) => {
 					this.$modal.msgSuccess('新增成功');
 					this.open = false;
 					this.getList();
@@ -562,7 +631,7 @@ export default {
 					this.getList();
 					this.$modal.msgSuccess('删除成功');
 				})
-				.catch(() => { });
+				.catch(() => {});
 		},
 		/** 导出按钮操作 */
 		handleExport() {
@@ -580,7 +649,7 @@ export default {
 					this.$download.excel(response, '设备.xls');
 					this.exportLoading = false;
 				})
-				.catch(() => { });
+				.catch(() => {});
 		},
 		// 查看详情
 		viewDetail(id) {

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/coreHotMaterial/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-15 16:23:49
+ * @LastEditTime: 2023-11-27 20:12:00
  * @Description:
 -->
 <template>
@@ -11,7 +11,7 @@
 		:rules="dataRule"
 		ref="dataForm"
 		@keyup.enter.native="dataFormSubmit()"
-		label-width="100px">
+		label-width="90px">
 		<el-row :gutter="20">
 			<el-col :span="12">
 				<el-form-item label="原料名称" prop="name">
@@ -46,6 +46,9 @@
 				</el-form-item>
 			</el-col>
 		</el-row>
+		<el-form-item label="备注" prop="remark">
+			<el-input v-model="dataForm.remark" clearable placeholder="请输入备注" />
+		</el-form-item>
 	</el-form>
 </template>
 
@@ -70,7 +73,8 @@ export default {
         code: undefined,
         name: undefined,
         unit: undefined,
-        dailyCost: undefined
+        dailyCost: undefined,
+				remark: undefined
 			},
 			departmentlList: [],
 			menuOptions: [],

src/views/base/coreHotMaterial/index.vue

@@ -29,7 +29,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="50%">
+			width="45%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>

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

@@ -2,14 +2,14 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-15 15:41:44
+ * @LastEditTime: 2023-11-27 20:07:09
  * @Description:
 -->
 <template>
 	<el-drawer
 		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapper-closable="isdetail"
 		class="drawer"
 		size="60%">
 		<small-title slot="title" :no-padding="true">
@@ -114,14 +114,6 @@
 					</el-row>
 				</el-form>
 			</div>
-			<div class="drawer-body__footer">
-				<el-button v-if="!idAttrShow" @click="goback()">取消</el-button>
-				<el-button v-else :disabled="isdetail" @click="init(dataForm.id)">重置</el-button>
-				<el-button v-if="isdetail" type="primary" @click="goEdit()">
-					编辑
-				</el-button>
-				<el-button v-else type="primary" @click="dataFormSubmit()">确定</el-button>
-			</div>
 
 			<div class="attr-list" v-if="idAttrShow">
 				<small-title
@@ -158,14 +150,16 @@
 					:limit.sync="listQuery.pageSize"
 					:page-sizes="[5, 10, 15]"
 					@pagination="getList" />
-
-				<div class="drawer-body__footer">
-					<el-button type="primary" @click="goback()">关闭</el-button>
-				</div>
 			</div>
 
 		</div>
 
+		<div v-if="!isdetail" class="drawer-body__footer">
+			<el-button @click="goback()">取消</el-button>
+			<el-button :disabled="isdetail" @click="init(dataForm.id)">重置</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</div>
+
 		<attr-add
 			v-if="addOrUpdateVisible"
 			ref="addOrUpdate"
@@ -253,8 +247,8 @@ export default {
 			isdetail: false,
 			idAttrShow: false,
 			dataRule: {
-        code: [{ required: true, message: "物料编码不能为空", trigger: "blur" }],
+        code: [{ required: true, message: "产品编码不能为空", trigger: "blur" }],
-        name: [{ required: true, message: "物料名称不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "产品名称不能为空", trigger: "blur" }],
 				materialType: [{ required: true, message: "物料类型不能为空", trigger: "change" }],
 				productType: [{ required: true, message: "产品类型不能为空", trigger: "change" }],
 				processTime: [{ required: true, message: "产线生产单位用时不能为空", trigger: "blur" }]
@@ -270,11 +264,7 @@ export default {
 		handleClick(raw) {
 			if (raw.type === 'delete') {
 				this.$confirm(
-					`确定对${
+					`是否确认删除属性名为"${raw.data.name}"的数据项?`,
-						raw.data.attrName
-							? '[名称=' + raw.data.attrName + ']'
-							: '[序号=' + raw.data._pageIndex + ']'
-					}进行删除操作?`,
 					'提示',
 					{
 						confirmButtonText: '确定',

src/views/base/coreProduct/index.vue

@@ -84,18 +84,18 @@ export default {
 			},
 			tableProps,
 			tableBtn: [
+				this.$auth.hasPermi(`base:core-product:detail`)
+					? {
+							type: 'detail',
+							btnName: '查看详情',
+					  }
+					: undefined,
 				this.$auth.hasPermi(`base:core-product:update`)
 					? {
 							type: 'edit',
 							btnName: '编辑',
 					  }
 					: undefined,
-					this.$auth.hasPermi(`base:core-product:detail`)
-					? {
-							type: 'detail',
-							btnName: '查看详情',
-					  }
-					: undefined,
           this.$auth.hasPermi(`base:core-product:delete`)
 					? {
 							type: 'delete',
@@ -141,6 +141,27 @@ export default {
 	},
 	created() {},
 	methods: {
+		// 删除
+    deleteHandle(id, name, index) {
+      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(() => { });
+    },
 		// 查看详情
 		otherMethods(val) {
 			if (val.type === 'detail') {

src/views/base/coreProductionLine/index.vue

@@ -144,8 +144,8 @@ export default {
     getDataList() {
       this.dataListLoading = true;
       this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        this.tableData = response.data.list;
+        // this.tableData = response.data.list;
-				// this.getStatus(response.data.list)
+				this.getStatus(response.data.list)
         this.listQuery.total = response.data.total;
         this.dataListLoading = false;
       });

src/views/base/coreSupplier/index.vue

@@ -105,7 +105,7 @@ export default {
 			formConfig: [
 				{
 					type: 'input',
-					label: '关键字',
+					label: '供应商',
 					placeholder: '供应商名称',
 					param: 'name',
 				},

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-20 16:51:24
+ * @LastEditTime: 2023-11-24 18:20:26
  * @Description:
 -->
 <template>
@@ -29,11 +29,10 @@
 
 				<div class="action_btn">
 					<template>
-						<span style="display: inline-block;" @click="addNew()">
+            <span style="display: inline-block;">
-							<svg-icon style="width: 14px; height: 14px" class="item-icon" icon-class="table_add" />
+              <el-button type="text" @click="addNew()" icon="el-icon-plus">添加</el-button>
-							<span class="add">添加</span>
+            </span>
-						</span>
+          </template>
-					</template>
 				</div>
 				<base-table
 					:table-props="tableProps"
@@ -298,7 +297,7 @@ export default {
 }
 .action_btn {
   float: right;
-  margin: 5px 15px;
+  margin: -40px 15px;
   font-size: 14px;
 }
 .add {

src/views/base/coreWorkOrder/addWorkOrder.vue

@@ -1,21 +1,19 @@
 <template>
-  <el-form ref="dataForm" :rules="rules" label-width="130px" :model="dataForm">
+  <el-form ref="dataForm" :rules="rules" label-width="130px" :model="dataForm" label-position="top">
-    <el-row>
+    <el-row :gutter="20">
-      <el-col :span='12'>
+      <el-col :span='8'>
         <el-form-item label="工单名称" prop="name">
-          <el-input v-model="dataForm.name"></el-input>
+          <el-input v-model="dataForm.name" placeholder="请输入工单名称"></el-input>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='8'>
         <el-form-item label="工单编码" prop="code">
-          <el-input v-model="dataForm.code" disabled></el-input>
+          <el-input v-model="dataForm.code" disabled placeholder="请输入工单编码"></el-input>
         </el-form-item>
       </el-col>
-    </el-row>
+      <el-col :span='8'>
-    <el-row>
-      <el-col :span='12'>
         <el-form-item label="产品名称" prop="planProductId">
-          <el-select v-model="dataForm.planProductId" placeholder="请选择" style="width: 100%;" @change="selectProduct">
+          <el-select v-model="dataForm.planProductId" placeholder="请选择产品" style="width: 100%;" @change="selectProduct">
             <el-option
               v-for="item in productList"
               :key="item.id"
@@ -25,52 +23,50 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span='8'>
         <el-form-item label="产品规格" prop="specifications">
-          <el-input v-model="dataForm.specifications" />
+          <el-input v-model="dataForm.specifications" placeholder="请输入产品规格" />
         </el-form-item>
       </el-col>
-    </el-row>
+      <el-col :span='8'>
-    <el-row>
-      <el-col :span='12'>
         <el-form-item label="计划开始时间">
           <el-date-picker
             v-model="dataForm.planStartTime"
             type="datetime"
             value-format="timestamp"
             style="width: 100%;"
-            placeholder="选择日期">
+            placeholder="请选择计划开始时间">
           </el-date-picker>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='8'>
         <el-form-item label="计划完成时间">
           <el-date-picker
             v-model="dataForm.planFinishTime"
             type="datetime"
             value-format="timestamp"
             style="width: 100%;"
-            placeholder="选择日期">
+            placeholder="请选择计划完成时间">
           </el-date-picker>
         </el-form-item>
       </el-col>
     </el-row>
-    <el-row>
+    <el-row :gutter="20">
-      <el-col :span='12'>
+      <el-col :span='8'>
         <el-form-item label="计划投入数量" prop="planAssignQuantity">
-          <el-input-number v-model="dataForm.planAssignQuantity" :min="0" :max="9999999999999" style="width: 100%;"></el-input-number>
+          <el-input-number v-model="dataForm.planAssignQuantity" :min="0" :max="9999999999999" style="width: 100%;" placeholder="请输入计划投入数量"></el-input-number>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='8'>
         <el-form-item label="计划生产数量" prop="planQuantity">
-          <el-input-number v-model="dataForm.planQuantity" :min="0" :max="9999999999999" style="width: 100%;"></el-input-number>
+          <el-input-number v-model="dataForm.planQuantity" :min="0" :max="9999999999999" style="width: 100%;" placeholder="请输入计划生产数量"></el-input-number>
         </el-form-item>
       </el-col>
-    </el-row>
+      <el-col :span='8'>
-    <el-row>
-      <el-col :span='12'>
         <el-form-item label="关联工艺" prop="processFlowId">
-          <el-select v-model="dataForm.processFlowId" placeholder="请选择工艺" clearable filterable style="width: 100%;" @change="processFlowIdChange">
+          <el-select v-model="dataForm.processFlowId" placeholder="请选择关联工艺" clearable filterable style="width: 100%;" @change="processFlowIdChange">
             <el-option
               v-for="item in processFlowList"
               :key="item.id"
@@ -80,19 +76,23 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span='8'>
         <el-form-item label="物料计算方式" prop="materialMethod">
-          <el-radio-group v-model="dataForm.materialMethod" @change="materialMethodChange">
+          <!-- <el-radio-group v-model="dataForm.materialMethod" @change="materialMethodChange">
             <el-radio :label="1">产品基础BOM</el-radio>
             <el-radio :label="2">工艺扩展BOM</el-radio>
-          </el-radio-group>
+          </el-radio-group> -->
+          <el-select v-model="dataForm.materialMethod" placeholder="请选择物料计算方式" style="width: 100%;" @change="materialMethodChange">
+            <el-option key="1" label="产品基础BOM" :value="1" />
+            <el-option key="2" label="工艺扩展BOM" :value="2" />
+          </el-select>
         </el-form-item>
       </el-col>
-    </el-row>
+      <el-col :span='8'>
-    <el-row>
-      <el-col :span='12'>
         <el-form-item label="优先级" prop="priority">
-          <el-select v-model="dataForm.priority" placeholder="请选择" style="width: 100%;">
+          <el-select v-model="dataForm.priority" placeholder="请选择优先级" style="width: 100%;">
             <el-option
               v-for="item in getDictDatas(DICT_TYPE.ORDER_PRIORITY)"
               :key="item.value"
@@ -102,9 +102,9 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='8'>
         <el-form-item label="工单类型" prop="type">
-          <el-select v-model="dataForm.type" placeholder="请选择" style="width: 100%;">
+          <el-select v-model="dataForm.type" placeholder="请选择工单类型" style="width: 100%;">
             <el-option
               v-for="item in workOrderTypeList"
               :key="item.id"
@@ -115,10 +115,10 @@
         </el-form-item>
       </el-col>
     </el-row>
-    <el-row>
+    <el-row :gutter="20">
-      <el-col :span='12'>
+      <el-col :span='8'>
         <el-form-item label="关联产线" prop="productLineIds">
-          <el-select v-model="dataForm.productLineIds" placeholder="请选择" multiple style="width: 100%;">
+          <el-select v-model="dataForm.productLineIds" placeholder="请选择关联产线" multiple style="width: 100%;">
             <el-option
               v-for="item in productLineList"
               :key="item.id"
@@ -128,9 +128,9 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span='12'>
+      <el-col :span='8'>
         <el-form-item label="负责人" prop="workers">
-          <el-input v-model="dataForm.workers"></el-input>
+          <el-input v-model="dataForm.workers" placeholder="请输入负责人"></el-input>
         </el-form-item>
       </el-col>
     </el-row>
@@ -311,11 +311,11 @@ export default {
       if (val) {
         this.productList.map(item => {
           if (val === item.id) {
-            this.dataForm.productSpec = item.specifications
+            this.dataForm.specifications = item.specifications
           }
         })
       } else {
-        this.dataForm.productSpec = ''
+        this.dataForm.specifications = ''
       }
     }
   }

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/coreWorkOrder/index.vue

@@ -65,7 +65,8 @@ const tableProps = [
 	{
 		prop: 'createTime',
 		label: '创建时间',
-		filter: parseTime
+		filter: parseTime,
+		'show-overflow-tooltip': true
 	},
 	{
 		prop: 'name',
@@ -127,48 +128,10 @@ export default {
 			allocationVisible: false,
 			tableProps,
 			tableBtn: [
-				this.$auth.hasPermi(`base:core-work-order:update`)
+				this.$auth.hasPermi(`base:core-work-order:material`)
-					? {
-							type: 'edit',
-							btnName: '编辑',
-							showParam: {
-								type: '&',
-								data: [
-									{
-										name: 'status',
-										type: 'equal',
-										value: 1
-									}
-								]
-							}
-					  }
-					: undefined,
-					this.$auth.hasPermi(`base:core-work-order:material`)
 					? {
 							type: 'material',
-							btnName: '预使用原料信息',
+							btnName: '原料信息',
-					  }
-					: undefined,
-					this.$auth.hasPermi(`base:core-work-order:detail`)
-					? {
-							type: 'detail',
-							btnName: '查看详情',
-					  }
-					: undefined,
-          this.$auth.hasPermi(`base:core-work-order:delete`)
-					? {
-							type: 'delete',
-							btnName: '删除',
-							showParam: {
-								type: '|',
-								data: [
-									{
-										name: 'status',
-										type: 'equal',
-										value: 1
-									}
-								]
-							}
 					  }
 					: undefined,
 					{
@@ -246,7 +209,45 @@ export default {
 								}
 							]
 						}
-					}
+					},
+					this.$auth.hasPermi(`base:core-work-order:detail`)
+					? {
+							type: 'detail',
+							btnName: '查看详情',
+					  }
+					: undefined,
+					this.$auth.hasPermi(`base:core-work-order:update`)
+					? {
+							type: 'edit',
+							btnName: '编辑',
+							showParam: {
+								type: '&',
+								data: [
+									{
+										name: 'status',
+										type: 'equal',
+										value: 1
+									}
+								]
+							}
+					  }
+					: undefined,
+          this.$auth.hasPermi(`base:core-work-order:delete`)
+					? {
+							type: 'delete',
+							btnName: '删除',
+							showParam: {
+								type: '|',
+								data: [
+									{
+										name: 'status',
+										type: 'equal',
+										value: 1
+									}
+								]
+							}
+					  }
+					: undefined
 			].filter((v)=>v),
 			tableData: [],
 			formConfig: [

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-22 10:26:58
+ * @LastEditTime: 2023-11-24 18:13:02
  * @Description:
 -->
 <template>
@@ -196,7 +196,7 @@ export default {
 				workCost: undefined,
         remark: undefined,
 			},
-			majorIdList: undefined,
+			majorIdList: [],
 			departmentlList: [],
 			menuOptions: [],
 			bindIds: [],
@@ -267,7 +267,7 @@ export default {
 				workCost: undefined,
         remark: undefined
 			}
-			this.majorIdList = undefined
+			this.majorIdList = []
 		},
 		// 表单提交
     dataFormSubmit() {
@@ -288,24 +288,28 @@ export default {
             this.visible = false;
             this.$emit("refreshDataList");
           });
-					this.majorIdList.forEach(majorId => {
+					if (this.majorIdList.length > 0) {
-						createWoBindMa({
+						this.majorIdList.forEach(majorId => {
-							workerId: this.dataForm.id,
+							createWoBindMa({
-							majorId: majorId
+								workerId: this.dataForm.id,
-						}).then(res => {})
+								majorId: majorId
-					});
+							}).then(res => {})
+						});
+					}
           return;
         }
         // 添加的提交
         this.urlOptions.createURL(this.dataForm).then(response => {
 					// response.data = id
 					this.workerId = response.data
-					this.majorIdList.forEach(majorId => {
+					if (this.majorIdList.length > 0) {
-						createWoBindMa({
+						this.majorIdList.forEach(majorId => {
-							workerId: this.workerId,
+							createWoBindMa({
-							majorId: majorId
+								workerId: this.workerId,
-						}).then(res => {})
+								majorId: majorId
-					});
+							}).then(res => {})
+						});
+					}
           this.$modal.msgSuccess("新增成功");
           this.visible = false;
           this.$emit("refreshDataList");
@@ -324,6 +328,7 @@ export default {
         if (this.dataForm.id) {
           this.urlOptions.infoURL(id).then(response => {
             this.dataForm = response.data;
+						this.dataForm.departmentName = undefined
           });
 					// 获取员工--专业
 					getWoBindMaPage({

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-22 08:55:37
+ * @LastEditTime: 2023-11-27 09:21:48
  * @Description:
 -->
 <template>
@@ -43,7 +43,9 @@
 				<el-form-item label="排序" prop="sort">
 					<el-input-number
 						v-model="dataForm.sort"
-						placeholder="排序" />
+						controls-position="right"
+						placeholder="排序"
+						style="width: 100%" />
 				</el-form-item>
 			</el-col>
 		</el-row>

src/views/base/coreWorkshopSection/index.vue

@@ -29,7 +29,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="50%">
+			width="40%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>

src/views/base/equipmentPlcConnect/components/BasicDrawer.vue

@@ -166,13 +166,17 @@ export default {
 						input: true,
 						label: '参数列名',
 						prop: 'plcParamName',
-						rules: [{ required: true, message: '参数列名不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '参数列名不能为空', trigger: 'blur' },
+						],
 					},
 					{
 						input: true,
 						label: '参数名称',
 						prop: 'name',
-						rules: [{ required: true, message: '参数名称不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '参数名称不能为空', trigger: 'blur' },
+						],
 					},
 				],
 				[
@@ -419,35 +423,35 @@ export default {
 		},
 
 		// 提交属性表
-		async submitAttrForm() {
+		submitAttrForm() {
-			this.$refs['attrForm'].validate((valid) => {
+			this.$refs['attrForm'].validate(async (valid) => {
 				if (!valid) {
 					return;
 				}
-			});
+				const isEdit = this.attrForm.id != null;
-			const isEdit = this.attrForm.id != null;
+				this.attrFormSubmitting = true;
-			this.attrFormSubmitting = true;
+				const res = await this.$axios({
-			const res = await this.$axios({
+					url: isEdit ? this.sections[1].urlUpdate : this.sections[1].urlCreate,
-				url: isEdit ? this.sections[1].urlUpdate : this.sections[1].urlCreate,
+					method: isEdit ? 'put' : 'post',
-				method: isEdit ? 'put' : 'post',
+					data: {
-				data: {
+						...this.attrForm,
-					...this.attrForm,
+						connectId: this.infoData.id,
-					connectId: this.infoData.id
-				},
-			});
-
-			if (res.code == 0) {
-				this.closeAttrForm();
-				this.$message({
-					message: `${isEdit ? '更新' : '创建'}成功`,
-					type: 'success',
-					duration: 1500,
-					onClose: () => {
-						this.getAttrList();
 					},
 				});
-			}
+
-			this.attrFormSubmitting = false;
+				if (res.code == 0) {
+					this.closeAttrForm();
+					this.$message({
+						message: `${isEdit ? '更新' : '创建'}成功`,
+						type: 'success',
+						duration: 1500,
+						onClose: () => {
+							this.getAttrList();
+						},
+					});
+				}
+				this.attrFormSubmitting = false;
+			});
 		},
 
 		closeAttrForm() {

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

@@ -2,14 +2,14 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-22 11:22:38
+ * @LastEditTime: 2023-11-27 15:26:12
  * @Description:
 -->
 <template>
 	<el-drawer
 		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapper-closable="isdetail"
 		class="drawer"
 		size="60%">
 		<small-title slot="title" :no-padding="true">
@@ -120,6 +120,7 @@
 					</el-row>
 				</el-form>
 			</div>
+			
 			<div class="attr-list" v-if="idAttrShow">
 				<small-title
 					style="margin: 16px 0; padding-left: 8px"
@@ -156,13 +157,11 @@
 					@pagination="getList" />
 			</div>
 
-			<div class="drawer-body__footer">
+			<div v-if="!isdetail" class="drawer-body__footer">
-				<el-button style="" @click="goback()">{{ isdetail ? '关闭' : '取消' }}</el-button>
+				<el-button style="" @click="goback()">取消</el-button>
-				<!-- <el-button v-if="isdetail" type="primary" @click="goEdit()">
+				<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
-					编辑
-				</el-button> -->
-				<el-button v-if="!isdetail" type="primary" @click="dataFormSubmit()">确定</el-button>
 			</div>
+
 		</div>
 
 		<attr-add
@@ -293,11 +292,7 @@ export default {
 		handleClick(raw) {
 			if (raw.type === 'delete') {
 				this.$confirm(
-					`确定对${
+					`是否确认删除属性名为"${raw.data.attrName}"的数据项?`,
-						raw.data.attrName
-							? '[名称=' + raw.data.attrName + ']'
-							: '[序号=' + raw.data._pageIndex + ']'
-					}进行删除操作?`,
 					'提示',
 					{
 						confirmButtonText: '确定',
@@ -363,6 +358,29 @@ export default {
 				}
 			});
 		},
+		// 表单提交
+    dataFormSubmit() {
+      this.$refs["dataForm"].validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+        // 修改的提交
+        if (this.dataForm.id) {
+          this.urlOptions.updateURL(this.dataForm).then(response => {
+            this.$modal.msgSuccess("修改成功");
+						this.visible = false
+            this.$emit("refreshDataList");
+          });
+          return;
+        }
+        // 添加的提交
+        this.urlOptions.createURL(this.dataForm).then(response => {
+          this.$modal.msgSuccess("新增成功");
+					this.idAttrShow = true
+          this.$emit("refreshDataList");
+        });
+      });
+    },
 		goback() {
 			this.$emit('refreshDataList');
 			this.visible = false;
@@ -432,7 +450,7 @@ export default {
 }
 .action_btn {
   float: right;
-  margin: -35px 15px;
+  margin: -40px 15px;
   font-size: 14px;
 }
 .add {

src/views/base/material/attr-add.vue

@@ -1,7 +1,7 @@
 <template>
 	<el-dialog
 		:visible.sync="visible"
-		:width="'35%'"
+		:width="'30%'"
 		:append-to-body="true"
 		:close-on-click-modal="false"
 		class="dialog">
@@ -17,7 +17,7 @@
 			ref="dataForm"
 			:model="dataForm"
 			:rules="dataRule"
-			label-width="100px"
+			label-width="70px"
 			@keyup.enter.native="dataFormSubmit()">
 			<el-form-item label="属性名" prop="attrName">
 				<el-input

src/views/base/material/index.vue

@@ -13,7 +13,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="220"
+				:width="120"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -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',
@@ -83,25 +85,25 @@ export default {
 			},
 			tableProps,
 			tableBtn: [
+				this.$auth.hasPermi(`base:material:queryAttr`)
+					? {
+							type: 'detail',
+							btnName: '查看属性',
+					  }
+					: undefined,
 				this.$auth.hasPermi(`base:material:update`)
 					? {
 							type: 'edit',
 							btnName: '编辑',
 					  }
 					: undefined,
-					this.$auth.hasPermi(`base:material:queryAttr`)
+					// this.$auth.hasPermi(`base:material:editAttr`)
-					? {
+					// ? {
-							type: 'search',
+					// 		type: 'editAttr',
-							btnName: '查看属性',
+					// 		btnName: '编辑属性',
-					  }
+					//   }
-					: undefined,
+					// : undefined,
-					this.$auth.hasPermi(`base:material:editAttr`)
+        this.$auth.hasPermi(`base:material:delete`)
-					? {
-							type: 'editAttr',
-							btnName: '编辑属性',
-					  }
-					: undefined,
-          this.$auth.hasPermi(`base:material:delete`)
 					? {
 							type: 'delete',
 							btnName: '删除',
@@ -134,7 +136,7 @@ export default {
 				},
 				{
 					type: this.$auth.hasPermi('base:material:create') ? 'button' : '',
-					btnName: '新增物料',
+					btnName: '新增',
 					name: 'add',
 					color: 'success',
 					plain: true
@@ -164,7 +166,7 @@ export default {
 			});
 		},
 		otherMethods(val) {
-			if (val.type === 'search') {
+			if (val.type === 'detail') {
 				this.addOrUpdateVisible = true;
 				this.addOrEditTitle = '详情';
 				this.$nextTick(() => {

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-06 19:55:59
+ * @LastEditTime: 2023-11-27 15:10:20
  * @Description:
 -->
 <template>
@@ -18,7 +18,8 @@
 					<el-select
 						v-model="dataForm.materialId"
 						placeholder="请选择物料"
-						@change="setMaterialCode">
+						@change="setMaterialCode"
+						style="width: 100%">
 						<el-option
 							v-for="dict in materialList"
 							:key="dict.id"

src/views/base/materialDate/index.vue

@@ -29,7 +29,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="50%">
+			width="40%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>

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

@@ -2,14 +2,14 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-22 11:09:44
+ * @LastEditTime: 2023-11-27 19:50:36
  * @Description:
 -->
 <template>
 	<el-drawer
 		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapper-closable="isdetail"
 		class="drawer"
 		size="70%">
 		<small-title slot="title" :no-padding="true">
@@ -25,7 +25,7 @@
 					label-width="100px"
 					label-position="top">
 					<el-row :gutter="20">
-						<el-col :span="12">
+						<el-col :span="8">
 							<el-form-item label="产品名称" prop="productId">
 								<el-select
 									v-model="dataForm.productId"
@@ -42,15 +42,17 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<el-col :span="12">
+						<el-col :span="8">
 							<el-form-item label="产品BOM编码" prop="code">
 								<el-input v-model="dataForm.code" :disabled="isdetail" placeholder="请输入产品Bom编码" />
 							</el-form-item>
 						</el-col>
+						<el-col :span="8">
+							<el-form-item label="备注" prop="remark">
+								<el-input v-model="dataForm.remark" :disabled="isdetail" clearable placeholder="请输入备注" />
+							</el-form-item>
+						</el-col>
 					</el-row>
-					<el-form-item label="备注" prop="remark">
-						<el-input v-model="dataForm.remark" :disabled="isdetail" clearable placeholder="请输入备注" />
-					</el-form-item>
 				</el-form>
 			</div>
 			<div class="attr-list" v-if="idAttrShow">
@@ -60,90 +62,26 @@
 					BOM明细
 				</small-title>
 
-				<!-- <base-table
+				<div v-if="!isdetail" class="action_btn">
+          <template>
+            <span style="display: inline-block;">
+              <el-button type="text" @click="addNew()" icon="el-icon-plus">添加</el-button>
+            </span>
+          </template>
+        </div>
+				<base-table
 					:table-props="tableProps"
 					:page="listQuery.pageNo"
 					:limit="listQuery.pageSize"
-					:add-button-show="isdetail ? null : '添加属性'"
+					:table-data="tableData">
-					@emitButtonClick="addNew()"
-					:table-data="materialAttrList">
 					<method-btn
 						v-if="!isdetail"
 						slot="handleBtn"
-						:width="120"
+						:width="90"
 						label="操作"
 						:method-list="tableBtn"
 						@clickBtn="handleClick" />
-				</base-table> -->
+				</base-table>
-				<el-button v-show="!isdetail" type="success" size="small" style="float: right" @click="addRow()">添加一行</el-button>
-				<el-table
-					:data="tableData"
-      		style="width: 100%">
-					<el-table-column type="index" label="序号" />
-					<el-table-column prop="createTime" label="添加时间">
-						<template slot-scope="scope">
-							<span>{{ parseTime(scope.row.createTime) }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="materialId" label="物料名称">
-						<template slot-scope="scope">
-							<el-select
-									v-model="scope.row.materialId"
-									filterable
-									clearable
-									:disabled="!scope.row.isEdit"
-									placeholder="请选择物料"
-									@change="setCode(scope.row)">
-									<el-option
-										v-for="dict in materialList"
-										:key="dict.id"
-										:label="dict.name"
-										:value="dict.id" />
-								</el-select>
-						</template>
-					</el-table-column>
-					<el-table-column prop="materialCode" label="物料编码" />
-					<el-table-column prop="mUnit" label="单位" />
-					<el-table-column prop="num" label="数量">
-						<template slot-scope="scope">
-							<el-input v-model="scope.row.num" :disabled="!scope.row.isEdit"></el-input>
-						</template>
-					</el-table-column>
-					<el-table-column prop="remark" label="备注">
-						<template slot-scope="scope">
-							<el-input v-model="scope.row.remark" :disabled="!scope.row.isEdit"></el-input>
-						</template>
-					</el-table-column>
-					<el-table-column v-if="!isdetail" label="操作">
-						<template slot-scope="scope">
-							<el-tooltip v-if="!scope.row.isEdit" placement="top" content="编辑">
-								<el-button
-									type="text"
-									:style="{color:'#0B58FF'}"
-									size="mini"
-									@click="edit(scope.row)"
-								>
-									<!-- 此处的icon的名字命名为'table_'加上按钮的type -->
-									<svg-icon style="width: 18px; height: 18px" class="item-icon" icon-class="edit" />
-									<!-- <span>{{ item.btnName | i18nFilter }}</span> -->
-								</el-button>
-							</el-tooltip>
-							<el-button v-else type="text" size="small" @click="saveData(scope.row)">保存</el-button>
-							<el-tooltip placement="top" content="删除">
-								<el-button
-									type="text"
-									:style="{color:'#FF5454'}"
-									size="mini"
-									@click="deleteDetail(scope.row)"
-								>
-									<!-- 此处的icon的名字命名为'table_'加上按钮的type -->
-									<svg-icon style="width: 18px; height: 18px" class="item-icon" icon-class="table_delete" />
-									<!-- <span>{{ item.btnName | i18nFilter }}</span> -->
-								</el-button>
-							</el-tooltip>
-						</template>
-					</el-table-column>
-				</el-table>
 				<pagination
 					v-show="listQuery.total > 0"
 					:total="listQuery.total"
@@ -153,20 +91,17 @@
 					@pagination="getList" />
 			</div>
 
-			<div class="drawer-body__footer">
+			<div v-if="!isdetail" class="drawer-body__footer">
-				<el-button style="" @click="goback()">{{ isdetail ? '关闭' : '取消' }}</el-button>
+				<el-button style="" @click="goback()">取消</el-button>
-				<!-- <el-button v-if="isdetail" type="primary" @click="goEdit()">
+				<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
-					编辑
-				</el-button> -->
-				<el-button v-if="!isdetail" type="primary" @click="dataFormSubmit()">确定</el-button>
 			</div>
 		</div>
 
-		<!-- <attr-add
+		<attr-add
 			v-if="addOrUpdateVisible"
 			ref="addOrUpdate"
-			:material-id="dataForm.id"
+			:bom-id="dataForm.id"
-			@refreshDataList="getList" /> -->
+			@refreshDataList="getList" />
 	</el-drawer>
 </template>
 
@@ -177,7 +112,8 @@ import { getMaterialList } from "@/api/base/material";
 import { listData } from "@/api/system/dict/data";
 import SmallTitle from '../material/SmallTitle';
 import { parseTime } from '../../core/mixins/code-filter';
-// import attrAdd from './attr-add';
+import attrAdd from './attr-add';
+import { publicFormatter } from '@/utils/dict';
 
 const tableBtn = [
 	{
@@ -196,18 +132,31 @@ const tableProps = [
 		filter: parseTime,
 	},
 	{
-		prop: 'attrName',
+		prop: 'materialName',
-		label: '属性名',
+		label: '物料名称',
 	},
 	{
-		prop: 'attrValue',
+		prop: 'materialCode',
-		label: '属性值',
+		label: '物料编码',
 	},
+	{
+		prop: 'unit',
+		label: '单位',
+		filter: publicFormatter('unit_dict'),
+	},
+	{
+		prop: 'num',
+		label: '数量',
+	},
+	{
+		prop: 'remark',
+		label: '备注',
+	}
 ];
 
 export default {
 	mixins: [basicAdd],
-	components: { SmallTitle },
+	components: { SmallTitle, attrAdd },
 	data() {
 		return {
 			tableBtn,
@@ -233,7 +182,6 @@ export default {
 			},
 			productList: [],
 			materialAttrList: [],
-			materialList: [],
 			tableData: [],
 			unitList: [],
 			visible: false,
@@ -248,13 +196,42 @@ export default {
 		this.getDict()
 	},
 	methods: {
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.deleteDetail(raw.data);
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+		// 表单提交
+    dataFormSubmit() {
+      this.$refs["dataForm"].validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+        // 修改的提交
+        if (this.dataForm.id) {
+          this.urlOptions.updateURL(this.dataForm).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.visible = false; 
+            this.$emit("refreshDataList");
+          });
+          return;
+        }
+        // 添加的提交
+        this.urlOptions.createURL(this.dataForm).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          // this.visible = false;
+					this.idAttrShow = true;
+					this.dataForm.id = response.data
+          this.$emit("refreshDataList");
+        });
+      });
+    },
 		async getDict() {
 			// 产品列表
 			const proRes = await getProList();
 			this.productList = proRes.data;
-			// 物料列表
-			const res = await getMaterialList();
-			this.materialList = res.data;
 			// 物料单位列表
 			const unitRes = await listData({
 				pageNo: 1,
@@ -274,8 +251,7 @@ export default {
 		},
 		deleteDetail(raw) {
 			this.$confirm(
-				`确定删除关于物料编码为${
+				`是否确认删除物料名称为"${raw.materialName}"的数据项?`,
-					raw.materialCode}的数据?`,
 				'提示',
 				{
 					confirmButtonText: '确定',
@@ -297,67 +273,13 @@ export default {
 				})
 				.catch(() => {});
 		},
-		setCode(row) {
-			const tempM = this.materialList.filter(item => {
-				if (row.materialId === item.id) {
-					row.materialCode = item.code
-				}
-				return row.materialId === item.id
-			})
-			if (tempM[0].unit) {
-				this.unitList.filter(u => {
-					if (tempM[0].unit === u.value) {
-						row.unit = u.value
-						row.mUnit = u.label
-					}
-				})
-			}
-			// row.materialCode = tempList[0].code
-			// row.unit = tempList[0].unit
-		},
-		edit(row) {
-			row.isEdit = true
-		},
-		saveData(row) {
-			// this.$refs['dataForm'].validate((valid) => {
-				// if (valid) {
-				// 	修改的提交
-				if (row.id) {
-					updateMaterialPBDet({
-						...row
-					}).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						// this.visible = false;
-						this.getList();
-					});
-					return;
-				}
-					// 添加的提交
-			createMaterialPBDet({
-				...row
-			}).then((response) => {
-				this.$modal.msgSuccess('新增成功');
-				// this.visible = false;
-				this.getList();
-			});
-				// }
-			// });
-		},
 		getList() {
 			// 获取产品Bom详细列表
 			getProBomList({
 				...this.listQuery,
 				bomId: this.dataForm.id
 			}).then((response) => {
-				this.tableData = response.data.records.map(item => {
+				this.tableData = response.data.records
-					this.unitList.filter(u => {
-						if (item.unit === u.value) {
-							item.mUnit = u.label
-						}
-					})
-					item.isEdit = false
-					return item
-				});
 				this.listQuery.total = response.data.total;
 			});
 		},
@@ -453,7 +375,7 @@ export default {
 
 .drawer >>> .visual-part {
 	flex: 1 auto;
-	max-height: 30vh;
+	max-height: 20vh;
 	overflow: hidden;
 	overflow-y: scroll;
 	padding-right: 10px; /* 调整滚动条样式 */
@@ -469,4 +391,12 @@ export default {
 	justify-content: flex-end;
 	padding: 18px;
 }
+.action_btn {
+  float: right;
+  margin: -40px 15px;
+  font-size: 14px;
+}
+.add {
+	color: #0b58ff;
+}
 </style>

src/views/base/materialProductBom/attr-add.vue

@@ -0,0 +1,197 @@
+<template>
+	<el-dialog
+		:visible.sync="visible"
+		:width="'40%'"
+		:append-to-body="true"
+		:close-on-click-modal="false"
+		class="dialog">
+		<template #title>
+			<slot name="title">
+				<div class="titleStyle">
+					{{ !dataForm.id ? '新增' : '编辑' }}
+				</div>
+			</slot>
+		</template>
+
+		<el-form
+			ref="dataForm"
+			:model="dataForm"
+			:rules="dataRule"
+			label-width="80px"
+			@keyup.enter.native="dataFormSubmit()">
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="物料名称" prop="materialId">
+						<el-select
+							v-model="dataForm.materialId"
+							placeholder="请选择物料"
+							clearable
+							filterable
+							@change="setCode"
+							style="width: 100%"
+						>
+							<el-option
+								v-for="dict in materialList"
+								:key="dict.id"
+								:label="dict.name"
+								:value="dict.id" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="物料编码" prop="materialCode">
+						<el-input
+							v-model="dataForm.materialCode"
+							clearable
+							disabled
+							placeholder="请输入物料编码" />
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="单位" prop="unit">
+						<el-select
+							v-model="dataForm.unit"
+							style="width: 100%"
+							disabled
+							placeholder="请选择单位">
+							<el-option
+								v-for="dict in getDictDatas(DICT_TYPE.UNIT_DICT)"
+								:key="dict.value"
+								:label="dict.label"
+								:value="dict.value" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="数量" prop="num">
+					<el-input-number v-model="dataForm.num" controls-position="right" clearable placeholder="请输入数量" style="width: 100%" />
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-form-item label="备注" prop="remark">
+				<el-input v-model="dataForm.remark" clearable placeholder="请输入备注" />
+			</el-form-item>
+		</el-form>
+
+		<el-row style="text-align: right">
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+		</el-row>
+	</el-dialog>
+</template>
+
+<script>
+import { getMaterialList } from '@/api/base/material';
+import { createMaterialPBDet, updateMaterialPBDet, getMaterialPBDet } from "@/api/base/materialProductBom";
+
+export default {
+	props: {
+		bomId: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			visible: false,
+			dataForm: {
+				id: undefined,
+				materialId: '',
+				num: 0,
+				materialCode: undefined,
+				unit: undefined,
+				remark: '',
+			},
+			materialList: [],
+			dataRule: {
+				materialId: [{ required: true, message: '物料名称不能为空', trigger: 'change' }],
+				num: [{ required: true, message: '数量不能为空', trigger: 'blur' }]
+			},
+		};
+	},
+	mounted() {
+		this.getDict()
+	},
+	methods: {
+		async getDict() {
+			// 物料列表
+			const res = await getMaterialList();
+			this.materialList = res.data;
+		},
+		init(id) {
+			this.dataForm.id = id || '';
+			this.visible = true;
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+				if (this.dataForm.id) {
+					getMaterialPBDet(this.dataForm.id).then((res) => {
+						this.dataForm = res.data
+						this.setCode()
+					});
+				}
+			});
+		},
+		setCode() {
+			const tempMaterial = this.materialList.filter(item =>{
+				return item.id === this.dataForm.materialId
+			})
+			this.dataForm.materialCode = tempMaterial[0]?.code
+			this.dataForm.unit = tempMaterial[0].unit === undefined ? undefined : String(tempMaterial[0]?.unit)
+		},
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (valid) {
+					// 修改的提交
+					if (this.dataForm.id) {
+						updateMaterialPBDet({
+							...this.dataForm,
+							bomId: this.bomId,
+						}).then((response) => {
+							this.$modal.msgSuccess('修改成功');
+							this.visible = false;
+							this.$emit('refreshDataList');
+						});
+						return;
+					}
+					// 添加的提交
+					createMaterialPBDet({
+						...this.dataForm,
+						bomId: this.bomId,
+					}).then((response) => {
+						this.$modal.msgSuccess('新增成功');
+						this.visible = false;
+						this.$emit('refreshDataList');
+					});
+				}
+			});
+		},
+	},
+};
+</script>
+
+<style scoped>
+.dialog >>> .el-dialog__body {
+	padding: 30px 24px;
+}
+.dialog >>> .el-dialog__header {
+	font-size: 16px;
+	color: rgba(0, 0, 0, 0.85);
+	font-weight: 500;
+	padding: 13px 24px;
+	border-bottom: 1px solid #e9e9e9;
+}
+.dialog >>> .el-dialog__header .titleStyle::before {
+	content: '';
+	display: inline-block;
+	width: 4px;
+	height: 16px;
+	background-color: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	position: relative;
+	top: 2px;
+}
+</style>

src/views/base/materialProductBom/index.vue

@@ -13,7 +13,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="220"
+				:width="120"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -68,24 +68,24 @@ export default {
 			},
 			tableProps,
 			tableBtn: [
-				this.$auth.hasPermi(`base:material-product-bom:update`)
+				this.$auth.hasPermi(`base:material-product-bom:queryMaterial`)
+					? {
+							type: 'detail',
+							btnName: '查看物料',
+					  }
+					: undefined,
+					this.$auth.hasPermi(`base:material-product-bom:update`)
 					? {
 							type: 'edit',
 							btnName: '编辑',
 					  }
 					: undefined,
-					this.$auth.hasPermi(`base:material-product-bom:queryMaterial`)
+					// this.$auth.hasPermi(`base:material-product-bom:editMaterial`)
-					? {
+					// ? {
-							type: 'search',
+					// 		type: 'editMaterial',
-							btnName: '查看物料',
+					// 		btnName: '编辑物料',
-					  }
+					//   }
-					: undefined,
+					// : undefined,
-					this.$auth.hasPermi(`base:material-product-bom:editMaterial`)
-					? {
-							type: 'editMaterial',
-							btnName: '编辑物料',
-					  }
-					: undefined,
           this.$auth.hasPermi(`base:material-product-bom:delete`)
 					? {
 							type: 'delete',
@@ -123,7 +123,7 @@ export default {
 	created() {},
 	methods: {
 		otherMethods(val) {
-			if (val.type === 'search') {
+			if (val.type === 'detail') {
 				this.addOrUpdateVisible = true;
 				this.addOrEditTitle = '详情';
 				this.$nextTick(() => {

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-22 10:40:08
+ * @LastEditTime: 2023-11-27 19:57:23
  * @Description:
 -->
 <template>
@@ -11,9 +11,10 @@
 		:rules="dataRule"
 		ref="dataForm"
 		@keyup.enter.native="dataFormSubmit()"
-		label-width="80px">
+		label-width="80px"
+		label-position="top">
 		<el-row :gutter="20">
-			<el-col :span="12">
+			<el-col :span="8">
 				<el-form-item label="物料名称" prop="materialId">
 					<el-select
 						v-model="dataForm.materialId"
@@ -21,6 +22,7 @@
 						clearable
 						filterable
 						@change="setCode"
+						style="width: 100%"
 					>
 						<el-option
 							v-for="dict in materialList"
@@ -30,7 +32,7 @@
 					</el-select>
 				</el-form-item>
 			</el-col>
-			<el-col :span="12">
+			<el-col :span="8">
 				<el-form-item label="物料编码" prop="materialCode">
 					<el-input
 						v-model="dataForm.materialCode"
@@ -39,15 +41,14 @@
 						placeholder="请输入物料编码" />
 				</el-form-item>
 			</el-col>
-		</el-row>
+			<el-col :span="8">
-		<el-row :gutter="20">
-			<el-col :span="12">
 				<el-form-item label="批次号" prop="materialDateId">
 					<el-select
 						v-model="dataForm.materialDateId"
 						clearable
 						filterable
 						placeholder="请选择物料批次"
+						style="width: 100%"
 					>
 						<el-option
 							v-for="dict in materialDateList"
@@ -57,13 +58,16 @@
 					</el-select>
 				</el-form-item>
 			</el-col>
-			<el-col :span="12">
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="8">
 				<el-form-item label="使用设备" prop="equipmentId">
 					<el-select
 						v-model="dataForm.equipmentId"
 						clearable
 						filterable
-						placeholder="请选择使用设备">
+						placeholder="请选择使用设备"
+						style="width: 100%">
 						<el-option
 							v-for="dict in eqList"
 							:key="dict.id"
@@ -72,9 +76,7 @@
 					</el-select>
 				</el-form-item>
 			</el-col>
-		</el-row>
+			<el-col :span="8">
-		<el-row :gutter="20">
-			<el-col :span="12">
 				<el-form-item label="使用时间" prop="useTime">
 					<el-date-picker
 						v-model="dataForm.useTime"
@@ -84,14 +86,15 @@
 						placeholder="选择日期时间" />
 				</el-form-item>
 			</el-col>
-			<el-col :span="12">
+			<el-col :span="8">
 				<el-form-item label="操作员" prop="userNames">
 					<el-select
 						v-model="dataForm.userNames"
 						clearable
 						filterable
 						multiple
-						placeholder="请选择操作员">
+						placeholder="请选择操作员"
+						style="width: 100%">
 						<el-option
 							v-for="dict in workersList"
 							:key="dict.id"
@@ -102,12 +105,12 @@
 			</el-col>
 		</el-row>
 		<el-row :gutter="20">
-			<el-col :span="12">
+			<el-col :span="8">
 				<el-form-item label="使用数量" prop="num">
-					<el-input-number v-model="dataForm.num" clearable placeholder="请输入使用数量" />
+					<el-input-number v-model="dataForm.num" clearable controls-position="right" placeholder="请输入使用数量" style="width: 100%" />
 				</el-form-item>
 			</el-col>
-			<el-col :span="12">
+			<el-col :span="8">
 				<el-form-item label="数据来源" prop="source">
 					<el-select
 						v-model="dataForm.source"
@@ -121,10 +124,12 @@
 					</el-select>
 				</el-form-item>
 			</el-col>
+			<el-col :span="8">
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="dataForm.remark" clearable placeholder="请输入备注" />
+				</el-form-item>
+			</el-col>
 		</el-row>
-		<el-form-item label="备注" prop="remark">
-			<el-input v-model="dataForm.remark" clearable placeholder="请输入备注" />
-		</el-form-item>
 	</el-form>
 </template>
 
@@ -237,13 +242,8 @@ export default {
 						this.dataForm.source = response.data.source
 						this.dataForm.remark = response.data.remark
 						this.dataForm.userNames = response.data.userName.split(',')
-						console.log('打印', this.dataForm)
           });
-        } else {
+        } else {}
-          if (this.urlOptions.isGetCode) {
-            this.getCode()
-          }
-				}
       });
     },
 		setCode() {

src/views/base/materialUseLog/index.vue

@@ -29,7 +29,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="50%">
+			width="60%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>
@@ -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/core/base/factory/index.vue

@@ -110,7 +110,7 @@ export default {
 				},
 				{
 					type: 'button',
-					btnName: '搜索',
+					btnName: '查询',
 					name: 'search',
 					color: 'primary',
 				},
@@ -149,6 +149,27 @@ export default {
 	},
 	created() {},
 	methods: {
+		// 删除
+    deleteHandle(id, name, index) {
+      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(() => { });
+    },
 		buttonClick(val) {
 			switch (val.btnName) {
 				case 'search':

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

@@ -2,9 +2,10 @@
   <el-drawer
     title="发货进度"
     :visible.sync="centervisible"
-    size="80%"
+    size="50%"
     class="deliveryLogDetail"
-    @close='closeA'>
+    @close='closeA'
+    :show-close='false'>
     <div class="box1">
       <div class="box_col">
         <div class="blodTip">订单名</div>
@@ -46,7 +47,7 @@
               <method-btn
                 v-if="tableBtn.length"
                 slot="handleBtn"
-                :width="150"
+                :width="80"
                 label="操作"
                 :method-list="tableBtn"
                 @clickBtn="viewDetDetail"
@@ -64,7 +65,7 @@
           <div v-if="activeName === 'barChart'">
             <div 
               id="logDetPieBar"
-              style="width: 100%"
+              style="width: 60%"
               :style="{ height: chartHeight + 'px' }"
             ></div>
           </div>
@@ -74,10 +75,11 @@
     <!-- 详情抽屉 -->
     <el-drawer
       title="发货详情"
-      size="60%"
+      size="50%"
       :append-to-body="true"
       :visible.sync="innerDrawer"
-      @close='closeB'>
+      @close='closeB'
+      :show-close='false'>
       <div class="box3">
         <el-row>
           <el-col :span='12'>
@@ -139,7 +141,8 @@ const tableProps = [
   },
   {
     prop: 'rate',
-    label: '发货比列(%)'
+    label: '发货比列(%)',
+    width: 110
   },
   {
     prop: 'principalCost',
@@ -171,7 +174,8 @@ const tableProps2 = [
   },
   {
     prop: 'packagingSize',
-    label: '装箱规格（片/箱）'
+    label: '装箱规格（片/箱）',
+    minWidth: 140
   },
   {
     prop: 'packagingNum',
@@ -208,8 +212,8 @@ export default {
       tableBtn: [
         this.$auth.hasPermi('base:group-team:update')
           ? {
-              type: 'detDetail',
+              type: 'detail',
-              btnName: '查看发货详情'
+              btnName: '详情'
             }
           : undefined
       ].filter((v) => v),
@@ -228,7 +232,7 @@ export default {
       // 图
       chartDom: '',
       chart: '',
-      chartHeight: this.tableHeight(300)
+      chartHeight: this.tableHeight(300)*0.6
     }
   },
   // watch: {
@@ -268,6 +272,8 @@ export default {
       }
     },
     getBar() {
+      let color = ['#7164FF','#288AFF','#63BDFF','#8EF0AB','#FFCE6A']
+      let colorList = []
       if (
         this.chart !== null &&
         this.chart !== '' &&
@@ -278,64 +284,90 @@ export default {
       this.chartDom = document.getElementById('logDetPieBar')
       this.chart = echarts.init(this.chartDom)
       let seriesData = []
-      let sumData = 0
+      if (this.tableData.length > 0) {
-      this.tableData && this.tableData.map(item =>{
+        for (let i = 0; i < this.tableData.length; i++) {
+          let obj = {}
+          obj.value = this.tableData[i].num
+          obj.name = this.tableData[i].name
+          seriesData.push(obj)
+          if (i < 5) {
+            colorList.push(color[i])
+          } else {
+            colorList.push(color[i%5])
+          }
+        }
+      }
+      if (this.orderMsg.num < this.orderMsg.orderNum) {
         let obj = {}
-        obj.value = item.rate
+        obj.value = this.orderMsg.orderNum - this.orderMsg.num
-        obj.name = item.name
-        seriesData.push(obj)
-        sumData+=item.rate
-      })
-      if (sumData < 100) {
-        let obj = {}
-        obj.value = 100 - sumData
         obj.name = "未发货"
         seriesData.push(obj)
+        colorList.push('#F5F5F5')
+      }else {
+        let obj = {}
+        obj.value = 0
+        obj.name = "未发货"
+        seriesData.push(obj)
+        colorList.push('#F5F5F5')
       }
       var option = {
-        color: ['#B0EB42', '#FF9747', '#FF6860', '#7164FF', '#288AFF', '#63BDFF', '#73DE93', '#FFCE6A'],
+        color: colorList,
-        tooltip: {
-          trigger: 'item',
-          formatter: function(params) {
-            let str = `<span style="display:inline-block;width:8px;height:8px;margin: 0 8px 0 -3px;border-radius:2px;background-color:${params.color};"></span>`
-            return `<span>
-                <span style="color:rgba(0,0,0,0.85);">${str}${params.name}</span>
-                <span style="display:inline-block;margin-left:10px;color:rgba(0,0,0,0.45);">${params.percent}</span>
-              </span>`
-          }
-        },
         legend: {
-          type: 'scroll',
+          bottom: '5%',
-          orient: 'vertical',
+          left: 'center',
-          right: '10%',
+          itemWidth: 8,
-          top: 20,
+          itemHeight: 8
-          bottom: 20,
-          icon: 'rect',
-          itemHeight: 8,
-          itemWidth: 8
         },
         series: [
           {
             type: 'pie',
-            radius: ['60%', '80%'],
+            radius: ['40%', '55%'],
-            avoidLabelOverlap: false,
-            label: {
-              show: false,
-              position: 'center'
-            },
             emphasis: {
-              label: {
+              scale: false
-                show: true,
-                fontSize: 40,
-                fontWeight: 'bold'
-              },
-              scale: true ,
-              scaleSize: 20 ,
             },
-            labelLine: {
+            label: {
-              show: false
+              alignTo: 'edge',
+              formatter: '{name|{b}}\n{value|{c}}',
+              minMargin: 5,
+              edgeDistance: 10,
+              lineHeight: 15,
+              rich: {
+                name: {
+                  fontSize: 14,
+                  color: 'rgba(0,0,0,0.65)'
+                },
+                value: {
+                  fontSize: 14,
+                  color: 'rgba(0,0,0,0.65)'
+                }
+              }
             },
             data: seriesData
+          },
+          {
+            type: 'pie',
+            radius: ['40%', '40%'],
+            label: {
+              show: true,
+              position: 'center',
+              color: '#000',
+              formatter: [
+                  '{a|'+this.orderMsg.orderNum+'}',
+                  '{b|总数}'
+              ].join('\n\n'),
+              rich: {
+                a: {
+                    fontSize: 26 +'px'
+                },
+                b: {
+                    fontSize: 16 +'px'
+                }
+              }
+            },
+            emphasis: {
+              scale: false
+            },
+            data: [100]
           }
         ]
       };
@@ -375,11 +407,13 @@ export default {
 </script>
 <style scoped lang='scss'>
 .box1 {
-  height: 56px;
+  height: 76px;
+  border-bottom: 1px solid #E9E9E9;
+  margin: 0px 8px 20px 30px;
   .box_col {
     display: inline-block;
     width: 20%;
-    padding: 8px 8px 8px 40px;
+    padding: 8px 8px 8px 8px;
     .blodTip {
       height: 16px;
       font-size: 14px;
@@ -396,7 +430,7 @@ export default {
   }
 }
 .box2 {
-    padding:32px 32px 30px 30px;
+    padding:0px 32px 30px 30px;
     height: calc(100vh - 150px);
 }
 .boxTitle {

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

@@ -6,6 +6,7 @@
         :key="item.prop"
         :prop="item.prop" 
         :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/Visualization/index.vue

@@ -8,11 +8,11 @@
 <template>
 	<div class="app-container allow-overflow">
 		<!-- 搜索工作栏 -->
-		<small-title
+		<!-- <small-title
 			style="margin: 16px 0; padding-left: 8px"
 			:no-padding="true">
 			设备运行状态
-		</small-title>
+		</small-title> -->
 
 		<div
 			class="graph"
@@ -22,7 +22,8 @@
 				flex-direction: column;
 				position: relative;
 			">
-			<div class="blue-title">各设备加工数量</div>
+			<!-- <div class="blue-title">各设备加工数量</div> -->
+			<div class="blue-title">设备运行状态</div>
 			<div class="legend">
 				<div class="legend-item">
 					<span class="icon blue"></span>
@@ -41,22 +42,17 @@
 					<span class="text">速度开动率</span>
 				</div>
 			</div>
-			<div class="graph-grid">
+			<div v-if="list.length" class="graph-grid">
 				<div class="bg-grid grid-line">
-					<div
+					<div class="grid-item" v-for="item in list.length" :key="item"></div>
-						class="grid-item"
-						v-for="item in list.length"
-						:key="item"></div>
 				</div>
 
 				<div class="bg-grid grid-charts">
-					<pie-chart
+					<pie-chart v-for="item in list" :key="item.id" :value="item" />
-						v-for="item in list"
-						:key="item.id"
-						:value="item" />
 					<!-- <pie-chart v-for="item in 5" :key="item" :value="item" /> -->
 				</div>
 			</div>
+			<div class="no-data-bg" v-else></div>
 		</div>
 	</div>
 </template>

src/views/equipment/analysis/efficiency/components/pieChart.vue

@@ -202,7 +202,9 @@ export default {
 			];
 			this.config.series[1].data = [
 				{ name: '速度开动率', value: peEfficiency },
-				{ name: '', value: Math.ceil(peEfficiency) - peEfficiency },
+				{ name: '', value: 100 },
+				// { name: '速度开动率', value: peEfficiency },
+				// { name: '', value: Math.ceil(peEfficiency) - peEfficiency },
 			];
 			//
 			this.textData = {

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/analysis/quality/components/lineChart.vue

@@ -21,18 +21,15 @@ export default {
 			chart: null,
 		};
 	},
-	// watch: {
+	watch: {
-	// 	list: {
+		list: {
-	// 		handler(listdata) {
+			handler(listdata) {
-	// 			if (listdata && listdata.length) {
+				this.setOption();
-	// 				console.log('[linechart] list changed', listdata);
+			},
-	// 				const option = this.handleList(listdata);
+			immediate: true,
-	// 				this.setOption(option);
+			deep: true,
-	// 			}
+		},
-	// 		},
+	},
-	// 		immediate: true,
-	// 	},
-	// },
 	computed: {
 		option() {
 			const opt = [];
@@ -55,7 +52,7 @@ export default {
 					},
 					formatter: (params) => {
 						const name = params[0].name;
-						const goodRate = opt.find((item) => item[0] == name)[4];
+						const goodRate = opt.find((item) => item[0] == name)[4] || '0';
 						return `
 							<h1 style="font-size: 18px; letter-spacing: 1px;">${
 								params[0].axisValue
@@ -109,6 +106,9 @@ export default {
 				xAxis: {
 					type: 'category',
 					axisTick: { show: false },
+					axisLabel: {
+						rotate: 45,
+					},
 					data: opt.map((item) => item[0]),
 				},
 				yAxis: {

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

@@ -6,15 +6,15 @@
 -->
 
 <template>
-	<div class="app-container">
+	<div class="app-container" style="flex: 1; height: 1px; display: flex; flex-direction: column;">
 		<!-- 搜索工作栏 -->
 		<SearchBar
 			:formConfigs="searchBarFormConfig"
 			ref="search-bar"
 			@headBtnClick="handleSearchBarBtnClick" />
 
-		<el-row>
+		<el-row type="flex" style="flex: 1;">
-			<el-col class="custom-tabs">
+			<el-col class="custom-tabs" style="flex: 1;">
 				<el-tabs
 					v-model="activeName"
 					:stretch="true"
@@ -32,7 +32,7 @@
 						<div
 							v-if="activeName == 'graph'"
 							class="graph"
-							style="height: 40vh; display: flex; flex-direction: column">
+							style="height: 100%; display: flex; flex-direction: column">
 							<div class="blue-title">各设备加工数量</div>
 							<LineChart v-if="list && list.length" :list="list" />
 							<div v-else class="no-data-bg"></div>
@@ -63,13 +63,13 @@ export default {
 			activeName: 'table', // defaults to 'table'
 			searchBarFormConfig: [
 				// 产品
-				{
+				// {
-					__index: 'product',
+				// 	__index: 'product',
-					type: 'select',
+				// 	type: 'select',
-					label: '产品',
+				// 	label: '产品',
-					placeholder: '请选择产品',
+				// 	placeholder: '请选择产品',
-					param: 'productId',
+				// 	param: 'productId',
-				},
+				// },
 				// 产线
 				{
 					__index: 'line',
@@ -156,17 +156,17 @@ export default {
 				{
 					// width: 160,
 					prop: 'inQuantity',
-					label: '进片数量',
+					label: '加工数量',
 				},
 				{
 					// width: 160,
 					prop: 'outQuantity',
-					label: '出片数量',
+					label: '合格数量',
 				},
 				{
 					// width: 160,
 					prop: 'nokQuantity',
-					label: '破损/不合格数',
+					label: '不合格数量',
 				},
 				{
 					// width: 160,
@@ -377,6 +377,9 @@ export default {
 }
 
 :deep(.custom-tabs) {
+	.el-tabs {
+		height: 100%;
+	}
 	.el-tabs__header {
 		margin-bottom: 8px;
 		display: inline-block;
@@ -389,6 +392,14 @@ export default {
 		line-height: 36px !important;
 		height: 36px;
 	}
+
+	.el-tabs__content {
+		height: calc(100% - 48px);
+	}
+
+	#pane-graph {
+		height: 100%;
+	}
 }
 
 .blue-title {

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

@@ -0,0 +1,301 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2023-11-11 20:33:12
+ * @Description:
+-->
+<template>
+	<div class="alarm-handle">
+		<el-skeleton v-if="loading" />
+		<div v-else>
+			<DialogForm
+				ref="orderForm"
+				key="orderForm"
+				v-model="orderForm"
+				:disabled="readOnly"
+				:has-files="false"
+				label-position="top"
+				:rows="orderFormRows" />
+
+			<small-title style="margin: 16px 0" :no-padding="true" size="sm">
+				处理方式
+			</small-title>
+
+			<DialogForm
+				key="handleMethodForm"
+				ref="handleMethodForm"
+				v-model="handleMethodForm"
+				:disabled="readOnly"
+				:has-files="true"
+				label-position="top"
+				:rows="handleMethodFormRows" />
+		</div>
+	</div>
+</template>
+
+<script>
+import SmallTitle from './SmallTitle';
+import { getworkerAll } from '@/api/base/materialUseLog';
+import Editor from '@/components/Editor';
+import DialogForm from '@/components/DialogForm';
+
+export default {
+	name: 'AlarmHandle',
+	props: ['readOnly', 'logId'],
+	components: { SmallTitle, DialogForm, Editor },
+	data() {
+		return {
+			loading: false,
+			orderForm: {
+				id: null,
+				equipment: null,
+				createTime: null,
+				alarmContent: null,
+				alarmValue: null,
+				// 缺少报警编号字段, 用 alarmValue 代替
+			},
+			orderFormRows: [
+				[
+					{
+						input: true,
+						label: '设备编码',
+						prop: 'equipment',
+					},
+					{
+						datetime: true,
+						label: '报警时间',
+						prop: 'createTime',
+					},
+					{
+						input: true,
+						label: '报警编号',
+						prop: 'alarmValue',
+					},
+					{
+						input: true,
+						label: '报警内容',
+						prop: 'alarmContent',
+					},
+				],
+			],
+			handleMethodFormRows: [
+				[
+					{
+						select: true,
+						label: '处理人',
+						prop: 'hander',
+						url: '/base/core-worker/listAll',
+						bind: {
+							multiple: true,
+						},
+						rules: [
+							{ required: true, message: '类型名称不能为空', trigger: 'blur' },
+						],
+					},
+					{
+						upload: true,
+						label: '上传资料',
+						prop: 'files',
+					},
+				],
+				[
+					{
+						key: 'handerMode',
+						subcomponent: Editor,
+						label: '处理方式',
+						prop: 'handerMode',
+						bind: {
+							'min-height': 200,
+						},
+					},
+				],
+			],
+			handleMethodForm: {
+				id: null,
+				logId: null,
+				hander: null,
+				handerMode: null,
+				remark: null,
+				files: [
+					// {
+					// 	fileName: '',
+					// 	fileType: '',
+					// 	fileUrl: ''
+					// }
+				],
+			},
+			workersList: [],
+		};
+	},
+	mounted() {
+		this.loading = true;
+		this.getDict()
+			.then(() => {
+				this.init();
+			})
+			.catch((err) => {
+				this.loading = false;
+			});
+	},
+	methods: {
+		/**
+		 * 获取员工数据
+		 */
+		async getDict() {
+			const workerRes = await getworkerAll();
+			this.workersList = workerRes.data;
+		},
+
+		/**
+		 * 初始化
+		 */
+		async init() {
+			await this.initTop();
+			await this.initDown();
+			this.loading = false;
+		},
+
+		/**
+		 * 初始化上部表单
+		 */
+		async initTop() {
+			if (!this.logId) {
+				this.$msgError('缺少报警日志id');
+				this.$emit('close');
+			}
+			const url = '/base/equipment-alarm-log/get';
+			const { data, code } = await this.$axios({
+				url: url,
+				method: 'get',
+				params: {
+					id: this.logId,
+				},
+			});
+			if (code == 0) {
+				this.orderForm = data;
+			}
+		},
+
+		/**
+		 * 初始化下部表单
+		 */
+		async initDown() {
+			if (!this.logId) {
+				this.$msgError('缺少报警日志id');
+				this.$emit('close');
+			}
+			const url = '/base/equipment-alarm-hand/page'; // 经沟通，此处采用page接口的第一个返回值
+			const { data, code } = await this.$axios({
+				url: url,
+				method: 'get',
+				params: {
+					logId: this.logId,
+				},
+			});
+			if (code == 0) {
+				this.handleMethodForm = {
+					...data.list[0],
+					hander: data.list[0]?.hander?.split(',') || '',
+				};
+			}
+		},
+
+		/**
+		 * 更新表单
+		 */
+		async submit() {
+			const result = await Promise.all([
+				await this.updateTop(),
+				await this.updateHandleMethod(),
+			]);
+			if (result[0] == true && result[1] == true) {
+				this.$modal.msgSuccess('更新成功');
+				this.$emit('refreshDataList');
+			} else {
+				this.$modal.msgError('更新失败');
+			}
+		},
+
+		/**
+		 * 更新下部表单
+		 */
+		async updateHandleMethod() {
+			const url = '/base/equipment-alarm-hand';
+			const valid = await this.$refs.orderForm.validate();
+			if (!valid) {
+				return false;
+			}
+			const { code, data } = await this.$axios({
+				url: url + (this.handleMethodForm.id ? '/update' : '/create'),
+				method: this.handleMethodForm.id ? 'put' : 'post',
+				data: {
+					...this.handleMethodForm,
+					hander: this.handleMethodForm.hander?.join(',') || '',
+					logId: this.logId,
+				},
+			});
+			if (code == 0) {
+				return true;
+			}
+			return false;
+		},
+
+		/**
+		 * 更新上部分表单
+		 */
+		async updateTop() {
+			const url = '/base/equipment-alarm-log';
+			const valid = await this.$refs.handleMethodForm.validate();
+			if (!valid) {
+				return false;
+			}
+			const { code, data } = await this.$axios({
+				url: url + '/update',
+				method: 'put',
+				data: this.orderForm,
+			});
+			if (code == 0) {
+				return true;
+			}
+			return false;
+		},
+
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (!valid) {
+					return false;
+				}
+
+				if (this.file) {
+					const temp = this.file.split(','); // 获取文件个数
+					let arry = [];
+					temp.forEach((item) => {
+						arry.push({
+							fileType: 2,
+							fileUrl: item,
+						});
+					});
+					this.dataForm.files = arry;
+				}
+				this.urlOptions.createURL(this.dataForm).then((response) => {
+					this.$modal.msgSuccess('新增成功');
+					this.visible = false;
+					this.$emit('refreshDataList');
+				});
+			});
+		},
+	},
+};
+</script>
+
+<style scoped>
+.alarm-handle {
+	padding: 0;
+}
+
+.alarm-handle__method >>> .el-select {
+	width: 100% !important;
+}
+</style>

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

@@ -40,7 +40,7 @@ $pxls: (xl, 28px) (lg, 24px) (de, 20px) (md, 18px) (sm, 16px);
 $mgr: 8px;
 @each $size, $height in $pxls {
 	.#{$size}-title {
-		font-size: 18px;
+		font-size: $height;
 		line-height: $height;
 		color: #000;
 		font-weight: 500;
@@ -53,7 +53,7 @@ $mgr: 8px;
 			width: 4px;
 			height: $height + 2px;
 			border-radius: 1px;
-			margin-right: $mgr;
+			margin-right: 4px;
 			background-color: #0b58ff;
 		}
 	}

src/views/equipment/base/alarm/Record/add-or-updata.vue

@@ -1,195 +0,0 @@
-<!--
- * @Author: zwq
- * @Date: 2021-11-18 14:16:25
- * @LastEditors: DY
- * @LastEditTime: 2023-11-11 20:33:12
- * @Description:
--->
-<template>
-	<div>
-		<small-title
-			style="margin: 16px 0; padding-left: 8px"
-			:no-padding="true">
-			系统自带
-		</small-title>
-		<el-form
-			:model="dataForm1"
-			ref="dataForm1"
-			label-width="80px">
-			<el-row :gutter="20">
-				<el-col :span="12">
-					<el-form-item label="设备编码" prop="equipment">
-						<el-input
-							v-model="dataForm1.equipment"
-							disabled
-							placeholder="请输入设备编码" />
-					</el-form-item>
-				</el-col>
-				<el-col :span="12">
-					<el-form-item label="报警时间" prop="createTime">
-						<el-input
-							v-model="dataForm1.createTime"
-							disabled
-							placeholder="请输入报警时间" />
-					</el-form-item>
-				</el-col>
-			</el-row>
-			<el-row :gutter="20">
-				<el-col :span="12">
-					<el-form-item label="报警编号" prop="code">
-						<!-- 接口缺参数 -->
-						<el-input
-							v-model="dataForm1.code"
-							disabled
-							placeholder="请输入报警编号" />
-					</el-form-item>
-				</el-col>
-				<el-col :span="12">
-					<el-form-item label="报警内容" prop="alarmContent">
-						<el-input
-							v-model="dataForm1.alarmContent"
-							disabled
-							placeholder="请输入报警内容" />
-					</el-form-item>
-				</el-col>
-			</el-row>
-		</el-form>
-		<small-title
-			style="margin: 16px 0; padding-left: 8px"
-			:no-padding="true">
-			处理方式
-		</small-title>
-		<el-form
-			:model="dataForm"
-			:rules="dataRule"
-			ref="dataForm"
-			label-width="80px">
-			<el-form-item label="处理人" prop="hander">
-				<el-select
-					v-model="dataForm.hander"
-					:disabled="isdetail"
-					placeholder="请选择处理人"
-					>
-					<el-option
-						v-for="dict in workersList"
-						:key="dict.id"
-						:label="dict.name"
-						:value="dict.name" />
-				</el-select>
-			</el-form-item>
-			<el-form-item label="处理方式" prop="handerMode">
-				<editor v-model="dataForm.handerMode" :read-only="isdetail" :min-height="200"/>
-			</el-form-item>
-			<el-form-item label="附件" prop="file">
-				<!-- <el-input
-					v-model="dataForm.file"
-					type="textarea"
-					min-size="3"
-					placeholder="请输入处理方式" /> -->
-					<FileUpload v-model="file" :disabled="isdetail" />
-			</el-form-item>
-		</el-form>
-	</div>
-</template>
-
-<script>
-import basicAdd from '../../../../core/mixins/basic-add';
-import SmallTitle from './SmallTitle';
-import { getworkerAll } from "@/api/base/materialUseLog";
-import { createAlarmHand, getAlarmLog } from '@/api/equipment/base/alarm/records';
-import FileUpload from "@/components/FileUpload";
-import Editor from "@/components/Editor";
-
-export default {
-	components: { SmallTitle, FileUpload, Editor },
-	mixins: [basicAdd],
-	data() {
-		return {
-			urlOptions: {
-				createURL: createAlarmHand,
-				infoURL: getAlarmLog,
-			},
-			dataForm1: {
-        id: undefined,
-        equipment: undefined,
-        createTime: undefined,
-        alarmContent: undefined,
-				code: undefined
-			},
-			file: '',
-			dataForm: {
-        id: undefined,
-        hander: undefined,
-        handerMode: undefined
-			},
-			isdetail: false,
-			workersList: [],
-			dataRule: {
-				hander: [{ required: true, message: "处理人不能为空", trigger: "change" }],
-        handerMode: [{ required: true, message: "处理方式不能为空", trigger: "blur" }]
-      }
-		};
-	},
-	mounted() {
-		this.getDict()
-		console.log('我看看', this.dataForm)
-	},
-	methods: {
-		async getDict() {
-			// 获得员工
-			const workerRes = await getworkerAll()
-			this.workersList = workerRes.data
-		},
-		// 表单提交
-    dataFormSubmit() {
-      this.$refs["dataForm"].validate((valid) => {
-        if (!valid) {
-          return false;
-        }
-        // 修改的提交
-        // if (this.dataForm.id) {
-        //   this.urlOptions.updateURL(this.dataForm).then(response => {
-        //     this.$modal.msgSuccess("修改成功");
-        //     this.visible = false;
-        //     this.$emit("refreshDataList");
-        //   });
-        //   return;
-        // }
-        // 添加的提交
-				if (this.file) {
-					const temp = this.file.split(',') // 获取文件个数
-					let arry = []
-					temp.forEach(item => {
-						arry.push({
-							fileType: 2,
-							fileUrl: item
-						})
-					})
-					this.dataForm.files = arry
-				}
-        this.urlOptions.createURL(this.dataForm).then(response => {
-          this.$modal.msgSuccess("新增成功");
-          this.visible = false;
-          this.$emit("refreshDataList");
-        });
-      });
-    },
-		init(id, isdetail) {
-      this.dataForm1.id = id || "";
-			this.isdetail = isdetail || false
-      this.visible = true;
-      this.$nextTick(() => {
-        this.$refs["dataForm1"].resetFields();
-				this.$refs["dataForm"].resetFields();
-        if (this.dataForm1.id) {
-          this.urlOptions.infoURL(id).then(response => {
-						if (response.data) {
-							this.dataForm1 = response.data;
-						}
-          });
-        }
-      });
-    },
-	},
-};
-</script>

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

@@ -45,20 +45,28 @@
 				:disabled="mode == 'detail'"
 				:has-files="false"
 				:rows="rows" /> -->
-			<add-or-update
+			<AddOrUpdate
-			ref="addOrUpdate"
+				v-if="open"
-			@refreshDataList="successSubmit" />
+				ref="addOrUpdate"
+				:read-only="readOnly"
+				:log-id="chosedLogId"
+				@close="cancel"
+				@refreshDataList="successSubmit" />
 		</base-dialog>
 	</div>
 </template>
 
 <script>
-import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import AddOrUpdate from './add-or-updata.vue'
 import { publicFormatter } from '@/utils/dict';
+<<<<<<< HEAD
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
+=======
+import AddOrUpdate from './AddOrUpdate.vue';
+import moment from 'moment';
+const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
+>>>>>>> projects/mes-test
 
 const btn = {
 	name: 'tableBtn',
@@ -68,7 +76,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) {
@@ -80,15 +91,19 @@ const btn = {
 	},
 };
 
-
-
 export default {
 	name: 'Record',
 	components: { AddOrUpdate },
 	mixins: [basicPageMixin],
 	data() {
 		return {
+<<<<<<< HEAD
       searchBarKeys: ['equipmentName', 'createTime'],
+=======
+			readOnly: false,
+			chosedLogId: false,
+			searchBarKeys: ['equipmentName', 'recordTime'],
+>>>>>>> projects/mes-test
 			tableBtn: [
 				// this.$auth.hasPermi('equipment:spare-parts-config:update')
 				// 	? {
@@ -113,12 +128,22 @@ export default {
 				{ prop: 'productionLine', label: '产线' },
 				{ prop: 'workshopSection', label: '工段' },
 				{ prop: 'equipment', label: '设备名称' },
+<<<<<<< HEAD
 				{ prop: 'alarmGrade', label: '报警级别', filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL) },
         { prop: 'createTime', label: '报警时间',filter: timeFilter }, // 接口缺
 				{ prop: 'responsible1', label: '设备报警码' }, // 接口缺
+=======
+				{
+					prop: 'alarmGrade',
+					label: '报警级别',
+					filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL),
+				},
+				{ prop: 'createTime', label: '报警时间', filter: timeFilter }, // 接口缺
+				{ prop: 'alarmCode', label: '设备报警码' }, // 接口缺
+>>>>>>> projects/mes-test
 				{ prop: 'alarmContent', label: '报警内容' },
 				{ prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn },
-				{ prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn },  // TODO: 是否换成按钮， 群里问
+				{ prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn }, // TODO: 是否换成按钮， 群里问
 				// { prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
@@ -135,8 +160,8 @@ export default {
 					dateType: 'daterange', // datetimerange
 					// format: 'yyyy-MM-dd HH:mm:ss',
 					format: 'yyyy-MM-dd',
-					// valueFormat: 'timestamp',
+					valueFormat: 'timestamp',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					// valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始日期',
 					endPlaceholder: '结束日期',
@@ -196,9 +221,10 @@ export default {
 				pageSize: 10,
 				lineId: null,
 				equipmentId: null,
+				recordTime: []
 			},
 			basePath: '/base/equipment-alarm-log',
-			list: []
+			list: [],
 		};
 	},
 	created() {
@@ -206,21 +232,20 @@ export default {
 	},
 	methods: {
 		handleEmitFun(val) {
-			console.log('你好', val)
 			if (val.action === '报警处理') {
+				// this.chosedLogId = val.value.alarmId;
+				this.chosedLogId = val.value.id;
 				// 报警处理
-				this.open = true
+				this.open = true;
-				this.title = '报警处理'
+				this.title = '报警处理';
-				this.$nextTick(() => {
+				this.readOnly = false;
-					this.$refs.addOrUpdate.init(val.value.id);
-				});
 			} else {
+				// this.chosedLogId = val.value.alarmId;
+				this.chosedLogId = val.value.id;
 				// 查看
-				this.open = true
+				this.open = true;
-				this.title = '查看'
+				this.title = '查看';
-				this.$nextTick(() => {
+				this.readOnly = true;
-					this.$refs.addOrUpdate.init(val.value.id, true);
-				});
 			}
 		},
 		/** 查询列表 */
@@ -234,9 +259,9 @@ export default {
 			});
 		},
 		successSubmit() {
-      this.cancel()
+			this.cancel();
-      this.getList()
+			this.getList();
-    },
+		},
 		/** 取消按钮 */
 		cancel() {
 			this.open = false;
@@ -282,7 +307,7 @@ export default {
 		},
 		/** 提交按钮 */
 		submitForm() {
-			this.$refs.addOrUpdate.dataFormSubmit()
+			this.$refs.addOrUpdate.submit();
 			// this.$refs['form'].validate((valid) => {
 			// 	if (!valid) {
 			// 		return;
@@ -310,7 +335,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/components/BasicDrawer.vue

@@ -12,7 +12,7 @@
 		:wrapper-closable="false"
 		class="drawer"
 		custom-class="mes-drawer"
-		size="60%"
+		:size="size || '50%'"
 		@closed="$emit('destroy')">
 		<SmallTitle slot="title">
 			{{
@@ -42,7 +42,8 @@
 							:dataForm="form"
 							:rows="formRows" /> -->
 
-						<el-row style="margin-bottom: 24px">
+						<!-- if  -->
+						<el-row v-if="mode.includes('detail')" style="margin-bottom: 24px">
 							<el-col :span="8">
 								<div
 									class="title"
@@ -62,13 +63,39 @@
 								</div>
 							</el-col>
 						</el-row>
+						<!-- else  -->
+						<el-row v-else style="margin-bottom: 24px" :gutter="20">
+							<el-form ref="form" :model="form">
+								<el-col :span="8">
+									<el-form-item
+										class="title"
+										label="设备分组名称"
+										style="font-size: 16px; margin: 8px 0">
+										<el-input
+											v-model="form.name"
+											placeholder="请输入设备分组名称"></el-input>
+									</el-form-item>
+								</el-col>
+								<el-col :span="8">
+									<el-form-item
+										class="title"
+										label="设备分组编码"
+										style="font-size: 16px; margin: 8px 0">
+										<el-input
+											v-model="form.code"
+											placeholder="请输入设备分组编码"></el-input>
+									</el-form-item>
+								</el-col>
+							</el-form>
+						</el-row>
 					</div>
 
 					<div
 						v-if="section.key == 'attrs'"
 						style="position: relative; margin-top: 12px">
-						<!-- v-if="!mode.includes('detail')" -->
+						<div
-						<div style="position: absolute; top: -40px; right: 0">
+							v-if="!mode.includes('detail')"
+							style="position: absolute; top: -40px; right: 0">
 							<el-button @click="handleAddAttr" type="text">
 								<i class="el-icon-plus"></i>
 								添加报警
@@ -84,7 +111,7 @@
 							<!-- :add-button-show="mode.includes('detail') ? null : '添加属性'"
 							@emitButtonClick="handleAddAttr" -->
 							<method-btn
-								v-if="section.tableBtn"
+								v-if="section.tableBtn && !mode.includes('detail')"
 								slot="handleBtn"
 								label="操作"
 								:method-list="tableBtn"
@@ -103,11 +130,13 @@
 			</div>
 
 			<div class="drawer-body__footer">
-				<el-button style="" @click="handleCancel">取消</el-button>
+				<el-button style="" @click="handleCancel">返回</el-button>
-				<!-- <el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+				<el-button
-					编辑
+					type="primary"
-				</el-button> -->
+					v-if="!mode.includes('detail')"
-				<!-- <el-button v-else type="primary" @click="handleCancel">确定</el-button> -->
+					@click="handleSave">
+					保存
+				</el-button>
 			</div>
 		</div>
 
@@ -163,7 +192,7 @@ const SmallTitle = {
 
 export default {
 	components: { SmallTitle, DialogForm, BaseInfoForm },
-	props: ['sections', 'defaultMode', 'dataId'], // dataId 作为一个通用的存放id的字段
+	props: ['sections', 'defaultMode', 'dataId', 'size'], // dataId 作为一个通用的存放id的字段
 	data() {
 		return {
 			mode: '',
@@ -191,7 +220,9 @@ export default {
 						label: '报警编码', // 自动生成
 						prop: 'code',
 						url: '/base/equipment-group-alarm/getCode',
-						rules: [{ required: true, message: '报警编码不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '报警编码不能为空', trigger: 'blur' },
+						],
 					},
 					{
 						select: true,
@@ -205,13 +236,17 @@ export default {
 						input: true,
 						label: '参数列名', // 在实时数据库的列名
 						prop: 'plcParamName',
-						rules: [{ required: true, message: '参数列名不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '参数列名不能为空', trigger: 'blur' },
+						],
 					},
 					{
 						input: true,
 						label: '报警内容',
 						prop: 'alarmContent',
-						rules: [{ required: true, message: '报警内容不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '报警内容不能为空', trigger: 'blur' },
+						],
 					},
 				],
 				[
@@ -223,7 +258,9 @@ export default {
 							{ label: '布尔型', value: 2 },
 							{ label: '字符型', value: 1 },
 						],
-						rules: [{ required: true, message: '报警类型不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '报警类型不能为空', trigger: 'blur' },
+						],
 					},
 					{
 						input: true,
@@ -322,7 +359,7 @@ export default {
 		handleSave() {
 			this.$refs['form'][0].validate(async (valid) => {
 				if (valid) {
-					const isEdit = this.mode == 'edit';
+					const isEdit = !this.mode.includes('detail');
 					await this.$axios({
 						url: this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
 						method: isEdit ? 'put' : 'post',
@@ -403,32 +440,32 @@ export default {
 		},
 
 		// 提交属性表
-		async submitAttrForm() {
+		submitAttrForm() {
-			this.$refs['attrForm'].validate((valid) => {
+			this.$refs['attrForm'].validate(async (valid) => {
 				if (!valid) {
 					return;
 				}
-			});
+				const isEdit = this.attrForm.id != null;
-			const isEdit = this.attrForm.id != null;
+				this.attrFormSubmitting = true;
-			this.attrFormSubmitting = true;
+				const res = await this.$axios({
-			const res = await this.$axios({
+					url: isEdit ? this.sections[1].urlUpdate : this.sections[1].urlCreate,
-				url: isEdit ? this.sections[1].urlUpdate : this.sections[1].urlCreate,
+					method: isEdit ? 'put' : 'post',
-				method: isEdit ? 'put' : 'post',
+					data: this.attrForm,
-				data: this.attrForm,
-			});
-
-			if (res.code == 0) {
-				this.closeAttrForm();
-				this.$message({
-					message: `${isEdit ? '更新' : '创建'}成功`,
-					type: 'success',
-					duration: 1500,
-					onClose: () => {
-						this.getAttrList();
-					},
 				});
-			}
+
-			this.attrFormSubmitting = false;
+				if (res.code == 0) {
+					this.closeAttrForm();
+					this.$message({
+						message: `${isEdit ? '更新' : '创建'}成功`,
+						type: 'success',
+						duration: 1500,
+						onClose: () => {
+							this.getAttrList();
+						},
+					});
+				}
+				this.attrFormSubmitting = false;
+			});
 		},
 
 		closeAttrForm() {

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

@@ -45,6 +45,7 @@
 		<BasicDrawer
 			v-if="editVisible"
 			ref="drawer"
+			size="45%"
 			:default-mode="editMode"
 			:data-id="alarmForm.id"
 			:sections="[
@@ -198,26 +199,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,
@@ -406,12 +404,25 @@ export default {
 				});
 			});
 		},
+		handleTableBtnClick({ data, type }) {
+			switch (type) {
+				case 'edit':
+					this.handleDetail(data, 'edit');
+					break;
+				case 'delete':
+					this.handleDelete(data);
+					break;
+				case 'detail':
+					this.handleDetail(data);
+					break;
+			}
+		},
 		// 查看报警
-		handleDetail(row) {
+		handleDetail(row, mode = 'detail') {
 			// debugger;
 			const { id, code, name, createTime } = row;
 			// 打开抽屉
-			this.editMode = 'detail';
+			this.editMode = mode;
 			this.alarmForm.id = id;
 			this.alarmForm.equipmentGroupCode = code;
 			this.alarmForm.equipmentGroupName = name;

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

@@ -12,7 +12,7 @@
 		:wrapper-closable="false"
 		class="drawer"
 		custom-class="mes-drawer"
-		size="60%"
+		:size="size || '50%'"
 		@closed="$emit('destroy')">
 		<SmallTitle slot="title">
 			{{
@@ -42,6 +42,7 @@
 							:dataForm="form"
 							:rows="formRows" /> -->
 
+						<!-- <el-row v-if="mode.includes('detail')" style="margin-bottom: 24px"> -->
 						<el-row style="margin-bottom: 24px">
 							<el-col :span="8">
 								<div
@@ -62,13 +63,38 @@
 								</div>
 							</el-col>
 						</el-row>
+						<!-- <el-row v-else style="margin-bottom: 24px" :gutter="20">
+							<el-form ref="form" :model="form">
+								<el-col :span="8">
+									<el-form-item
+										class="title"
+										label="设备分组名称"
+										style="font-size: 16px; margin: 8px 0">
+										<el-input
+											v-model="form.name"
+											placeholder="请输入设备分组名称"></el-input>
+									</el-form-item>
+								</el-col>
+								<el-col :span="8">
+									<el-form-item
+										class="title"
+										label="设备分组编码"
+										style="font-size: 16px; margin: 8px 0">
+										<el-input
+											v-model="form.code"
+											placeholder="请输入设备分组编码"></el-input>
+									</el-form-item>
+								</el-col>
+							</el-form>
+						</el-row> -->
 					</div>
 
 					<div
 						v-if="section.key == 'attrs'"
 						style="position: relative; margin-top: 12px">
-						<!-- v-if="!mode.includes('detail')" -->
+						<div
-						<div style="position: absolute; top: -40px; right: 0">
+							v-if="!mode.includes('detail')"
+							style="position: absolute; top: -40px; right: 0">
 							<el-button @click="handleAddAttr" type="text">
 								<i class="el-icon-plus"></i>
 								添加属性
@@ -84,7 +110,7 @@
 							<!-- :add-button-show="mode.includes('detail') ? null : '添加属性'"
 							@emitButtonClick="handleAddAttr" -->
 							<method-btn
-								v-if="section.tableBtn"
+								v-if="section.tableBtn && !mode.includes('detail')"
 								slot="handleBtn"
 								label="操作"
 								:method-list="tableBtn"
@@ -104,10 +130,12 @@
 
 			<div class="drawer-body__footer">
 				<el-button style="" @click="handleCancel">取消</el-button>
-				<!-- <el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+				<el-button
-					编辑
+					type="primary"
-				</el-button> -->
+					v-if="!mode.includes('detail')"
-				<!-- <el-button v-else type="primary" @click="handleCancel">确定</el-button> -->
+					@click="handleCancel">
+					确定
+				</el-button>
 			</div>
 		</div>
 
@@ -163,7 +191,7 @@ const SmallTitle = {
 
 export default {
 	components: { SmallTitle, DialogForm, BaseInfoForm },
-	props: ['sections', 'defaultMode', 'dataId'], // dataId 作为一个通用的存放id的字段
+	props: ['sections', 'defaultMode', 'dataId', 'size'], // dataId 作为一个通用的存放id的字段
 	data() {
 		return {
 			mode: '',
@@ -191,7 +219,9 @@ export default {
 						label: '报警编码', // 自动生成
 						prop: 'code',
 						url: '/base/equipment-group-alarm/getCode',
-						rules: [{ required: true, message: '报警编码不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '报警编码不能为空', trigger: 'blur' },
+						],
 					},
 					{
 						select: true,
@@ -201,7 +231,9 @@ export default {
 							{ label: '布尔型', value: 2 },
 							{ label: '字符型', value: 1 },
 						],
-						rules: [{ required: true, message: '报警类型不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '报警类型不能为空', trigger: 'blur' },
+						],
 					},
 				],
 				[
@@ -222,13 +254,17 @@ export default {
 						input: true,
 						label: '参数列名', // 在实时数据库的列名
 						prop: 'plcParamName',
-						rules: [{ required: true, message: '参数列名不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '参数列名不能为空', trigger: 'blur' },
+						],
 					},
 					{
 						input: true,
 						label: '报警内容',
 						prop: 'alarmContent',
-						rules: [{ required: true, message: '报警内容不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '报警内容不能为空', trigger: 'blur' },
+						],
 					},
 				],
 			],
@@ -322,7 +358,7 @@ export default {
 		handleSave() {
 			this.$refs['form'][0].validate(async (valid) => {
 				if (valid) {
-					const isEdit = this.mode == 'edit';
+					const isEdit = !this.mode.includes('detail');
 					await this.$axios({
 						url: this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
 						method: isEdit ? 'put' : 'post',
@@ -403,33 +439,32 @@ export default {
 		},
 
 		// 提交属性表
-		async submitAttrForm() {
+		submitAttrForm() {
-			this.$refs['attrForm'].validate((valid) => {
+			this.$refs['attrForm'].validate(async (valid) => {
 				if (!valid) {
 					return;
 				}
-			});
+				const isEdit = this.attrForm.id != null;
-			console.log('this.attrform', this.attrForm);
+				this.attrFormSubmitting = true;
-			const isEdit = this.attrForm.id != null;
+				const res = await this.$axios({
-			this.attrFormSubmitting = true;
+					url: isEdit ? this.sections[1].urlUpdate : this.sections[1].urlCreate,
-			const res = await this.$axios({
+					method: isEdit ? 'put' : 'post',
-				url: isEdit ? this.sections[1].urlUpdate : this.sections[1].urlCreate,
+					data: this.attrForm,
-				method: isEdit ? 'put' : 'post',
-				data: this.attrForm,
-			});
-
-			if (res.code == 0) {
-				this.closeAttrForm();
-				this.$message({
-					message: `${isEdit ? '更新' : '创建'}成功`,
-					type: 'success',
-					duration: 1500,
-					onClose: () => {
-						this.getAttrList();
-					},
 				});
-			}
+
-			this.attrFormSubmitting = false;
+				if (res.code == 0) {
+					this.closeAttrForm();
+					this.$message({
+						message: `${isEdit ? '更新' : '创建'}成功`,
+						type: 'success',
+						duration: 1500,
+						onClose: () => {
+							this.getAttrList();
+						},
+					});
+				}
+				this.attrFormSubmitting = false;
+			});
 		},
 
 		closeAttrForm() {

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

@@ -45,6 +45,7 @@
 		<BasicDrawer
 			v-if="editVisible"
 			ref="drawer"
+			size="45%"
 			:default-mode="editMode"
 			:data-id="alarmForm.id"
 			:sections="[
@@ -224,7 +225,9 @@ export default {
 						bind: {
 							filterable: true,
 						},
-						rules: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '设备不能为空', trigger: 'blur' },
+						],
 					},
 				],
 				[
@@ -238,7 +241,9 @@ export default {
 						bind: {
 							filterable: true,
 						},
-						rules: [{ required: true, message: '报警分组不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '报警分组不能为空', trigger: 'blur' },
+						],
 					},
 				],
 			],
@@ -269,7 +274,13 @@ export default {
 						input: true,
 						label: '设备分组名称',
 						prop: 'name',
-						rules: [{ required: true, message: '设备分组名称不能为空', trigger: 'blur' }],
+						rules: [
+							{
+								required: true,
+								message: '设备分组名称不能为空',
+								trigger: 'blur',
+							},
+						],
 						// bind: {
 						// 	disabled: this.editMode == 'detail', // some condition, like detail mode...
 						// }
@@ -287,26 +298,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: '报警内容' },
 			],
 		};
 	},
@@ -361,6 +369,19 @@ export default {
 			};
 			this.resetForm('form');
 		},
+		handleTableBtnClick({ data, type }) {
+			switch (type) {
+				case 'edit':
+					this.handleDetail(data, 'edit');
+					break;
+				case 'delete':
+					this.handleDelete(data);
+					break;
+				case 'detail':
+					this.handleDetail(data);
+					break;
+			}
+		},
 		/** 搜索按钮操作 */
 		handleQuery() {
 			this.queryParams.pageNo = 1;
@@ -411,11 +432,11 @@ export default {
 			});
 		},
 		// 查看报警
-		handleDetail(row) {
+		handleDetail(row, mode = 'detail') {
 			const { equipmentId, equipmentName, groupCode, groupId, groupName, id } =
 				row;
 			// 打开抽屉
-			this.editMode = 'detail';
+			this.editMode = mode;
 			this.alarmForm.id = groupId;
 			this.alarmForm.equipmentGroupCode = groupCode;
 			this.alarmForm.equipmentGroupName = groupName;

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

@@ -52,6 +52,7 @@
 		<BasicDrawer
 			v-if="editVisible"
 			ref="drawer"
+			size="45%"
 			:default-mode="editMode"
 			:info-data="alarmForm"
 			:sections="[
@@ -59,6 +60,10 @@
 					name: '基本信息',
 					key: 'base',
 					rows: drawerBaseInfoRows,
+					url: '/base/equipment-plc-connect/get',
+					urlUpdate: '/base/equipment-plc-connect/update',
+					urlCreate: '/base/equipment-plc-connect/create',
+					queryParams: { id: alarmForm.id },
 				},
 				{
 					name: '采集参数',
@@ -189,7 +194,7 @@ export default {
 					placeholder: '请选择设备',
 					param: 'equipmentId',
 					selectOptions: [],
-					filterable: true
+					filterable: true,
 				},
 				{
 					type: 'select',
@@ -197,7 +202,7 @@ export default {
 					placeholder: '请选择关联表编码',
 					param: 'plcId',
 					selectOptions: [],
-					filterable: true
+					filterable: true,
 				},
 				{
 					type: 'button',
@@ -311,8 +316,8 @@ export default {
 					label: '生产参数类型',
 					filter: (val) =>
 						val != null
-							// ? ['', '进片数量', '出片数量', '破损数量', '无类型', ''][val]
+							? // ? ['', '进片数量', '出片数量', '破损数量', '无类型', ''][val]
-							? ['', '进口计数', '出口计数', '损耗计数', '无类型', ''][val]
+							  ['', '进口计数', '出口计数', '损耗计数', '无类型', ''][val]
 							: '-',
 				},
 				{
@@ -423,6 +428,19 @@ export default {
 			};
 			this.resetForm('form');
 		},
+		handleTableBtnClick({ data, type }) {
+			switch (type) {
+				case 'edit':
+					this.handleDetail(data, 'edit');
+					break;
+				case 'delete':
+					this.handleDelete(data);
+					break;
+				case 'detail':
+					this.handleDetail(data);
+					break;
+			}
+		},
 		/** 搜索按钮操作 */
 		handleQuery() {
 			this.queryParams.pageNo = 1;
@@ -474,7 +492,7 @@ export default {
 		},
 
 		// 查看报警
-		handleDetail(row) {
+		handleDetail(row, mode = 'detail') {
 			// debugger;
 			const {
 				id,
@@ -490,7 +508,7 @@ export default {
 				workshopSection,
 			} = row;
 			// 打开抽屉
-			this.editMode = 'detail';
+			this.editMode = mode;
 			this.alarmForm.id = id;
 			this.alarmForm.plcTableName = plcTableName; // 关联表名
 			this.alarmForm.equipmentName = equipmentName;

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

@@ -12,7 +12,7 @@
 		:wrapper-closable="false"
 		class="drawer"
 		custom-class="mes-drawer"
-		size="60%"
+		:size="size || '50%'"
 		@closed="$emit('destroy')">
 		<SmallTitle slot="title">
 			{{
@@ -42,7 +42,8 @@
 							v-model="form"
 							:rows="formRows" /> -->
 
-						<el-row style="margin-bottom: 24px">
+						<!-- if  -->
+						<el-row v-if="mode.includes('detail')" style="margin-bottom: 24px">
 							<el-col :span="8">
 								<div
 									class="title"
@@ -64,13 +65,39 @@
 								</div>
 							</el-col>
 						</el-row>
+						<!-- else  -->
+						<el-row v-else style="margin-bottom: 24px" :gutter="20">
+							<el-form ref="form" :model="form">
+								<el-col :span="8">
+									<el-form-item
+										class="title"
+										label="设备名"
+										style="font-size: 16px; margin: 8px 0">
+										<el-input
+											v-model="form.equipmentName"
+											placeholder="请输入设备名"></el-input>
+									</el-form-item>
+								</el-col>
+								<el-col :span="8">
+									<el-form-item
+										class="title"
+										label="设备关联表名"
+										style="font-size: 16px; margin: 8px 0">
+										<el-input
+											v-model="form.plcTableName"
+											placeholder="请输入关联表名"></el-input>
+									</el-form-item>
+								</el-col>
+							</el-form>
+						</el-row>
 					</div>
 
 					<div
 						v-if="section.key == 'attrs'"
 						style="position: relative; margin-top: 12px">
-						<!-- v-if="!mode.includes('detail')" -->
+						<div
-						<div style="position: absolute; top: -40px; right: 0">
+							v-if="!mode.includes('detail')"
+							style="position: absolute; top: -40px; right: 0">
 							<el-button @click="handleAddAttr" type="text">
 								<i class="el-icon-plus"></i>
 								添加属性
@@ -86,7 +113,7 @@
 							<!-- :add-button-show="mode.includes('detail') ? null : '添加属性'"
 							@emitButtonClick="handleAddAttr" -->
 							<method-btn
-								v-if="section.tableBtn"
+								v-if="section.tableBtn && !mode.includes('detail')"
 								slot="handleBtn"
 								label="操作"
 								:method-list="tableBtn"
@@ -106,10 +133,12 @@
 
 			<div class="drawer-body__footer">
 				<el-button style="" @click="handleCancel">取消</el-button>
-				<!-- <el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+				<el-button
-					编辑
+					type="primary"
-				</el-button> -->
+					v-if="!mode.includes('detail')"
-				<!-- <el-button v-else type="primary" @click="handleCancel">确定</el-button> -->
+					@click="handleSave">
+					保存
+				</el-button>
 			</div>
 		</div>
 
@@ -164,7 +193,7 @@ const SmallTitle = {
 
 export default {
 	components: { SmallTitle, DialogForm: BaseInfoForm, BaseInfoForm },
-	props: ['sections', 'defaultMode', 'infoData'],
+	props: ['sections', 'defaultMode', 'infoData', 'size'],
 	data() {
 		return {
 			mode: '',
@@ -412,7 +441,7 @@ export default {
 		handleSave() {
 			this.$refs['form'][0].validate(async (valid) => {
 				if (valid) {
-					const isEdit = this.mode == 'edit';
+					const isEdit = !this.mode.includes('detail');
 					await this.$axios({
 						url: this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
 						method: isEdit ? 'put' : 'post',

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/addRecord.vue

@@ -7,13 +7,14 @@
 
 <template>
 	<el-drawer
+		ref="drawer"
 		:visible.sync="visible"
 		:show-close="false"
 		:wrapper-closable="false"
 		class="drawer"
 		size="60%">
 		<small-title slot="title" :no-padding="true">
-			{{ isdetail ? '查看详情' : '新增' }}
+			{{ isdetail ? '查看详情' : !dataForm.id ? '新增' : '编辑' }}
 		</small-title>
 		<el-form
 			ref="dataForm"
@@ -77,9 +78,9 @@
 					<el-form-item label="巡检时间" prop="actualTime">
 						<el-date-picker
 							v-model="dataForm.actualTime"
-							type="date"
+							type="datetime"
 							:disabled="isdetail"
-							format='yyyy-MM-dd'
+							format='yyyy-MM-dd HH:mm:ss'
 							value-format="timestamp"
 							placeholder="选择巡检时间" />
 					</el-form-item>
@@ -93,20 +94,20 @@
 					:table-data="list" />
 			</el-form-item>
 			<el-form-item label="巡检详情" prop="description">
-				<editor v-model="dataForm.description" :read-only="isdetail" :min-height="380"/>
+				<editor v-model="dataForm.description" :read-only="isdetail" :min-height="150"/>
 			</el-form-item>
 			<el-form-item label="附件">
-				<FileUpload v-model="file" :disabled="isdetail" />
+				<FileUpload v-model="file" :limit="1" :f-name="fileName" :disabled="isdetail" @name="setFileName" />
 			</el-form-item>
 			
 		</el-form>
 
 		<div class="drawer-body__footer">
-			<el-button type="primary" @click="goback()">取消</el-button>
+			<el-button type="primary" @click="goback()">{{ isdetail ? '关闭' : '取消' }}</el-button>
-			<el-button v-if="isdetail" type="primary" @click="goEdit()">
+			<!-- <el-button v-if="isdetail" type="primary" @click="goEdit()">
 				编辑
-			</el-button>
+			</el-button> -->
-			<el-button v-else type="primary" @click="dataFormSubmit()">确定</el-button>
+			<el-button v-if="!isdetail" type="primary" @click="dataFormSubmit()">确定</el-button>
 		</div>
 	</el-drawer>
 </template>
@@ -184,6 +185,7 @@ export default {
 				total: 0,
 			},
 			file: '',
+			fileName: '',
 			dataRule: {
         responsible: [{ required: true, message: "巡检人不能为空", trigger: "blur" }],
         actualTime: [{ required: true, message: "巡检时间不能为空", trigger: "blur" }]
@@ -194,6 +196,9 @@ export default {
 		this.getDict()
 	},
 	methods: {
+		setFileName(val) {
+			this.fileName = val
+		},
 		async getDict() {
 			const res = await getEquipmentAll()
 			this.eqList = res.data
@@ -232,6 +237,8 @@ export default {
 				files: []
 			}
 			this.list = []
+			this.file = ''
+			this.fileName = ''
 		},
 		init(id, isdetail) {
 			this.initData();
@@ -239,6 +246,10 @@ export default {
 			this.dataForm.id = id || undefined;
 			this.visible = true;
 
+			// const scrollContainer = this.$refs.dataForm;
+			// const scrollPosition = scrollContainer.scrollTop;
+			// console.log('12', scrollPosition);
+
 			this.$nextTick(() => {
 				this.$refs['dataForm'].resetFields();
 
@@ -247,6 +258,11 @@ export default {
 					getEqCheckLog(this.dataForm.id).then(response => {
 						this.formLoading = false
             this.dataForm = response.data;
+						if (this.dataForm.files.length > 0) {
+							this.file = this.dataForm.files[0].fileUrl
+							this.fileName = this.dataForm.files[0].fileName
+						}
+						this.setConfig()
           });
 				} else {
 					// if (this.urlOptions.isGetCode) {
@@ -283,8 +299,9 @@ export default {
 				if (this.file) {
 					const temp = this.file.split(',') // 获取文件个数
 					let arry = []
-					temp.forEach(item => {
+					temp.forEach((item, index) => {
 						arry.push({
+							fileName: this.fileName,
 							fileType: 2,
 							fileUrl: item
 						})

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

@@ -69,7 +69,7 @@ export default {
 	data() {
 		return {
 			addOrUpdateVisible: false,
-			searchBarKeys: ['equipmentId', 'createTime'],
+			searchBarKeys: ['equipmentId', 'actualTime'],
 			tableBtn: [
 				this.$auth.hasPermi('equipment:check-record:detail')
 					? {
@@ -105,6 +105,7 @@ export default {
 					label: '设备',
 					placeholder: '请选择设备',
 					param: 'equipmentId',
+					filterable: true
 				},
 				// 开始结束时间 
 				{
@@ -112,12 +113,12 @@ export default {
 					label: '时间段',
 					dateType: 'daterange', // datetimerange
 					format: 'yyyy-MM-dd',
-					valueFormat: 'timestamp',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始日期',
 					endPlaceholder: '结束日期',
 					defaultTime: ['00:00:00', '23:59:59'],
-					param: 'startTime',
+					param: 'actualTime',
 					// width: 350,
 				},
 				{

src/views/equipment/base/inspection/Settings/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-09 11:09:26
+ * @LastEditTime: 2023-11-27 10:48:55
  * @Description:
 -->
 <template>
@@ -52,11 +52,10 @@
 
 				<div v-if="!isdetail" class="action_btn">
 					<template>
-						<span style="display: inline-block;" @click="addNew()">
+            <span style="display: inline-block;">
-							<svg-icon style="width: 14px; height: 14px" class="item-icon" icon-class="table_add" />
+              <el-button type="text" @click="addNew()" icon="el-icon-plus">添加</el-button>
-							<span class="add">添加</span>
+            </span>
-						</span>
+          </template>
-					</template>
 				</div>
 				<base-table
 					:table-props="tableProps"
@@ -177,11 +176,7 @@ export default {
 		handleClick(raw) {
 			if (raw.type === 'delete') {
 				this.$confirm(
-					`确定对${
+					`是否确认删除巡检项目名称为"${raw.data.program}"的数据项?`,
-						raw.data.attrName
-							? '[名称=' + raw.data.attrName + ']'
-							: '[序号=' + raw.data._pageIndex + ']'
-					}进行删除操作?`,
 					'提示',
 					{
 						confirmButtonText: '确定',
@@ -290,7 +285,7 @@ export default {
 
 .drawer >>> .visual-part {
 	flex: 1 auto;
-	max-height: 76vh;
+	max-height: 16vh;
 	overflow: hidden;
 	overflow-y: scroll;
 	padding-right: 10px; /* 调整滚动条样式 */
@@ -308,7 +303,7 @@ export default {
 }
 .action_btn {
   float: right;
-  margin: 5px 15px;
+  margin: -40px 15px;
   font-size: 14px;
 }
 .add {

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

@@ -0,0 +1,105 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2023-11-25 16:23:13
+ * @Description:
+-->
+<template>
+	<el-form
+		:model="dataForm"
+		:rules="dataRule"
+		ref="dataForm"
+		@keyup.enter.native="dataFormSubmit()"
+		label-width="80px">
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="配置名称" prop="name">
+					<el-input
+						v-model="dataForm.name"
+						placeholder="请输入配置名称" />
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="配置编码" prop="code">
+					<el-input
+						v-model="dataForm.code"
+						placeholder="请输入配置编码" />
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="设备名称" prop="equipmentId">
+					<el-select
+						v-model="dataForm.equipmentId"
+						filterable
+						style="width: 100%"
+						placeholder="请选择设备名称"
+						@change="setCode">
+						<el-option
+							v-for="dict in eqList"
+							:key="dict.id"
+							:label="dict.name"
+							:value="dict.id" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="设备编码" prop="equipmentCode">
+						<el-input v-model="dataForm.equipmentCode" disabled placeholder="请输入设备编码" />
+					</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import basicAdd from '../../../../core/mixins/basic-add';
+import { getEqCheck, getCode, createCheckConfig, updateCheckConfig } from "@/api/equipment/base/inspection/settings";
+import { getEquipmentAll } from '@/api/base/equipment'
+
+export default {
+	mixins: [basicAdd],
+	data() {
+		return {
+			urlOptions: {
+			  isGetCode: true,
+        codeURL: getCode,
+				createURL: createCheckConfig,
+				updateURL: updateCheckConfig,
+				infoURL: getEqCheck,
+			},
+			dataForm: {
+        id: undefined,
+        code: undefined,
+        name: undefined,
+        equipmentId: undefined,
+				equipmentCode: undefined
+			},
+			eqList: [],
+			dataRule: {
+				equipmentId: [{ required: true, message: "设备不能为空", trigger: "blur" }],
+        code: [{ required: true, message: "配置编码不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "配置名称不能为空", trigger: "blur" }],
+      }
+		};
+	},
+	mounted() {
+		this.getDict()
+	},
+	methods: {
+		async getDict() {
+			// 设备列表
+			const res = await getEquipmentAll()
+			this.eqList = res.data
+		},
+		setCode() {
+			const chooseM = this.eqList.filter(item => {
+				return item.id === this.dataForm.equipmentId
+			})
+			this.dataForm.equipmentCode = chooseM[0].code
+		}
+	},
+};
+</script>

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

@@ -36,14 +36,10 @@
 			:dialogVisible="open"
 			@close="cancel"
 			@cancel="cancel"
-			@confirm="submitForm">
+			@confirm="handleConfirm">
-			<DialogForm
+			<add
-				v-if="open"
+				ref="add"
-				ref="form"
+				@refreshDataList="successSubmit" />
-				v-model="form"
-				:disabled="mode == 'detail'"
-				:has-files="false"
-				:rows="rows" />
 		</base-dialog>
 		<!-- 添加巡检，查看详情 -->
 		<addOrUpdata
@@ -54,15 +50,15 @@
 </template>
 
 <script>
-import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import addOrUpdata from './add-or-updata.vue';
+import add from './add.vue'
 // import { publicFormatter } from '@/utils/dict';
 // const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
 export default {
 	name: 'EquipmentCheckSetting',
-	components: { addOrUpdata },
+	components: { addOrUpdata, add },
 	mixins: [basicPageMixin],
 	data() {
 		return {
@@ -101,9 +97,9 @@ export default {
 				{ prop: 'lineName', label: '产线' },
 				{ prop: 'sectionName', label: '工段' },
 				{ prop: 'equipmentName', label: '设备' },
-				{ prop: 'responsible', label: '负责人' },
+				{ prop: 'equipmentCode', label: '设备编码' },
-				{ prop: 'equipmentCode', label: '描述' },
+				// { prop: 'responsible', label: '负责人' },
-				{ prop: 'checkNumber', label: '巡检条数' } // TODO: 操作 选项，四个，群里询问
+				{ prop: 'checkNumber', label: '巡检条数' }, // TODO: 操作 选项，四个，群里询问
 			],
 			searchBarFormConfig: [
 				{
@@ -117,6 +113,7 @@ export default {
 					label: '设备名称',
 					placeholder: '请选择设备',
 					param: 'equipmentId',
+					filterable: true,
 				},
 				{
 					type: 'button',
@@ -151,14 +148,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 +168,13 @@ export default {
 						label: '设备名称',
 						prop: 'equipmentId',
 						url: '/base/core-equipment/listAll',
-						rules: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
+						bind: {
+							filterable: true,
+							clearable: true,
+						},
+						rules: [
+							{ required: true, message: '设备名称不能为空', trigger: 'change' },
+						],
 					},
 					{
 						input: true,
@@ -196,6 +203,13 @@ export default {
 		this.getList();
 	},
 	methods: {
+		handleConfirm() {
+      this.$refs.add.dataFormSubmit()
+    },
+		successSubmit() {
+      this.cancel()
+      this.getList()
+    },
 		initSearchBar() {
 			this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
 				this.$set(
@@ -220,9 +234,10 @@ export default {
 		},
 		/** 取消按钮 */
 		cancel() {
+			this.$refs.add.formClear()
 			this.open = false;
-			this.mode = null;
+			this.title = ''
-			this.reset();
+			// this.reset();
 		},
 		/** 表单重置 */
 		reset() {
@@ -247,18 +262,26 @@ export default {
 		},
 		/** 新增按钮操作 */
 		handleAdd() {
-			this.reset();
+			// this.reset();
 			this.open = true;
 			this.title = '添加巡检设置';
+			this.$nextTick(() => {
+				this.$refs.add.init();
+			});
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
-			this.reset();
+			// this.reset();
-			const id = row.id;
+			// const id = row.id;
-			this.info({ id }).then((response) => {
+			// this.info({ id }).then((response) => {
-				this.form = response.data;
+			// 	this.form = response.data;
-				this.open = true;
+			// 	this.open = true;
-				this.title = '修改巡检设置';
+			// 	this.title = '修改巡检设置';
+			// });
+			this.open = true;
+			this.title = '修改巡检设置';
+			this.$nextTick(() => {
+				this.$refs.add.init(row.id);
 			});
 		},
 		/** 提交按钮 */
@@ -288,9 +311,9 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除记录"' + row.name + '"?')
+				.confirm('是否确认删除配置名为"' + row.name + '"的数据项?')
-				.then(function () {
+				.then(() => {
-					return this.delete({ id });
+					return this.del({ id });
 				})
 				.then(() => {
 					this.getList();
@@ -317,14 +340,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

@@ -45,6 +45,11 @@
 				:disabled="mode == 'detail'"
 				:has-files="true"
 				:rows="rows" />
+			<el-row v-if="mode === 'detail'" slot="footer" type="flex" justify="end">
+				<el-col :span="12">
+					<el-button size="small" class="btnTextStyle" @click="cancel">关闭</el-button>
+				</el-col>
+			</el-row>
 		</base-dialog>
 	</div>
 </template>
@@ -53,7 +58,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 +126,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 +316,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 +406,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 +461,7 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否删除设备名称为"' + row.equipmentName + '"的数据项?')
+				.confirm('是否确认删除设备名称为"' + row.equipmentName + '"的数据项?')
 				.then(function () {
 					return deleteEqMaintainLog(id);
 				})
@@ -456,7 +477,7 @@ export default {
 			this.info({ id }).then((response) => {
 				this.form = response.data;
 				this.open = true;
-				this.title = '修改保养记录';
+				this.title = '查看保养记录详情';
 			});
 		},
 		/** 导出按钮操作 */
@@ -469,10 +490,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">
@@ -146,7 +146,7 @@
 			<el-row :gutter="20">
 				<el-col>
 					<el-form-item label="维修附件" prop="file">
-						<FileUpload v-model="file" :disabled="disabled" />
+						<FileUpload v-model="file" :limit="1" :f-name="fileName" :disabled="disabled" @name="setFileName" />
 					</el-form-item>
 				</el-col>
 			</el-row>
@@ -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',
@@ -204,11 +206,15 @@ export default {
 			visible: false,
 			disabled: false,
 			dataForm: {},
-			file: ''
+			file: '',
+			fileName: ''
 		};
 	},
 	mounted() {},
 	methods: {
+		setFileName(val) {
+			this.fileName = val
+		},
 		goback() {
 			this.$emit('refreshDataList');
 			this.visible = false;
@@ -223,12 +229,15 @@ export default {
 		resetFields(args) {
 			return this.$refs.form.resetFields(args);
 		},
+		initData() {
+			this.file = ''
+			this.fileName = ''
+		},
 		init(row, isdetail) {
-			// this.initData();
+			this.initData();
 			this.disabled = isdetail || false;
 			this.dataForm.id = row.id || undefined;
 			this.visible = true;
-			console.log('111', this.dataForm, row)
 
 			this.$nextTick(() => {
 				this.$refs['form'].resetFields();
@@ -239,6 +248,10 @@ export default {
 						this.formLoading = false
             this.dataForm = response.data;
 						this.dataForm.maintenanceStatus = row.maintenanceStatus || 0
+						if (this.dataForm.files.length > 0) {
+							this.file = this.dataForm.files[0].fileUrl
+							this.fileName = this.dataForm.files[0].fileName
+						}
           });
 				} else {
 					// if (this.urlOptions.isGetCode) {
@@ -259,6 +272,7 @@ export default {
 					let arry = []
 					temp.forEach(item => {
 						arry.push({
+							fileName: this.fileName,
 							fileType: 2,
 							fileUrl: item
 						})

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/addSparts.vue

@@ -75,9 +75,6 @@
 
 		<div class="drawer-body__footer">
 			<el-button type="primary" @click="goback()">关闭</el-button>
-			<el-button v-if="disabled" type="primary" @click="goEdit()">
-				编辑
-			</el-button>
 		</div>
 
 		<attr-add

src/views/equipment/base/spareParts/Config/attr-add.vue

@@ -35,7 +35,7 @@
 		</el-form>
 
 		<el-row style="text-align: right">
-			<el-button @click="visible = false">取消</el-button>
+			<el-button @click="cancel">取消</el-button>
 			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
 		</el-row>
 	</el-dialog>
@@ -79,21 +79,13 @@ export default {
 				this.partList = res.data.list;
 			})
 		},
+		cancel() {
+			this.$refs['dataForm'].resetFields()
+			this.visible = false
+		},
 		init(id) {
-			this.dataForm.id = id || '';
+			// this.dataForm.id = id || '';
 			this.visible = true;
-			// this.$nextTick(() => {
-			// 	this.$refs['dataForm'].resetFields();
-			// 	if (this.dataForm.id) {
-			// 		getCoreProductAttr({
-			// 			id: this.dataForm.id
-			// 		}).then((res) => {
-			// 			const { name, value } = res.data;
-			// 			this.dataForm.name = name;
-			// 			this.dataForm.value = value;
-			// 		});
-			// 	}
-			// });
 		},
 		// 表单提交
 		dataFormSubmit() {
@@ -117,6 +109,7 @@ export default {
 						configId: this.configId,
 					}).then((response) => {
 						this.$modal.msgSuccess('新增成功');
+						this.$refs['dataForm'].resetFields()
 						this.visible = false;
 						this.$emit('refreshDataList');
 					});

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: '备注',
@@ -284,6 +301,12 @@ export default {
 			const id = row.id;
 			this.info({ id }).then((response) => {
 				this.form = response.data;
+				if (this.form.unit !== undefined) {
+					this.form.unit = String(this.form.unit)
+				}
+				if (this.form.type !== undefined) {
+					this.form.type = String(this.form.type)
+				}
 				this.open = true;
 				this.title = '修改备品备件';
 			});

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

@@ -310,7 +310,8 @@ export default {
 		handleClick(raw) {
 			if (raw.type === 'change') {
 				// 更换
-				this.addNew();
+				console.log(raw)
+				this.addNew(raw.data.sparePartId);
 			} else {}
 		},
 		getList() {
@@ -320,7 +321,7 @@ export default {
 				configId: this.dataForm.id,
 			}).then((response) => {
 				this.list = response.data;
-				this.listQuery.total = response.data.total;
+				this.listQuery.total = response.data.length;
 			});
 		},
 		getList1() {
@@ -334,10 +335,10 @@ export default {
 			});
 		},
 		// 新增 / 修改
-		addNew(id) {
+		addNew(sparePartId) {
 			this.addOrUpdateVisible = true;
 			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init(id);
+				this.$refs.addOrUpdate.init(sparePartId);
 			});
 		},
 		/** 导出按钮操作 */

src/views/equipment/base/spareParts/Monitor/attr-add.vue

@@ -25,10 +25,27 @@
 					clearable
 					placeholder="请输入操作人" />
 			</el-form-item>
+			<el-form-item label="更换耗时(min)" prop="timeUsed">
+				<el-input-number
+					v-model="dataForm.timeUsed"
+					controls-position="right"
+					clearable
+					placeholder="请输入更换耗时"
+					style="width: 100%" />
+			</el-form-item>
+			<el-form-item label="更换时间" prop="replacementTime">
+				<el-date-picker
+					v-model="dataForm.replacementTime"
+					type="date"
+					format='yyyy-MM-dd'
+					value-format='timestamp'
+					placeholder="选择入更换时间"
+					style="width: 100%" />
+			</el-form-item>
 		</el-form>
 
 		<el-row style="text-align: right">
-			<el-button @click="visible = false">取消</el-button>
+			<el-button @click="cancel">取消</el-button>
 			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
 		</el-row>
 	</el-dialog>
@@ -49,11 +66,15 @@ export default {
 			visible: false,
 			dataForm: {
 				id: undefined,
-				responsible: ''
+				responsible: '',
+				timeUsed: 0,
+				sparePartId: '',
+				replacementTime: undefined
 			},
 			partList: [],
 			dataRule: {
-				responsible: [{ required: true, message: '操作人不能为空', trigger: 'blur' }]
+				responsible: [{ required: true, message: '操作人不能为空', trigger: 'blur' }],
+				replacementTime: [{ required: true, message: '更换时间不能为空', trigger: 'blur' }]
 			},
 		};
 	},
@@ -66,9 +87,13 @@ export default {
 		// 	this.partList = res.data
 		// },
 		init(id) {
-			this.dataForm.id = id || '';
+			this.dataForm.sparePartId = id || undefined;
 			this.visible = true;
 		},
+		cancel() {
+			this.$refs['dataForm'].resetFields();
+			this.visible = false;
+		},
 		// 表单提交
 		dataFormSubmit() {
 			this.$refs['dataForm'].validate((valid) => {
@@ -91,6 +116,7 @@ export default {
 						configId: this.configId,
 					}).then((response) => {
 						this.$modal.msgSuccess('新增成功');
+						this.$refs['dataForm'].resetFields();
 						this.visible = false;
 						this.$emit('refreshDataList');
 					});

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,143 @@
+<!-- 
+    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() {
+			this.$emit('action', {
+				action: 'search',
+				payload: this.form,
+			});
+		},
+	},
+};
+</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" @action="handleSearchBarActions" />
-			: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,154 +75,104 @@ 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() {
+	mounted() {
-		// this.getList();
+		this.getList();
 	},
 	methods: {
-		handleEmitFun(val) {
+		/**
-			console.log('你好', val)
+		 * 处理表格按钮点击事件
-			if (val.action === '状态可视化') {
+		 * @param {string} action 按钮名称
+		 * @param {object} value 按钮数据(行数据) { equipmentId, equipmentCode, equipmentName, inQuantity, outQuantity, run, status, error, quantityRecordTime, statusRecordTime}
+		 */
+		handleEmitFun({ action, value: row } = {}) {
+			if (action === '状态可视化') {
 				// 状态可视化
-			} else {
+			} else if (action === '参数监控') {
 				// 参数监控
+				// 接口需要 equipmentId recordTime workOrderId 工单id
+				this.$router.push({
+					// path: '/equipment/monitor/full-params',
+					name: 'EquipmentFullParams',
+					params: {
+						equipmentId: row.equipmentId,
+						equipmentCode: row.equipmentCode,
+						equipmentName: row.equipmentName,
+					},
+				});
+			} else {
 			}
 		},
 		/** 查询列表 */
 		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;
@@ -242,9 +190,25 @@ export default {
 		// 	};
 		// 	this.resetForm('form');
 		// },
+		handleSearchBarActions({ action, payload }) {
+			switch (action) {
+				case 'search':
+					this.handleQuery();
+					break;
+				case 'reset':
+					this.resetQuery();
+					break;
+				default:
+					break;
+			}
+		},
 		/** 搜索按钮操作 */
 		handleQuery() {
-			this.queryParams.pageNo = 1;
+			this.queryParams = {
+				...this.queryParams,
+				...this.searchBarForm,
+				pageNo: 1,
+			};
 			this.getList();
 		},
 		/** 重置按钮操作 */
@@ -270,7 +234,7 @@ export default {
 		},
 		/** 提交按钮 */
 		submitForm() {
-			this.$refs.addOrUpdate.dataFormSubmit()
+			this.$refs.addOrUpdate.dataFormSubmit();
 			// this.$refs['form'].validate((valid) => {
 			// 	if (!valid) {
 			// 		return;
@@ -297,8 +261,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/extend/processEquValueBom/add-or-updata.vue

@@ -1,8 +1,13 @@
 <!--
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
+<<<<<<< HEAD
  * @LastEditors: zhp
  * @LastEditTime: 2023-11-28 10:09:20
+=======
+ * @LastEditors: DY
+ * @LastEditTime: 2023-11-27 16:37:17
+>>>>>>> projects/mes-test
  * @Description:
 -->
 <template>