elink-star
/
ShibeiWorkPlatform_Frontend
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

合并冲突

shibei_master
jiangyy 4 years ago
parent
0257a95af3 2f467d4df8
commit
5ec86b8f1e
11 changed files with 280 additions and 153 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .env.production
  2. 2
      public/index.html
  3. 4
      src/assets/scss/modules/search.scss
  4. 1
      src/js/dai/request.js
  5. 13
      src/views/main-shuju/main.vue
  6. 16
      src/views/main.vue
  7. 58
      src/views/modules/base/community/buildTable.vue
  8. 40
      src/views/modules/base/community/community.vue
  9. 62
      src/views/modules/base/community/communityTable.vue
  10. 63
      src/views/modules/base/community/roomTable.vue
  11. 16
      src/views/modules/shequ/index.vue

2
.env.production
View File

@ -1,4 +1,4 @@
NODE_ENV=production NODE_ENV=production
VUE_APP_API_SERVER = https://epdc-shibei.elinkservice.cn/api VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api
VUE_APP_NODE_ENV=prod VUE_APP_NODE_ENV=prod
VUE_APP_PUBLIC_PATH=epmet-oper VUE_APP_PUBLIC_PATH=epmet-oper

2
public/index.html
View File

@ -64,7 +64,7 @@
<!-- 生产环境 --> <!-- 生产环境 -->
<% if (process.env.VUE_APP_NODE_ENV==='prod' ) { %> <% if (process.env.VUE_APP_NODE_ENV==='prod' ) { %>
<script> <script>
window.SITE_CONFIG['apiURL'] = 'https://epdc-shibei.elinkservice.cn/api' window.SITE_CONFIG['apiURL'] = 'https://epmet-cloud.elinkservice.cn/api'
</script> </script>
<% } %> <% } %>
</head> </head>

4
src/assets/scss/modules/search.scss
View File

