From aea776ca7f115901e98b4a1f1d7874ed58d71f94 Mon Sep 17 00:00:00 2001
From: YANGDL <114714267@qq.com>
Date: 星期六, 09 一月 2021 14:08:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/api/region.js | 12 ++++++
src/mock/modules/region.js | 0
src/components/panel/TopEnterprisePanel.vue | 69 +++++++++++-----------------------
3 files changed, 34 insertions(+), 47 deletions(-)
diff --git a/src/api/region.js b/src/api/region.js
new file mode 100644
index 0000000..8e44a63
--- /dev/null
+++ b/src/api/region.js
@@ -0,0 +1,12 @@
+import $http from '@/utils/axios'
+let $HOST = ''
+// 濡傛灉涓嶆槸寮�鍙戠増鏈寚瀹歶rl鍦板潃
+if (process.env.NODE_ENV !== 'development') {
+ $HOST = process.env.VUE_APP_API_HOST
+}
+
+export const RegionList = $HOST + '/region/list'
+
+export function listRegion (data) {
+ return $http.get(RegionList, data)
+}
diff --git a/src/components/panel/TopEnterprisePanel.vue b/src/components/panel/TopEnterprisePanel.vue
index 3d94cbc..1185c8c 100644
--- a/src/components/panel/TopEnterprisePanel.vue
+++ b/src/components/panel/TopEnterprisePanel.vue
@@ -4,7 +4,7 @@
<el-form-item label="鍒嗙被锛�">
<el-select v-model="form.regionType" @change="handlePipelineType">
<el-option
- v-for="item in regionTypeOptions"
+ v-for="item in regionOptions"
:key="item.value"
:label="item.label"
:value="item.value">
@@ -32,6 +32,7 @@
</template>
<script>
+import { listRegion } from '@/api/region'
import { listEnterprise } from '@/api/enterprise'
export default {
@@ -42,44 +43,8 @@
isPanelVisible: false,
total: 0,
list: [],
- regionTypeOptions: [{
- value: '1',
- label: '闀挎睙娴佸煙'
- }, {
- value: '2',
- label: '榛勬渤娴佸煙'
- }, {
- value: '3',
- label: '鍗楅儴娌挎捣姘村煙'
- }, {
- value: '4',
- label: '鐜袱娴锋按鍩�'
- }, {
- value: '5',
- label: '鍏朵粬鍦板煙'
- }, {
- value: '6',
- label: '鍌寲鍓傚叕鍙�'
- }],
- enterpriseOptions: [{
- value: '1',
- label: '鍖楁捣鐐煎寲'
- }, {
- value: '2',
- label: '鑼傚悕鐭冲寲'
- }, {
- value: '3',
- label: '婀涙睙涓滃叴'
- }, {
- value: '4',
- label: '骞垮窞鐭冲寲'
- }, {
- value: '5',
- label: '娴峰崡鐐煎寲'
- }, {
- value: '6',
- label: '鑼傚悕娑︽粦娌�'
- }],
+ regionOptions: [],
+ enterpriseOptions: [],
form: {
regionType: '',
enterprise: ''
@@ -94,11 +59,14 @@
console.log(tab, event)
},
handlePipelineType (item) {
-
+ listEnterprise({}).then((res) => {
+ var data = res.data
+ this.enterpriseOptions = data[item]
+ })
},
loadData () {
- listEnterprise({}).then((res) => {
- console.log(res)
+ listRegion({}).then((res) => {
+ this.regionOptions = res.data
})
},
onSubmit () {
@@ -107,6 +75,8 @@
},
mounted () {
this.loadData()
+ },
+ created () {
}
}
</script>
@@ -114,19 +84,24 @@
<style lang="less">
.top-enterprise-panel {
position: absolute;
- margin:0 auto;
- left: 0; right: 0; top: 0;bottom: 0;
+ margin: 0 auto;
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
z-index: 1000;
width: 940px;
height: 50px;
padding-top: 15px;
background: #07325b;
- border:2px solid #2A8FD4;
- border-radius:10px;
+ border: 2px solid #2A8FD4;
+ border-radius: 10px;
+ text-align: center;
- .el-form-item__label{
+ .el-form-item__label {
color: #ffffff;
}
+
.el-message-box__content {
background-color: #030D2E;
}
diff --git a/src/mock/modules/regionType.js b/src/mock/modules/region.js
similarity index 100%
rename from src/mock/modules/regionType.js
rename to src/mock/modules/region.js
--
Gitblit v1.8.0