Merge pull request 'projects/mes-dy' (#90) from projects/mes-dy into projects/mes-test

Reviewed-on: #90

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

@@ -1,7 +1,7 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-11-08 15:56:52
- * @LastEditTime: 2023-11-13 09:15:17
+ * @LastEditTime: 2023-11-16 20:15:02
  * @LastEditors: DY
  * @Description: 
  */
@@ -60,3 +60,11 @@ export function getcheckConfigByEqList(query) {
     params: query
   })
 }
+
+// 删除设备巡检记录
+export function deleteEqCheckLog(id) {
+  return request({
+    url: '/base/equipment-check-log/delete?id=' + id,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,16 @@
+/*
+ * @Author: Do not edit
+ * @Date: 2023-11-08 15:56:52
+ * @LastEditTime: 2023-11-16 20:22:12
+ * @LastEditors: DY
+ * @Description: 
+ */
+import request from '@/utils/request'
+
+// 删除设备保养记录
+export function deleteEqMaintainLog(id) {
+  return request({
+    url: '/base/equipment-maintain-log/delete?id=' + id,
+    method: 'delete'
+  })
+}

src/api/equipment/base/repair.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-11-10 16:09:33
- * @LastEditTime: 2023-11-10 16:50:08
+ * @LastEditTime: 2023-11-16 18:57:08
  * @LastEditors: DY
  * @Description: 
  */
@@ -23,3 +23,11 @@ export function updateEqRepair(data) {
     data: data
   })
 }
+
+// 删除维修记录
+export function deleteRepair(id) {
+  return request({
+    url: '/base/equipment-repair-log/delete?id=' + id,
+    method: 'delete'
+  })
+}

src/api/equipment/base/spare-parts/config.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-11-11 16:18:57
- * @LastEditTime: 2023-11-11 17:28:54
+ * @LastEditTime: 2023-11-16 20:52:06
  * @LastEditors: DY
  * @Description: 
  */
@@ -49,3 +49,20 @@ export function getSparePartList(query) {
     params: query
   })
 }
