From 738b846113ae39fbd0594ff98d968f559e9a8a90 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 24 七月 2023 11:17:23 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 4 ++--
Source/UBCS-WEB/src/router/avue-router.js | 1 -
Source/UBCS-WEB/vue.config.js | 4 ++--
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 14 ++++++++++----
Source/UBCS-WEB/src/api/omd/enum.js | 2 --
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 5 -----
6 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/omd/enum.js b/Source/UBCS-WEB/src/api/omd/enum.js
index 0427f19..b471140 100644
--- a/Source/UBCS-WEB/src/api/omd/enum.js
+++ b/Source/UBCS-WEB/src/api/omd/enum.js
@@ -25,7 +25,6 @@
}
export const getChildList = (current, size, parentoid, params) => {
- debugger;
return request({
url: '/api/ubcs-omd/enumItem/listAll',
method: 'get',
@@ -75,7 +74,6 @@
}
export const update = (row) => {
- debugger;
return request({
url: '/api/ubcs-omd/enum/submit',
method: 'post',
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 4fe2405..ce76a42 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -29,6 +29,7 @@
},
data(){
return{
+ idData:'',
masterVrBtnList:[],
tableHeadFindData:[],
tableHeadDataFateher:[],
@@ -76,9 +77,12 @@
methods:{
//鑾峰彇鏁版嵁
getTreeLists(){
- const fullPath = this.$route.fullPath
- const queryString = fullPath.split('?')[1];
- getTreeList({'conditionMap[id]': 'wupin'}).then(res=>{
+ const index = this.$route.query.id.indexOf('@');
+ const result = this.$route.query.id.substring(0, index);
+ this.idData=result
+ // console.log(this.$route)
+ console.log(this.idData)
+ getTreeList({'conditionMap[id]':this.idData }).then(res=>{
this.Treedata=res.data
this.ModifyProperties(this.Treedata, 'text', 'label');
this.codeClassifyOid=res.data[0].oid;
@@ -117,10 +121,12 @@
},
//琛ㄦ牸澶撮儴
TableHeadRend() {
+ const index = this.$route.query.id.indexOf('@');
+ const result = this.$route.query.id.substring(0, index);
return new Promise((resolve, reject) => {
MasterTable({
codeClassifyOid: this.nodeClickList.oid,
- functionId: 5,
+ functionId:result,
}).then(res => {
const flagsToDeleteBtn = ["CODEIMPORTHISTORY", "CODEEXPORT", "CODEQUERY","batchApplyCode"];
//涓嶅悓鑺傜偣鏄剧ず涓嶅悓鎸夐挳
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index eb773e3..ec68c50 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -72,11 +72,6 @@
<el-table :data="tableData" style="width: 100%" @cell-click="handleCellClick"
@selection-change="handleSelectionChange">
<!-- 娓叉煋琛ㄦ牸鍒楀強浼犲弬 -->
- <el-table-column label="搴忓彿" type="index"></el-table-column>
- <el-table-column
- type="selection"
- width="55">
- </el-table-column>
<el-table-column label="閫夐」鍊�" prop="key">
<template slot-scope="{ row }">
<!-- 缂栬緫鍜屽睍绀洪�昏緫 -->
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index b373861..c40093b 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -628,13 +628,13 @@
},
stopLose: {
tip: "妯℃澘鍙湁鍙戝竷鐘舵�佹墠鑳借浣跨敤锛屾槸鍚︾‘瀹氬仠鐢紵",
- typeText: "鍋滅敤/澶辨晥",
+ typeText: "鍋滅敤",
funAPi: stopLose,
load: 'stopLoseLoad'
},
startRelease: {
tip: "鏄惁纭畾鍚敤/鍙戝竷杩欎釜妯℃澘锛屾ā鏉垮彧鏈夊彂甯冪姸鎬佹墠鑳借浣跨敤锛屾槸鍚︾户缁紵",
- typeText: "鍚敤/鍙戝竷",
+ typeText: "鍚敤",
funAPi: startRelease,
load: 'startReleaseLoad'
}
diff --git a/Source/UBCS-WEB/src/router/avue-router.js b/Source/UBCS-WEB/src/router/avue-router.js
index 8be667c..e39c327 100644
--- a/Source/UBCS-WEB/src/router/avue-router.js
+++ b/Source/UBCS-WEB/src/router/avue-router.js
@@ -208,7 +208,6 @@
// for寰幆缁撴潫
// 杩欎釜first 鍗＄殑鍏跺疄灏辨槸棣栬矾鐢�
if (first) {
- debugger;
this.safe.$router.addRoutes(aRouter)
} else {
// 杩欓噷杩斿洖鐨勬槸瀛愮粍浠�
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index ad43a75..0991057 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,10 +26,10 @@
proxy: {
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
- target: 'http://localhost:37000',
+ // target: 'http://localhost:37000',
// target: 'http://192.168.1.51:37000',
// target: 'http://192.168.1.46:37000',
- // target: 'http://dev.vci-tech.com:37000',
+ target: 'http://dev.vci-tech.com:37000',
// target: 'http://192.168.1.51:37000/',
// target: 'http://192.168.1.104:37000',
// target: 'http://192.168.1.63:37000',
--
Gitblit v1.9.3