Commit 1e156968 authored by danfuman's avatar danfuman

Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915

parents f4afaf70 f1349d0e
......@@ -99,8 +99,7 @@ export default {
if (response.data) {
this.uploadResult.successCount = response.data.sucessCount;
this.uploadResult.errorCount = response.data.errorCount;
response.data.errorMsg ? this.uploadResult.errorMsg = response.data.errorMsg : null;
this.upload.showResult = true;
(response.data?.errorMsg && response.data?.errorMsg?.length) ? ((this.uploadResult.errorMsg = response.data.errorMsg) && (this.upload.showResult = true)) : null;
}
} else {
this.$message.error(`上传失败,${response.msg ? response.msg : "请根据模板正确填写表格内容!"}`);
......
......@@ -15,7 +15,8 @@
<div class="titles">
<img src="@/assets/images/project/headimg.png" class="headimg">
<strong class="text">{{ProjectData.projectName}}</strong>
<div class="protypes" :class="{'i1':ProjectData.status == 0,'i2':ProjectData.status == 1,'i3':ProjectData.status == 2}"
<div class="protypes"
:class="{'i1':ProjectData.status == 0,'i2':ProjectData.status == 1,'i3':ProjectData.status == 2,'i4':ProjectData.status == 3}"
v-if="isDisabled == false">
<span v-for="(item,index) in projectStatus"><i v-if="ProjectData.status == item.dictValue">{{item.dictLabel}}</i></span>
<el-select class="sels" v-model="ProjectData.status" @change="editXMSL({status:ProjectData.status})">
......@@ -484,6 +485,13 @@ export default {
background: #cbe5ff;
}
}
&.i4 {
background: #F3F4F5;
color: #999999;
&:hover {
background: #D9D9D9;
}
}
> span {
width: 100%;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment