From 2b3a7e06b9fb836b5004273f9a411cf78b4af844 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 25 十月 2024 17:59:12 +0800
Subject: [PATCH] 调整页面，修改bug
---
Source/plt-web/plt-web-ui/src/views/systemModel/systemConfig/index.vue | 3
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue | 3
Source/plt-web/plt-web-ui/src/util/func.js | 6
Source/plt-web/plt-web-ui/src/views/system/department/index.vue | 2
Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue | 121 ++++++++++---------
Source/plt-web/plt-web-ui/src/views/authority/ui/typeAction/index.vue | 2
Source/plt-web/plt-web-ui/src/views/systemModel/operateType/index.vue | 48 ++++---
Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue | 123 +++++++++++---------
8 files changed, 170 insertions(+), 138 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/util/func.js b/Source/plt-web/plt-web-ui/src/util/func.js
index e342467..9d26c8d 100644
--- a/Source/plt-web/plt-web-ui/src/util/func.js
+++ b/Source/plt-web/plt-web-ui/src/util/func.js
@@ -90,7 +90,11 @@
*/
static isEmptyObject(obj) {
- return Object.keys(obj).length === 0;
+ if(obj){
+ return Object.keys(obj).length === 0;
+ }else {
+ return true;
+ }
}
/**
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/ui/typeAction/index.vue b/Source/plt-web/plt-web-ui/src/views/authority/ui/typeAction/index.vue
index 98bee88..e919477 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/ui/typeAction/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/ui/typeAction/index.vue
@@ -217,7 +217,7 @@
savePLTypeAction(params).then(res => {
if(res.data.code == 200){
this.$message.success(res.data.obj);
-
+ this.getTableList();
}
})
},
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue
index c47afba..71d89b0 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue
@@ -218,6 +218,9 @@
this.data = data;
this.tableLoading = false;
+ this.$nextTick(function (){
+ this.$refs.crud.doLayout()
+ })
})
},
diff --git a/Source/plt-web/plt-web-ui/src/views/system/department/index.vue b/Source/plt-web/plt-web-ui/src/views/system/department/index.vue
index e71ddd1..82e6fcc 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/department/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/department/index.vue
@@ -100,6 +100,7 @@
editBtn: false,
delBtn: false,
gridBtn: false,
+ menuWidth:280,
highlightCurrentRow: true,
calcHeight: -60,
column: column
@@ -115,6 +116,7 @@
selection: false,
refreshBtn: false,
addBtn: false,
+ header :false,
menu: false,
calcHeight:80,
column: [
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
index cb210be..ef5069c 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
@@ -17,38 +17,88 @@
<el-main>
<basic-container>
- <el-form ref="form" :model="form" label-width="85px" style="max-height: calc(100vh - 180px);overflow: auto;">
+ <div v-if="form.childType && form.childType !== 0 && !addStatus && !editStatus" class="btnBox">
+ <el-button :disabled="mangeShowBtn ? false : !childTypeBtn" icon="el-icon-plus" plain
+ size="small"
+ type="primary" @click="addClickHandler">澧炲姞
+ </el-button>
+ <el-button :disabled="mangeShowBtn" icon="el-icon-edit" plain size="small" type="primary"
+ @click="editClickHandler">淇敼
+ </el-button>
+ <el-button :disabled="mangeShowBtn" icon="el-icon-close" plain size="small" type="danger"
+ @click="delClickHandler">鍒犻櫎
+ </el-button>
+ <el-button :disabled="mangeShowBtn ? true : childTypeBtn" icon="el-icon-circle-plus-outline" plain
+ size="small"
+ type="primary" @click="addMethodsClickHandler">澧炲姞鎿嶄綔绫诲瀷
+ </el-button>
+ <el-button v-if="this.form.childType ? mangeShowBtn :true" icon="el-icon-circle-close" plain size="small"
+ type="danger"
+ @click="addClickHandler">鍒犻櫎闈炵郴缁熸ā鍧�
+ </el-button>
+ <el-button v-if="this.form.childType ? mangeShowBtn :true" icon="el-icon-circle-close" plain size="small"
+ type="danger"
+ @click="addClickHandler">鍒犻櫎涓氬姟妯″潡
+ </el-button>
+ <el-button :disabled="!mangeShowBtn" icon="el-icon-upload2" plain size="small" type="primary"
+ @click="upLoadClickHandler">瀵煎叆
+ </el-button>
+ <el-button :disabled="!mangeShowBtn" icon="el-icon-download" plain size="small" type="primary"
+ @click="exportClickHandler">瀵煎嚭
+ </el-button>
+ <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="sqlClickExportClick">瀵煎嚭sql
+ </el-button>
+ </div>
+ <div v-else-if="form.childType && form.childType !== 0 &&(addStatus || editStatus)" class="btnBox">
+ <el-button v-if="addStatus" icon="el-icon-check" plain size="small"
+ type="success" @click="addSaveClickHandler">淇濆瓨
+ </el-button>
+ <el-button v-if="editStatus" icon="el-icon-check" plain size="small"
+ type="success" @click="editSaveClickHandler">淇濆瓨
+ </el-button>
+ <el-button icon="el-icon-close" plain size="small"
+ type="danger" @click="addStatus=false;editStatus=false;">鍙栨秷
+ </el-button>
+ </div>
+ <div v-if="form.childType === 0" class="btnBox">
+ <el-button icon="el-icon-edit" plain size="small" type="primary" @click="updataAliasClickHandler">淇敼鍒悕
+ </el-button>
+ <el-button icon="el-icon-close" plain size="small" type="danger" @click="deleteOperationClickHandler">鍒犻櫎
+ </el-button>
+ </div>
+ <el-form ref="form" :model="form" label-width="85px" style="max-height: calc(100vh - 200px);overflow: auto;">
<span v-if="form.childType !== 0">
<el-form-item label="妯″潡鍚嶏細">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ユā鍧楀悕"></el-input>
+ <el-input v-model="form.name" :disabled="!editStatus && !addStatus" placeholder="璇疯緭鍏ユā鍧楀悕"></el-input>
</el-form-item>
<el-form-item label="妯″潡鍒悕锛�">
- <el-input v-model="form.alias" placeholder="妯″潡鍒悕鐢ㄦ潵璁板綍鏃ュ織浣跨敤"></el-input>
+ <el-input v-model="form.alias" :disabled="!editStatus && !addStatus" placeholder="妯″潡鍒悕鐢ㄦ潵璁板綍鏃ュ織浣跨敤"></el-input>
</el-form-item>
<el-form-item label="C/S锛�">
- <el-input v-model="form.pathC" :rows="3" placeholder="璇疯緭鍏/S璺緞" type="textarea"></el-input>
+ <el-input v-model="form.pathC" :disabled="!editStatus && !addStatus" :rows="2" placeholder="璇疯緭鍏/S璺緞" type="textarea"></el-input>
</el-form-item>
<el-form-item label="B/S锛�">
- <el-input v-model="form.path" :rows="3" placeholder="璇疯緭鍏/S璺緞" type="textarea"></el-input>
+ <el-input v-model="form.path" :disabled="!editStatus && !addStatus" :rows="2" placeholder="璇疯緭鍏/S璺緞" type="textarea"></el-input>
</el-form-item>
<el-form-item label=".NET锛�">
- <el-input v-model="form.resourceDotNet" :rows="3" placeholder="璇疯緭鍏�.NET" type="textarea"></el-input>
+ <el-input v-model="form.resourceDotNet" :disabled="!editStatus && !addStatus" :rows="2" placeholder="璇疯緭鍏�.NET" type="textarea"></el-input>
</el-form-item>
<el-form-item label="Mobile锛�">
- <el-input v-model="form.resourceMobile" :rows="3" placeholder="璇疯緭鍏obile" type="textarea"></el-input>
+ <el-input v-model="form.resourceMobile" :disabled="!editStatus && !addStatus" :rows="2" placeholder="璇疯緭鍏obile" type="textarea"></el-input>
</el-form-item>
<el-form-item label="搴忓彿锛�">
- <el-input v-model="form.sort" placeholder="鏁板瓧锛屾弿杩拌妯″潡鍦ㄥ叾鐖舵ā鍧椾笅鐨勬樉绀洪『搴�"></el-input>
+ <el-input v-model="form.sort" :disabled="!editStatus && !addStatus" placeholder="鏁板瓧锛屾弿杩拌妯″潡鍦ㄥ叾鐖舵ā鍧椾笅鐨勬樉绀洪『搴�"></el-input>
</el-form-item>
<el-form-item label="绠�鍥撅細">
- <el-input v-model="form.source"></el-input>
+ <el-input v-model="form.source" :disabled="!editStatus && !addStatus"></el-input>
</el-form-item>
<el-form-item label="鎻忚堪锛�">
- <el-input v-model="form.remark" :rows="3" placeholder="璇疯緭鍏ユ弿杩�" type="textarea"></el-input>
+ <el-input v-model="form.remark" :disabled="!editStatus && !addStatus" :rows="3" placeholder="璇疯緭鍏ユ弿杩�" type="textarea"></el-input>
</el-form-item>
<el-form-item label="鏄惁鏈夋晥锛�">
<el-switch
v-model="form.isValid"
+ :disabled="!editStatus && !addStatus"
active-color="#13ce66"
inactive-color="#ff4949">
</el-switch>
@@ -81,50 +131,6 @@
</el-form-item>
</span>
</el-form>
- <div v-if="form.childType && form.childType !== 0" class="btnBox">
- <el-button v-if="!addStatus" :disabled="mangeShowBtn ? false : !childTypeBtn" icon="el-icon-plus" plain
- size="small"
- type="primary" @click="addClickHandler">澧炲姞
- </el-button>
- <el-button v-if="addStatus" icon="el-icon-check" plain size="small"
- type="success" @click="addSaveClickHandler">淇濆瓨
- </el-button>
- <el-button v-if="!editStatus" :disabled="mangeShowBtn" icon="el-icon-edit" plain size="small" type="primary"
- @click="editClickHandler">淇敼
- </el-button>
- <el-button v-if="editStatus" icon="el-icon-check" plain size="small"
- type="success" @click="editSaveClickHandler">淇濆瓨
- </el-button>
- <el-button :disabled="mangeShowBtn" icon="el-icon-close" plain size="small" type="danger"
- @click="delClickHandler">鍒犻櫎
- </el-button>
- <el-button :disabled="mangeShowBtn ? true : childTypeBtn" icon="el-icon-circle-plus-outline" plain
- size="small"
- type="primary" @click="addMethodsClickHandler">澧炲姞鎿嶄綔绫诲瀷
- </el-button>
- <el-button v-if="this.form.childType ? mangeShowBtn :true" icon="el-icon-circle-close" plain size="small"
- type="danger"
- @click="addClickHandler">鍒犻櫎闈炵郴缁熸ā鍧�
- </el-button>
- <el-button v-if="this.form.childType ? mangeShowBtn :true" icon="el-icon-circle-close" plain size="small"
- type="danger"
- @click="addClickHandler">鍒犻櫎涓氬姟妯″潡
- </el-button>
- <el-button :disabled="!mangeShowBtn" icon="el-icon-upload2" plain size="small" type="primary"
- @click="upLoadClickHandler">瀵煎叆
- </el-button>
- <el-button :disabled="!mangeShowBtn" icon="el-icon-download" plain size="small" type="primary"
- @click="exportClickHandler">瀵煎嚭
- </el-button>
- <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="sqlClickExportClick">瀵煎嚭sql
- </el-button>
- </div>
- <div v-if="form.childType === 0" class="btnBox">
- <el-button icon="el-icon-edit" plain size="small" type="primary" @click="updataAliasClickHandler">淇敼鍒悕
- </el-button>
- <el-button icon="el-icon-close" plain size="small" type="danger" @click="deleteOperationClickHandler">鍒犻櫎
- </el-button>
- </div>
</basic-container>
</el-main>
<el-dialog
@@ -403,11 +409,13 @@
addMethodsClickHandler() {
this.methodsLoading = true;
getSysModelTreeMenuByPID({parentId: 'sysOptionNode'}).then(res => {
- if (res.data.code === 200) {
+ if (res.data.code === 200 && res.data.data.length>0) {
this.methodsVisble = true;
const data = res.data.data[0].children;
this.methodsData = data;
this.methodsLoading = false;
+ }else {
+ this.$message.error('鏈壘鍒板彲澧炲姞鐨勬搷浣滅被鍨�');
}
})
},
@@ -536,6 +544,7 @@
.btnBox {
display: flex;
- justify-content: center;
+ justify-content:left;
+ margin-bottom: 15px;
}
</style>
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
index 15cbb86..6a8f5e5 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
@@ -17,38 +17,88 @@
<el-main>
<basic-container>
- <el-form ref="form" :model="form" label-width="85px" style="max-height: calc(100vh - 180px);overflow: auto;">
+ <div v-if="form.childType && form.childType !== 0 && !addStatus && !editStatus" class="btnBox">
+ <el-button :disabled="mangeShowBtn ? false : !childTypeBtn" icon="el-icon-plus" plain
+ size="small"
+ type="primary" @click="addClickHandler">澧炲姞
+ </el-button>
+ <el-button :disabled="mangeShowBtn" icon="el-icon-edit" plain size="small" type="primary"
+ @click="editClickHandler">淇敼
+ </el-button>
+ <el-button :disabled="mangeShowBtn" icon="el-icon-close" plain size="small" type="danger"
+ @click="delClickHandler">鍒犻櫎
+ </el-button>
+ <el-button :disabled="mangeShowBtn ? true : childTypeBtn" icon="el-icon-circle-plus-outline" plain
+ size="small"
+ type="primary" @click="addMethodsClickHandler">澧炲姞鎿嶄綔绫诲瀷
+ </el-button>
+ <el-button v-if="this.form.childType ? mangeShowBtn :true" icon="el-icon-circle-close" plain size="small"
+ type="danger"
+ @click="addClickHandler">鍒犻櫎闈炵郴缁熸ā鍧�
+ </el-button>
+ <el-button v-if="this.form.childType ? mangeShowBtn :true" icon="el-icon-circle-close" plain size="small"
+ type="danger"
+ @click="addClickHandler">鍒犻櫎涓氬姟妯″潡
+ </el-button>
+ <el-button :disabled="!mangeShowBtn" icon="el-icon-upload2" plain size="small" type="primary"
+ @click="upLoadClickHandler">瀵煎叆
+ </el-button>
+ <el-button :disabled="!mangeShowBtn" icon="el-icon-download" plain size="small" type="primary"
+ @click="exportClickHandler">瀵煎嚭
+ </el-button>
+ <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="sqlClickExportClick">瀵煎嚭sql
+ </el-button>
+ </div>
+ <div v-else-if="form.childType && form.childType !== 0 &&(addStatus || editStatus)" class="btnBox">
+ <el-button v-if="addStatus" icon="el-icon-check" plain size="small"
+ type="success" @click="addSaveClickHandler">淇濆瓨
+ </el-button>
+ <el-button v-if="editStatus" icon="el-icon-check" plain size="small"
+ type="success" @click="editSaveClickHandler">淇濆瓨
+ </el-button>
+ <el-button icon="el-icon-close" plain size="small"
+ type="danger" @click="addStatus=false;editStatus=false;">鍙栨秷
+ </el-button>
+ </div>
+ <div v-if="form.childType === 0" class="btnBox">
+ <el-button icon="el-icon-edit" plain size="small" type="primary" @click="updataAliasClickHandler">淇敼鍒悕
+ </el-button>
+ <el-button icon="el-icon-close" plain size="small" type="danger" @click="deleteOperationClickHandler">鍒犻櫎
+ </el-button>
+ </div>
+ <el-form ref="form" :model="form" label-width="85px" style="max-height: calc(100vh - 200px);overflow: auto;">
<span v-if="form.childType !== 0">
<el-form-item label="妯″潡鍚嶏細">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ユā鍧楀悕"></el-input>
+ <el-input v-model="form.name" :disabled="!editStatus && !addStatus" placeholder="璇疯緭鍏ユā鍧楀悕"></el-input>
</el-form-item>
<el-form-item label="妯″潡鍒悕锛�">
- <el-input v-model="form.alias" placeholder="妯″潡鍒悕鐢ㄦ潵璁板綍鏃ュ織浣跨敤"></el-input>
+ <el-input v-model="form.alias" :disabled="!editStatus && !addStatus" placeholder="妯″潡鍒悕鐢ㄦ潵璁板綍鏃ュ織浣跨敤"></el-input>
</el-form-item>
- <el-form-item label="C/S锛�">
- <el-input v-model="form.pathC" :rows="3" placeholder="璇疯緭鍏/S璺緞" type="textarea"></el-input>
+ <el-form-item label="C/S锛�">
+ <el-input v-model="form.pathC" :disabled="!editStatus && !addStatus" :rows="2" placeholder="璇疯緭鍏/S璺緞" type="textarea"></el-input>
</el-form-item>
<el-form-item label="B/S锛�">
- <el-input v-model="form.path" :rows="3" placeholder="璇疯緭鍏/S璺緞" type="textarea"></el-input>
+ <el-input v-model="form.path" :disabled="!editStatus && !addStatus" :rows="2" placeholder="璇疯緭鍏/S璺緞" type="textarea"></el-input>
</el-form-item>
<el-form-item label=".NET锛�">
- <el-input v-model="form.resourceDotNet" :rows="3" placeholder="璇疯緭鍏�.NET" type="textarea"></el-input>
+ <el-input v-model="form.resourceDotNet" :disabled="!editStatus && !addStatus" :rows="2" placeholder="璇疯緭鍏�.NET" type="textarea"></el-input>
</el-form-item>
<el-form-item label="Mobile锛�">
- <el-input v-model="form.resourceMobile" :rows="3" placeholder="璇疯緭鍏obile" type="textarea"></el-input>
+ <el-input v-model="form.resourceMobile" :disabled="!editStatus && !addStatus" :rows="2" placeholder="璇疯緭鍏obile" type="textarea"></el-input>
</el-form-item>
<el-form-item label="搴忓彿锛�">
- <el-input v-model="form.sort" placeholder="鏁板瓧锛屾弿杩拌妯″潡鍦ㄥ叾鐖舵ā鍧椾笅鐨勬樉绀洪『搴�"></el-input>
+ <el-input v-model="form.sort" :disabled="!editStatus && !addStatus" placeholder="鏁板瓧锛屾弿杩拌妯″潡鍦ㄥ叾鐖舵ā鍧椾笅鐨勬樉绀洪『搴�"></el-input>
</el-form-item>
<el-form-item label="绠�鍥撅細">
- <el-input v-model="form.source"></el-input>
+ <el-input v-model="form.source" :disabled="!editStatus && !addStatus"></el-input>
</el-form-item>
<el-form-item label="鎻忚堪锛�">
- <el-input v-model="form.remark" :rows="3" placeholder="璇疯緭鍏ユ弿杩�" type="textarea"></el-input>
+ <el-input v-model="form.remark" :disabled="!editStatus && !addStatus" :rows="3" placeholder="璇疯緭鍏ユ弿杩�" type="textarea"></el-input>
</el-form-item>
<el-form-item label="鏄惁鏈夋晥锛�">
<el-switch
v-model="form.isValid"
+ :disabled="!editStatus && !addStatus"
active-color="#13ce66"
inactive-color="#ff4949">
</el-switch>
@@ -81,50 +131,6 @@
</el-form-item>
</span>
</el-form>
- <div v-if="form.childType && form.childType !== 0" class="btnBox">
- <el-button v-if="!addStatus" :disabled="mangeShowBtn ? false : !childTypeBtn" icon="el-icon-plus" plain
- size="small"
- type="primary" @click="addClickHandler">澧炲姞
- </el-button>
- <el-button v-if="addStatus" icon="el-icon-check" plain size="small"
- type="success" @click="addSaveClickHandler">淇濆瓨
- </el-button>
- <el-button v-if="!editStatus" :disabled="mangeShowBtn" icon="el-icon-edit" plain size="small" type="primary"
- @click="editClickHandler">淇敼
- </el-button>
- <el-button v-if="editStatus" icon="el-icon-check" plain size="small"
- type="success" @click="editSaveClickHandler">淇濆瓨
- </el-button>
- <el-button :disabled="mangeShowBtn" icon="el-icon-close" plain size="small" type="danger"
- @click="delClickHandler">鍒犻櫎
- </el-button>
- <el-button :disabled="mangeShowBtn ? true : childTypeBtn" icon="el-icon-circle-plus-outline" plain
- size="small"
- type="primary" @click="addMethodsClickHandler">澧炲姞鎿嶄綔绫诲瀷
- </el-button>
- <el-button v-if="this.form.childType ? mangeShowBtn :true" icon="el-icon-circle-close" plain size="small"
- type="danger"
- @click="addClickHandler">鍒犻櫎闈炵郴缁熸ā鍧�
- </el-button>
- <el-button v-if="this.form.childType ? mangeShowBtn :true" icon="el-icon-circle-close" plain size="small"
- type="danger"
- @click="addClickHandler">鍒犻櫎涓氬姟妯″潡
- </el-button>
- <el-button :disabled="!mangeShowBtn" icon="el-icon-upload2" plain size="small" type="primary"
- @click="upLoadClickHandler">瀵煎叆
- </el-button>
- <el-button :disabled="!mangeShowBtn" icon="el-icon-download" plain size="small" type="primary"
- @click="exportClickHandler">瀵煎嚭
- </el-button>
- <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="sqlClickExportClick">瀵煎嚭sql
- </el-button>
- </div>
- <div v-if="form.childType === 0" class="btnBox">
- <el-button icon="el-icon-edit" plain size="small" type="primary" @click="updataAliasClickHandler">淇敼鍒悕
- </el-button>
- <el-button icon="el-icon-close" plain size="small" type="danger" @click="deleteOperationClickHandler">鍒犻櫎
- </el-button>
- </div>
</basic-container>
</el-main>
<el-dialog
@@ -406,11 +412,13 @@
addMethodsClickHandler() {
this.methodsLoading = true;
getSysModelTreeMenuByPID({parentId: 'sysOptionNode'}).then(res => {
- if (res.data.code === 200) {
+ if (res.data.code === 200 && res.data.data.length>0) {
this.methodsVisble = true;
const data = res.data.data[0].children;
this.methodsData = data;
this.methodsLoading = false;
+ }else {
+ this.$message.error('鏈壘鍒板彲澧炲姞鐨勬搷浣滅被鍨�');
}
})
},
@@ -526,6 +534,7 @@
.btnBox {
display: flex;
- justify-content: center;
+ justify-content:left;
+ margin-bottom: 15px;
}
</style>
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/operateType/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/operateType/index.vue
index afbb76d..6af6e5f 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/operateType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/operateType/index.vue
@@ -17,43 +17,46 @@
<el-main>
<basic-container>
- <el-form ref="form" :model="form" label-width="85px" style="max-height: calc(100vh - 180px);overflow: auto;">
- <el-form-item label="鍚嶇О锛�">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ュ悕绉�"></el-input>
- </el-form-item>
- <el-form-item label="鏍囪瘑锛�">
- <el-input v-model="form.code" placeholder="璇疯緭鍏ユ爣璇�"></el-input>
- </el-form-item>
- <el-form-item label="鍒悕锛�">
- <el-input v-model="form.alias" placeholder="璇疯緭鍏ュ埆鍚�"></el-input>
- </el-form-item>
- <el-form-item label="椤哄簭锛�">
- <el-input-number v-model="form.sort" :min="0" :max="9999" label="椤哄簭"></el-input-number>
- </el-form-item>
- <el-form-item label="鎻忚堪锛�">
- <el-input v-model="form.remark" placeholder="璇疯緭鍏ユ弿杩�"></el-input>
- </el-form-item>
- </el-form>
<div v-if="nodeRow.childType === 0 || nodeRow.childType === -1" class="btnBox">
- <el-button v-if="!addStatus" :disabled="nodeRow.childType === 0" icon="el-icon-plus" plain
+ <el-button v-if="!addStatus && !editStatus" :disabled="nodeRow.childType === 0" icon="el-icon-plus" plain
size="small"
type="primary" @click="addClickHandler">澧炲姞
</el-button>
<el-button v-if="addStatus" icon="el-icon-check" plain size="small"
type="success" @click="addSaveClickHandler">淇濆瓨
</el-button>
- <el-button v-if="!editStatus" :disabled="nodeRow.childType === -1" icon="el-icon-edit" plain size="small" type="primary"
+ <el-button v-if="!addStatus && !editStatus" :disabled="nodeRow.childType === -1" icon="el-icon-edit" plain size="small" type="primary"
@click="editClickHandler">淇敼
</el-button>
<el-button v-if="editStatus" icon="el-icon-check" plain size="small"
type="success" @click="editSaveClickHandler">淇濆瓨
</el-button>
- <el-button :disabled="nodeRow.childType === -1" icon="el-icon-close" plain size="small" type="danger"
+ <el-button v-if="addStatus || editStatus" icon="el-icon-close" plain size="small"
+ type="danger" @click="addStatus=false;editStatus=false;">鍙栨秷
+ </el-button>
+ <el-button v-if="!addStatus && !editStatus" :disabled="nodeRow.childType === -1" icon="el-icon-close" plain size="small" type="danger"
@click="delClickHandler">鍒犻櫎
</el-button>
- <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="sqlClickExportClick">瀵煎嚭sql
+ <el-button v-if="!addStatus && !editStatus" icon="el-icon-upload2" plain size="small" type="primary" @click="sqlClickExportClick">瀵煎嚭sql
</el-button>
</div>
+ <el-form ref="form" :model="form" label-width="85px" style="max-height: calc(100vh - 180px);overflow: auto;">
+ <el-form-item label="鍚嶇О锛�">
+ <el-input v-model="form.name" :disabled="!editStatus && !addStatus" placeholder="璇疯緭鍏ュ悕绉�"></el-input>
+ </el-form-item>
+ <el-form-item label="鏍囪瘑锛�">
+ <el-input v-model="form.code" :disabled="!editStatus && !addStatus" placeholder="璇疯緭鍏ユ爣璇�"></el-input>
+ </el-form-item>
+ <el-form-item label="鍒悕锛�">
+ <el-input v-model="form.alias" :disabled="!editStatus && !addStatus" placeholder="璇疯緭鍏ュ埆鍚�"></el-input>
+ </el-form-item>
+ <el-form-item label="椤哄簭锛�">
+ <el-input-number v-model="form.sort" :disabled="!editStatus && !addStatus" :min="0" :max="9999" label="椤哄簭"></el-input-number>
+ </el-form-item>
+ <el-form-item label="鎻忚堪锛�">
+ <el-input v-model="form.remark" :disabled="!editStatus && !addStatus" placeholder="璇疯緭鍏ユ弿杩�"></el-input>
+ </el-form-item>
+ </el-form>
</basic-container>
</el-main>
</el-container>
@@ -296,6 +299,7 @@
.btnBox {
display: flex;
- justify-content: center;
+ justify-content:left;
+ margin-bottom: 15px;
}
</style>
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/systemConfig/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/systemConfig/index.vue
index 8761d82..3971d0f 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/systemConfig/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/systemConfig/index.vue
@@ -64,8 +64,8 @@
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
- <el-button size="small" @click="addVisibleClose">鍙� 娑�</el-button>
<el-button size="small" type="primary" @click="addSaveClickHandler">纭� 瀹�</el-button>
+ <el-button size="small" @click="addVisibleClose">鍙� 娑�</el-button>
</span>
</el-dialog>
@@ -114,6 +114,7 @@
addBtn: false,
editBtn: false,
delBtn: false,
+ calcHeight: -50,
column: [
{
label: '鍚嶇О',
--
Gitblit v1.9.3