fix:代码合并

This commit is contained in:
wyx
2022-12-04 15:00:02 +08:00
parent feb253afb7
commit 0a7a86a00e
3 changed files with 5 additions and 3 deletions

View File

@@ -31,6 +31,7 @@
<div class="btnbox"> <div class="btnbox">
<a-form-item has-feedback label="作业名称" name="workName"> <a-form-item has-feedback label="作业名称" name="workName">
<a-input <a-input
maxLength="20"
v-model:value="formState.workName" v-model:value="formState.workName"
style="width: 424px; height: 32px; margin-left: 35px" style="width: 424px; height: 32px; margin-left: 35px"
placeholder="请输入作业名称" placeholder="请输入作业名称"
@@ -46,7 +47,7 @@
placeholder="请输入作业要求" placeholder="请输入作业要求"
autocomplete="off" autocomplete="off"
allow-clear allow-clear
style="margin-left: 35px" style="margin-left: 35px;width: 426px;height: 200px;"
maxlength="150" maxlength="150"
/> />
</a-form-item> </a-form-item>

View File

@@ -1914,6 +1914,7 @@ export default {
GetRouterDetail(state.routerId) GetRouterDetail(state.routerId)
.then((res) => { .then((res) => {
console.log('router-list',res) console.log('router-list',res)
state.fileList = JSON.parse(res.data.data.routerInfo.attach)
if (res.data.data.routerInfo.status == 1) { if (res.data.data.routerInfo.status == 1) {
state.nodata = false; state.nodata = false;
} }

View File

@@ -1608,9 +1608,9 @@ export default {
}); });
} else { } else {
//默认阶段 //默认阶段
if (state.stageList.length === 1 && !state.stageList.name) { // if (state.stageList.length === 1 && !state.stageList.name) {
} // }
let obj = { let obj = {
name: state.valuesname, name: state.valuesname,
projectId: state.projectId, projectId: state.projectId,