Browse Source

解决冲突

prod
13176889840 4 years ago
parent
commit
762271962b
  1. BIN
      src/assets/img/modules/visual/box-2.png
  2. 45
      src/assets/scss/modules/visual/basicInfoMain.scss
  3. 15
      src/views/modules/communityParty/regionalParty/activitysForm.vue
  4. 1306
      src/views/modules/communityService/measure/index.vue
  5. 291
      src/views/modules/importRecord/index.vue
  6. 48
      src/views/modules/visual/basicinfo/basicInfoMain.vue
  7. 9
      src/views/modules/visual/communityParty/community.vue
  8. 4
      src/views/modules/visual/communityParty/dialogInfo.vue

BIN
src/assets/img/modules/visual/box-2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

45
src/assets/scss/modules/visual/basicInfoMain.scss

@ -378,3 +378,48 @@
flex: 1;
}
}
.div_agency_list {
z-index: 1000;
position: absolute;
top: 50px;
right: 600px;
box-sizing: border-box;
width: 320px;
height: 470px;
color: #fff;
background: url('../../../img/modules/visual/box-2.png') no-repeat center;
background-size: 100% 100%;
padding: 45px 20px 35px 20px;
.no-data-img {
text-align: center;
margin-top: 50px;
margin-left: 15px;
}
.agency_list {
.agency_item {
height: 50px;
font-size: 17px;
font-family: PingFang SC;
font-weight: 400;
color: #ffffff;
line-height: 50px;
padding-left: 12px;
}
.agency_item_on {
background: #08216c;
border-radius: 2px;
}
.agency_item:hover {
cursor: pointer;
background-color: #011168;
border-radius: 4px 0 0 4px;
border: none;
box-shadow: 0 0 10px inset #1a5afd;
border-radius: 2px;
}
}
}

15
src/views/modules/communityParty/regionalParty/activitysForm.vue

