From cd6722665d20ed6a9221a44d381b5e0901fc918d Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期五, 15 九月 2023 17:12:09 +0800
Subject: [PATCH] 颜色别表更新
---
src/views/datamanage/layerManagement.vue | 70 +++++++++++++++++++++++++++--------
1 files changed, 54 insertions(+), 16 deletions(-)
diff --git a/src/views/datamanage/layerManagement.vue b/src/views/datamanage/layerManagement.vue
index e075579..1cca2bd 100644
--- a/src/views/datamanage/layerManagement.vue
+++ b/src/views/datamanage/layerManagement.vue
@@ -99,7 +99,7 @@
</div>
<div class="dividing-line"></div>
- <div style="padding: 10px;">
+ <div style="padding: 10px;height: 70vh;margin-top: 10px; overflow: auto;">
<el-form
:model="formInline"
class="demo-form-inline"
@@ -241,7 +241,7 @@
<!-- 鏄惁鏄剧ず -->
<el-form-item
v-show="formInline.isLayer == 1"
- :label="$t('dataManage.layerObj.displayOrNot')"
+ :label="$t('dataManage.layerObj.enableOrNot')"
>
<el-radio
@@ -253,7 +253,20 @@
label="1"
> {{$t('dataManage.layerObj.isEnable')}}</el-radio>
</el-form-item>
-
+ <!-- 鏄惁鏄剧ず -->
+ <el-form-item
+ v-show="formInline.isLayer == 1"
+ :label="$t('dataManage.layerObj.displayOrNot')"
+ >
+ <el-radio
+ v-model="formInline.isShow"
+ label="0"
+ >{{$t('dataManage.layerObj.isfalse')}}</el-radio>
+ <el-radio
+ v-model="formInline.isShow"
+ label="1"
+ > {{$t('dataManage.layerObj.istrue')}}</el-radio>
+ </el-form-item>
<!-- 鎻忚堪 -->
<el-form-item :label="$t('common.bak')">
<el-input
@@ -436,10 +449,10 @@
v-model="insertData.tab"
></el-input>
</el-form-item>
- <!-- 鏄惁鏄剧ず -->
+ <!-- 鏄惁鍚敤 -->
<el-form-item
v-show="insertData.isLayer == 1"
- :label="$t('dataManage.layerObj.displayOrNot')"
+ :label="$t('dataManage.layerObj.enableOrNot')"
>
<el-radio
v-model="insertData.status"
@@ -450,7 +463,20 @@
label="1"
> {{$t('dataManage.layerObj.isEnable')}}</el-radio>
</el-form-item>
-
+ <!-- 鏄惁鏄剧ず -->
+ <el-form-item
+ v-show="insertData.isLayer == 1"
+ :label="$t('dataManage.layerObj.displayOrNot')"
+ >
+ <el-radio
+ v-model="insertData.isShow"
+ label="0"
+ >{{$t('dataManage.layerObj.isfalse')}}</el-radio>
+ <el-radio
+ v-model="insertData.isShow"
+ label="1"
+ > {{$t('dataManage.layerObj.istrue')}}</el-radio>
+ </el-form-item>
<!-- 鎻忚堪 -->
<el-form-item :label="$t('common.bak')">
<el-input
@@ -596,7 +622,7 @@
url: null,
dataType: null,
bak: null,
- isShow: '1',
+ isShow: '0',
isProject: '0',
enName: '',
isLayer: null,
@@ -948,6 +974,7 @@
val.serviceUrl = val.serviceUrl.replaceAll(BASE_URL, '');
val.serviceUrl = val.serviceUrl.replaceAll(token, '{token}')
}
+ val.isShow = parseInt(val.isShow)
val.url = val.serviceUrl
const data = await layer_insert(val);
if (data.code != 200) {
@@ -967,11 +994,17 @@
this.newNode = node;
var id, lever, orderNum;
if (res == 1) {
- //鏂板鍚岀骇
- id = this.formInline.pid;
- let pchildNodes = this.$refs.tree.getNode(this.newNode.id).parent.childNodes
- orderNum = this.getMaxOrderNum(pchildNodes);
- lever = this.formInline.level;
+ if (this.formInline.pid) {
+ id = this.formInline.pid;
+ let pchildNodes = this.$refs.tree.getNode(this.newNode.id).parent.childNodes
+ orderNum = this.getMaxOrderNum(pchildNodes);
+ lever = this.formInline.level;
+ } else {
+ let pchildNodes = this.$refs.tree.getNode(this.newNode.id).parent.childNodes
+ orderNum = this.getMaxOrderNum(pchildNodes);
+ lever = this.formInline.level;
+ id = this.formInline.pid;
+ }
} else if (res == 2) {
//鏂板瀛愮骇
id = this.formInline.id;
@@ -1007,7 +1040,7 @@
url: null,
dataType: null,
bak: null,
- isShow: '1',
+ isShow: '0',
isProject: '0',
enName: '',
isLayer: null,
@@ -1027,6 +1060,7 @@
val.serviceUrl = val.serviceUrl.replaceAll(BASE_URL, '');
val.serviceUrl = val.serviceUrl.replaceAll(token, '{token}')
}
+ val.isShow = parseInt(val.isShow)
val.url = val.serviceUrl
const data = await layer_update(val);
this.currentData = JSON.stringify(this.formInline)
@@ -1050,7 +1084,7 @@
},
//鑾峰彇鍥惧眰鍒楄〃
async getLayerTree() {
- const data = await layer_selectAll();
+ const data = await layer_selectAll({ flag: 0 });
if (data.code != 200) {
return this.$message.error("鍥惧眰鍒楄〃鏌ヨ澶辫触");
}
@@ -1085,12 +1119,16 @@
this.formInline = result;
this.formInline.isLayer = res.isLayer.toString();
this.formInline.status = result.status.toString();
+
+ this.formInline.isShow = res.isShow.toString();
+
+
if (res.resid && res.resid > 0) {
this.serviceActive = true
} else {
this.serviceActive = false
}
- debugger
+
var url;
if (!this.serviceActive) {
url = result.url;
@@ -1174,7 +1212,7 @@
url: null,
dataType: null,
bak: null,
- isShow: '1',
+ isShow: '0',
isProject: '0',
enName: '',
isLayer: null,
--
Gitblit v1.9.3