Browse Source

按钮调整

feature
jiangyy 4 years ago
parent
commit
60dd67bcf0
  1. 2
      src/App.vue
  2. 14
      src/assets/scss/aui.scss
  3. 67
      src/assets/scss/buttonstyle copy.scss
  4. 154
      src/assets/scss/buttonstyle.scss
  5. 2
      src/main.js
  6. 50
      src/views/modules/base/community/buildTable.vue
  7. 59
      src/views/modules/base/community/communityTable.vue
  8. 43
      src/views/modules/base/community/roomTable.vue
  9. 21
      src/views/modules/communityParty/regionalParty/activitys.vue
  10. 54
      src/views/modules/communityParty/regionalParty/units.vue
  11. 6
      src/views/modules/communityService/ninePlaces/inspect/inspect.vue
  12. 311
      src/views/modules/communityService/ninePlaces/inspect/inspectForm.vue
  13. 2
      src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue
  14. 3
      src/views/modules/communityService/ninePlaces/places/places.vue
  15. 243
      src/views/modules/communityService/ninePlaces/places/placesForm.vue
  16. 26
      src/views/modules/communityService/ninePlaces/team/team.vue
  17. 297
      src/views/modules/communityService/ninePlaces/team/teamForm.vue

2
src/App.vue

@ -106,6 +106,8 @@ export default {
</script>
<style lang="scss">
@import "@/assets/scss/buttonstyle.scss";
.tox-dialog__disable-scroll {
.tox-tinymce-aux {
z-index: 130000000;

14
src/assets/scss/aui.scss

@ -1,11 +1,11 @@
// 变量
@import "~@/element-ui/theme-variables.scss";
@import "./variables.scss";
@import '~@/element-ui/theme-variables.scss';
@import './variables.scss';
// 公共
@import "./normalize.scss";
@import "./common.scss";
@import './normalize.scss';
@import './common.scss';
// 页面
@import "./pages/login.scss";
@import "./pages/404.scss";
@import './pages/login.scss';
@import './pages/404.scss';
// 模块
@import "./modules/home.scss";
@import './modules/home.scss';

67
src/assets/scss/buttonstyle copy.scss

@ -0,0 +1,67 @@
//新增
.el-button--add {
color: #fff;
background-color: #22c1c3;
border-color: #22c1c3;
}
.el-button--add:hover {
color: #fff;
background-color: #05b1b4;
border-color: #05b1b4;
}
.el-button--add:focus {
color: #fff;
background-color: #22c1c3;
border-color: #22c1c3;
}
//删除导入
.el-button--delete {
color: #fff;
background-color: #fe6252;
border-color: #fe6252;
}
.el-button--delete:hover {
color: #fff;
background-color: #fe6252;
border-color: #fe6252;
}
.el-button--delete:focus {
color: #fff;
background-color: #fe6252;
border-color: #fe6252;
}
//重置导出
.el-button--reset {
color: #fff;
background-color: #feb349;
border-color: #feb349;
}
.el-button--reset:hover {
color: #fff;
background-color: #feb349;
border-color: #feb349;
}
.el-button--reset:focus {
color: #fff;
background-color: #feb349;
border-color: #feb349;
}
//查询确定
.el-button--search:hover {
color: #fff;
background-color: #3e8ef7;
border-color: #3e8ef7;
}
.el-button--search:focus {
color: #fff;
background-color: #3e8ef7;
border-color: #3e8ef7;
}
.el-button--search {
color: #fff;
background-color: #3e8ef7;
border-color: #3e8ef7;
}

154
src/assets/scss/buttonstyle.scss

@ -1,61 +1,103 @@
.el-button--green {
color: #fff;
background-color: #22c1c3;
border-color: #22c1c3;
//查询确定
.diy-button--search {
color: #fff !important;
background-color: #3e8ef7 !important;
border-color: #3e8ef7 !important;
}
.el-button--green:hover {
color: #fff;
background-color: #05b1b4;
border-color: #05b1b4;
.diy-button--search:hover {
color: #fff !important;
background-color: #3e8ef7 !important;
border-color: #3e8ef7 !important;
}
.el-button--green:focus {
color: #fff;
background-color: #22c1c3;
border-color: #22c1c3;
.diy-button--search:focus {
color: #fff !important;
background-color: #3e8ef7 !important;
border-color: #3e8ef7 !important;
}
.el-button--yellow:hover {
color: #fff;
background-color: #fa9200;
border-color: #fa9200;
}
.el-button--yellow:focus {
color: #fff;
background-color: #feb349;
border-color: #feb349;
}
.el-button--yellow {
color: #fff;
background-color: #feb349;
border-color: #feb349;
}
.el-button--blue:focus {
color: #fff;
background-color: #2195fe;
border-color: #2195fe;
}
.el-button--blue:hover {
color: #fff;
background-color: #0083fd;
border-color: #0083fd;
}
.el-button--blue {
color: #fff;
background-color: #2195fe;
border-color: #2195fe;
}
.el-button--red:focus {
color: #fff;
background-color: #fe6252;
border-color: #fe6252;
}
.el-button--red:hover {
color: #fff;
background-color: #fd341e;
border-color: #fd341e;
}
.el-button--red {
color: #fff;
background-color: #fe6252;
border-color: #fe6252;
//重置导出
.diy-button--reset {
color: #fff !important;
background-color: #feb349 !important;
border-color: #feb349 !important;
}
.diy-button--reset:hover {
color: #fff !important;
background-color: #feb349 !important;
border-color: #feb349 !important;
}
.diy-button--reset:focus {
color: #fff !important;
background-color: #feb349 !important;
border-color: #feb349 !important;
}
//新增
.diy-button--add {
color: #fff !important;
background-color: #22c1c3 !important;
border-color: #22c1c3 !important;
}
.diy-button--add:hover {
color: #fff !important;
background-color: #22c1c3 !important;
border-color: #22c1c3 !important;
}
.diy-button--add:focus {
color: #fff !important;
background-color: #22c1c3 !important;
border-color: #22c1c3 !important;
}
//删除导入
.diy-button--delete {
color: #fff !important;
background-color: #fe6252 !important;
border-color: #fe6252 !important;
}
.diy-button--delete:hover {
color: #fff !important;
background-color: #fe6252 !important;
border-color: #fe6252 !important;
}
.diy-button--delete:focus {
color: #fff !important;
background-color: #fe6252 !important;
border-color: #fe6252 !important;
}
//下载模板
.diy-button--export {
color: #fff !important;
background-color: #3e8ef7 !important;
border-color: #3e8ef7 !important;
}
.diy-button--export:hover {
color: #fff !important;
background-color: #3e8ef7 !important;
border-color: #3e8ef7 !important;
}
.diy-button--export:focus {
color: #fff !important;
background-color: #3e8ef7 !important;
border-color: #3e8ef7 !important;
}
//table按钮样式
//查看
.div-table-button--detail {
color: #1c6afd !important;
text-decoration: underline !important;
}
//修改
.div-table-button--edit {
color: #00a7a9 !important;
text-decoration: underline !important;
}
//删除
.div-table-button--delete {
color: #d51010 !important;
text-decoration: underline !important;
}

2
src/main.js

@ -8,6 +8,8 @@ import router from "@/router";
import "@/icons";
import "@/element-ui/theme/index.css";
import "@/assets/scss/aui.scss";
//按钮
import http from "@/utils/request";
import renRadioGroup from "@/components/ren-radio-group";
import renSelect from "@/components/ren-select";

50
src/views/modules/base/community/buildTable.vue

@ -26,27 +26,25 @@
</div>
</div>
<el-button style="margin-left:10px"
type="primary"
class="diy-button--search"
size="small"
@click="handleSearch">查询</el-button>
<el-button style="margin-left:10px"
class="diy-button--reset"
size="small"
@click="resetSearch">重置</el-button>
</div>
<div class="div_btn">
<el-button style="float:left"
type="yellow"
size="small"
icon="el-icon-download"
@click="handleExport">导出</el-button>
<el-button style="float:left"
type="green"
class="diy-button--add"
size="small"
icon="el-icon-plus"
@click="handleAdd">新增楼宇</el-button>
<div class="btn_upload"
v-if="showImportBtn">
<el-button style=";margin-left:10px"
type="blue"
class="diy-button--export"
size="small"
icon="el-icon-download"
@click="handleExportModule('building')">下载楼宇模板</el-button>
<el-upload style=""
@ -59,14 +57,11 @@
:http-request="(()=>{uploadFile( 'building')})">
<el-button style="margin-left:10px"
size="small"
icon="el-icon-upload2"
:loading="importBuildingLoading"
type="red">导入楼宇数据</el-button>
class="diy-button--delete">导入楼宇数据</el-button>
</el-upload>
<el-button style=";margin-left:10px"
type="blue"
class="diy-button--export"
size="small"
icon="el-icon-download"
@click="handleExportModule('room')">下载房屋模板</el-button>
<el-upload style=""
@ -79,11 +74,13 @@
:http-request="(()=>{uploadFile( 'room')})">
<el-button style="margin-left:10px"
size="small"
icon="el-icon-upload2"
:loading="importRoomLoading"
type="red">导入房屋数据</el-button>
class="diy-button--delete">导入房屋数据</el-button>
</el-upload>
</div>
<el-button style="float:left;margin-left:10px"
class="diy-button--reset"
size="small"
@click="handleExport">导出</el-button>
</div>
<div class="div_table">
@ -134,18 +131,18 @@
size="small"
@click="handleToNextLevel(scope.row)">进入</el-button> -->
<el-button type="text"
style="color:#1C6AFD;text-decoration: underline;"
class="div-table-button--detail"
size="small"
@click="handleDetail(scope.row)">查看</el-button>
<el-button v-if="scope.row.showBtn"
type="text"
style="color:#00A7A9;text-decoration: underline;"
class="div-table-button--edit"
size="small"
@click="handleEdit(scope.row)">修改</el-button>
<el-button v-if="scope.row.showBtn"
type="text"
style="color:#D51010;text-decoration: underline;"
class="div-table-button--delete"
size="small"
@click="handleDelete(scope.row)">删除</el-button>
</template>
@ -245,7 +242,15 @@ export default {
...mapGetters(['clientHeight'])
},
methods: {
//
resetSearch () {
this.ownerName = ''
this.ownerPhone = ''
this.pageSize = 10
this.pageNo = 0
// this.loadTable()
},
handleSearch () {
this.loadTable()
},
@ -716,6 +721,5 @@ export default {
}
</script>
<style lang="scss" scoped >
@import "@/assets/scss/buttonstyle.scss";
@import "@/assets/scss/modules/visual/communityManage.scss";
</style>

59
src/views/modules/base/community/communityTable.vue

@ -26,27 +26,25 @@
</div>
</div>
<el-button style="margin-left:10px"
type="primary"
class="diy-button--search"
size="small"
@click="handleSearch">查询</el-button>
<el-button style="margin-left:10px"
class="diy-button--reset"
size="small"
@click="resetSearch">重置</el-button>
</div>
<div class="div_btn">
<el-button style=""
type="yellow"
size="small"
icon="el-icon-download"
@click="handleExport">导出</el-button>
<el-button style=""
type="green"
class="diy-button--add"
size="small"
icon="el-icon-plus"
@click="handleAdd">新增小区</el-button>
<div class="btn_upload"
v-if="showImportBtn">
<el-button style=""
type="blue"
class="diy-button--export"
size="small"
icon="el-icon-download"
@click="handleExportModule('community')">下载小区模板</el-button>
<el-upload ref="upload_community"
@ -59,15 +57,12 @@
:http-request="(()=>{uploadFile( 'community')})">
<el-button style="margin-left:10px"
size="small"
icon="el-icon-upload2"
:loading="importCommunityLoading"
type="red">导入小区数据</el-button>
class="diy-button--delete">导入小区数据</el-button>
</el-upload>
<el-button style=";margin-left:10px"
type="blue"
class="diy-button--export"
size="small"
icon="el-icon-download"
@click="handleExportModule('building')">下载楼宇模板</el-button>
<el-upload style=""
@ -80,14 +75,11 @@
:http-request="(()=>{uploadFile( 'building')})">
<el-button style="margin-left:10px"
size="small"
icon="el-icon-upload2"
:loading="importBuildingLoading"
type="red">导入楼宇数据</el-button>
class="diy-button--delete">导入楼宇数据</el-button>
</el-upload>
<el-button style=";margin-left:10px"
type="blue"
class="diy-button--export"
size="small"
icon="el-icon-download"
@click="handleExportModule('room')">下载房屋模板</el-button>
<el-upload style=""
@ -100,11 +92,13 @@
:http-request="(()=>{uploadFile( 'room')})">
<el-button style="margin-left:10px"
size="small"
icon="el-icon-upload2"
:loading="importRoomLoading"
type="red">导入房屋数据</el-button>
class="diy-button--delete">导入房屋数据</el-button>
</el-upload>
</div>
<el-button style="margin-left:10px"
class="diy-button--reset"
size="small"
@click="handleExport">导出</el-button>
</div>
@ -163,18 +157,18 @@
size="small"
@click="handleToNextLevel(scope.row)">进入</el-button> -->
<el-button type="text"
style="color:#1C6AFD;text-decoration: underline;"
class="div-table-button--detail"
size="small"
@click="handleDetail(scope.row)">查看</el-button>
<el-button v-if="scope.row.showBtn"
type="text"
style="color:#00A7A9;text-decoration: underline;"
class="div-table-button--edit"
size="small"
@click="handleEdit(scope.row)">修改</el-button>
<el-button v-if="scope.row.showBtn"
type="text"
style="color:#D51010;text-decoration: underline;"
class="div-table-button--delete"
size="small"
@click="handleDelete(scope.row)">删除</el-button>
</template>
@ -199,7 +193,7 @@
@change="handleSelectAll">全选</el-checkbox>
<el-button v-show="showDeletBtn"
style="margin-left:15px"
type="red"
class="diy-button--delete"
size="small"
@click="deleteBatch">删除</el-button>
</div>
@ -281,7 +275,15 @@ export default {
...mapGetters(['clientHeight'])
},
methods: {
//
resetSearch () {
this.ownerName = ''
this.ownerPhone = ''
this.pageSize = 10
this.pageNo = 0
// this.loadTable()
},
handleSearch () {
this.loadTable()
},
@ -771,7 +773,6 @@ export default {
}
</script>
<style lang="scss" scoped >
@import "@/assets/scss/buttonstyle.scss";
@import "@/assets/scss/modules/visual/communityManage.scss";
</style>

43
src/views/modules/base/community/roomTable.vue

@ -26,27 +26,25 @@
</div>
</div>
<el-button style="margin-left:10px"
type="primary"
class="diy-button--search"
size="small"
@click="handleSearch">查询</el-button>
<el-button style="margin-left:10px"
class="diy-button--reset"
size="small"
@click="resetSearch">重置</el-button>
</div>
<div class="div_btn">
<el-button style="float:left"
type="yellow"
size="small"
icon="el-icon-download"
@click="handleExport">导出</el-button>
<el-button style="float:left"
type="green"
icon="el-icon-plus"
class="diy-button--add"
size="small"
@click="handleAdd">新增房屋</el-button>
<div class="btn_upload"
v-if="showImportBtn">
<el-button style="float:left"
type="blue"
class="diy-button--export"
size="small"
icon="el-icon-download"
@click="handleExportModule">下载房屋模板</el-button>
<el-upload ref="upload"
:multiple='false'
@ -59,11 +57,13 @@
:http-request="uploadFile">
<el-button style="margin-left:10px"
size="small"
icon="el-icon-upload2"
:loading="importRoomLoading"
type="red">导入房屋数据</el-button>
class="diy-button--delete">导入房屋数据</el-button>
</el-upload>
</div>
<el-button style="float:left;margin-left:10px"
class="diy-button--reset"
size="small"
@click="handleExport">导出</el-button>
</div>
<div class="div_table">
@ -126,18 +126,18 @@
<template slot-scope="scope">
<el-button type="text"
style="color:#1C6AFD;text-decoration: underline;"
class="div-table-button--detail"
size="small"
@click="handleDetail(scope.row)">查看</el-button>
<el-button v-if="scope.row.showBtn"
type="text"
style="color:#00A7A9;text-decoration: underline;"
class="div-table-button--edit"
size="small"
@click="handleEdit(scope.row)">修改</el-button>
<el-button v-if="scope.row.showBtn"
type="text"
style="color:#D51010;text-decoration: underline;"
class="div-table-button--delete"
size="small"
@click="handleDelete(scope.row)">删除</el-button>
</template>
@ -237,7 +237,15 @@ export default {
...mapGetters(['clientHeight'])
},
methods: {
//
resetSearch () {
this.ownerName = ''
this.ownerPhone = ''
this.pageSize = 10
this.pageNo = 0
// this.loadTable()
},
handleSearch () {
this.loadTable()
@ -680,6 +688,5 @@ export default {
}
</script>
<style lang="scss" scoped >
@import "@/assets/scss/buttonstyle.scss";
@import "@/assets/scss/modules/visual/communityManage.scss";
</style>

21
src/views/modules/communityParty/regionalParty/activitys.vue

@ -66,11 +66,11 @@
</el-form-item>
<el-button style="margin-left:10px"
type="primary"
class="diy-button--search"
size="small"
@click="handleSearch">查询</el-button>
<el-button style="margin-left:10px"
type="yellow"
class="diy-button--reset"
size="small"
@click="resetSearch">重置</el-button>
</div>
@ -79,13 +79,10 @@
<div class="div_table">
<div class="div_btn">
<el-button style=""
type="green"
class="diy-button--add"
size="small"
@click="handleAdd">新增</el-button>
<!-- <el-button style="float:left"
type="yellow"
size="small"
@click="handleExport">导出</el-button>
<!--
<el-upload ref="upload"
:multiple='false'
:show-file-list='false'
@ -97,10 +94,14 @@
:http-request="uploadFile">
<el-button style="margin-left:10px"
size="small"
type="red">导入</el-button>
class="diy-button--delete">导入</el-button>
</el-upload> -->
</el-upload>
<el-button style="float:left"
class="diy-button--reset"
size="small"
@click="handleExport">导出</el-button>-->
</div>
@ -650,8 +651,6 @@ export default {
}
</script>
<style lang="scss" scoped >
@import "@/assets/scss/buttonstyle.scss";
.div_main {
width: 100%;
}

54
src/views/modules/communityParty/regionalParty/units.vue

@ -72,11 +72,11 @@
</el-form-item>
<el-button style="margin-left:10px"
type="primary"
class="diy-button--search"
size="small"
@click="handleSearch">查询</el-button>
<el-button style="margin-left:10px"
type="yellow"
class="diy-button--reset"
size="small"
@click="resetSearch">重置</el-button>
</div>
@ -84,14 +84,10 @@
</div>
<div class="div_table">
<div class="div_btn">
<el-button style=""
type="green"
<el-button class="diy-button--add"
size="small"
@click="handleAdd">新增</el-button>
<!-- <el-button style="float:left"
type="yellow"
size="small"
@click="handleExport">导出</el-button>
<!--
<el-upload ref="upload"
:multiple='false'
:show-file-list='false'
@ -103,9 +99,13 @@
:http-request="uploadFile">
<el-button style="margin-left:10px"
size="small"
type="red">导入</el-button>
class="diy-button--delete">导入</el-button>
</el-upload>-->
</el-upload>
<el-button style="float:left"
class="diy-button--reset"
size="small"
@click="handleExport">导出</el-button>-->
</div>
@ -134,18 +134,19 @@
label="分类"
min-width="80">
</el-table-column>
<el-table-column prop="serviceMatterList"
<el-table-column prop="serviceMatterListShow"
header-align="center"
align="center"
label="服务事项"
show-overflow-tooltip
min-width="250">
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<p style="text-align:center;margin:2px 0;"
v-for="(item,index) in scope.row.serviceMatterList"
:key="index">{{item}}</p>
</template>
</template> -->
</el-table-column>
<el-table-column prop="contact"
header-align="center"
@ -181,7 +182,7 @@
header-align="center"
align="center"
label="备注"
:show-overflow-tooltip="true"
show-overflow-tooltip
width="150">
</el-table-column>
<el-table-column label="操作"
@ -193,24 +194,24 @@
<template slot-scope="scope">
<el-button type="text"
style="color:#1C6AFD;text-decoration: underline;"
class="div-table-button--detail"
size="small"
@click="handleDetail(scope.row)">查看</el-button>
<el-button type="text"
style="color:#00A7A9;text-decoration: underline;"
class="div-table-button--edit"
size="small"
@click="handleEdit(scope.row)">修改</el-button>
<el-button type="text"
style="color:#1C6AFD;text-decoration: underline;"
class="div-table-button--detail"
size="small"
@click="handleFinish(scope.row)">完成情况</el-button>
<el-button type="text"
style="color:#1C6AFD;text-decoration: underline;"
class="div-table-button--detail"
size="small"
@click="handleScore(scope.row)">积分记录</el-button>
<el-button type="text"
style="color:#D51010;text-decoration: underline;"
class="div-table-button--delete"
size="small"
@click="handleDelete(scope.row)">删除</el-button>
@ -416,6 +417,14 @@ export default {
if (code === 0) {
this.total = data.total
data.list.forEach(element => {
if (element.serviceMatterList.length > 0) {
element.serviceMatterListShow = element.serviceMatterList.join(',')
} else {
element.serviceMatterListShow = ''
}
});
this.tableData = data.list
} else {
@ -533,7 +542,7 @@ export default {
}
this.pageSize = 10
this.pageNo = 0
this.loadTable()
// this.loadTable()
},
//
@ -683,8 +692,6 @@ export default {
}
</script>
<style lang="scss" scoped >
@import "@/assets/scss/buttonstyle.scss";
.div_main {
width: 100%;
}
@ -715,9 +722,6 @@ export default {
}
}
.div_btn {
}
.el-row {
/* margin-bottom: 20px; */
display: flex;

6
src/views/modules/communityService/ninePlaces/inspect/inspect.vue

@ -138,7 +138,7 @@
<el-table-column prop="firstTime"
header-align="center"
align="center"
label="首次巡时间"
label="首次巡时间"
width="110">
</el-table-column>
<el-table-column prop="detailed"
@ -214,6 +214,7 @@
:title="formTitle"
width="850px"
top="5vh"
class="dialog-h"
@closed="diaClose">
<inspect-form ref="ref_form"
:gridList="gridList"
@ -230,6 +231,7 @@
:title="'复查记录'"
width="80%"
top="5vh"
class="dialog-h"
@closed="reviewDiaClose">
<inspect-review ref="ref_review"
:resultList="resultList"
@ -527,7 +529,7 @@ export default {
computed: {
tableHeight () {
return (this.clientHeight - 460)
return (this.clientHeight - 420)
},
rowHeight () {

311
src/views/modules/communityService/ninePlaces/inspect/inspectForm.vue

@ -1,150 +1,151 @@
<template>
<div>
<div>
<div>
<el-form ref="ref_form"
:inline="true"
:model="formData"
:rules="dataRule"
:disabled="formType === 'detail'"
class="form">
<el-form-item label="场所区域"
prop="gridId"
label-width="150px"
style="display: block">
<el-select class="item_width_1"
v-model="formData.gridId"
placeholder="全部"
clearable>
<el-option v-for="item in gridList"
@click.native="handleChangeGrid"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="场所类型"
label-width="150px"
prop="ninePlaceVal">
<el-select class="item_width_1"
v-model="formData.ninePlaceVal"
placeholder="请选择"
clearable>
<el-option v-for="item in placeTypeList"
@click.native="handleChangeType"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="场所名称"
label-width="150px"
prop="placeOrgId">
<el-select class="item_width_1"
v-model="formData.placeOrgId"
placeholder="请选择"
clearable>
<el-option v-for="item in placesList"
:key="item.placeOrgId"
:label="item.placeOrgName"
:value="item.placeOrgId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="分队名称"
label-width="150px"
prop="placePatrolTeamId">
<el-select class="item_width_1"
v-model="formData.placePatrolTeamId"
placeholder="请选择"
clearable>
<el-option v-for="(item,index) in teamsList"
@click.native="hancleChangeTeam(index)"
:key="item.teamId"
:label="item.teamName"
:value="item.teamId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="检查人员"
prop="inspectorArray"
label-width="150px"
style="display: block">
<el-checkbox-group class="item_width_1"
style="display:flex;flex-wrap:wrap"
v-model="formData.inspectorArray">
<el-checkbox v-for="item in inspectorsList"
:key="item.id"
:label="item.id">{{item.name}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="首次巡查时间"
style="display: block"
prop="firstTime"
label-width="150px">
<el-date-picker v-model="formData.firstTime"
value-format="yyyy-MM-dd HH:mm:ss"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="隐患明细"
prop="detailed"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
type="textarea"
maxlength="500"
show-word-limit
:rows="3"
placeholder="请输入备注,不超过500字"
v-model="formData.detailed"></el-input>
</el-form-item>
<el-form-item label="首次检查结论"
prop="firstResult"
label-width="150px"
style="display: block">
<el-select class="item_width_1"
v-model="formData.firstResult"
placeholder="全部"
clearable>
<el-option v-for="item in resultList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="拟复查时间"
style="display: block"
prop="reviewTime"
label-width="150px">
<el-date-picker v-model="formData.reviewTime"
value-format="yyyy-MM-dd HH:mm:ss"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-form>
</div>
<div class="dialog-h-content scroll-h">
<el-form ref="ref_form"
:inline="true"
:model="formData"
:rules="dataRule"
:disabled="formType === 'detail'"
class="form">
<el-form-item label="场所区域"
prop="gridId"
label-width="150px"
style="display: block">
<el-select class="item_width_1"
v-model="formData.gridId"
placeholder="全部"
clearable>
<el-option v-for="item in gridList"
@click.native="handleChangeGrid"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="场所类型"
label-width="150px"
prop="ninePlaceVal">
<el-select class="item_width_1"
v-model="formData.ninePlaceVal"
placeholder="请选择"
clearable>
<el-option v-for="item in placeTypeList"
@click.native="handleChangeType"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="场所名称"
label-width="150px"
prop="placeOrgId">
<el-select class="item_width_1"
v-model="formData.placeOrgId"
placeholder="请选择"
clearable>
<el-option v-for="item in placesList"
:key="item.placeOrgId"
:label="item.placeOrgName"
:value="item.placeOrgId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="分队名称"
label-width="150px"
prop="placePatrolTeamId">
<el-select class="item_width_1"
v-model="formData.placePatrolTeamId"
placeholder="请选择"
clearable>
<el-option v-for="(item,index) in teamsList"
@click.native="hancleChangeTeam(index)"
:key="item.teamId"
:label="item.teamName"
:value="item.teamId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="检查人员"
prop="inspectorArray"
label-width="150px"
style="display: block">
<el-checkbox-group class="item_width_1"
style="display:flex;flex-wrap:wrap"
v-model="formData.inspectorArray">
<el-checkbox v-for="item in inspectorsList"
:key="item.id"
:label="item.id">{{item.name}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="首次巡查时间"
style="display: block"
prop="firstTime"
label-width="150px">
<el-date-picker v-model="formData.firstTime"
value-format="yyyy-MM-dd HH:mm:ss"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="隐患明细"
prop="detailed"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
type="textarea"
maxlength="500"
show-word-limit
:rows="3"
placeholder="请输入备注,不超过500字"
v-model="formData.detailed"></el-input>
</el-form-item>
<el-form-item label="首次检查结论"
prop="firstResult"
label-width="150px"
style="display: block">
<el-select class="item_width_1"
v-model="formData.firstResult"
placeholder="全部"
clearable>
<el-option v-for="item in resultList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="拟复查时间"
style="display: block"
prop="reviewTime"
label-width="150px">
<el-date-picker v-model="formData.reviewTime"
value-format="yyyy-MM-dd HH:mm:ss"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-form>
</div>
<div class="div_btn">
<el-button @click="handleCancle"> </el-button>
<el-button v-if="formType != 'detail'"
<el-button size="small"
@click="handleCancle"> </el-button>
<el-button size="small"
v-if="formType != 'detail'"
type="primary"
:disabled="btnDisable"
@click="handleComfirm"> </el-button>
@ -415,7 +416,7 @@ export default {
{ required: true, message: '隐患明细不能为空', trigger: 'blur' }
],
firstResult: [
{ required: true, message: '首次巡结果不能为空', trigger: 'blur' }
{ required: true, message: '首次巡结果不能为空', trigger: 'blur' }
]
}
},
@ -438,28 +439,8 @@ export default {
}
}
</script>
<style scoped>
.item_width_1 {
width: 500px;
}
.item_width_2 {
width: 400px;
}
.item_width_3 {
margin-left: 10px;
width: 200px;
}
.item_width_4 {
width: 200px;
}
.div_btn {
display: flex;
justify-content: flex-end;
}
.form {
margin-top: 30px;
}
<style lang="scss" scoped >
@import "@/assets/scss/modules/visual/communityManageForm.scss";
</style>

2
src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue

@ -1,5 +1,5 @@
<template>
<div>
<div class="dialog-h-content scroll-h">
<div class="div_table">
<el-button type="green"
size="small"

3
src/views/modules/communityService/ninePlaces/places/places.vue

@ -182,6 +182,7 @@
:title="formTitle"
width="850px"
top="5vh"
class="dialog-h"
@closed="diaClose">
<places-form ref="ref_form"
:gridList="gridList"
@ -463,7 +464,7 @@ export default {
computed: {
tableHeight () {
return (this.clientHeight - 460)
return (this.clientHeight - 420)
},
rowHeight () {

243
src/views/modules/communityService/ninePlaces/places/placesForm.vue

@ -1,110 +1,111 @@
<template>
<div>
<div>
<div>
<el-form ref="ref_form"
:inline="true"
:model="formData"
:rules="dataRule"
:disabled="formType === 'detail'"
class="form">
<el-form-item label="场所类型"
label-width="150px"
prop="ninePlaceVal">
<el-select class="item_width_1"
v-model="formData.ninePlaceVal"
placeholder="请选择"
clearable>
<el-option v-for="item in placeTypeList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="场所区域"
prop="gridId"
label-width="150px"
style="display: block">
<el-select class="item_width_1"
v-model="formData.gridId"
placeholder="全部"
clearable>
<el-option v-for="item in gridList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="场所名称"
label-width="150px"
prop="placeOrgName">
<el-input v-model="formData.placeOrgName"
class="item_width_1"
clearable
placeholder="请输入九小场所名称">
</el-input>
</el-form-item>
<el-form-item label="场所地址"
label-width="150px"
prop="address">
<el-input v-model="formData.address"
class="item_width_1"
clearable
placeholder="请输入场所地址">
</el-input>
</el-form-item>
<el-form-item label="规模"
label-width="150px"
prop="scale">
<el-select class="item_width_1"
v-model="formData.scale"
placeholder="请选择"
clearable>
<el-option v-for="item in scaleList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="负责人"
label-width="150px"
prop="personInCharge">
<el-input v-model="formData.personInCharge"
class="item_width_1"
clearable
placeholder="请输入负责人姓名">
</el-input>
</el-form-item>
<el-form-item label="联系电话"
label-width="150px"
prop="mobile">
<el-input v-model="formData.mobile"
class="item_width_1"
type='number'
clearable
placeholder="请输入电话">
</el-input>
</el-form-item>
</el-form>
</div>
<div class="dialog-h-content scroll-h">
<el-form ref="ref_form"
:inline="true"
:model="formData"
:rules="dataRule"
:disabled="formType === 'detail'"
class="form">
<el-form-item label="场所类型"
label-width="150px"
prop="ninePlaceVal">
<el-select class="item_width_1"
v-model="formData.ninePlaceVal"
placeholder="请选择"
clearable>
<el-option v-for="item in placeTypeList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="场所区域"
prop="gridId"
label-width="150px"
style="display: block">
<el-select class="item_width_1"
v-model="formData.gridId"
placeholder="全部"
clearable>
<el-option v-for="item in gridList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="场所名称"
label-width="150px"
prop="placeOrgName">
<el-input v-model="formData.placeOrgName"
class="item_width_1"
clearable
placeholder="请输入九小场所名称">
</el-input>
</el-form-item>
<el-form-item label="场所地址"
label-width="150px"
prop="address">
<el-input v-model="formData.address"
class="item_width_1"
clearable
placeholder="请输入场所地址">
</el-input>
</el-form-item>
<el-form-item label="规模"
label-width="150px"
prop="scale">
<el-select class="item_width_1"
v-model="formData.scale"
placeholder="请选择"
clearable>
<el-option v-for="item in scaleList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="负责人"
label-width="150px"
prop="personInCharge">
<el-input v-model="formData.personInCharge"
class="item_width_1"
clearable
placeholder="请输入负责人姓名">
</el-input>
</el-form-item>
<el-form-item label="联系电话"
label-width="150px"
prop="mobile">
<el-input v-model="formData.mobile"
class="item_width_1"
type='number'
clearable
placeholder="请输入电话">
</el-input>
</el-form-item>
</el-form>
</div>
<div class="div_btn">
<el-button @click="handleCancle"> </el-button>
<el-button v-if="formType != 'detail'"
<el-button size="small"
@click="handleCancle"> </el-button>
<el-button size="small"
v-if="formType != 'detail'"
type="primary"
:disabled="btnDisable"
@click="handleComfirm"> </el-button>
@ -316,48 +317,14 @@ export default {
}
</script>
<style scoped>
.item_width_1 {
width: 500px;
}
.item_width_2 {
width: 400px;
}
.item_width_3 {
margin-left: 10px;
width: 200px;
}
.item_width_4 {
width: 200px;
}
.div_map {
position: relative;
}
.div_searchmap {
z-index: 5000;
position: absolute;
top: 5px;
left: 5px;
}
.div_btn {
display: flex;
justify-content: flex-end;
}
.el-tabs {
margin: 0 20px;
}
.el-upload__tip {
color: rgb(155, 155, 155);
margin: 0;
}
.form {
margin-top: 30px;
}
</style>
<style lang=scss>
.el-dialog__body {
padding: 0 10px 20px !important;
}
<style lang="scss" scoped >
@import "@/assets/scss/modules/visual/communityManageForm.scss";
</style>

26
src/views/modules/communityService/ninePlaces/team/team.vue

@ -94,13 +94,13 @@
header-align="center"
align="center"
label="分队名称"
min-width="180">
min-width="100">
</el-table-column>
<el-table-column prop="personInCharge"
header-align="center"
align="center"
label="负责人"
width="180">
width="90">
</el-table-column>
<el-table-column prop="mobile"
header-align="center"
@ -112,25 +112,25 @@
header-align="center"
align="center"
label="负责区域"
min-width="280">
min-width="150">
</el-table-column>
<el-table-column prop="ninePlaceNames"
header-align="center"
align="center"
label="负责场所类型"
min-width="180">
min-width="230">
</el-table-column>
<el-table-column prop="plan"
header-align="center"
align="center"
label="监察计划"
min-width="180">
label="巡查计划"
min-width="120">
</el-table-column>
<el-table-column prop="time"
header-align="center"
align="center"
label="创建时间"
min-width="120">
width="120">
</el-table-column>
<el-table-column label="操作"
@ -141,17 +141,14 @@
class="operate">
<template slot-scope="scope">
<el-button type="text"
style="color:#1C6AFD;text-decoration: underline;"
<el-button style="color:#1C6AFD;text-decoration: underline;"
size="small"
@click="handleDetail(scope.row)">查看</el-button>
<el-button type="text"
style="color:#00A7A9;text-decoration: underline;"
<el-button style="color:#00A7A9;text-decoration: underline;"
size="small"
@click="handleEdit(scope.row)">修改</el-button>
<el-button type="text"
style="color:#D51010;text-decoration: underline;"
<el-button style="background-color:#D51010;color:#ffffff;text-decoration: underline;"
size="small"
@click="handleDelete(scope.row)">删除</el-button>
</template>
@ -176,6 +173,7 @@
:title="formTitle"
width="850px"
top="5vh"
class="dialog-h"
@closed="diaClose">
<team-form ref="ref_form"
:gridList="gridList"
@ -440,7 +438,7 @@ export default {
computed: {
tableHeight () {
return (this.clientHeight - 460)
return (this.clientHeight - 420)
},
rowHeight () {

297
src/views/modules/communityService/ninePlaces/team/teamForm.vue

@ -1,147 +1,150 @@
<template>
<div>
<div>
<div>
<el-form ref="ref_form"
:inline="true"
:model="formData"
:rules="dataRule"
:disabled="formType === 'detail'"
class="form">
<el-form-item label="分队名称"
label-width="150px"
prop="teamName">
<el-input v-model="formData.teamName"
class="item_width_1"
clearable
placeholder="请输入分队名称">
</el-input>
</el-form-item>
<el-form-item label="负责区域"
prop="gridIdArray"
label-width="150px"
style="display: block">
<el-select class="item_width_1"
v-model="formData.gridIdArray"
placeholder="全部"
multiple
clearable>
<el-option v-for="item in gridList"
<div class="dialog-h-content scroll-h">
<el-form ref="ref_form"
:inline="true"
:model="formData"
:rules="dataRule"
:disabled="formType === 'detail'"
class="form">
<el-form-item label="分队名称"
label-width="150px"
prop="teamName">
<el-input v-model="formData.teamName"
class="item_width_1"
clearable
placeholder="请输入分队名称">
</el-input>
</el-form-item>
<el-form-item label="负责区域"
prop="gridIdArray"
label-width="150px"
style="display: block">
<el-select class="item_width_1"
v-model="formData.gridIdArray"
placeholder="全部"
multiple
clearable>
<el-option v-for="item in gridList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="负责场所类型"
prop="ninePlaceArray"
label-width="150px"
style="display: block">
<el-checkbox-group class="item_width_1"
style="display:flex;flex-wrap:wrap"
v-model="formData.ninePlaceArray">
<el-checkbox v-for="item in placeTypeList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="负责场所类型"
prop="ninePlaceArray"
label-width="150px"
style="display: block">
<el-checkbox-group class="item_width_1"
style="display:flex;flex-wrap:wrap"
v-model="formData.ninePlaceArray">
<el-checkbox v-for="item in placeTypeList"
:key="item.value"
:label="item.value">{{item.label}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="巡查计划"
prop="plan"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
type="textarea"
maxlength="500"
show-word-limit
:rows="3"
placeholder="请输入备注,不超过500字"
v-model="formData.plan"></el-input>
</el-form-item>
<el-form-item label="创建时间"
style="display: block"
prop="time"
label-width="150px">
<el-date-picker v-model="formData.time"
value-format="yyyy-MM-dd HH:mm:ss"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="负责人"
label-width="150px"
prop="personInCharge">
<el-input v-model="formData.personInCharge"
class="item_width_1"
:label="item.value">{{item.label}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="巡查计划"
prop="plan"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
type="textarea"
maxlength="500"
show-word-limit
:rows="3"
placeholder="请输入备注,不超过500字"
v-model="formData.plan"></el-input>
</el-form-item>
<el-form-item label="创建时间"
style="display: block"
prop="time"
label-width="150px">
<el-date-picker v-model="formData.time"
value-format="yyyy-MM-dd HH:mm:ss"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="负责人"
label-width="150px"
prop="personInCharge">
<el-input v-model="formData.personInCharge"
class="item_width_1"
clearable
placeholder="请输入负责人姓名">
</el-input>
</el-form-item>
<el-form-item label="联系电话"
label-width="150px"
prop="mobile">
<el-input v-model="formData.mobile"
class="item_width_1"
type='number'
clearable
placeholder="请输入电话">
</el-input>
</el-form-item>
<el-form-item label="成员"
label-width="150px"
prop="member">
<el-button v-if="formType != 'detail'"
type="primary"
size="mini"
icon="el-icon-plus"
@click="handleAddPerson"></el-button>
<div v-for="(item,index) in memberList"
:key="index"
class="div_person_list"
:class="[{'margin10':formType !== 'detail'}]">
<span class="div_person_list_title">姓名</span>
<el-input v-if="item.isSet"
v-model="item.name"
class="item_width_3"
clearable
placeholder="请输入负责人姓名">
placeholder="请输入姓名">
</el-input>
<span class="item_width_span_3"
v-else>{{item.name}}</span>
</el-form-item>
<el-form-item label="联系电话"
label-width="150px"
prop="mobile">
<el-input v-model="formData.mobile"
class="item_width_1"
type='number'
<span class="div_person_list_title2">联系电话</span>
<el-input v-if="item.isSet"
v-model="item.mobile"
class="item_width_4"
clearable
placeholder="请输入电话">
</el-input>
<span class="item_width_span_4"
v-else>{{item.mobile}}</span>
</el-form-item>
<el-form-item label="成员"
label-width="150px"
prop="member">
<el-button v-if="formType != 'detail'"
type="primary"
<el-button v-if="formType !== 'detail'"
style="margin-left:30px"
type="red"
size="mini"
icon="el-icon-plus"
@click="handleAddPerson"></el-button>
<div v-for="(item,index) in memberList"
:key="index"
class="div_person_list">
<span style="font-weight: bold">姓名</span>
<el-input v-if="item.isSet"
v-model="item.name"
class="item_width_3"
clearable
placeholder="请输入姓名">
</el-input>
<span class="item_width_span_3"
v-else>{{item.name}}</span>
<span style="font-weight: bold;margin-left:20px">联系电话</span>
<el-input v-if="item.isSet"
v-model="item.mobile"
class="item_width_4"
clearable
placeholder="请输入电话">
</el-input>
<span class="item_width_span_4"
v-else>{{item.mobile}}</span>
<el-button style="margin-left:30px"
type="red"
size="mini"
@click="handleDelPerson(index)">删除</el-button>
</div>
</el-form-item>
</el-form>
</div>
@click="handleDelPerson(index)">删除</el-button>
</div>
</el-form-item>
</el-form>
</div>
<div class="div_btn">
<el-button @click="handleCancle"> </el-button>
<el-button v-if="formType != 'detail'"
<el-button size="small"
@click="handleCancle"> </el-button>
<el-button size="small"
v-if="formType != 'detail'"
type="primary"
:disabled="btnDisable"
@click="handleComfirm"> </el-button>
@ -422,6 +425,11 @@ export default {
}
}
</script>
<style lang="scss" scoped >
@import "@/assets/scss/modules/visual/communityManageForm.scss";
</style>
<style lang="scss" scoped>
@import "@/assets/scss/buttonstyle.scss";
.item_width_1 {
@ -440,30 +448,33 @@ export default {
}
.item_width_span_3 {
margin-left: 10px;
width: 120px;
width: 160px;
}
.item_width_span_4 {
margin-left: 10px;
width: 150px;
}
.div_btn {
display: flex;
justify-content: flex-end;
.margin10 {
margin-top: 10px;
}
.form {
margin-top: 30px;
}
.div_person_list {
margin-top: 10px;
width: 500px;
display: flex;
.div_person_list_title {
width: 40px;
font-weight: bold;
}
.div_person_list_title2 {
width: 90px;
font-weight: bold;
margin-left: 20px;
}
}
</style>
<style lang=scss>
.el-dialog__body {
padding: 0 10px 20px !important;
}
<style lang="scss" scoped >
@import "@/assets/scss/modules/visual/communityManageForm.scss";
</style>

Loading…
Cancel
Save