From ec86ce630c3bf6ef4abe5f52ecde21eeda03c5e7 Mon Sep 17 00:00:00 2001
From: WX <1377869194@qq.com>
Date: 星期二, 15 八月 2023 10:59:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.20.39:8989/r/LunarMidplane
---
src/views/datamanage/layerManagement.vue | 116 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 84 insertions(+), 32 deletions(-)
diff --git a/src/views/datamanage/layerManagement.vue b/src/views/datamanage/layerManagement.vue
index 5d1dedc..9ddd70c 100644
--- a/src/views/datamanage/layerManagement.vue
+++ b/src/views/datamanage/layerManagement.vue
@@ -132,13 +132,15 @@
size="small"
class="serviceButton"
@click="setServiceChange('0')"
- :class="{serviceActive: formInline.service === '0'}"
+ key="0"
+ :class="{serviceActive: !serviceActive }"
>{{$t('dataManage.layerObj.isfalse')}}</el-button>
<el-button
size="small"
class="serviceButton"
@click="setServiceChange('1')"
- :class="{serviceActive: formInline.service === '1'}"
+ key="1"
+ :class="{serviceActive: serviceActive}"
>{{$t('dataManage.layerObj.istrue')}}</el-button>
</el-form-item>
@@ -148,7 +150,7 @@
:placeholder="$t('dataManage.layerObj.prompt1')"
style="width: 60%;"
v-model="formInline.cnName"
- :disabled="formInline.service =='1'"
+ :disabled="serviceActive"
></el-input>
</el-form-item>
<!-- 鑻辨枃鍚嶇О -->
@@ -157,20 +159,20 @@
:placeholder="$t('dataManage.layerObj.prompt6')"
style="width: 60%;"
v-model="formInline.enName"
- :disabled="formInline.service =='1'"
+ :disabled="serviceActive"
></el-input>
</el-form-item>
<!-- 鏁版嵁绫诲瀷 -->
<el-form-item
v-show="formInline.isLayer == 1"
- :label="$t('dataManage.layerObj.serviceType')"
+ :label="$t('dataManage.layerObj.firm')"
>
<el-select
style="width: 60%;"
v-model="formInline.type"
:placeholder="$t('dataManage.layerObj.prompt3')"
- :disabled="formInline.service =='1'"
+ :disabled="serviceActive"
>
<el-option
v-for="item in dataType"
@@ -189,8 +191,8 @@
<el-input
:placeholder="$t('dataManage.layerObj.prompt4')"
style="width: 60%;"
- v-model="formInline.url"
- :disabled="formInline.service =='1'"
+ v-model="formInline.serviceUrl"
+ :disabled="serviceActive"
></el-input>
</el-form-item>
@@ -271,7 +273,7 @@
v-show="insertData.isLayer == 1"
:label="$t('dataManage.layerObj.serviceResources')"
>
- <el-button
+ <!-- <el-button
size="small"
class="serviceButton"
@click="setServiceChange('0')"
@@ -282,13 +284,27 @@
class="serviceButton"
@click="setServiceChange('1')"
:class="{serviceActive: insertData.service === '1'}"
+ >{{$t('dataManage.layerObj.istrue')}}</el-button> -->
+ <el-button
+ size="small"
+ class="serviceButton"
+ @click="setInsertServiceChange('0')"
+ key="0"
+ :class="{serviceActive: !insertServiceActive }"
+ >{{$t('dataManage.layerObj.isfalse')}}</el-button>
+ <el-button
+ size="small"
+ class="serviceButton"
+ @click="setInsertServiceChange('1')"
+ key="1"
+ :class="{serviceActive: insertServiceActive}"
>{{$t('dataManage.layerObj.istrue')}}</el-button>
</el-form-item>
<!-- 鑿滃崟鍚嶇О -->
<el-form-item :label="$t('dataManage.layerObj.layerName')">
<el-input
- :disabled="insertData.service =='1'"
+ :disabled="insertServiceActive"
:placeholder="$t('dataManage.layerObj.prompt1')"
style="width: 60%;"
v-model="insertData.cnName"
@@ -297,7 +313,7 @@
<!-- 鑻辨枃鍚嶇О -->
<el-form-item :label="$t('dataManage.layerObj.englishName')">
<el-input
- :disabled="insertData.service =='1'"
+ :disabled="insertServiceActive"
:placeholder="$t('dataManage.layerObj.prompt6')"
style="width: 60%;"
v-model="insertData.enName"
@@ -307,10 +323,10 @@
<!-- 鏁版嵁绫诲瀷 -->
<el-form-item
v-show="insertData.isLayer == 1"
- :label="$t('dataManage.layerObj.serviceType')"
+ :label="$t('dataManage.layerObj.firm')"
>
<el-select
- :disabled="insertData.service =='1'"
+ :disabled="insertServiceActive"
style="width: 60%;"
v-model="insertData.type"
:placeholder="$t('dataManage.layerObj.prompt3')"
@@ -330,10 +346,10 @@
:label="$t('dataManage.layerObj.serviceAddress')"
>
<el-input
- :disabled="insertData.service =='1'"
+ :disabled="insertServiceActive"
:placeholder="$t('dataManage.layerObj.prompt4')"
style="width: 60%;"
- v-model="insertData.url"
+ v-model="insertData.serviceUrl"
></el-input>
</el-form-item>
<!-- 鏄惁鏄剧ず -->
@@ -435,7 +451,7 @@
<el-table-column
align="center"
prop="category"
- :label="$t('dataManage.layerObj.serviceType')"
+ :label="$t('dataManage.layerObj.firm')"
:formatter="setResCategory"
/>
<el-table-column
@@ -502,7 +518,8 @@
isLayer: null,
category: null,
status: null,
- service: '0'
+ service: '0',
+ serviceUrl: null
},
serveType: null,
dataType: null,
@@ -534,6 +551,8 @@
},
tableData: [],
multipleSelection: [],
+ serviceActive: true,
+ insertServiceActive: false
};
},
watch: {
@@ -546,35 +565,36 @@
if (this.multipleSelection.length <= 0) {
return this.$message("鏈�夋嫨璧勬簮鏁版嵁");
}
-
- var url;
+ var url, serviceUrl;
if (this.multipleSelection.status == 1) {
+ serviceUrl = this.multipleSelection.url;
url = this.multipleSelection.url;
} else if (this.multipleSelection.status == 2) {
var token = getToken()
- url = BASE_URL + this.multipleSelection.proxy.replaceAll('{token}', token);
+ serviceUrl = BASE_URL + this.multipleSelection.proxy.replaceAll('{token}', token);
+ url = this.multipleSelection.proxy;
}
-
if (this.dialogVisible) {
this.insertData.cnName = this.multipleSelection.cnName;
this.insertData.enName = this.multipleSelection.enName;
this.insertData.type = this.multipleSelection.type;
this.insertData.resid = this.multipleSelection.id
+ this.insertData.serviceUrl = serviceUrl;
this.insertData.url = url;
- this.insertData.service = '1'
+ this.insertServiceActive = true
+ // this.insertData.status = this.multipleSelection.status;
} else {
this.formInline.cnName = this.multipleSelection.cnName;
this.formInline.enName = this.multipleSelection.enName;
this.formInline.type = this.multipleSelection.type;
this.formInline.resid = this.multipleSelection.id
+ this.formInline.serviceUrl = serviceUrl;
this.formInline.url = url;
- this.formInline.service = '1'
+ this.serviceActive = true
+ // this.formInline.status = '1';
+
}
-
-
-
this.dialogService = false
-
},
setServiceRest() {
this.listData = {
@@ -664,6 +684,17 @@
setServiceChange(res) {
if (res == '1') {
this.setServiceRest()
+ } else {
+ this.serviceActive = false
+ this.formInline.resid = 0
+ }
+ },
+ setInsertServiceChange(res) {
+ if (res == '1') {
+ this.setServiceRest()
+ } else {
+ this.insertServiceActive = false
+ this.insertData.resid = 0
}
},
async getServiceData() {
@@ -780,9 +811,14 @@
this.insertStart();
},
async submitForm() {
- var val = this.insertData;
+ var val = JSON.parse(JSON.stringify(this.insertData));
val.status = parseInt(val.status);
- // val.isProject = parseInt(val.isProject);
+ var token = getToken();
+ if (val.serviceUrl.indexOf(BASE_URL) > -1) {
+ val.serviceUrl = val.serviceUrl.replaceAll(BASE_URL, '');
+ val.serviceUrl = val.serviceUrl.replaceAll(token, '{token}')
+ }
+ val.url = val.serviceUrl
const data = await layer_insert(val);
if (data.code != 200) {
return this.$message.error("鏂板澶辫触");
@@ -849,6 +885,12 @@
//淇敼鏁版嵁
async updateSend() {
var val = JSON.parse(JSON.stringify(this.formInline));
+ var token = getToken();
+ if (val.serviceUrl.indexOf(BASE_URL) > -1) {
+ val.serviceUrl = val.serviceUrl.replaceAll(BASE_URL, '');
+ val.serviceUrl = val.serviceUrl.replaceAll(token, '{token}')
+ }
+ val.url = val.serviceUrl
const data = await layer_update(val);
this.currentData = JSON.stringify(this.formInline)
if (data.code != 200) {
@@ -903,10 +945,19 @@
this.formInline.isLayer = res.isLayer.toString();
this.formInline.status = result.status.toString();
if (res.resid && res.resid > 0) {
- this.formInline.service = '1'
+ this.serviceActive = true
} else {
- this.formInline.service = '0'
+ this.serviceActive = false
}
+ var url;
+ if (!this.serviceActive) {
+ url = result.url;
+ } else if (this.serviceActive) {
+ var token = getToken()
+ url = BASE_URL + result.url.replaceAll('{token}', token);
+ }
+ this.formInline.serviceUrl = url;
+
// this.formInline.isProject = result.isProject.toString();
},
//鍥惧眰鍒楄〃鐐瑰嚮浜嬩欢
@@ -969,7 +1020,8 @@
isProject: '0',
enName: '',
isLayer: null,
- category: null
+ category: null,
+ serviceUrl: null
}
},
//鑾峰彇鏉冮檺
--
Gitblit v1.9.3