From f879ddd80a2bd267a0a575ef03f76d3ec2ae1504 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 04 一月 2024 11:42:22 +0800
Subject: [PATCH] bug列表269：集成日志查询bug修改。 270：关键属性校验，去掉多线程之后请求响应非常慢（之前报错线程阻塞的bug改成单线程导致非常慢，现在又改回ForJoinPool方式限制线程生成数量实现多线程并行，提升执行效率）。
---
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 311 +++++++++++++++++++++++++++++----------------------
1 files changed, 178 insertions(+), 133 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 32f60ef..9e194c9 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -31,78 +31,99 @@
</el-button>
</div>
</div>
- <div style="display: flex;justify-content: space-around;margin-top: 5px;margin-bottom: 5px">
+ <div style="display: flex;margin-top: 5px;margin-bottom: 5px">
+ <el-button v-if="permissionList.flowingBtnStuatus" plain size="mini" type="primary"
+ @click="flowingDependHandler">娴佹按澶勭悊
+ </el-button>
+ <el-button v-if="permissionList.classifyAuth" plain size="mini" type="primary"
+ @click="classifyAuthHandler">鍒嗙被鎺堟潈
+ </el-button>
</div>
</div>
- <!-- 宸︿晶鏍�-->
- <div style="height: calc(100vh - 230px);overflow: auto">
- <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata"
- :defaultExpandAll="false"
- :option="Treeoption"
- class="classifyTree"
- style="height: calc(100vh - 280px)"
- @node-click="nodeClick"
- >
- </avue-tree>
- </div>
-
- <!-- 鏍戣妭鐐规坊鍔犲璇濇-->
- <el-dialog v-loading="AddLoading" :before-close="TreeEscHandler"
- :title="this.TreeFlag ? '娣诲姞鍒嗙被' :'娣诲姞涓婚搴�'" :visible.sync="TreeAddFormVisible" append-to-body
- style="width: 1700px;margin: auto">
- <el-form ref="myForm" :model="TreeAddform" :rules="rules">
- <el-form-item :label="this.TreeFlag ? '鍒嗙被缂栧彿锛�' :'涓婚搴撶紪鍙凤細'" label-width="150px" prop="id"
- style="display: inline-block">
- <el-input v-model="TreeAddform.id" autocomplete="off" style="width: 170px"></el-input>
- </el-form-item>
- <el-form-item :label="this.TreeFlag ? '鍒嗙被鍚嶇О锛�' :'涓婚搴撳悕绉帮細'" label-width="110px" prop="name"
- style="display: inline-block">
- <el-input v-model="TreeAddform.name" autocomplete="off" style="width: 170px"></el-input>
- </el-form-item>
- <el-form-item v-if="TreeFlagCode" label="瀛樺偍鐨勪笟鍔＄被鍨嬶細" label-width="150px" prop="btmTypeName">
- <el-input v-model="TreeAddform.btmTypeName" autocomplete="off" style="width: 585px"
- @focus="btmFoucus"></el-input>
- </el-form-item>
- <el-form-item label="鎻忚堪锛�" label-width="150px">
- <el-input v-model="TreeAddform.description" autocomplete="off" style="width: 585px"></el-input>
- </el-form-item>
- <el-form-item label="缂栫爜瑙勫垯锛�" label-width="150px">
- <el-input v-model="TreeAddform.codeRuleOidName" autocomplete="off" style="width: 585px"
- @focus="CodeFoucus"></el-input>
- </el-form-item>
- <el-form-item label="鍏抽敭灞炴�ф煡璇㈣鍒欙細" label-width="150px">
- <el-input v-model="TreeAddform.codeKeyAttrRepeatOidName" autocomplete="off" style="width: 585px"
- @focus="Keyfouce"></el-input>
- </el-form-item>
- <el-form-item label="鏄惁鍙備笌鍏抽敭灞炴�ф牎楠岋細" label-width="170px">
- <el-switch
- v-model="TreeAddform.codeKeyAttrValue"
- active-color="#13ce66"
- active-text="鏄�"
- inactive-color="#ff4949"
- inactive-text="鍚�"
- @change="switchChange">
- </el-switch>
- </el-form-item>
- <el-form-item label="鐩镐技鏌ヨ瑙勫垯锛�" label-width="150px">
- <el-input v-model="TreeAddform.codeResembleRuleOidName" autocomplete="off" style="width: 585px"
- @focus="simFouce"></el-input>
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button @click="TreeEscHandler">鍙� 娑�</el-button>
- <el-button type="primary" @click="TreeAddHandler">纭� 瀹�</el-button>
- </div>
- </el-dialog>
- <!-- 淇敼瀵硅瘽妗�-->
- <el-dialog :visible.sync="TreeEditFormVisible" append-to-body title="淇敼鍒嗙被">
- <classifyTreeform ref="childForm" :Editclose=" ()=>{TreeEditFormVisible=false}" :TreeFlag="editTreeFLagCode"
- :flag="'edit'"
- :loneTreeNewForm="TreeList" :nodeClickList="nodeClickList"
- :nodeList="nodeList" @MasterHandler="MasterHandler" @flushed="flushed"
- @referTreeForm="referTreeForm"></classifyTreeform>
- </el-dialog>
</div>
+ <!-- 宸︿晶鏍�-->
+ <div style="height: calc(100vh - 230px);overflow: auto">
+ <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata"
+ :defaultExpandAll="false"
+ :option="Treeoption"
+ class="classifyTree"
+ style="height: calc(100vh - 290px)"
+ @node-click="nodeClick"
+ >
+ <template slot-scope="{ node, data }" class="el-tree-node__label">
+ <el-tooltip :content="$createElement('div', { domProps: { innerHTML: node.label } })" class="item"
+ effect="dark"
+ open-delay="500"
+ placement="right-start">
+ <span style="font-size: 14px;">
+ {{ (node || {}).label }}
+ </span>
+ </el-tooltip>
+ </template>
+ </avue-tree>
+ </div>
+
+ <!-- 鏍戣妭鐐规坊鍔犲璇濇-->
+ <el-dialog v-loading="AddLoading" :before-close="TreeEscHandler"
+ :title="this.TreeFlag ? '娣诲姞鍒嗙被' :'娣诲姞涓婚搴�'" :visible.sync="TreeAddFormVisible" append-to-body
+ style="width: 1700px;margin: auto">
+ <el-form ref="myForm" :model="TreeAddform" :rules="rules">
+ <el-form-item :label="this.TreeFlag ? '鍒嗙被缂栧彿锛�' :'涓婚搴撶紪鍙凤細'" label-width="150px" prop="id"
+ style="display: inline-block">
+ <el-input v-model="TreeAddform.id" autocomplete="off" style="width: 170px"></el-input>
+ </el-form-item>
+ <el-form-item :label="this.TreeFlag ? '鍒嗙被鍚嶇О锛�' :'涓婚搴撳悕绉帮細'" label-width="110px" prop="name"
+ style="display: inline-block">
+ <el-input v-model="TreeAddform.name" autocomplete="off" style="width: 170px"></el-input>
+ </el-form-item>
+ <el-form-item v-if="TreeFlagCode" label="瀛樺偍鐨勪笟鍔＄被鍨嬶細" label-width="150px" prop="btmTypeName">
+ <el-input v-model="TreeAddform.btmTypeName" autocomplete="off" style="width: 585px"
+ @focus="btmFoucus"></el-input>
+ </el-form-item>
+ <el-form-item label="鎻忚堪锛�" label-width="150px">
+ <el-input v-model="TreeAddform.description" autocomplete="off" style="width: 585px"></el-input>
+ </el-form-item>
+ <el-form-item label="缂栫爜瑙勫垯锛�" label-width="150px">
+ <el-input v-model="TreeAddform.codeRuleOidName" autocomplete="off" style="width: 585px"
+ @focus="CodeFoucus"></el-input>
+ </el-form-item>
+ <el-form-item label="鍏抽敭灞炴�ф煡璇㈣鍒欙細" label-width="150px">
+ <el-input v-model="TreeAddform.codeKeyAttrRepeatOidName" autocomplete="off" style="width: 585px"
+ @focus="Keyfouce"></el-input>
+ </el-form-item>
+ <el-form-item label="鏄惁鍙備笌鍏抽敭灞炴�ф牎楠岋細" label-width="170px">
+ <el-switch
+ v-model="TreeAddform.codeKeyAttrValue"
+ active-color="#13ce66"
+ active-text="鏄�"
+ inactive-color="#ff4949"
+ inactive-text="鍚�"
+ @change="switchChange">
+ </el-switch>
+ </el-form-item>
+ <el-form-item label="鐩镐技鏌ヨ瑙勫垯锛�" label-width="150px">
+ <el-input v-model="TreeAddform.codeResembleRuleOidName" autocomplete="off" style="width: 585px"
+ @focus="simFouce"></el-input>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="TreeEscHandler">鍙� 娑�</el-button>
+ <el-button type="primary" @click="TreeAddHandler">纭� 瀹�</el-button>
+ </div>
+ </el-dialog>
+ <!-- 淇敼瀵硅瘽妗�-->
+ <el-dialog :visible.sync="TreeEditFormVisible" append-to-body title="淇敼鍒嗙被">
+ <classifyTreeform ref="childForm" :Editclose=" ()=>{TreeEditFormVisible=false}" :TreeFlag="editTreeFLagCode"
+ :flag="'edit'"
+ :loneTreeNewForm="TreeEditObj" :nodeClickList="nodeClickList"
+ :nodeList="nodeList" @MasterHandler="MasterHandler" @flushed="flushed"
+ @referTreeForm="referTreeForm"></classifyTreeform>
+ </el-dialog>
+ <!-- 鍒嗙被鎺堟潈瀵硅瘽妗�-->
+ <classify-auth-dialog
+ :classifyData="classifyData"
+ :visible.sync="classifyAuthVisible"
+ ></classify-auth-dialog>
</basic-container>
</el-aside>
<el-main>
@@ -110,7 +131,7 @@
<!-- 鍙充晶琛ㄦ牸-->
<avue-tabs :option="tabOption" @change="handleChange"></avue-tabs>
<span v-if="type.prop==='tab1'">
- <classifyTreeform ref="childForm" :flag="'renonly'" :loneTreeNewForm="TreeList"
+ <classifyTreeform ref="childForm" :flag="'renonly'" :loneTreeNewForm="TreeEditObj"
:nodeList="nodeList"></classifyTreeform>
</span>
<span v-else-if="type.prop==='tab2'">
@@ -423,16 +444,20 @@
upVersion,
stopLose,
startRelease,
- exportClassify
+ exportClassify,
+ flowingDependencyGen
} from "@/api/template/templateAttr";
import {defaultReferDataGrid, referDataGrid} from '@/api/MasterData/master'
import func from "@/util/func";
import {mapGetters} from "vuex";
+import ClassifyAuth from './ClassifyAuthDialog.vue';
export default {
+ components: {ClassifyAuth},
name: "classifyTrees.vue",
data() {
return {
+ activeName: 'first',
masterRow: null,
AddLoading: false,
// 瀹氫箟涓�涓彉閲忔潵淇濆瓨鏍戣姹傜殑鏁伴噺
@@ -472,6 +497,8 @@
masterOption: {
addBtn: false,
index: true,
+ refreshBtn: false,
+ columnBtn: false,
border: true,
menu: false,
height: 380,
@@ -500,6 +527,7 @@
addBtn: false,
index: true,
columnBtn: false,
+ refreshBtn: false,
border: true,
menu: false,
height: 380,
@@ -591,6 +619,8 @@
TreeEditFormVisible: false,
//娣诲姞瀵硅瘽妗�
TreeAddFormVisible: false,
+ //鍒嗙被鎺堟潈瀵硅瘽妗�
+ classifyAuthVisible: false,
//褰撳墠鐐瑰嚮椤�
nodeClickList: "",
ClonenodeClickList: "",
@@ -762,7 +792,7 @@
}
],
//浼犻�掔粰瀛愮粍浠跺姩鎬佹覆鏌撶殑鏁版嵁
- TreeList: {},
+ TreeEditObj: {},
codeClassifyOid: "",
upAndStopAndStartData: {
upVersion: {
@@ -786,6 +816,8 @@
},
//妯℃澘绠＄悊缂栬緫
showEditBtn: false,
+ //浼犻�掔粰鍒嗙被鎺堟潈瀛愮粍浠跺璇濇鐨勫綋鍓嶉�変腑鐨勫垎绫昏妭鐐逛俊鎭�
+ classifyData: "",
}
},
watch: {},
@@ -795,9 +827,8 @@
const treeEle = this.$refs.tree.$el
treeEle.addEventListener('click', (e) => {
if (e.target.nodeName !== 'SPAN') {
- this.$refs.tree.setCurrentKey(null)
- this.nodeClickList = {}
- this.TreeList = []
+ this.$refs.tree.setCurrentKey(null);
+ this.nodeClickList = {};
this.TreeFlagCode = true;
}
}, true)
@@ -817,6 +848,8 @@
FindStatus: this.vaildData(this.permission.classifyTree.manage_search, false),
TemRefreshStatus: this.vaildData(this.permission.classifyTree.manage_break, false),
CloneBtnStuatus: this.vaildData(this.permission.classifyTree.manage_clone, false),
+ flowingBtnStuatus: this.vaildData(this.permission.classifyTree.tree_flowing, false),
+ classifyAuth: this.vaildData(this.permission.classifyTree.classify_auth, false),
}
},
crudTreeOption() {
@@ -879,10 +912,29 @@
created() {
},
methods: {
+ // 鍒嗙被鎺堟潈瀵硅瘽妗嗘墦寮�
+ classifyAuthHandler() {
+ if (this.nodeClickList.oid === '' || this.nodeClickList.oid === undefined) {
+ this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹紒')
+ return;
+ }
+ this.classifyData = this.nodeClickList;
+ this.classifyAuthVisible = true;
+ },
+ flowingDependHandler() {
+ if (this.nodeClickList.length <= 0) {
+ this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹紒')
+ return;
+ }
+ flowingDependencyGen(this.nodeClickList.oid).then(res => {
+ this.$message.success('鎿嶄綔鎴愬姛')
+ }).catch(res => {
+ this.$message.error(res)
+ })
+ },
// switch
switchChange() {
this.TreeAddform.isParticipateCheck = this.TreeAddform.codeKeyAttrValue === true ? 1 : 0;
- // console.log(this.TreeAddform.isParticipateCheck)
},
//瀛樺偍鐨勪笟鍔＄被鍨嬪叧闂�
BtmEscHandler() {
@@ -1103,7 +1155,7 @@
},
//瀛愪紶鐖�
MasterHandler(val) {
- this.TreeList = val;
+ this.TreeEditObj = val;
},
rowHandle(row, column) {
this.selectRow = row.$index;
@@ -1114,6 +1166,7 @@
},
//鍒嗙被鏍戞暟鎹鐞�
getAttr() {
+ this.loading = true;
return new Promise((resolve, reject) => {
getAtrrList()
.then(res => {
@@ -1132,6 +1185,7 @@
}
return item;
});
+ this.loading = false;
resolve(); // 瀹屾垚璇锋眰锛岃皟鐢╮esolve鏂规硶
})
.catch(error => {
@@ -1185,35 +1239,31 @@
this.$refs.myForm.clearValidate();
},
//鏍戣妭鐐规坊鍔犱簨浠�
- TreeAddHandler() {
+ async TreeAddHandler() {
if ((!this.TreeAddform.id || !this.TreeAddform.name) || (this.TreeFlagCode && !this.TreeAddform.btmTypeName)) {
this.$message.warning('璇疯緭鍏ュ唴瀹癸紒');
- } else {
+ return;
+ }
+ try {
const data = this.TreeAddform;
this.$set(data, "parentCodeClassifyOid", this.nodeClickList.oid);
- TreeSave(data)
- .then(() => {
- this.$message({
- type: "success",
- message: "娣诲姞鎴愬姛!",
- });
- Object.keys(this.TreeAddform).forEach(key => {
- this.TreeAddform[key] = "";
- this.TreeAddform.codeKeyAttrValue = true;
- this.TreeAddform.isParticipateCheck = 1;
- });
- this.getAttr();
- this.TreeAddFormVisible = false;
- //娣诲姞瀹屾垚鍚庡彸渚ф竻绌�
- this.ProData = [];
- this.Formlist = [];
- })
- .catch((res) => {
- this.$message({
- type: "warning",
- message: res,
- });
- });
+ await TreeSave(data)
+ this.$message.success("娣诲姞鎴愬姛!");
+ Object.keys(this.TreeAddform).forEach(key => {
+ this.TreeAddform[key] = "";
+ });
+ this.TreeAddform.codeKeyAttrValue = true;
+ this.TreeAddform.isParticipateCheck = 1;
+ this.getAttr();
+ this.TreeAddFormVisible = false;
+ //娣诲姞瀹屾垚鍚庡彸渚ф竻绌�
+ this.ProData = [];
+ this.Formlist = [];
+ } catch (res) {
+ this.$message({
+ type: "warning",
+ message: res,
+ });
}
},
//鏍戣妭鐐瑰垹闄ゆ寜閽�
@@ -1284,20 +1334,12 @@
}
},
//鏍戝埛鏂�
- flushed() {
- this.loading = true;
- this.getAttr()
- .then(() => {
- this.loading = false;
- this.$refs.tree.setCurrentKey(null);
- this.nodeClickList = {}
- this.TreeList = []
- this.TreeFlagCode = true;
- })
- .catch(error => {
- this.loading = false;
- console.error(error);
- });
+ async flushed() {
+ await this.getAttr()
+ this.$refs.tree.setCurrentKey(null);
+ this.nodeClickList = {};
+ this.TreeEditObj = {};
+ this.TreeFlagCode = true;
},
//鍚敤鍜屽仠鐢ㄩ兘鍏堝垽鏂姸鎬�
//鍚敤
@@ -1321,12 +1363,14 @@
type: 'warning'
});
if (confirmResult) {
- await TreeEnable(this.nodeClickList);
- this.$message({
- type: 'success',
- message: '鍚敤鎴愬姛!'
- });
+ await TreeEnable(this.nodeClickList).then(res => {
+ this.$message({
+ type: 'success',
+ message: '鍚敤鎴愬姛!'
+ });
+ })
await this.getAttr();
+
} else {
this.$message({
type: 'info',
@@ -1334,7 +1378,7 @@
});
}
} catch (error) {
- console.error(error);
+ // console.error(error);
} finally {
this.loading = false;
}
@@ -1362,11 +1406,12 @@
type: 'warning'
});
if (confirmResult) {
- await TreeDeactivate(this.nodeClickList);
- this.$message({
- type: 'success',
- message: '鍋滅敤鎴愬姛!'
- });
+ await TreeDeactivate(this.nodeClickList).then(res => {
+ this.$message({
+ type: 'success',
+ message: '鍋滅敤鎴愬姛!'
+ });
+ })
this.nodeClickList['flag'] = true;
await this.getAttr();
} else {
@@ -1376,7 +1421,7 @@
});
}
} catch (error) {
- console.error(error);
+ // console.error(error);
} finally {
this.loading = false;
}
@@ -1412,9 +1457,9 @@
this.ProData = [];
this.crudOid = ''
}
- this.TreeList = res3.data.data;
- if (this.TreeList.isParticipateCheck === null || this.TreeList.isParticipateCheck === undefined || this.TreeList.isParticipateCheck === "") {
- this.$set(this.TreeList, "isParticipateCheck", 1)
+ this.TreeEditObj = res3.data.data;
+ if (this.TreeEditObj.isParticipateCheck === null || this.TreeEditObj.isParticipateCheck === undefined || this.TreeEditObj.isParticipateCheck === "") {
+ this.$set(this.TreeEditObj, "isParticipateCheck", 1)
return
}
} catch (error) {
@@ -1446,12 +1491,12 @@
}
},
treeClick(e) {
- console.log(e);
+ // console.log(e);
},
//鍩烘湰淇℃伅琛ㄥ崟鍒锋柊
referTreeForm() {
getObjectByOid(this.nodeClickList.oid).then(res => {
- this.TreeList = res.data.data;
+ this.TreeEditObj = res.data.data;
}).catch(res => {
this.$message.error(res)
})
--
Gitblit v1.9.3