update

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/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/base/alarm/Record/AddOrUpdate.vue

@@ -7,27 +7,30 @@
 -->
 <template>
 	<div class="alarm-handle">
-		<DialogForm
+		<el-skeleton v-if="loading" />
-			ref="orderForm"
+		<div v-else>
-			key="orderForm"
+			<DialogForm
-			v-model="orderForm"
+				ref="orderForm"
-			:disabled="readOnly"
+				key="orderForm"
-			:has-files="false"
+				v-model="orderForm"
-			label-position="top"
+				:disabled="readOnly"
-			:rows="orderFormRows" />
+				:has-files="false"
+				label-position="top"
+				:rows="orderFormRows" />
 
-		<small-title style="margin: 16px 0" :no-padding="true" size="sm">
+			<small-title style="margin: 16px 0" :no-padding="true" size="sm">
-			处理方式
+				处理方式
-		</small-title>
+			</small-title>
 
-		<DialogForm
+			<DialogForm
-			key="handleMethodForm"
+				key="handleMethodForm"
-			ref="handleMethodForm"
+				ref="handleMethodForm"
-			v-model="handleMethodForm"
+				v-model="handleMethodForm"
-			:disabled="readOnly"
+				:disabled="readOnly"
-			:has-files="true"
+				:has-files="true"
-			label-position="top"
+				label-position="top"
-			:rows="handleMethodFormRows" />
+				:rows="handleMethodFormRows" />
+		</div>
 	</div>
 </template>
 
@@ -43,6 +46,7 @@ export default {
 	components: { SmallTitle, DialogForm, Editor },
 	data() {
 		return {
+			loading: false,
 			orderForm: {
 				id: null,
 				equipment: null,
@@ -82,6 +86,9 @@ export default {
 						label: '处理人',
 						prop: 'hander',
 						url: '/base/core-worker/listAll',
+						bind: {
+							multiple: true,
+						},
 						rules: [
 							{ required: true, message: '类型名称不能为空', trigger: 'blur' },
 						],
@@ -122,9 +129,14 @@ export default {
 		};
 	},
 	mounted() {
-		this.getDict().then(() => {
+		this.loading = true;
-			this.init();
+		this.getDict()
-		});
+			.then(() => {
+				this.init();
+			})
+			.catch((err) => {
+				this.loading = false;
+			});
 	},
 	methods: {
 		/**
@@ -139,8 +151,9 @@ export default {
 		 * 初始化
 		 */
 		async init() {
-			this.initTop();
+			await this.initTop();
-			this.initDown();
+			await this.initDown();
+			this.loading = false;
 		},
 
 		/**
@@ -172,16 +185,19 @@ export default {
 				this.$msgError('缺少报警日志id');
 				this.$emit('close');
 			}
-			const url = '/base/equipment-alarm-hand/get';
+			const url = '/base/equipment-alarm-hand/page'; // 经沟通，此处采用page接口的第一个返回值
 			const { data, code } = await this.$axios({
 				url: url,
 				method: 'get',
 				params: {
-					id: this.logId,
+					logId: this.logId,
 				},
 			});
 			if (code == 0) {
-				this.handleMethodForm = data;
+				this.handleMethodForm = {
+					...data.list[0],
+					hander: data.list[0]?.hander?.split(',') || '',
+				};
 			}
 		},
 
@@ -213,7 +229,11 @@ export default {
 			const { code, data } = await this.$axios({
 				url: url + (this.handleMethodForm.id ? '/update' : '/create'),
 				method: this.handleMethodForm.id ? 'put' : 'post',
-				data: { ...this.handleMethodForm, logId: this.logId },
+				data: {
+					...this.handleMethodForm,
+					hander: this.handleMethodForm.hander?.join(',') || '',
+					logId: this.logId,
+				},
 			});
 			if (code == 0) {
 				return true;