From 0b89c49a1e3ab87368b689d985e28a977a9bb84e Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 22 三月 2024 13:08:20 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/a6-device-management.vue | 88 +++++++++++++++++++++++++-------------------
1 files changed, 50 insertions(+), 38 deletions(-)
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index 57f7967..3e3fd6a 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -149,7 +149,7 @@
</el-date-picker>
</el-form-item>
<el-form-item label="璁惧璐熻矗浜�:" >
- <el-select :disabled="isUp" v-model="formData.equipmentManager" placeholder="璇烽�夋嫨" size="small" style="width:100%">
+ <el-select :disabled="isUp" v-model="formData.getDeviceManager" placeholder="璇烽�夋嫨" size="small" style="width:100%">
<el-option
v-for="item in responsiblePersonList"
:key="item.value"
@@ -160,7 +160,7 @@
</el-select>
</el-form-item>
<el-form-item label="琚巿鏉冧汉:" >
- <el-select :disabled="isUp" v-model="formData.authorizedPerson" size="small" multiple placeholder="璇烽�夋嫨" style="width:100%">
+ <el-select :disabled="isUp" v-model="formData.getDeviceManager" size="small" multiple placeholder="璇烽�夋嫨" style="width:100%">
<el-option
v-for="item in authorizerList"
:key="item.value"
@@ -331,7 +331,7 @@
<el-col :span="7" >
<el-col>
<!-- 鍥剧墖 -->
- <el-image class="img" style="width:100%;height: 320px;marginBottom:16px" :src="javaApi+'/img/'+formData2.imageUpload">
+ <el-image class="img" style="width:100%;height: 320px;margin-bottom:16px" :src="javaApi+'/img/'+formData2.imageUpload">
<div slot="error" class="image-error" style="width: calc(100% -2px);
height: 318px;
border-radius: 16px;
@@ -345,7 +345,7 @@
<!-- 琛ㄥ崟 -->
<el-form :label-position="labelPosition" :model="formData2" label-width="90px">
<el-form-item label="璁惧鍒嗙被:" >
- <el-select :disabled="isUp" v-model="formData2.largeCategory" placeholder="璇烽�夋嫨" size="small" style="width:100%">
+ <el-select v-model="formData2.largeCategory" placeholder="璇烽�夋嫨" size="small" style="width:100%">
<el-option
v-for="item in equipmentList"
:key="item.value"
@@ -358,7 +358,6 @@
<el-form-item label="鍑哄巶鏃ユ湡:">
<el-date-picker
style="width:100%"
- :disabled="isUp"
v-model="formData2.dateProduction"
type="datetime"
size="small"
@@ -368,7 +367,7 @@
</el-date-picker>
</el-form-item>
<el-form-item label="璁惧璐熻矗浜�:" >
- <el-select :disabled="isUp" v-model="formData2.equipmentManager" placeholder="璇烽�夋嫨" size="small" style="width:100%">
+ <el-select v-model="formData2.equipmentManager" placeholder="璇烽�夋嫨" size="small" style="width:100%">
<el-option
v-for="item in responsiblePersonList"
:key="item.value"
@@ -379,7 +378,7 @@
</el-select>
</el-form-item>
<el-form-item label="琚巿鏉冧汉:" >
- <el-select :disabled="isUp" v-model="formData2.authorizedPerson" size="small" multiple placeholder="璇烽�夋嫨" style="width:100%">
+ <el-select v-model="formData2.authorizedPerson" size="small" multiple placeholder="璇烽�夋嫨" style="width:100%">
<el-option
v-for="item in authorizerList"
:key="item.value"
@@ -395,17 +394,16 @@
<el-col :span="7">
<el-form :label-position="labelPosition" :model="formData2" label-width="116px">
<el-form-item label="璁惧鍚嶇О:" >
- <el-input :disabled="isUp" v-model="formData2.deviceName" size="small"></el-input>
+ <el-input v-model="formData2.deviceName" size="small"></el-input>
</el-form-item>
<el-form-item label="鍐呴儴缂栫爜:">
- <el-input :disabled="isUp" v-model="formData2.internalCode" size="small"></el-input>
+ <el-input v-model="formData2.internalCode" size="small"></el-input>
</el-form-item>
<el-form-item label="璧勪骇缂栫爜:" >
- <el-input :disabled="isUp" v-model="formData2.assetCode" size="small"></el-input>
+ <el-input v-model="formData2.assetCode" size="small"></el-input>
</el-form-item>
<el-form-item label="鏍″噯鏃ユ湡锛堟湀锛�:" >
<el-date-picker
- :disabled="isUp"
v-model="formData2.calibrationDate"
type="month"
size="small"
@@ -418,7 +416,6 @@
<el-form-item label="鎶ュ簾鏃堕棿:" >
<el-date-picker
style="width:100%"
- :disabled="isUp"
v-model="formData2.scrapTime"
type="datetime"
format="yyyy-MM-dd HH:mm:ss"
@@ -428,15 +425,14 @@
</el-date-picker>
</el-form-item>
<el-form-item label="楠屾敹璁板綍:" >
- <el-input :disabled="isUp" v-model="formData2.acceptanceRecords" size="small"></el-input>
+ <el-input v-model="formData2.acceptanceRecords" size="small"></el-input>
</el-form-item>
<el-form-item label="鍑哄巶缂栧彿:" >
- <el-input :disabled="isUp" v-model="formData2.factoryNo" size="small"></el-input>
+ <el-input v-model="formData2.factoryNo" size="small"></el-input>
</el-form-item>
<el-form-item label="璐疆鏃ユ湡:" >
<el-date-picker
style="width:100%"
- :disabled="isUp"
v-model="formData2.acquisitionDate"
type="datetime"
size="small"
@@ -446,10 +442,10 @@
</el-date-picker>
</el-form-item>
<el-form-item label="鍑嗙‘搴﹂噺鍊�:" >
- <el-input :disabled="isUp" v-model="formData2.accurateMeasurement" size="small"></el-input>
+ <el-input v-model="formData2.accurateMeasurement" size="small"></el-input>
</el-form-item>
<el-form-item label="澶囨敞:" >
- <el-input :disabled="isUp" v-model="formData2.notes" size="small"></el-input>
+ <el-input v-model="formData2.notes" size="small"></el-input>
</el-form-item>
</el-form>
</el-col>
@@ -457,10 +453,10 @@
<el-col :span="7">
<el-form :label-position="labelPosition" :model="formData2" label-width="110px" ref="ruleForm">
<el-form-item label="瑙勬牸鍨嬪彿:" >
- <el-input :disabled="isUp" v-model="formData2.specificationModel" size="small"></el-input>
+ <el-input v-model="formData2.specificationModel" size="small"></el-input>
</el-form-item>
<el-form-item label="璁惧鐘舵��:">
- <el-select :disabled="isUp" v-model="formData2.deviceStatus" placeholder="璇烽�夋嫨" size="small" style="width:100%">
+ <el-select v-model="formData2.deviceStatus" placeholder="璇烽�夋嫨" size="small" style="width:100%">
<el-option
v-for="item in deviceStatusList"
:key="item.value"
@@ -471,12 +467,11 @@
</el-select>
</el-form-item>
<el-form-item label="瀛樻斁鐐�:" >
- <el-input :disabled="isUp" v-model="formData2.storagePoint" size="small"></el-input>
+ <el-input v-model="formData2.storagePoint" size="small"></el-input>
</el-form-item>
<el-form-item label="鏈�杩戣拷婧棩鏈�:" >
<el-date-picker
style="width:100%"
- :disabled="isUp"
v-model="formData2.latestTraceability"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
@@ -488,7 +483,6 @@
<el-form-item label="鍋滅敤鏃堕棿:" >
<el-date-picker
style="width:100%"
- :disabled="isUp"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="formData2.downTime"
@@ -498,23 +492,23 @@
</el-date-picker>
</el-form-item>
<el-form-item label="缁翠慨璁板綍:" >
- <el-input :disabled="isUp" v-model="formData2.maintenanceRecords" size="small"></el-input>
+ <el-input v-model="formData2.maintenanceRecords" size="small"></el-input>
</el-form-item>
<el-form-item label="鐢熶骇鍘傚:" >
- <el-input :disabled="isUp" v-model="formData2.manufacturer" size="small" ></el-input>
+ <el-input v-model="formData2.manufacturer" size="small" ></el-input>
</el-form-item>
<el-form-item label="閲囪喘璐圭敤:" >
- <el-input :disabled="isUp" v-model="formData2.procurementCosts" size="small"></el-input>
+ <el-input v-model="formData2.procurementCosts" size="small"></el-input>
</el-form-item>
<el-form-item label="鏍″噯璇佷功:" >
- <el-input :disabled="isUp" v-model="formData2.calibrationCerticate" size="small"></el-input>
+ <el-input v-model="formData2.calibrationCerticate" size="small"></el-input>
</el-form-item>
- <el-form-item v-if="!isUp" label="鍥剧墖:" >
+ <el-form-item label="鍥剧墖:" >
<div style="border: 1px solid #DCDFE6;border-radius:4px;height:32px;lineHeight:32px;display:flex;justify-content: space-around;font-size: 13px;">
<div v-show="formData2.imageName" class="picName">{{formData2.imageName}}</div>
<el-upload
:action="action"
- :on-success="handleSuccessUpImg"
+ :on-success="handleSuccessUpImg2"
:show-file-list="false"
accept='image/jpg,image/jpeg,image/png'
:headers="headers"
@@ -532,7 +526,7 @@
<span slot="footer" class="dialog-footer">
<el-row >
<el-button @click="handleClose2">鍙� 娑�</el-button>
- <el-button type="primary" @click="submitForm" :loading="upLoad">纭� 瀹�</el-button>
+ <el-button type="primary" @click="submitForm2" :loading="upLoad2">纭� 瀹�</el-button>
</el-row>
</span>
</el-dialog>
@@ -550,7 +544,10 @@
//鏄惁鏄。妗堜慨璁� true涓嶆槸 false鏄�
isUp: true,
formData: {},
- formData2: {},
+ formData2: {
+ imageUpload:'',
+ imageName:''
+ },
value: '',
options: [],
labelPosition: 'right',
@@ -621,6 +618,7 @@
// 璁惧鐘舵�佸垪琛�
deviceStatusList:[],
upLoad:false,
+ upLoad2:false,
}
},
computed: {
@@ -673,12 +671,12 @@
},
// 鑾峰彇鎺堟潈浜�
getAuthorizedPerson(){
- this.$axios.get(this.$api.deviceScope.authorizedPerson).then(res => {
+ this.$axios.get(this.$api.deviceScope.selectDevicePrincipal).then(res => {
let data = []
res.data.forEach(a=>{
data.push({
- label: a.authorizedPerson,
- value: a.authorizedPerson
+ label: a.name,
+ value: a.id
})
})
this.authorizerList = data
@@ -703,8 +701,8 @@
let data = []
res.data.forEach(a=>{
data.push({
- label: a.equipmentManager,
- value: a.equipmentManager
+ label: a.name,
+ value: a.id
})
})
this.responsiblePersonList = data
@@ -757,6 +755,14 @@
this.formData.imageName = response.data.name;
}
},
+ handleSuccessUpImg2(response,){
+ if(response.code==200){
+ this.$nextTick(()=>{
+ this.formData2.imageUpload = response.data.url;
+ this.formData2.imageName = response.data.name;
+ })
+ }
+ },
submitForm(){
this.upLoad = true;
let authorizedPerson = this.formData.authorizedPerson.length>0?this.formData.authorizedPerson.join(','):''
@@ -786,6 +792,8 @@
},
submitForm2(){
this.upLoad2 = true;
+ let authorizedPerson = this.formData2.authorizedPerson.length>0?this.formData2.authorizedPerson.join(','):''
+ this.formData2.authorizedPerson = authorizedPerson
this.$axios.post(this.$api.deviceScope.addDeviceParameter, this.formData2, {
headers: {
'Content-Type': 'application/json'
@@ -795,12 +803,16 @@
this.upLoad2 = false
return
}
- this.$message.success('淇敼鎴愬姛')
- this.upLoad = false
+ this.$message.success('鎻愪氦鎴愬姛')
+ this.upLoad2 = false
this.refreshTable()
this.dialogVisible2 = false
+ this.formData2 = {
+ imageUpload:'',
+ imageName:''
+ }
}).catch(e => {
- this.$message.error('淇敼澶辫触')
+ this.$message.error('鎻愪氦澶辫触')
this.dialogVisible2 = false
this.upLoad2 = false
})
--
Gitblit v1.9.3