From 90b6945445ee97109a57f26c83788d24729a098e Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期三, 25 十二月 2024 16:52:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue | 62 +++++++++++++++++-------------
1 files changed, 35 insertions(+), 27 deletions(-)
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 a116746..4625e1c 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
@@ -6,8 +6,8 @@
<avue-tree :key="refresh" ref="tree" :data="treeData" :option="treeOption" node-key="id"
@node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
- <i class="el-icon-s-promotion"></i>
+ <span>
+ <i :class="data.icon"></i>
{{ (node || {}).label }}
</span>
</span>
@@ -18,8 +18,10 @@
<el-main>
<basic-container>
- <div v-if="form.childType && form.childType !== 0 && !addStatus && !editStatus" class="btnBox">
- <el-button :disabled="mangeShowBtn ? false : !childTypeBtn" icon="el-icon-plus" plain
+ <div v-if="(form.childType || form.childType === 0) && !addStatus && !editStatus && form.category !== 1"
+ class="btnBox">
+ <el-button :disabled="(mangeShowBtn || form.childType === 0) ? false : !childTypeBtn" icon="el-icon-plus"
+ plain
size="small"
type="primary" @click="addClickHandler">澧炲姞
</el-button>
@@ -33,11 +35,11 @@
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"
+ <el-button v-if=" mangeShowBtn" 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"
+ <el-button v-if="mangeShowBtn " icon="el-icon-circle-close" plain size="small"
type="danger"
@click="addClickHandler">鍒犻櫎涓氬姟妯″潡
</el-button>
@@ -50,7 +52,7 @@
<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">
+ <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>
@@ -61,48 +63,54 @@
type="danger" @click="addStatus=false;editStatus=false;">鍙栨秷
</el-button>
</div>
- <div v-if="form.childType === 0" class="btnBox">
+ <div v-if="form.category === 1" 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">
+ <span v-if="form.category !== 1">
<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.alias" :disabled="!editStatus && !addStatus" placeholder="妯″潡鍒悕鐢ㄦ潵璁板綍鏃ュ織浣跨敤"></el-input>
</el-form-item>
- <el-form-item label="C/S锛�">
+ <el-form-item v-if="form.functionType === 0" 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-form-item v-if="form.functionType === 0" label="B/S锛�">
<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-form-item v-if="form.functionType === 0" label=".NET锛�">
<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" :disabled="!editStatus && !addStatus" :rows="2"
- placeholder="璇疯緭鍏obile" type="textarea"></el-input>
</el-form-item>
<el-form-item label="搴忓彿锛�">
<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" :disabled="!editStatus && !addStatus"></el-input>-->
- <avue-input-icon v-model="form.source" :disabled="!editStatus && !addStatus" :icon-list="iconList" placeholder="璇烽�夋嫨鍥炬爣">
- </avue-input-icon>
+ <avue-input-icon v-model="form.source" :disabled="!editStatus && !addStatus" :icon-list="iconList"
+ placeholder="璇烽�夋嫨鍥炬爣">
+ </avue-input-icon>
</el-form-item>
<el-form-item label="鎻忚堪锛�">
<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.functionType"
+ :active-value="0"
+ :disabled="!editStatus && !addStatus"
+ :inactive-value="1"
+ active-color="#13ce66"
+ inactive-color="#ff4949">
+ </el-switch>
</el-form-item>
<el-form-item label="鏄惁鏈夋晥锛�">
<el-switch
@@ -114,21 +122,21 @@
<el-link :underline="false" style="margin-left: 20px" type="danger">涓嶇敓鏁堬紙涓嶉�夋嫨锛夋椂锛岃妯″潡鍦ㄥ姛鑳芥ā鍧楁巿鏉冮噷涓嶆樉绀�</el-link>
</el-form-item>
</span>
- <span v-if="form.childType === 0">
+ <span v-if="form.category === 1">
<el-form-item label="鍚嶇О锛�">
- <el-input v-model="form.name" :disabled="form.childType === 0" placeholder="璇疯緭鍏ュ悕绉�"></el-input>
+ <el-input v-model="form.name" :disabled="form.category === 1" placeholder="璇疯緭鍏ュ悕绉�"></el-input>
</el-form-item>
<el-form-item label="鏍囪瘑锛�">
- <el-input v-model="form.code" :disabled="form.childType === 0" placeholder="璇疯緭鍏ユ爣璇�"></el-input>
+ <el-input v-model="form.code" :disabled="form.category === 1" 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 v-model="form.sort" :disabled="form.childType === 0" placeholder="璇疯緭鍏ョ紪鍙�"></el-input>
+ <el-input v-model="form.sort" :disabled="form.category === 1" placeholder="璇疯緭鍏ョ紪鍙�"></el-input>
</el-form-item>
<el-form-item label="鎻忚堪锛�">
- <el-input v-model="form.remark" :disabled="form.childType === 0" placeholder="璇疯緭鍏ユ弿杩�"></el-input>
+ <el-input v-model="form.remark" :disabled="form.category === 1" placeholder="璇疯緭鍏ユ弿杩�"></el-input>
</el-form-item>
<el-form-item label="鏄惁鏈夋晥锛�">
<el-switch
@@ -244,7 +252,8 @@
...item,
id: item.id,
name: item.name,
- leaf: !item.hasChildren
+ leaf: !item.hasChildren,
+ icon: item.source || 'el-icon-s-home'
}
}))
})
@@ -409,8 +418,6 @@
exportFunctionSql({isFunction: true}).then(res => {
func.downloadFileByBlobHandler(res);
this.$message.success('瀵煎嚭鎴愬姛');
- }).catch(err => {
- this.$message.error(err);
});
},
@@ -515,6 +522,7 @@
upLoadClickHandler() {
this.$refs.upload.visible = true;
},
+
handleRefreshTree(type) {
//type:add\edit\del
if (type == "del") {
--
Gitblit v1.9.3