From aa82e3631a7571ce14f44ab5cb57401abd89692e Mon Sep 17 00:00:00 2001
From: WX <1377869194@qq.com>
Date: 星期五, 21 七月 2023 16:24:17 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.20.39:8989/r/LunarMidplane
---
src/views/datamanage/layerManagement.vue | 402 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 250 insertions(+), 152 deletions(-)
diff --git a/src/views/datamanage/layerManagement.vue b/src/views/datamanage/layerManagement.vue
index 9caeb2c..ee9c5ee 100644
--- a/src/views/datamanage/layerManagement.vue
+++ b/src/views/datamanage/layerManagement.vue
@@ -58,7 +58,7 @@
>{{ $t("shuJuGuanLi.butten.NewPeer") }}</el-button>
</el-form-item>
<!-- 瀛愮骇鑺傜偣娣诲姞 -->
- <el-form-item v-show="menuStatus.insert">
+ <el-form-item v-show="menuStatus.insert && formInline.type == 1">
<el-button
type="success"
size="small"
@@ -108,40 +108,70 @@
<!-- 鑿滃崟鍚嶇О -->
<el-form-item :label="$t('dataManage.layerObj.layerName')">
<el-input
- :placeholder="$t('dataManage.layerObj.prompt1')"
- style="width: 60%;"
+ style="width: 80%;"
v-model="formInline.cnName"
-
+ :placeholder="$t('dataManage.layerObj.prompt1')"
+ ></el-input>
+ </el-form-item>
+ <!-- 鑻辨枃鍚嶇О -->
+ <el-form-item :label="$t('dataManage.layerObj.englishName')">
+ <el-input
+ style="width: 80%;"
+ v-model="formInline.enName"
+ :placeholder="$t('dataManage.layerObj.prompt6')"
></el-input>
</el-form-item>
<!-- 鑿滃崟绫诲瀷 -->
<el-form-item :label="$t('dataManage.layerObj.layerType')">
<el-select
- :placeholder="$t('dataManage.layerObj.prompt2')"
clearable
- style="width: 60%;"
+ style="width: 80%;"
v-model="formInline.type"
-
+ :placeholder="$t('dataManage.layerObj.prompt2')"
>
<el-option
- label="鐩綍"
- value='1'
+ label="鍥惧眰缁�"
+ :value='1'
></el-option>
<el-option
- label="鍥惧眰"
- value='2'
+ label="鏅�氬浘灞�"
+ :value='2'
></el-option>
+ <el-option
+ label="浠ｇ悊鍥惧眰"
+ :value='3'
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ <!-- 鏁版嵁绫诲瀷 -->
+ <el-form-item
+ v-show="formInline.type === 2 || formInline.type === 3 "
+ :label="$t('dataManage.layerObj.firm')"
+ >
+ <el-select
+ clearable
+ style="width: 80%;"
+ v-model="formInline.firm"
+ :placeholder="$t('dataManage.layerObj.prompt8')"
+ >
+ <el-option
+ v-for="item in dataType"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
</el-select>
</el-form-item>
<!-- 鏈嶅姟绫诲瀷 -->
<el-form-item
- v-show="formInline.type == 2"
+ v-show="formInline.type === 2 || formInline.type === 3 "
:label="$t('dataManage.layerObj.serviceType')"
>
<el-select
clearable
- style="width: 60%;"
- v-model="formInline.serveType"
+ style="width: 80%;"
+ v-model="formInline.category"
:placeholder="$t('dataManage.layerObj.prompt3')"
>
<el-option
@@ -155,77 +185,86 @@
</el-form-item>
<!-- 鏈嶅姟鍦板潃 -->
<el-form-item
- v-show="formInline.type == 2"
+ v-show="formInline.type === 2 || formInline.type === 3 "
:label="$t('dataManage.layerObj.serviceAddress')"
>
<el-input
:placeholder="$t('dataManage.layerObj.prompt4')"
- style="width: 60%;"
+ style="width: 80%;"
v-model="formInline.url"
+ ></el-input>
+ </el-form-item>
+ <!-- 娴嬭瘯鍦板潃 -->
+ <el-form-item
+ v-show="formInline.type === 2 || formInline.type === 3 "
+ :label="$t('dataManage.layerObj.testAddress')"
+ >
+ <el-input
+ :placeholder="$t('dataManage.layerObj.prompt9')"
+ style="width: 80%;"
+ v-model="formInline.test"
+ ></el-input>
+ </el-form-item>
+ <!-- 浠ｇ悊鍦板潃 -->
+ <el-form-item
+ v-show="formInline.type === 2 || formInline.type === 3 "
+ :label="$t('dataManage.layerObj.proxyAddress')"
+ >
+ <el-input
+ :disabled="!formInline.proxy"
+ :placeholder="$t('dataManage.layerObj.prompt11')"
+ style="width: 80%;"
+ :value="formInline.proxy"
></el-input>
</el-form-item>
<!-- 鑻辨枃琛ㄥ悕 -->
<el-form-item
- v-show="formInline.type == 2 && formInline.serveType =='WMS'"
- :label="$t('dataManage.layerObj.enTableName')"
+ v-show="formInline.type === 2 || formInline.type === 3 "
+ :label="$t('dataManage.layerObj.tableName')"
>
<el-input
- :placeholder="$t('dataManage.layerObj.prompt6')"
- style="width: 60%;"
- v-model="formInline.enName"
+ :placeholder="$t('dataManage.layerObj.prompt12')"
+ style="width: 80%;"
+ v-model="formInline.tab"
></el-input>
</el-form-item>
- <!-- 鏁版嵁绫诲瀷 -->
- <el-form-item :label="$t('dataManage.layerObj.dataType')">
- <el-select
- clearable
- style="width: 60%;"
- v-model="formInline.dataType"
- :placeholder="$t('dataManage.layerObj.prompt8')"
- >
- <el-option
- v-for="item in dataType"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
+
<!-- 鏄惁鏄剧ず -->
<el-form-item
- v-show="formInline.type == 2"
- :label="$t('dataManage.layerObj.displayOrNot')"
+ v-show="formInline.type === 2 || formInline.type === 3 "
+ :label="$t('dataManage.layerObj.status')"
>
<el-radio
- v-model="formInline.isShow"
- label="0"
- > {{$t('dataManage.layerObj.isfalse')}}</el-radio>
+ v-model="formInline.status"
+ :label="0"
+ > {{$t('dataManage.layerObj.isStop')}}</el-radio>
<el-radio
- v-model="formInline.isShow"
- label="1"
- >{{$t('dataManage.layerObj.istrue')}}</el-radio>
+ v-model="formInline.status"
+ :label="1"
+ >{{$t('dataManage.layerObj.isEnable')}}</el-radio>
+ <el-radio
+ v-model="formInline.status"
+ :label="-1"
+ >{{$t('dataManage.layerObj.isDisuse')}}</el-radio>
</el-form-item>
<!-- 鏄惁涓洪」鐩暟鎹� -->
- <el-form-item
- v-show="formInline.type == 2"
- :label="$t('dataManage.layerObj.isItProjectData')"
- >
- <el-radio
- v-model="formInline.isProject"
- label="0"
- > {{$t('dataManage.layerObj.isfalse')}}</el-radio>
- <el-radio
- v-model="formInline.isProject"
- label="1"
- >{{$t('dataManage.layerObj.istrue')}}</el-radio>
- </el-form-item>
+ <!-- <el-form-item :label="$t('dataManage.layerObj.isItProjectData')">
+ <el-radio
+ v-model="insertData.isProject"
+ label="0"
+ > {{$t('dataManage.layerObj.isfalse')}}</el-radio>
+ <el-radio
+ v-model="insertData.isProject"
+ label="1"
+ >{{$t('dataManage.layerObj.istrue')}}</el-radio>
+ </el-form-item> -->
<!-- 鎻忚堪 -->
- <el-form-item :label="$t('common.bak')">
+ <el-form-item :label="$t('dataManage.layerObj.descr')">
<el-input
- style="width: 60%;"
- v-model="formInline.bak"
- :placeholder="$t('dataManage.layerObj.prompt7')"
+ :placeholder="$t('dataManage.layerObj.prompt10')"
+ style="width: 80%;"
+ v-model="formInline.descr"
+ type="textarea"
></el-input>
</el-form-item>
<el-form-item v-show="menuStatus.update">
@@ -263,6 +302,14 @@
:placeholder="$t('dataManage.layerObj.prompt1')"
></el-input>
</el-form-item>
+ <!-- 鑻辨枃鍚嶇О -->
+ <el-form-item :label="$t('dataManage.layerObj.englishName')">
+ <el-input
+ style="width: 80%;"
+ v-model="insertData.enName"
+ :placeholder="$t('dataManage.layerObj.prompt6')"
+ ></el-input>
+ </el-form-item>
<!-- 鑿滃崟绫诲瀷 -->
<el-form-item :label="$t('dataManage.layerObj.layerType')">
<el-select
@@ -272,24 +319,48 @@
:placeholder="$t('dataManage.layerObj.prompt2')"
>
<el-option
- label="鐩綍"
- value='1'
+ label="鍥惧眰缁�"
+ :value='1'
></el-option>
<el-option
- label="鍥惧眰"
- value='2'
+ label="鏅�氬浘灞�"
+ :value='2'
></el-option>
+ <el-option
+ label="浠ｇ悊鍥惧眰"
+ :value='3'
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ <!-- 鏁版嵁绫诲瀷 -->
+ <el-form-item
+ v-show="insertData.type === 2 || insertData.type === 3"
+ :label="$t('dataManage.layerObj.firm')"
+ >
+ <el-select
+ clearable
+ style="width: 80%;"
+ v-model="insertData.firm"
+ :placeholder="$t('dataManage.layerObj.prompt8')"
+ >
+ <el-option
+ v-for="item in dataType"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
</el-select>
</el-form-item>
<!-- 鏈嶅姟绫诲瀷 -->
<el-form-item
- v-show="insertData.type == 2"
+ v-show="insertData.type === 2 || insertData.type === 3"
:label="$t('dataManage.layerObj.serviceType')"
>
<el-select
clearable
style="width: 80%;"
- v-model="insertData.serveType"
+ v-model="insertData.category"
:placeholder="$t('dataManage.layerObj.prompt3')"
>
<el-option
@@ -303,7 +374,7 @@
</el-form-item>
<!-- 鏈嶅姟鍦板潃 -->
<el-form-item
- v-show="insertData.type == 2"
+ v-show="insertData.type === 2 || insertData.type === 3"
:label="$t('dataManage.layerObj.serviceAddress')"
>
<el-input
@@ -312,53 +383,48 @@
v-model="insertData.url"
></el-input>
</el-form-item>
- <!-- 鑻辨枃琛ㄥ悕 -->
<el-form-item
- v-show="insertData.type == 2 && insertData.serveType =='WMS'"
- :label="$t('dataManage.layerObj.enTableName')"
+ v-show="insertData.type === 2 || insertData.type === 3"
+ :label="$t('dataManage.layerObj.testAddress')"
>
<el-input
- :placeholder="$t('dataManage.layerObj.prompt6')"
+ :placeholder="$t('dataManage.layerObj.prompt9')"
style="width: 80%;"
- v-model="insertData.enName"
+ v-model="insertData.test"
></el-input>
</el-form-item>
- <!-- 鏁版嵁绫诲瀷 -->
- <el-form-item :label="$t('dataManage.layerObj.dataType')">
- <el-select
- clearable
+ <!-- 鑻辨枃琛ㄥ悕 -->
+ <el-form-item
+ v-show="formInline.type === 2 || formInline.type === 3 "
+ :label="$t('dataManage.layerObj.tableName')"
+ >
+ <el-input
+ :placeholder="$t('dataManage.layerObj.prompt12')"
style="width: 80%;"
- v-model="insertData.dataType"
- :placeholder="$t('dataManage.layerObj.prompt8')"
- >
- <el-option
- v-for="item in dataType"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
+ v-model="insertData.tab"
+ ></el-input>
</el-form-item>
+
<!-- 鏄惁鏄剧ず -->
<el-form-item
- v-show="insertData.type == 2"
- :label="$t('dataManage.layerObj.displayOrNot')"
+ v-show="insertData.type === 2 || insertData.type === 3"
+ :label="$t('dataManage.layerObj.status')"
>
<el-radio
- v-model="insertData.isShow"
- label="0"
- > {{$t('dataManage.layerObj.isfalse')}}</el-radio>
+ v-model="insertData.status"
+ :label="0"
+ > {{$t('dataManage.layerObj.isStop')}}</el-radio>
<el-radio
- v-model="insertData.isShow"
- label="1"
- >{{$t('dataManage.layerObj.istrue')}}</el-radio>
+ v-model="insertData.status"
+ :label="1"
+ >{{$t('dataManage.layerObj.isEnable')}}</el-radio>
+ <el-radio
+ v-model="insertData.status"
+ :label="-1"
+ >{{$t('dataManage.layerObj.isDisuse')}}</el-radio>
</el-form-item>
<!-- 鏄惁涓洪」鐩暟鎹� -->
- <el-form-item
- v-show="insertData.type == 2"
- :label="$t('dataManage.layerObj.isItProjectData')"
- >
+ <!-- <el-form-item :label="$t('dataManage.layerObj.isItProjectData')">
<el-radio
v-model="insertData.isProject"
label="0"
@@ -367,14 +433,14 @@
v-model="insertData.isProject"
label="1"
>{{$t('dataManage.layerObj.istrue')}}</el-radio>
- </el-form-item>
+ </el-form-item> -->
<!-- 鎻忚堪 -->
- <el-form-item :label="$t('common.bak')">
+ <el-form-item :label="$t('dataManage.layerObj.descr')">
<el-input
- :placeholder="$t('dataManage.layerObj.prompt7')"
+ :placeholder="$t('dataManage.layerObj.prompt10')"
style="width: 80%;"
- v-model="insertData.bak"
-
+ v-model="insertData.descr"
+ type="textarea"
></el-input>
</el-form-item>
<el-form-item v-show="menuStatus.update">
@@ -386,6 +452,7 @@
<el-button
type="info"
size="small"
+ @click="cannelForm( )"
>{{$t('common.cancel')}}</el-button>
</el-form-item>
@@ -398,11 +465,11 @@
import MyBread from "../../components/MyBread.vue";
import {
getPerms,
- layer_selectAll,
- layer_update,
- layer_updates,
- layer_insert,
- layer_delete
+ res_selectAll,
+ res_insert,
+ res_delete,
+ res_updates,
+ res_update,
} from "../../api/api";
import $ from 'jquery'
import { getToken } from '../../utils/auth';
@@ -486,11 +553,18 @@
arr.push(res);
}
});
+ var token = getToken();
+ if (arr[1].proxy && arr[1].proxy.indexOf(token) > -1) {
+ arr[1].proxy.replace(token, "{token}")
+ }
- const orderNum = arr[1].orderNum
- arr[1].orderNum = arr[0].orderNum
- arr[0].orderNum = orderNum
+ if (arr[0].proxy && arr[0].proxy.indexOf(token) > -1) {
+ arr[0].proxy.replace(token, "{token}")
+ }
+ const orderNum = arr[1].sort
+ arr[1].sort = arr[0].sort
+ arr[0].sort = orderNum
this.newData = arr;
this.sendChange();
} else {
@@ -517,9 +591,18 @@
arr.push(res);
}
});
- const orderNum = arr[1].orderNum
- arr[1].orderNum = arr[0].orderNum
- arr[0].orderNum = orderNum
+ var token = getToken();
+ if (arr[1].proxy && arr[1].proxy.indexOf(token) > -1) {
+ arr[1].proxy.replace(token, "{token}")
+ }
+
+ if (arr[0].proxy && arr[0].proxy.indexOf(token) > -1) {
+ arr[0].proxy.replace(token, "{token}")
+ }
+
+ const orderNum = arr[1].sort
+ arr[1].sort = arr[0].sort
+ arr[0].sort = orderNum
this.newData = arr;
this.sendChange();
} else {
@@ -532,7 +615,7 @@
}
},
async sendChange() {
- const data = await layer_updates(this.newData)
+ const data = await res_updates(this.newData)
if (data.code != 200) {
return this.$message.error("绉诲姩澶辫触");
}
@@ -540,7 +623,7 @@
},
async setDeleteNode() {
- const data = await layer_delete({ id: this.formInline.id });
+ const data = await res_delete({ id: this.formInline.id });
if (data.code != 200) {
return this.$message.error("鍒犻櫎澶辫触");
}
@@ -562,7 +645,7 @@
var val = this.insertData;
val.isShow = parseInt(val.isShow);
val.isProject = parseInt(val.isProject);
- const data = await layer_insert(val);
+ const data = await res_insert(val);
if (data.code != 200) {
return this.$message.error("鏂板澶辫触");
}
@@ -594,14 +677,18 @@
}
this.insertData.pid = id;
this.insertData.level = lever;
- this.insertData.orderNum = orderNum;
+ this.insertData.sort = orderNum;
this.dialogVisible = true;
},
+ cannelForm() {
+ this.dialogVisible = false;
+ this.insertData = {}
+ },
getMaxOrderNum(res) {
- var val = -100;
+ var val = 1;
for (var i in res) {
- if (res[i].data.orderNum > val) {
- val = res[i].data.orderNum;
+ if (res[i].data.sort > val) {
+ val = res[i].data.sort;
}
}
val = val + 1;
@@ -609,21 +696,17 @@
},
insertStart() {
this.insertData = {
- cnName: null,
- type: null,
- serveType: null,
- serveType: null,
- url: null,
- dataType: null,
- bak: null,
- isShow: '0',
- isProject: '0'
+
}
},
//淇敼鏁版嵁
async updateSend() {
var val = JSON.parse(JSON.stringify(this.formInline));
- const data = await layer_update(val);
+ var token = getToken()
+ if (val.proxy && val.proxy.indexOf(token) > -1) {
+ val.proxy = val.proxy.replace(token, "{token}");
+ }
+ const data = await res_update(val);
this.currentData = JSON.stringify(this.formInline)
if (data.code != 200) {
return this.$message.error("淇敼澶辫触");
@@ -637,20 +720,27 @@
//淇敼閲嶇疆
updateRest() {
var res = JSON.parse(this.backUpData);
+ var token = getToken()
+ if (res.proxy && res.proxy.indexOf('{token}') > -1) {
+ res.proxy = res.proxy.replace("{token}", token);
+ }
this.formInline = res;
- this.formInline.type = res.type.toString();
- this.formInline.isShow = res.isShow.toString();
- this.formInline.isProject = res.isProject.toString();
+ // this.formInline.type = res.type.toString();
+ // this.formInline.isShow = res.isShow.toString();
+ // this.formInline.isProject = res.isProject.toString();
},
//鑾峰彇鍥惧眰鍒楄〃
async getLayerTree() {
- const data = await layer_selectAll();
+ const data = await res_selectAll();
if (data.code != 200) {
return this.$message.error("鍥惧眰鍒楄〃鏌ヨ澶辫触");
}
this.oriData = data.result;
this.newData = data.result;
var val = this.setTreeData(data.result);
+ val.sort(function (a, b) {
+ return a.sort - b.sort
+ })
this.treeData = val;
var cdata;
if (this.currentData) {
@@ -665,17 +755,23 @@
});
},
layerFormInline(res) {
-
+ var token = getToken();
var val = JSON.parse(JSON.stringify(res))
-
var data = this.$refs.tree.getNode(val.id).data;
var result = JSON.parse(JSON.stringify(data))
this.backUpData = JSON.stringify(result)
this.currentData = JSON.stringify(result)
this.formInline = result;
- this.formInline.type = result.type.toString();
- this.formInline.isShow = result.isShow.toString();
- this.formInline.isProject = result.isProject.toString();
+
+ if (result.proxy && result.proxy.indexOf('{token}') > -1) {
+ this.formInline.proxy = result.proxy.replace("{token}", token);
+ } else {
+ this.formInline.proxy = result.proxy
+ }
+
+ // this.formInline.type = result.type.toString();
+ // this.formInline.isShow = result.isShow.toString();
+ // this.formInline.isProject = result.isProject.toString();
},
//鍥惧眰鍒楄〃鐐瑰嚮浜嬩欢
handleNodeClick(data, node) {
@@ -690,7 +786,7 @@
branchArr.sort(function (a, b) {
- return a.orderNum - b.orderNum
+ return a.sort - b.sort
})
}
@@ -711,15 +807,15 @@
var ste = [];
for (var i in serve_type) {
std.push({
- value: serve_type[i],
- label: serve_type[i],
+ value: serve_type[i].value,
+ label: serve_type[i].name,
})
}
this.serveType = std;
for (var i in data_type) {
ste.push({
- value: data_type[i],
- label: data_type[i],
+ value: data_type[i].value,
+ label: data_type[i].name,
})
}
this.dataType = ste;
@@ -809,7 +905,10 @@
padding: 10px;
box-sizing: border-box;
border: 1px solid #dcdfe6;
+ overflow: auto;
.menuTop {
+ overflow: auto;
+ height: 100%;
/deep/ .el-form-item {
margin: 5px;
}
@@ -817,8 +916,7 @@
}
}
/deep/ .el-input__suffix {
-
- top: 50%;
- transform: translateY(-50%);
+ top: 50%;
+ transform: translateY(-50%);
}
</style>
--
Gitblit v1.9.3