@ -11,7 +11,7 @@
<el-form-item label="服务事项"
label-width="150px"
prop="serviceMatter">
prop="serviceMatterList">
<el-checkbox-group class="item_width_1"
style="display:flex;flex-wrap:wrap"
@ -36,12 +36,12 @@
</el-form-item>
<el-form-item label="单位名称"
prop="unitId"
prop="unitIdList"
label-width="150px"
style="display: block">
<el-checkbox-group class="item_width_1"
style="display:flex;flex-wrap:wrap"
v-model="formData.unitList">
v-model="formData.unitIdList">
<el-checkbox v-for="item in unitList"
:key="item.value"
:label="item.value">{{item.label}}</el-checkbox>
@ -225,10 +225,9 @@ export default {
activityId: '',
formData: {
serviceMatter: '',//
serviceMatterList: [],
unitId: '',//ID
unitList: [],
unitIdList: [],
title: '',//
target: '',//
content: '',//
@ -480,7 +479,7 @@ export default {
serviceMatter: '',//
serviceMatterList: [],
unitId: '',//ID
unitList: [],
unitIdList: [],
title: '',//
target: '',//
content: '',//
@ -511,10 +510,10 @@ export default {
computed: {
dataRule () {
return {
serviceMatter: [
serviceMatterList: [
{ required: true, message: '服务事项不能为空', trigger: 'blur' }
],
unitId: [
unitIdList: [
{ required: true, message: '单位名称不能为空', trigger: 'blur' },
],
title: [

1306
src/views/modules/communityService/measure/index.vue

File diff suppressed because it is too large

291
src/views/modules/importRecord/index.vue

@ -0,0 +1,291 @@
<template>
<div>
<el-card class="resi-card-table">
<div class="resi-row-btn">
<h2 type="success" size="small">导入记录</h2>
</div>
<el-table
:data="tableData"
border
style="width: 100%"
class="resi-table"
:max-height="maxTableHeight"
>
<el-table-column label="序号" type="index" align="center" width="50" />
<el-table-column prop="originFileName" label="文件名">
</el-table-column>
<el-table-column prop="startTime" label="导入时间"> </el-table-column>
<el-table-column label="导入状态" align="center" width="180">
<template slot-scope="scope">
<span
v-if="scope.row.processStatus == 'processing'"
>导入中</span
>
<span
v-else-if="scope.row.processStatus == 'finished'"
>已完成</span
>
<a target="_blank"
:href="scope.row.resultDescFile"
style="color: #00a7a9"
v-else-if="scope.row.processStatus == 'finished_fail'"
>下载失败说明</a
>
</template>
</el-table-column>
</el-table>
<div>
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="pageNo"
:page-sizes="[20, 50, 100, 200]"
:page-size="parseInt(pageSize)"
layout="sizes, prev, pager, next"
:total="total"
>
</el-pagination>
</div>
</el-card>
</div>
</template>
<script>
import { requestPost } from "@/js/dai/request";
import nextTick from "dai-js/tools/nextTick";
import { mapGetters } from "vuex";
import axios from "axios";
export default {
components: {},
data() {
return {
openSearch: false,
formShow: false,
formTitle: "",
pageNo: 1,
pageSize: window.localStorage.getItem("pageSize") || 20,
total: 1,
tableData: [
// {
// originFileName: '.xls',
// processStatus: 'finished_fail',
// startTime: '2022-02-22',
// resultDescFile: 'http://www.baidu.com',
// }
],
};
},
computed: {
maxTableHeight() {
return this.clientHeight - 450;
},
...mapGetters(["clientHeight"]),
},
watch: {},
mounted() {
this.getTableData();
},
methods: {
handleSizeChange(val) {
console.log(`每页 ${val}`);
this.pageSize = val;
window.localStorage.setItem("pageSize", val);
this.getTableData();
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.pageNo = val;
this.getTableData();
},
handleClose() {
this.formShow = false;
},
handleSearch(val) {
console.log(this.fmData);
this.pageNo = 1;
this.getTableData();
},
async handleAdd() {
this.formShow = true;
await nextTick();
console.log(this.$refs);
this.$refs.eleEditForm.initForm("add");
},
async handleDel(rowData, rowIndex) {
console.log(rowData, rowIndex);
const url = "/heart/societyorg/del";
const { tableData } = this;
const { data, code, msg } = await requestPost(url, {
societyId: tableData[rowIndex].societyId,
});
if (code === 0) {
this.$message.success("删除成功!");
this.getTableData();
} else {
this.$message.success("操作失败!");
}
},
async getTableData() {
const url = "/commonservice/import-task/page";
const { pageSize, pageNo, fmData } = this;
const { data, code, msg } = await requestPost(url, {
pageSize,
pageNo,
...fmData,
});
if (code === 0) {
console.log("列表请求成功!!!!!!!!!!!!!!");
this.total = data.total || 0;
this.tableData = data.list
? data.list.map((item) => {
return item;
})
: [];
} else {
}
},
},
};
</script>
<style lang="scss" scoped>
.tabs-other-info {
.el-tabs__item {
// width: 50px;
height: 20px;
box-sizing: border-box;
margin-right: 7px;
padding: 0 10px !important;
font-size: 8px;
font-weight: 500;
color: #666666;
line-height: 20px;
background: #ebecf1;
border-radius: 2px;
}
.el-tabs__nav-wrap::after,
.el-tabs__active-bar {
display: none;
}
.el-tabs__nav-next,
.el-tabs__nav-prev {
line-height: 20px;
}
}
.resi-card-table {
margin-top: 20px;
}
.resi-row-btn {
margin-bottom: 13px;
.upload-btn {
display: inline-block;
margin: 0 10px;
}
}
.resi-other {
width: 100%;
display: flex;
.resi-other-title {
width: 100px;
box-sizing: border-box;
margin-bottom: 10px;
// padding: 6px 12px 0 0;
font-size: 16px;
font-weight: 500;
color: #333;
text-align: center;
}
.tabs-other-info {
// padding-left: 60px;
}
}
.resi-btns {
margin-top: 20px;
text-align: center;
}
.resi-container .resi-card {
position: relative;
overflow: visible;
}
.resi-down {
position: absolute;
left: 50%;
bottom: -10px;
display: flex;
justify-content: center;
align-items: center;
width: 46px;
height: 12px;
box-sizing: border-box;
margin-left: -23rpx;
cursor: pointer;
background: #ffffff;
border-radius: 0 0 10px 10px;
img {
display: block;
}
}
.resi-row-box {
height: 104px;
overflow: hidden;
transition: height 0.5s;
}
.resi-row-more {
height: max-content;
transition: height 0.5s;
}
.resi-row {
margin-bottom: 20px;
}
.resi-search {
.el-col {
text-align: right;
}
}
.resi-cell {
display: flex;
align-items: center;
.resi-cell-label {
width: 70px;
box-sizing: border-box;
margin-right: 15px;
text-align: right;
// line-height: 32;
}
.resi-cell-value-radio {
display: flex;
align-items: center;
min-height: 32px;
}
.resi-cell-input {
width: 180px;
}
.resi-cell-select {
width: 180px;
box-sizing: border-box;
margin-right: 10px;
&-middle {
width: 130px;
}
&-small {
width: 88px;
}
}
.resi-cell-select:last-child {
margin-right: 0;
}
}
</style>

48
src/views/modules/visual/basicinfo/basicInfoMain.vue

@ -14,6 +14,32 @@
</div>
</div>
<!-- 组织列表 -->
<div v-show="orgLevel!=='neighborHood'"
class="div_agency_list">
<el-scrollbar style="height:98%"
wrap-style="overflow-x:hidden">
<div v-if="subAgencyArray.length>0"
class="agency_list">
<div v-for="(item,index) in subAgencyArray"
:key="index"
@click="clickAgencyItem(item,index)"
:class="['agency_item',{'agency_item_on':index%2 ==0}]">
<div>{{item.name}}</div>
</div>
</div>
<div v-else>
<img src="@/assets/img/modules/visual/noData.png"
alt=""
srcset=""
class="no-data-img" />
</div>
</el-scrollbar>
</div>
<people-search v-show="orgLevel==='search'"
@toSubAgency="toSubAgency"
ref="ref_search"></people-search>
@ -277,7 +303,6 @@ const vueGis = {
methods: {
handleSearch () {
this.toSubAgency('search')
},
@ -325,10 +350,23 @@ const vueGis = {
this.level = ''
},
//
clickAgencyItem (item, index) {
let e = {
selected: []
}
let one = {
values_: item
}
e.selected.push(one)
this.toSubAgency('polygon', e)
},
// type:polygon / search people
async toSubAgency (type, e, searchName) {
//neighborHood
if (type === 'people') {
this.runNum++
@ -358,6 +396,7 @@ const vueGis = {
});
} else {
if (!e) {
return false
}
@ -940,4 +979,9 @@ export default vueGis;
overflow-x: hidden !important;
}
}
.div_agency_list {
/deep/ .el-scrollbar__wrap {
overflow-x: hidden !important;
}
}
</style>

9
src/views/modules/visual/communityParty/community.vue

@ -144,7 +144,7 @@ export default {
headerList: [
{ title: "序号", coulmn: 'index' },
{ title: "活动标题", coulmn: 'title' },
{ title: "区域化党建单位名称", coulmn: 'unitName' },
{ title: "单位名称", coulmn: 'unitName' },
{ title: "活动地址", coulmn: 'address' },
{ title: "服务事项", coulmn: 'serviceMatterName' },
{ title: "服务人数", coulmn: 'peopleCount' },
@ -388,6 +388,8 @@ export default {
if (code === 0) {
this.detailInfo = data
this.detailInfo.serviceMatterNameShow = data.serviceMatterNameList.join(',')
this.detailInfo.unitNameShow = data.unitNameList.join(',')
} else {
this.$message.error(msg)
}
@ -756,11 +758,6 @@ export default {
}
.box-right {
flex: 1;
// width: calc(100% - 400px);
overflow: hidden;
.pagination {
margin-top: 0;
}
.box-map {
height: 400px;
// border: 1px solid #2865fa;

4
src/views/modules/visual/communityParty/dialogInfo.vue

@ -19,11 +19,11 @@
</div> -->
<div class="item">
<span class="item-field">服务事项</span>
<span>{{ info.serviceMatterName }}</span>
<span>{{ info.serviceMatterNameShow }}</span>
</div>
<div class="item">
<span class="item-field">单位名称</span>
<span>{{ info.unitName }}</span>
<span>{{ info.unitNameShow }}</span>
</div>
<div class="item">
<span class="item-field">活动标题</span>

Loading…
Cancel
Save