+
+// 删除设备备品备件配置
+export function deleteConfig(id) {
+  return request({
+    url: '/base/equipment-spare-part-config/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得备品备件分页
+export function getSparePartPage(query) {
+  return request({
+    url: '/base/equipment-spare-part/page',
+    method: 'get',
+    params: query
+  })
+}

src/views/base/coreEquipment/index.vue

@@ -17,7 +17,7 @@
 		<!-- 对话框(添加) -->
 		<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" :dataForm="form"
+			<DialogForm v-if="open" key="index-dialog-form" ref="form" label-position="top" size="small" v-model="form"
 				:rows="computedRows" />
 		</base-dialog>
 

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

@@ -38,7 +38,7 @@
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
+			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
 		</base-dialog>
 
 		<!-- 抽屉 详情 -->

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

@@ -38,7 +38,7 @@
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
+			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
 		</base-dialog>
 
 		<!-- 抽屉 详情 -->

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

@@ -49,7 +49,8 @@
 							filterable
 							:disabled="isdetail"
 							style="width: 100%"
-							placeholder="请选择巡检配置">
+							placeholder="请选择巡检配置"
+							@change="setInspectionContet">
 							<el-option
 								v-for="dict in configList"
 								:key="dict.id"
@@ -107,20 +108,15 @@
 			</el-button>
 			<el-button v-else type="primary" @click="dataFormSubmit()">确定</el-button>
 		</div>
-
-		<!-- <attr-add
-			v-if="addOrUpdateVisible"
-			ref="addOrUpdate"
-			:config-id="dataForm.id"
-			@refreshDataList="getList" /> -->
 	</el-drawer>
 </template>
 
 <script>
 import SmallTitle from '../../../base/alarm/Record/SmallTitle.vue';
-import { createCheckLog, updateCheckLog,  getcheckAllList, getcheckConfigByEqList, getEqCheckLog } from '@/api/equipment/base/inspection/record'
+import { createCheckLog, updateCheckLog, getcheckConfigByEqList, getEqCheckLog } from '@/api/equipment/base/inspection/record'
 import { getEquipmentAll } from '@/api/base/equipment'
 import Editor from "@/components/Editor";
+import { getCheckDetPage } from "@/api/equipment/base/inspection/settings";
 // import FileUpload from "@/components/FileUpload";
 // import { parseTime } from '../../../../core/mixins/code-filter';
 // import attrAdd from './attr-add';
@@ -176,7 +172,8 @@ export default {
 				equipmentId: undefined,
 				actualTime: undefined,
 				responsible: undefined,
-				description: undefined
+				description: undefined,
+				files: []
 			},
 			list: [],
 			eqList: [],
@@ -224,8 +221,20 @@ export default {
 		resetFields(args) {
 			return this.$refs.dataForm.resetFields(args);
 		},
+		initData() {
+			this.dataForm = {
+				id: undefined,
+				configId: undefined,
+				equipmentId: undefined,
+				actualTime: undefined,
+				responsible: undefined,
+				description: undefined,
+				files: []
+			}
+			this.list = []
+		},
 		init(id, isdetail) {
-			// this.initData();
+			this.initData();
 			this.isdetail = isdetail || false;
 			this.dataForm.id = id || undefined;
 			this.visible = true;
@@ -247,39 +256,12 @@ export default {
 			});
 			this.formLoading = false
 		},
-		handleClick(raw) {
+		setInspectionContet() {
-			if (raw.type === 'delete') {
+			// 根据巡检配置名称获得巡检配置详细对应巡检内容
-				this.$confirm(
+			getCheckDetPage({
-					`确定要删除名称为${raw.data.sparePartName}的数据?`,
+				pageNo: 1,
-					'提示',
+				pageSize: 99,
-					{
+				configId: this.dataForm.configId,
-						confirmButtonText: '确定',
-						cancelButtonText: '取消',
-						type: 'warning',
-					}
-				)
-					.then(() => {
-						deleteConfigDet(raw.data.id).then(({ data }) => {
-							this.$message({
-								message: '操作成功',
-								type: 'success',
-								duration: 1500,
-								onClose: () => {
-									this.getList();
-								},
-							});
-						});
-					})
-					.catch(() => {});
-			} else {
-				this.addNew(raw.data.id);
-			}
-		},
-		getList() {
-			// 获取巡检内容分页
-			getcheckAllList({
-				...this.listQuery,
-				configId: this.dataForm.id,
 			}).then((response) => {
 				this.list = response.data.list;
 				this.listQuery.total = response.data.total;
@@ -308,6 +290,8 @@ export default {
 						})
 					})
 					this.dataForm.files = arry
+				} else {
+					this.dataForm.files = []
 				}
 
         // 修改的提交

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

@@ -57,7 +57,7 @@
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import addRecord from './addRecord.vue';
-import { exportCheckLogExcel } from '@/api/equipment/base/inspection/record'
+import { exportCheckLogExcel, deleteEqCheckLog } from '@/api/equipment/base/inspection/record'
 import { parseTime } from '../../../../core/mixins/code-filter';
 
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
@@ -349,9 +349,9 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除记录"' + row.name + '"?')
+				.confirm('是否删除设备巡检记录配置名称为"' + row.configName + '"的数据项?')
 				.then(function () {
-					return this.delete({ id });
+					return deleteEqCheckLog(id);
 				})
 				.then(() => {
 					this.getList();

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

@@ -42,7 +42,7 @@
 				v-if="open"
 				ref="form"
 				v-model="form"
-                :disabled="mode == 'detail'"
+        :disabled="mode == 'detail'"
 				:has-files="true"
 				:rows="rows" />
 		</base-dialog>
@@ -53,6 +53,7 @@
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import Editor from '@/components/Editor';
+import { deleteEqMaintainLog } from '@/api/equipment/base/maintain/record'
 
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
@@ -131,7 +132,7 @@ export default {
 					label: '时间段',
 					dateType: 'daterange', // datetimerange
 					format: 'yyyy-MM-dd',
-					valueFormat: 'timestamp',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始日期',
 					endPlaceholder: '结束日期',
@@ -430,9 +431,9 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除记录"' + row.name + '"?')
+				.confirm('是否删除设备保养单号为"' + row.maintainOrderNumber + '"的数据项?')
 				.then(function () {
-					return this.delete({ id });
+					return deleteEqMaintainLog(id);
 				})
 				.then(() => {
 					this.getList();

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

@@ -56,6 +56,7 @@
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import CustomDialogForm from './CustomDialogForm.vue';
+import { deleteRepair } from '@/api/equipment/base/repair'
 
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
@@ -239,7 +240,7 @@ export default {
 			// 表单参数
 			form: {},
 			basePath: '/base/equipment-repair-log',
-			mode: null,
+			mode: null
 		};
 	},
 	created() {
@@ -375,9 +376,9 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除记录"' + row.name + '"?')
+				.confirm('是否确认删除维修单号为"' + row.repairOrderNumber + '"的数据?')
-				.then(function () {
+				.then(() => {
-					return this.delete({ id });
+					return deleteRepair(id);
 				})
 				.then(() => {
 					this.getList();
@@ -411,6 +412,7 @@ export default {
 		},
 		// 处理表格按钮
 		handleTableBtnClick({ data, type }) {
+			console.log('nihc', data, type)
 			switch (type) {
 				case 'edit':
 					this.handleUpdate(data);

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

@@ -188,6 +188,7 @@ export default {
 					getSparePartConfig(this.dataForm.id).then(response => {
 						this.formLoading = false
             this.dataForm = response.data;
+						this.getList()
           });
 				} else {
 					// if (this.urlOptions.isGetCode) {
@@ -257,7 +258,9 @@ export default {
 	padding: 18px;
 }
 .action_btn {
-  float: right;
+  /* float: right; */
+	display: flex;
+	justify-content: right;
   margin: 5px 15px;
   font-size: 14px;
 }

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

@@ -44,7 +44,7 @@
 <script>
 import {
 	createConfigDet,
-	getSparePartList
+	getSparePartPage
 } from  '@/api/equipment/base/spare-parts/config';
 
 export default {
@@ -72,8 +72,12 @@ export default {
 	},
 	methods: {
 		async getDict() {
-			const res = await getSparePartList()
+			await getSparePartPage({
-			this.partList = res.data
+				pageNo: 1,
+				pageSize: 99
+			}).then(res => {
+				this.partList = res.data.list;
+			})
 		},
 		init(id) {
 			this.dataForm.id = id || '';

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

@@ -59,6 +59,7 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { publicFormatter } from '@/utils/dict';
 import Editor from '@/components/Editor';
 import addSparts from './addSparts.vue';
+import { deleteConfig } from '@/api/equipment/base/spare-parts/config'
 
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
@@ -282,7 +283,7 @@ export default {
 			const id = row.id;
 			this.info({ id }).then((response) => {
 				this.form = response.data;
-				this.form.responsible = this.form.responsible.split(',')
+				this.form.responsible = this.form.responsible ? this.form.responsible.split(',') : undefined
 				this.open = true;
 				this.title = '修改备品备件配置';
 			});
@@ -315,9 +316,9 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除记录"' + row.name + '"?')
+				.confirm('是否确认删除配置名为"' + row.name + '"的数据?')
 				.then(function () {
-					return this.delete({ id });
+					return deleteConfig(id);
 				})
 				.then(() => {
 					this.getList();

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

@@ -328,7 +328,7 @@ export default {
 			this.initState();
 
 			const { code, data } = await this.$axios({
-				url: '/analysis/equipment-analysis/quantity',
+				url: '/monitoring/equipment-monitor/quantity-series',
 				method: 'get',
 				params: this.queryParams,
 			});

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

@@ -210,7 +210,7 @@ export default {
 
 		async getList() {
 			const { code, data } = await this.$axios({
-				url: '/analysis/equipment-analysis/status',
+				url: '/monitoring/equipment-monitor/status-series',
 				method: 'get',
 				params: this.queryParams,
 			});