@ -26,13 +26,15 @@
.input { .input {
position: relative; position: relative;
select { .select-show {
border: none; border: none;
display: block;
font-size: 16px; font-size: 16px;
width: 90px; width: 90px;
line-height: 32px; line-height: 32px;
text-align: center; text-align: center;
color: #0082fb; color: #0082fb;
cursor: default;
} }
input { input {

1
src/js/dai/request.js
View File

@ -2,7 +2,6 @@
| 请求接口封装 | | 请求接口封装 |
---------------------------------------------------------------*/ ---------------------------------------------------------------*/
import axios from "axios"; import axios from "axios";
import curry from "dai-js/tools/curry"; import curry from "dai-js/tools/curry";
import { Message } from "element-ui"; import { Message } from "element-ui";

13
src/views/main-shuju/main.vue
View File

@ -1,6 +1,5 @@
<template> <template>
<div <div v-loading.fullscreen.lock="loading"
v-loading.fullscreen.lock="loading"
:element-loading-text="$t('loading')" :element-loading-text="$t('loading')"
:class="[ :class="[
'g-bd', 'g-bd',
@ -8,15 +7,12 @@
{ {
'z-sidebar--noside': true, 'z-sidebar--noside': true,
}, },
]" ]">
>
<template v-if="!loading"> <template v-if="!loading">
<main-navbar ref="ref_navbar" /> <main-navbar ref="ref_navbar" />
<div class="g-cnt"> <div class="g-cnt">
<main-content <main-content v-if="!$store.state.contentIsNeedRefresh"
v-if="!$store.state.contentIsNeedRefresh" @changeCustomerName="changeCustomerName" />
@changeCustomerName="changeCustomerName"
/>
</div> </div>
</template> </template>
</div> </div>
@ -115,6 +111,7 @@ export default {
localStorage.setItem("roleList", data.roleList); localStorage.setItem("roleList", data.roleList);
localStorage.setItem("customerId", data.customerId); localStorage.setItem("customerId", data.customerId);
localStorage.setItem("staffId", data.id); localStorage.setItem("staffId", data.id);
localStorage.setItem("agencyId", data.agencyId);
if (!localStorage.getItem("customerName")) { if (!localStorage.getItem("customerName")) {
localStorage.setItem("customerName", data.customerName || ""); localStorage.setItem("customerName", data.customerName || "");
} }

16
src/views/main.vue
View File

@ -1,6 +1,5 @@
<template> <template>
<div <div v-loading.fullscreen.lock="loading"
v-loading.fullscreen.lock="loading"
:element-loading-text="$t('loading')" :element-loading-text="$t('loading')"
:class="[ :class="[
'aui-wrapper', 'aui-wrapper',
@ -10,16 +9,14 @@
$store.state.sidebarActiveSubMenuList.length == 0 || $store.state.inIframe, $store.state.sidebarActiveSubMenuList.length == 0 || $store.state.inIframe,
}, },
{ 'z-iframe': $store.state.inIframe }, { 'z-iframe': $store.state.inIframe },
]" ]">
>
<template v-if="!loading"> <template v-if="!loading">
<main-navbar ref="ref_navbar" v-if="!$store.state.inIframe" /> <main-navbar ref="ref_navbar"
v-if="!$store.state.inIframe" />
<main-sidebar v-if="!$store.state.inIframe" /> <main-sidebar v-if="!$store.state.inIframe" />
<div class="aui-content__wrapper"> <div class="aui-content__wrapper">
<main-content <main-content v-if="!$store.state.contentIsNeedRefresh"
v-if="!$store.state.contentIsNeedRefresh" @changeCustomerName="changeCustomerName" />
@changeCustomerName="changeCustomerName"
/>
</div> </div>
<main-theme-tools v-if="!$store.state.inIframe" /> <main-theme-tools v-if="!$store.state.inIframe" />
</template> </template>
@ -148,6 +145,7 @@ export default {
localStorage.setItem("roleList", data.roleList); localStorage.setItem("roleList", data.roleList);
localStorage.setItem("customerId", data.customerId); localStorage.setItem("customerId", data.customerId);
localStorage.setItem("staffId", data.id); localStorage.setItem("staffId", data.id);
localStorage.setItem("agencyId", data.agencyId);
if (!localStorage.getItem("customerName")) { if (!localStorage.getItem("customerName")) {
localStorage.setItem("customerName", data.customerName || ""); localStorage.setItem("customerName", data.customerName || "");
} }

58
src/views/modules/base/community/buildTable.vue
View File

@ -41,7 +41,8 @@
size="small" size="small"
icon="el-icon-plus" icon="el-icon-plus"
@click="handleAdd">新增楼宇</el-button> @click="handleAdd">新增楼宇</el-button>
<div class="btn_upload"
v-if="showImportBtn">
<el-button style=";margin-left:10px" <el-button style=";margin-left:10px"
type="blue" type="blue"
size="small" size="small"
@ -83,6 +84,7 @@
type="red">导入房屋数据</el-button> type="red">导入房屋数据</el-button>
</el-upload> </el-upload>
</div> </div>
</div>
<div class="div_table"> <div class="div_table">
<el-table ref="ref_table" <el-table ref="ref_table"
@ -134,12 +136,14 @@
style="color:#1C6AFD;text-decoration: underline;" style="color:#1C6AFD;text-decoration: underline;"
size="small" size="small"
@click="handleDetail(scope.row)">查看</el-button> @click="handleDetail(scope.row)">查看</el-button>
<el-button type="text" <el-button v-if="scope.row.showBtn"
type="text"
style="color:#00A7A9;text-decoration: underline;" style="color:#00A7A9;text-decoration: underline;"
size="small" size="small"
@click="handleEdit(scope.row)">修改</el-button> @click="handleEdit(scope.row)">修改</el-button>
<el-button type="text" <el-button v-if="scope.row.showBtn"
type="text"
style="color:#D51010;text-decoration: underline;" style="color:#D51010;text-decoration: underline;"
size="small" size="small"
@click="handleDelete(scope.row)">删除</el-button> @click="handleDelete(scope.row)">删除</el-button>
@ -206,6 +210,7 @@ export default {
tableLoading: true, tableLoading: true,
selAllFlag: false, selAllFlag: false,
isIndeterminate: false,//复选框的不确定状态 isIndeterminate: false,//复选框的不确定状态
// showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断
agencyObj: {},//树所选的小区对象 agencyObj: {},//树所选的小区对象
ownerName: '', ownerName: '',
@ -242,8 +247,17 @@ export default {
async loadTable (fromTree, treeObj) { async loadTable (fromTree, treeObj) {
this.tableLoading = true this.tableLoading = true
if (fromTree) { if (fromTree) {
this.agencyObj = treeObj this.agencyObj = treeObj
// if (this.agencyObj.pid === this.staffAgencyId) {//如果所选树的父级组织id和登录人员id相同，有权限
// this.showImportBtn = true
// } else {
// this.showImportBtn = false
// }
} }
console.log(this.agencyObj) console.log(this.agencyObj)
const url = "/gov/org/building/buildinglist" const url = "/gov/org/building/buildinglist"
let params = { let params = {
@ -258,6 +272,14 @@ export default {
if (code === 0) { if (code === 0) {
this.total = data.total this.total = data.total
data.list.forEach(item => {
if (item.agencyId === this.staffAgencyId) {
item.showBtn = true
} else {
item.showBtn = false
}
});
this.tableData = data.list this.tableData = data.list
} else { } else {
this.$message.error(msg) this.$message.error(msg)
@ -410,10 +432,11 @@ export default {
this.$emit('refreshTree') this.$emit('refreshTree')
this.loadTable() this.loadTable()
} else if (code > 8000) { } else if (code > 8000) {
// this.$message({ this.$message({
// type: "success", showClose: true,
// message: msg message: msg,
// }); duration: 0
})
this.$emit('refreshTree') this.$emit('refreshTree')
this.loadTable() this.loadTable()
} else { } else {
@ -590,12 +613,12 @@ export default {
if (data.code === 0 && data.msg == 'success') { if (data.code === 0 && data.msg == 'success') {
// this.$message.success('导入成功') // this.$message.success('导入成功')
} else { } else {
this.$message({ // this.$message({
showClose: true, // showClose: true,
message: rspMsg, // message: rspMsg,
duration: 0, // duration: 0,
type: "error" // type: "error"
}) // })
// this.$message.error(rspMsg) // this.$message.error(rspMsg)
} }
this.$emit('refreshTree') this.$emit('refreshTree')
@ -660,7 +683,14 @@ export default {
} }
}, },
props: { props: {
staffAgencyId: {
type: String,
default: '',
},
showImportBtn: {
type: Boolean,
default: false,
},
} }
} }
</script> </script>

40
src/views/modules/base/community/community.vue
View File

@ -29,13 +29,18 @@
<build-table v-if="selTreeObj.level==='neighborHood'" <build-table v-if="selTreeObj.level==='neighborHood'"
ref="ref_neighTable" ref="ref_neighTable"
:staffAgencyId="staffAgencyId"
:showImportBtn="showImportBtn"
@toNextLevel="toNextLevel" @toNextLevel="toNextLevel"
@refreshTree="refreshTree"></build-table> @refreshTree="refreshTree"></build-table>
<room-table v-else-if="selTreeObj.level==='building'" <room-table v-else-if="selTreeObj.level==='building'"
:staffAgencyId="staffAgencyId"
:showImportBtn="showImportBtn"
ref="ref_buildingTable" ref="ref_buildingTable"
@refreshTree="refreshTree"></room-table> @refreshTree="refreshTree"></room-table>
<community-table v-else <community-table v-else
@toNextLevel="toNextLevel" @toNextLevel="toNextLevel"
:staffAgencyId="staffAgencyId"
ref="ref_communityTable" ref="ref_communityTable"
@refreshTree="refreshTree"></community-table> @refreshTree="refreshTree"></community-table>
@ -67,7 +72,9 @@ export default {
selTreeObj: {}, selTreeObj: {},
centerPoint: [] centerPoint: [],
staffAgencyId: localStorage.getItem("agencyId"),
showImportBtn: false
} }
}, },
@ -78,6 +85,7 @@ export default {
this.treeLoading = true this.treeLoading = true
await this.loadOrgData() await this.loadOrgData()
await this.loadTree() await this.loadTree()
await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj) await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
if (this.treeData.length > 0) { if (this.treeData.length > 0) {
this.$nextTick(() => { this.$nextTick(() => {
@ -147,7 +155,12 @@ export default {
handleNodeClick (obj) { handleNodeClick (obj) {
this.getTreeObj(obj) this.getTreeObj(obj)
this.$nextTick(() => { this.$nextTick(() => {
if (obj.level === 'building') {//点击楼栋 if (obj.level === 'building') {//点击楼栋
this.$refs['ref_buildingTable'].loadTable(true, this.selTreeObj) this.$refs['ref_buildingTable'].loadTable(true, this.selTreeObj)
@ -196,18 +209,31 @@ export default {
// 小区：小区id、小区名称、type、所属网格id、所属网格名称、所属组织id、所属组织名称、经度、纬度 // 小区：小区id、小区名称、type、所属网格id、所属网格名称、所属组织id、所属组织名称、经度、纬度
// 楼：楼id、楼名称、type、所属小区id、所属小区名称 // 楼：楼id、楼名称、type、所属小区id、所属小区名称
if (obj.level === 'building') {//点击楼栋 if (obj.level === 'building') {//点击楼栋
let communityNode = this.$refs.ref_tree.getNode(obj.pid) let neighborHoodNode = this.$refs.ref_tree.getNode(obj.pid)//所属小区
obj.communityId = communityNode.data.id
obj.communityName = communityNode.data.label
} else if (obj.level === 'neighborHood') {//点击小区 let gridNode = this.$refs.ref_tree.getNode(neighborHoodNode.data.pid)//所属网格
let agencyNode = this.$refs.ref_tree.getNode(gridNode.data.pid)//所属社区
obj.agencyId = agencyNode.data.id
obj.agencyName = agencyNode.data.label
if (obj.agencyId === this.staffAgencyId) {
this.showImportBtn = true
} else {
this.showImportBtn = false
}
} else if (obj.level === 'neighborHood') {//点击小区
let gridNode = this.$refs.ref_tree.getNode(obj.pid) let gridNode = this.$refs.ref_tree.getNode(obj.pid)
let agencyNode = this.$refs.ref_tree.getNode(gridNode.data.pid) let agencyNode = this.$refs.ref_tree.getNode(gridNode.data.pid)
obj.gridId = gridNode.data.id obj.gridId = gridNode.data.id
obj.gridName = gridNode.data.label obj.gridName = gridNode.data.label
obj.agencyId = agencyNode.data.id obj.agencyId = agencyNode.data.id
obj.agencyName = agencyNode.data.label obj.agencyName = agencyNode.data.label
if (obj.agencyId === this.staffAgencyId) {
this.showImportBtn = true
} else {
this.showImportBtn = false
}
} else { } else {
} }
@ -276,8 +302,8 @@ export default {
.div_table { .div_table {
margin-left: 15px; margin-left: 15px;
flex: 1; // flex: 1;
// width: calc(100vw - 550px); width: calc(100vw - 550px);
background-color: #ffffff; background-color: #ffffff;
border-radius: 5px; border-radius: 5px;
padding: 10px; padding: 10px;

62
src/views/modules/base/community/communityTable.vue
View File

@ -42,7 +42,7 @@
icon="el-icon-plus" icon="el-icon-plus"
@click="handleAdd">新增小区</el-button> @click="handleAdd">新增小区</el-button>
<div class="btn_upload" <div class="btn_upload"
v-if="agencyObj.level==='community'||agencyObj.level==='grid'"> v-if="showImportBtn">
<el-button style="" <el-button style=""
type="blue" type="blue"
size="small" size="small"
@ -157,12 +157,14 @@
style="color:#1C6AFD;text-decoration: underline;" style="color:#1C6AFD;text-decoration: underline;"
size="small" size="small"
@click="handleDetail(scope.row)">查看</el-button> @click="handleDetail(scope.row)">查看</el-button>
<el-button type="text" <el-button v-if="scope.row.showBtn"
type="text"
style="color:#00A7A9;text-decoration: underline;" style="color:#00A7A9;text-decoration: underline;"
size="small" size="small"
@click="handleEdit(scope.row)">修改</el-button> @click="handleEdit(scope.row)">修改</el-button>
<el-button type="text" <el-button v-if="scope.row.showBtn"
type="text"
style="color:#D51010;text-decoration: underline;" style="color:#D51010;text-decoration: underline;"
size="small" size="small"
@click="handleDelete(scope.row)">删除</el-button> @click="handleDelete(scope.row)">删除</el-button>
@ -229,6 +231,7 @@ export default {
tableLoading: true, tableLoading: true,
selAllFlag: false, selAllFlag: false,
isIndeterminate: false,//复选框的不确定状态 isIndeterminate: false,//复选框的不确定状态
showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断
agencyObj: {},//树所选的组织对象 agencyObj: {},//树所选的组织对象
ownerName: '', ownerName: '',
@ -236,6 +239,7 @@ export default {
tableData: [], tableData: [],
selection: [], selection: [],
//form相关 //form相关
formShow: false, formShow: false,
formTitle: '新增小区', formTitle: '新增小区',
@ -254,7 +258,6 @@ export default {
}, },
computed: { computed: {
tableHeight () { tableHeight () {
return (this.clientHeight - 300) return (this.clientHeight - 300)
}, },
@ -269,9 +272,26 @@ export default {
this.loadTable() this.loadTable()
}, },
async loadTable (fromTree, treeObj) { async loadTable (fromTree, treeObj) {
console.log(111, this.staffAgencyId)
this.tableLoading = true this.tableLoading = true
if (fromTree) { if (fromTree) {
this.agencyObj = treeObj this.agencyObj = treeObj
if (this.agencyObj.level === 'community') {//只有社区和网格显示操作按钮
if (this.agencyObj.id === this.staffAgencyId) {//如果所选树的组织id和登录人员id相同，有权限
this.showImportBtn = true
} else {
this.showImportBtn = false
}
} else if (this.agencyObj.level === 'grid') {//网格下
if (this.agencyObj.pid === this.staffAgencyId) {//如果所选树的父级组织id和登录人员id相同，有权限
this.showImportBtn = true
} else {
this.showImportBtn = false
}
} else {
this.showImportBtn = false
}
} }
const url = "/gov/org/neighborhood/neighborhoodlist" const url = "/gov/org/neighborhood/neighborhoodlist"
@ -289,6 +309,14 @@ export default {
if (code === 0) { if (code === 0) {
this.total = data.total this.total = data.total
data.list.forEach(item => {
if (item.agencyId === this.staffAgencyId) {
item.showBtn = true
} else {
item.showBtn = false
}
});
this.tableData = data.list this.tableData = data.list
} else { } else {
this.$message.error(msg) this.$message.error(msg)
@ -440,11 +468,11 @@ export default {
this.$emit('refreshTree') this.$emit('refreshTree')
this.loadTable() this.loadTable()
} else if (code > 8000) { } else if (code > 8000) {
// this.$message({ this.$message({
// showClose: true, showClose: true,
// message: msg, message: msg,
// duration: 0 duration: 0
// }) })
this.$emit('refreshTree') this.$emit('refreshTree')
this.loadTable() this.loadTable()
} else { } else {
@ -624,12 +652,12 @@ export default {
if (data.code === 0 && data.msg == 'success') { if (data.code === 0 && data.msg == 'success') {
// this.$message.success('导入成功') // this.$message.success('导入成功')
} else { } else {
this.$message({ // this.$message({
showClose: true, // showClose: true,
message: rspMsg, // message: rspMsg,
duration: 0, // duration: 0,
type: "error" // type: "error"
}) // })
// this.$message.error(rspMsg) // this.$message.error(rspMsg)
} }
this.$emit('refreshTree') this.$emit('refreshTree')
@ -702,6 +730,10 @@ export default {
} }
}, },
props: { props: {
staffAgencyId: {
type: String,
default: '',
},
} }
} }

63
src/views/modules/base/community/roomTable.vue
View File

@ -41,6 +41,8 @@
icon="el-icon-plus" icon="el-icon-plus"
size="small" size="small"
@click="handleAdd">新增房屋</el-button> @click="handleAdd">新增房屋</el-button>
<div class="btn_upload"
v-if="showImportBtn">
<el-button style="float:left" <el-button style="float:left"
type="blue" type="blue"
size="small" size="small"
@ -62,6 +64,7 @@
type="red">导入房屋数据</el-button> type="red">导入房屋数据</el-button>
</el-upload> </el-upload>
</div> </div>
</div>
<div class="div_table"> <div class="div_table">
<el-table ref="ref_table" <el-table ref="ref_table"
@ -125,12 +128,14 @@
style="color:#1C6AFD;text-decoration: underline;" style="color:#1C6AFD;text-decoration: underline;"
size="small" size="small"
@click="handleDetail(scope.row)">查看</el-button> @click="handleDetail(scope.row)">查看</el-button>
<el-button type="text" <el-button v-if="scope.row.showBtn"
type="text"
style="color:#00A7A9;text-decoration: underline;" style="color:#00A7A9;text-decoration: underline;"
size="small" size="small"
@click="handleEdit(scope.row)">修改</el-button> @click="handleEdit(scope.row)">修改</el-button>
<el-button type="text" <el-button v-if="scope.row.showBtn"
type="text"
style="color:#D51010;text-decoration: underline;" style="color:#D51010;text-decoration: underline;"
size="small" size="small"
@click="handleDelete(scope.row)">删除</el-button> @click="handleDelete(scope.row)">删除</el-button>
@ -195,6 +200,7 @@ export default {
tableLoading: true, tableLoading: true,
selAllFlag: false, selAllFlag: false,
isIndeterminate: false,//复选框的不确定状态 isIndeterminate: false,//复选框的不确定状态
// showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断
agencyObj: {},//树所选的小区对象 agencyObj: {},//树所选的小区对象
ownerName: '', ownerName: '',
@ -234,6 +240,21 @@ export default {
this.tableLoading = true this.tableLoading = true
if (fromTree) { if (fromTree) {
this.agencyObj = treeObj this.agencyObj = treeObj
// if (this.agencyObj.level === 'community') {//只有社区和网格显示操作按钮
// if (this.agencyObj.id === this.staffAgencyId) {//如果所选树的组织id和登录人员id相同，有权限
// this.showImportBtn = true
// } else {
// this.showImportBtn = false
// }
// } else if (this.agencyObj.level === 'grid') {//网格下
// if (this.agencyObj.pid === this.staffAgencyId) {//如果所选树的父级组织id和登录人员id相同，有权限
// this.showImportBtn = true
// } else {
// this.showImportBtn = false
// }
// } else {
// this.showImportBtn = false
// }
} }
const url = "/gov/org/house/houselist" const url = "/gov/org/house/houselist"
@ -250,6 +271,14 @@ export default {
if (code === 0) { if (code === 0) {
this.total = data.total this.total = data.total
data.list.forEach(item => {
if (item.agencyId === this.staffAgencyId) {
item.showBtn = true
} else {
item.showBtn = false
}
});
this.tableData = data.list this.tableData = data.list
} else { } else {
this.$message.error(msg) this.$message.error(msg)
@ -397,10 +426,11 @@ export default {
this.$emit('refreshTree') this.$emit('refreshTree')
this.loadTable() this.loadTable()
} else if (code > 8000) { } else if (code > 8000) {
// this.$message({ this.$message({
// type: "success", showClose: true,
// message: msg message: msg,
// }); duration: 0
})
this.$emit('refreshTree') this.$emit('refreshTree')
this.loadTable() this.loadTable()
} else { } else {
@ -553,12 +583,12 @@ export default {
if (data.code === 0 && data.msg == 'success') { if (data.code === 0 && data.msg == 'success') {
// this.$message.success('导入成功') // this.$message.success('导入成功')
} else { } else {
this.$message({ // this.$message({
showClose: true, // showClose: true,
message: rspMsg, // message: rspMsg,
duration: 0, // duration: 0,
type: "error" // type: "error"
}) // })
// this.$message.error(rspMsg) // this.$message.error(rspMsg)
} }
this.$emit('refreshTree') this.$emit('refreshTree')
@ -615,7 +645,14 @@ export default {
} }
}, },
props: { props: {
staffAgencyId: {
type: String,
default: '',
},
showImportBtn: {
type: Boolean,
default: false,
},
} }
} }
</script> </script>

16
src/views/modules/shequ/index.vue
View File

@ -9,11 +9,17 @@
<div class="search"> <div class="search">
<div class="input"> <div class="input">
<select v-model="searchData.type"> <el-dropdown class="select"
<option value="jumin">居民</option> placement="bottom" v-model="searchData.type" @command="type => searchData.type = type">
<option value="fangwu">房屋</option> <span class="select-show">
<option value="xuqiu">需求</option> {{{jumin:'居民', fangwu: '房屋', xuqiu:'需求'}[searchData.type]}}<i class="el-icon-arrow-down el-icon--right"></i>
</select> </span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="jumin">居民</el-dropdown-item>
<el-dropdown-item command="fangwu">房屋</el-dropdown-item>
<el-dropdown-item command="xuqiu">需求</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<input <input
type="text" type="text"

Write Preview
Loading…
Cancel
Save