From a4bd8cfdabb8452dadd0a24252f85875aacef784 Mon Sep 17 00:00:00 2001
From: WX <1377869194@qq.com>
Date: 星期二, 15 八月 2023 11:08:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.20.39:8989/r/LunarMidplane
---
src/views/datamanage/layerManagement.vue | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/src/views/datamanage/layerManagement.vue b/src/views/datamanage/layerManagement.vue
index 9ddd70c..50b0125 100644
--- a/src/views/datamanage/layerManagement.vue
+++ b/src/views/datamanage/layerManagement.vue
@@ -166,7 +166,7 @@
<!-- 鏁版嵁绫诲瀷 -->
<el-form-item
v-show="formInline.isLayer == 1"
- :label="$t('dataManage.layerObj.firm')"
+ :label="$t('dataManage.layerObj.serviceType')"
>
<el-select
style="width: 60%;"
@@ -176,6 +176,27 @@
>
<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.isLayer == 1"
+ :label="$t('dataManage.layerObj.dataType')"
+ >
+ <el-select
+ style="width: 60%;"
+ v-model="formInline.data"
+ :placeholder="$t('dataManage.layerObj.prompt3')"
+ :disabled="serviceActive"
+ >
+ <el-option
+ v-for="item in serveType"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -323,7 +344,7 @@
<!-- 鏁版嵁绫诲瀷 -->
<el-form-item
v-show="insertData.isLayer == 1"
- :label="$t('dataManage.layerObj.firm')"
+ :label="$t('dataManage.layerObj.serviceType')"
>
<el-select
:disabled="insertServiceActive"
@@ -333,6 +354,26 @@
>
<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.isLayer == 1"
+ :label="$t('dataManage.layerObj.dataType')"
+ >
+ <el-select
+ style="width: 60%;"
+ v-model="insertData.data"
+ :placeholder="$t('dataManage.layerObj.prompt3')"
+ :disabled="serviceActive"
+ >
+ <el-option
+ v-for="item in serveType"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -451,7 +492,7 @@
<el-table-column
align="center"
prop="category"
- :label="$t('dataManage.layerObj.firm')"
+ :label="$t('dataManage.layerObj.serviceType')"
:formatter="setResCategory"
/>
<el-table-column
@@ -552,7 +593,8 @@
tableData: [],
multipleSelection: [],
serviceActive: true,
- insertServiceActive: false
+ insertServiceActive: false,
+
};
},
watch: {
@@ -581,6 +623,7 @@
this.insertData.resid = this.multipleSelection.id
this.insertData.serviceUrl = serviceUrl;
this.insertData.url = url;
+ this.insertData.data = this.multipleSelection.data;
this.insertServiceActive = true
// this.insertData.status = this.multipleSelection.status;
} else {
@@ -589,6 +632,7 @@
this.formInline.type = this.multipleSelection.type;
this.formInline.resid = this.multipleSelection.id
this.formInline.serviceUrl = serviceUrl;
+ this.formInline.data = this.multipleSelection.data;
this.formInline.url = url;
this.serviceActive = true
// this.formInline.status = '1';
--
Gitblit v1.9.3