From ae234efb788bca2fa77f700442427996fa7f4aca Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 14 十一月 2024 11:58:00 +0800
Subject: [PATCH] Merge branch 'hc-dataproduct-v1112' into lsf-dataproduct-1024
---
src/views/fysp/check/components/CompProblemAddOrUpd.vue | 226 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 134 insertions(+), 92 deletions(-)
diff --git a/src/views/fysp/check/components/CompProblemAddOrUpd.vue b/src/views/fysp/check/components/CompProblemAddOrUpd.vue
index eaad334..30db7f7 100644
--- a/src/views/fysp/check/components/CompProblemAddOrUpd.vue
+++ b/src/views/fysp/check/components/CompProblemAddOrUpd.vue
@@ -2,7 +2,12 @@
<div class="main-container">
<el-form :model="problem" label-width="auto" style="max-width: 95%">
<el-form-item label="闂绫诲瀷" prop="proType">
- <el-select v-model="proType" @change="onProTypeChange" class="row" :disabled="readonly">
+ <el-select
+ v-model="proType"
+ @change="onProTypeChange"
+ class="row"
+ :disabled="readonly"
+ >
<el-option
v-for="item in problemTypeOptions"
:key="item.typeid"
@@ -42,7 +47,11 @@
</el-select>
</el-form-item>
<el-form-item label="闂寤鸿" prop="advise">
- <el-select v-model="deepCopyProblem.advise" class="row" :disabled="readonly">
+ <el-select
+ v-model="deepCopyProblem.advise"
+ class="row"
+ :disabled="readonly"
+ >
<el-option
v-for="item in adviseOptions"
:key="item.adGuid"
@@ -63,10 +72,18 @@
<div class="t-card_item">
闂鍥剧墖
<div>
- <el-button @click="chosePicFromAnyPic" v-show="!readonly">浠庝换鎰忓浘鐗囬�夊彇</el-button>
- <el-button @click="chosePicFromDevicePic" v-show="!readonly">浠庤澶囧浘鐗囬�夊彇</el-button>
- <el-button @click="chosePicFromLedgerPic" v-show="!readonly">浠庡彴璐﹂�夊彇</el-button>
- <el-button @click="choseChangePic" v-show="!readonly">浠庢枃浠跺す閫夊彇</el-button>
+ <el-button @click="chosePicFromAnyPic" v-show="!readonly"
+ >浠庡満鏅浘鐗囬�夊彇</el-button
+ >
+ <el-button @click="chosePicFromDevicePic" v-show="!readonly"
+ >浠庤澶囧浘鐗囬�夊彇</el-button
+ >
+ <el-button @click="chosePicFromLedgerPic" v-show="!readonly"
+ >浠庡彴璐﹂�夊彇</el-button
+ >
+ <el-button @click="choseChangePic" v-show="!readonly"
+ >浠庢枃浠跺す閫夊彇</el-button
+ >
</div>
</div>
<el-upload
@@ -82,32 +99,35 @@
:disabled="readonly"
accept="image/*"
>
- <el-button type="primary" id="uploadBtnId" style="display: none"></el-button>
+ <el-button
+ type="primary"
+ id="uploadBtnId"
+ style="display: none"
+ ></el-button>
<el-icon v-show="fileList.length != 3">
<Plus />
</el-icon>
</el-upload>
<el-form-item>
- <el-button type="primary" @click="onSubmit" v-show="!readonly">淇濆瓨</el-button>
- <el-button @click="this.$emit('submited', false)" v-show="!readonly">鍙栨秷</el-button>
+ <el-button type="primary" @click="onSubmit" v-show="!readonly"
+ >淇濆瓨</el-button
+ >
+ <el-button @click="this.$emit('submited', false)" v-show="!readonly"
+ >鍙栨秷</el-button
+ >
</el-form-item>
</el-form>
- <el-dialog
- title="浠绘剰鍥剧墖"
- width="80%"
- v-model="anyPhotoDialog"
- :before-close="beforeAnyPhotoDialogclose"
- class="dialog_style"
+
+ <ArbitraryPhoto
+ :max-select="3"
+ v-if="anyPhotoDialog"
+ v-model:dialog-visible="anyPhotoDialog"
+ @selectByAnyPhonoEvent="handleSelectedAnyPhono"
+ :subtask="subtask"
+ :defaultFile="fileList"
+ ref="arbitraryPhotoRef"
>
- <ArbitraryPhoto
- v-if="anyPhotoDialog"
- @selectByAnyPhonoEvent="handleSelectedAnyPhono"
- :subtask="subtask"
- :defaultFile="fileList"
- ref="arbitraryPhotoRef"
- >
- </ArbitraryPhoto>
- </el-dialog>
+ </ArbitraryPhoto>
<el-dialog
title="鍙拌处鍥剧墖"
width="80%"
@@ -216,11 +236,31 @@
month: -1,
ledgerPicDialog: false,
rules: {
- proType: { required: true, message: '闂绫诲瀷涓嶈兘涓虹┖', trigger: 'change' },
- description: { required: true, message: '闂鎻忚堪涓嶈兘涓虹┖', trigger: 'change' },
- locationid: { required: true, message: '闂浣嶇疆涓嶈兘涓虹┖', trigger: 'change' },
- advise: { required: true, message: '闂寤鸿涓嶈兘涓虹┖', trigger: 'change' },
- proRemark: { required: true, message: '琛ュ厖璇存槑涓嶈兘涓虹┖', trigger: 'change' }
+ proType: {
+ required: true,
+ message: '闂绫诲瀷涓嶈兘涓虹┖',
+ trigger: 'change'
+ },
+ description: {
+ required: true,
+ message: '闂鎻忚堪涓嶈兘涓虹┖',
+ trigger: 'change'
+ },
+ locationid: {
+ required: true,
+ message: '闂浣嶇疆涓嶈兘涓虹┖',
+ trigger: 'change'
+ },
+ advise: {
+ required: true,
+ message: '闂寤鸿涓嶈兘涓虹┖',
+ trigger: 'change'
+ },
+ proRemark: {
+ required: true,
+ message: '琛ュ厖璇存槑涓嶈兘涓虹┖',
+ trigger: 'change'
+ }
},
deviceTopTypes: [
{ id: 0, label: '鐩戞帶璁惧' },
@@ -241,13 +281,13 @@
computed: {
descriptionOptions() {
const descriptions = [];
-
+
this.problemTypeList.forEach((item) => {
if (item.typename == this.proType) {
descriptions.push(item);
}
});
-
+
return descriptions;
},
problemTypeOptions() {
@@ -261,7 +301,9 @@
},
adviseOptions() {
var problemGuid = this.currProTypeGuid || this.problem.guid;
- var array = this.suggestions.filter((item) => item.adProblemtypeguid == problemGuid);
+ var array = this.suggestions.filter(
+ (item) => item.adProblemtypeguid == problemGuid
+ );
return array;
}
},
@@ -283,15 +325,15 @@
const newObj = {};
for (const key in obj) {
let newKey = key;
- if (key.startsWith('di')) {
- newKey = key.substring(2);
- } else if (key.startsWith('wi')) {
- newKey = key.substring(2);
- } else if (key.startsWith('pi')) {
- newKey = key.substring(2);
- }
- newKey = newKey.charAt(0).toLowerCase() + newKey.slice(1);
- newObj[newKey] = obj[key];
+ if (key.startsWith('di')) {
+ newKey = key.substring(2);
+ } else if (key.startsWith('wi')) {
+ newKey = key.substring(2);
+ } else if (key.startsWith('pi')) {
+ newKey = key.substring(2);
+ }
+ newKey = newKey.charAt(0).toLowerCase() + newKey.slice(1);
+ newObj[newKey] = obj[key];
}
return newObj;
},
@@ -314,44 +356,46 @@
this.deviceImgObjList = [];
for (const deviceTopTypeElement of this.deviceTopTypes) {
const topTypeId = deviceTopTypeElement.id;
- await deviceApi.fetchDevices(this.subtask.sceneId, topTypeId).then((result) => {
- // 鏍囧噯鍖栧睘鎬у悕
- for (let i = 0; i < result.data.length; i++) {
- var element = this.convertKeys(result.data[i]);
- // 鑾峰彇璁惧鐘舵�佷俊鎭�
- let data = {
- deviceId: element.id,
- sceneId: element.sceneGuid,
- deviceTypeId: topTypeId
- };
- deviceApi
- .fetchDeviceStatus(data)
- .then((status) => {
- var statusData = status.data;
- var imgPaths = [];
+ await deviceApi
+ .fetchDevices(this.subtask.sceneId, topTypeId)
+ .then((result) => {
+ // 鏍囧噯鍖栧睘鎬у悕
+ for (let i = 0; i < result.data.length; i++) {
+ var element = this.convertKeys(result.data[i]);
+ // 鑾峰彇璁惧鐘舵�佷俊鎭�
+ let data = {
+ deviceId: element.id,
+ sceneId: element.sceneGuid,
+ deviceTypeId: topTypeId
+ };
+ deviceApi
+ .fetchDeviceStatus(data)
+ .then((status) => {
+ var statusData = status.data;
+ var imgPaths = [];
- if (statusData) {
- if (statusData.length == 0) {
- this.deviceImgObjList.push(element);
- return;
- }
- element = this.convertKeys(result.data[i]);
- for (let j = 0; j < statusData.length; j++) {
- // 澶嶅埗鍑轰竴涓澶囧璞�
- var newDevice = useCloned(element).cloned.value;
- const statusItem = statusData[j];
- // 璁惧瀵硅薄娣诲姞涓�涓睘鎬у垪琛ㄥ睘鎬х敤鏉ヤ繚瀛樿澶囩姸鎬�
- this.saveStatus(newDevice, statusItem);
- newDevice.dlLocation = statusItem.dlLocation;
- newDevice.topTypeId = topTypeId;
+ if (statusData) {
+ if (statusData.length == 0) {
+ this.deviceImgObjList.push(element);
+ return;
+ }
+ element = this.convertKeys(result.data[i]);
+ for (let j = 0; j < statusData.length; j++) {
+ // 澶嶅埗鍑轰竴涓澶囧璞�
+ var newDevice = useCloned(element).cloned.value;
+ const statusItem = statusData[j];
+ // 璁惧瀵硅薄娣诲姞涓�涓睘鎬у垪琛ㄥ睘鎬х敤鏉ヤ繚瀛樿澶囩姸鎬�
+ this.saveStatus(newDevice, statusItem);
+ newDevice.dlLocation = statusItem.dlLocation;
+ newDevice.topTypeId = topTypeId;
- this.deviceImgObjList.push(newDevice);
+ this.deviceImgObjList.push(newDevice);
+ }
}
- }
- })
- .catch((err) => {});
- }
- });
+ })
+ .catch((err) => {});
+ }
+ });
}
},
initOptions() {
@@ -385,7 +429,10 @@
this.deepCopyProblem.description = currDescription;
this.proRemark = '';
} else {
- currDescription = currProName.substring(0, currProName.lastIndexOf('('));
+ currDescription = currProName.substring(
+ 0,
+ currProName.lastIndexOf('(')
+ );
this.problemTypeList.forEach((item) => {
if (item.description === currDescription) {
@@ -478,23 +525,24 @@
this.deepCopyProblem.advise = '';
},
findProByProDesName(name) {
- let result
- this.problemTypeList.forEach(item=>{
+ let result;
+ this.problemTypeList.forEach((item) => {
if (item.description == name) {
result = item;
}
- })
- return result
+ });
+ return result;
},
onProDesChange(value) {
- let currPro = this.findProByProDesName(value)
+ let currPro = this.findProByProDesName(value);
this.deepCopyProblem.advise = '';
this.currProTypeGuid = currPro.guid;
// this.deepCopyProblem.description = currPro.description;
this.changeProblemname();
this.deepCopyProblem.advise = '';
- var adName = this.adviseOptions.length == 0 ? '' : this.adviseOptions[0].adName;
+ var adName =
+ this.adviseOptions.length == 0 ? '' : this.adviseOptions[0].adName;
this.deepCopyProblem.advise = adName;
},
onProLocationChange(value) {
@@ -572,7 +620,9 @@
delete deepCopyPro['description'];
deepCopyPro.proName = deepCopyPro.problemname;
delete deepCopyPro['problemname'];
- deepCopyPro.ptGuid = that.findProTypeByGuid(that.currProTypeGuid).guid;
+ deepCopyPro.ptGuid = that.findProTypeByGuid(
+ that.currProTypeGuid
+ ).guid;
deepCopyPro.locationId = deepCopyPro.locationid;
delete deepCopyPro['locationid'];
data.append('problemVo', JSON.stringify(deepCopyPro));
@@ -682,14 +732,6 @@
}
.row {
width: 100%;
-}
-::v-deep .el-dialog {
- --el-dialog-margin-top: 2vh;
- height: 98vh;
-}
-::v-deep .el-dialog__body {
- width: 95%;
- height: 100%;
}
::v-deep .el-upload-list--picture-card .el-upload-list__item-thumbnail {
object-fit: cover !important;
--
Gitblit v1.9.3