Browse Source

首页占比,更改金点子,人员组织接口

chengyang
是小王呀\24601 9 months ago
parent
commit
b87b42c050
  1. 68
      src/views/modules/base/orgUnitManger/add.vue
  2. 111
      src/views/modules/base/orgUnitManger/index.vue
  3. 473
      src/views/modules/base/orgUnitManger/info.vue
  4. 43
      src/views/modules/base/vehicleManger/add.vue
  5. 6
      src/views/modules/home/index.vue
  6. 2
      src/views/modules/peopleOpinons/cpts/eventDetail.vue

68
src/views/modules/base/orgUnitManger/add.vue

@ -9,20 +9,14 @@
<el-form-item label="所属区域" prop="agencyId" label-width="120px"> <el-form-item label="所属区域" prop="agencyId" label-width="120px">
<el-cascader class="u-item-width-normal" ref="myCascader" clearable <el-cascader class="u-item-width-normal" ref="myCascader" clearable
v-model.trim="formData.agencyId" :options="orgOptions" :props="orgOptionProps" v-model.trim="formData.agencyId" :options="orgOptions" :props="orgOptionProps"
@change="handleChangeAgency1"></el-cascader> ></el-cascader>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="组织类型" prop="ownerPhone"> <el-form-item label="组织类型" prop="ownerPhone">
<el-select style="width: 100px;" v-model="formData.type" placeholder="请选择" <el-select style="width: 100px;" v-model="formData.type" placeholder="请选择"
clearable> clearable>
<el-option v-for="item in optionsStatus" :key="item.value" :label="item.label" <el-option v-for="item in orgTypeList" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-select style="margin-left: 8px;width: 100px;"
v-model="formData.classKey" placeholder="请选择" clearable>
<el-option v-for="item in optionsStatus" :key="item.value" :label="item.label"
:value="item.value"> :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
@ -129,11 +123,11 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="活动地点" prop="searchValue" label-width="120px"> <el-form-item label="地点" prop="searchValue" label-width="120px">
<div style="width: 940px;"> <div style="width: 940px;">
<el-select v-model.trim="searchValue" filterable style="width: 940px;" remote <el-select v-model.trim="searchValue" filterable style="width: 940px;" remote
:reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod" :reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
:loading="loading"> >
<el-option v-for="(item, index) in searchOptions" <el-option v-for="(item, index) in searchOptions"
@click.native="handleClickKey(index)" style="width: 400px;" @click.native="handleClickKey(index)" style="width: 400px;"
:key="item.value || index" :label="item.label" :value="item.value"> :key="item.value || index" :label="item.label" :value="item.value">
@ -157,7 +151,6 @@
<script> <script>
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
// import { Loading } from 'element-ui' // Loading
import { requestPost,requestGet } from '@/js/dai/request' import { requestPost,requestGet } from '@/js/dai/request'
import Tinymce from '@c/tinymce2/index.vue' import Tinymce from '@c/tinymce2/index.vue'
import daiMap from "@/utils/dai-map"; import daiMap from "@/utils/dai-map";
@ -175,34 +168,35 @@
return { return {
keyUnitList:[ keyUnitList:[
{ {
value: 0, value: "0",
label: '否', label: '否',
}, },
{ {
value: 1, value: "1",
label: '是', label: '是',
}, },
], ],
SmallPlaces:[ SmallPlaces:[
{ {
value: 0, value: "0",
label: '否', label: '否',
}, },
{ {
value: 1, value: "1",
label: '是', label: '是',
}, },
], // ], //
HazardousList:[ HazardousList:[
{ {
value: 0, value: "0",
label: '否', label: '否',
}, },
{ {
value: 1, value: "1",
label: '是', label: '是',
}, },
], // ], //
orgTypeList:[],//
placetList:[],// placetList:[],//
companyList:[],// companyList:[],//
placeTypeList:[],// placeTypeList:[],//
@ -282,6 +276,32 @@
}, },
methods: { methods: {
//
resetSearch() {
this.formData.latitude = "";
this.formData.longitude = "";
this.formData.registerAddress = "";
this.formData.dangerCompanyFlag = "";
this.formData.ninePlaceType = "";
this.formData.ninePlaceFlag = "";
this.formData.keyUnitFlag = "";
this.formData.legalUserPhone = "";
this.formData.legalUserIdCard = "";
this.formData.legalUserIdCardType = "";
this.formData.legalUserName = "";
this.formData.socialCreditCode ="";
this.formData.name = "";
this.formData.property = "";
this.formData.type = "";
this.formData.agencyId ="";
this.formData.updatedTime = "";
this.formData.updatedBy = "";
this.formData.delFlag = "";
this.formData.revision ="";
this.formData.createdBy = "";
this.formData.createdTime = "";
this.formData.customerId = "";
},
// //
async placetype() { async placetype() {
const url = '/sys/dict/data/dictlist'; const url = '/sys/dict/data/dictlist';
@ -317,6 +337,7 @@
const { data, code, msg } = await requestPost(url, params); const { data, code, msg } = await requestPost(url, params);
if (code === 0) { if (code === 0) {
console.log(data,"dsfl;jsdkl;"); console.log(data,"dsfl;jsdkl;");
this.orgTypeList=data
} else { } else {
this.$message.error(msg); this.$message.error(msg);
@ -415,12 +436,15 @@
}, },
// //
async initForm(type, unitId) { async initForm(type, unitId) {
console.log("dfklgjdfl");
console.log(type, unitId,"i就理解哦i"); console.log(type, unitId,"i就理解哦i");
if(type=="info"){ if(type=="add"){
this.showdisabled=true this.resetSearch()
this.getTableDetail(unitId)
} }
if (type == "edit") { if (type == "edit") {
console.log("dsfgkjskl");
this.getTableDetail(unitId) this.getTableDetail(unitId)
} }
@ -428,8 +452,8 @@
// //
getTableDetail(id) { getTableDetail(id) {
console.log(id,"dskljfksdljf"); console.log(id,"dskljfksdljf");
let url = `/voluntary/positionVenues/edit/${id}`; let url = `/gov/org/customerAgencyUnit/${id}`;
requestGet(url).then((res) => { requestPost(url).then((res) => {
console.log(res); console.log(res);
if (res.code == 0) { if (res.code == 0) {
this.formData = res.data this.formData = res.data

111
src/views/modules/base/orgUnitManger/index.vue

@ -133,7 +133,7 @@
<!--查看弹出框 --> <!--查看弹出框 -->
<el-dialog :visible.sync="showinfo" :close-on-click-modal="false" :close-on-press-escape="false" <el-dialog :visible.sync="showinfo" :close-on-click-modal="false" :close-on-press-escape="false"
:title="formTitle" width="750px" top="10vh" class="dialog-h" @closed="showAddClose"> :title="formTitle" width="750px" top="10vh" class="dialog-h" @closed="showAddClose">
<info ref="ref_form" v-if="showinfo" @showAddClose="showAddClose" /> <info ref="ref_form_info" v-if="showinfo" @showAddClose="showAddClose" />
</el-dialog> </el-dialog>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNo" <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" :page-sizes="[20, 50, 100, 200]" :page-size="parseInt(pageSize)" layout="sizes, prev, pager, next, total"
@ -243,6 +243,7 @@
add,info add,info
}, },
async mounted() { async mounted() {
this.getTableData()
this.getOrgTreeList() this.getOrgTreeList()
await this.loadOrgData(); await this.loadOrgData();
}, },
@ -311,7 +312,7 @@
return this.$message.error("请选择之后进行操作"); return this.$message.error("请选择之后进行操作");
let userIds = this.selection.map((item) => item.resiId); let userIds = this.selection.map((item) => item.resiId);
this.$http this.$http
.post("/actual/base/residentBaseInfo/batchdel", userIds) .post("/gov/org/customerAgencyUnit/delete", userIds)
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg); return this.$message.error(res.msg);
@ -440,23 +441,22 @@
}, },
// //
handleDel(row){ handleDel(row) {
this.$confirm("删除之后无法回复,确认删除?", "提示", { this.$confirm("删除之后无法回复,确认删除?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}) })
.then(() => { .then(() => {
console.log(row.id,"online"); let url = "/gov/org/customerAgencyUnit/delete"
let url="/voluntary/pointsAward/admin/delete" let params = {
let params={ id: [row.id]
id:row.id }
} requestPost(url, [row.id]).then((res) => {
requestPost(url,params).then((res)=>{ console.log(res, "res");
console.log(res,"res"); this.getTableData()
this.getTableData()
})
})
}) })
.catch(err => { .catch(err => {
if (err == "cancel") { if (err == "cancel") {
@ -465,24 +465,21 @@
}); });
}, },
// //
async getTableData() { async getTableData() {
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list"; // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
const url = "/gov/org/customerAgencyUnit/page"; const url = "/gov/org/customerAgencyUnit/page";
let params = { let params = {
page:1, page:this.pageNo,
limit:20, limit:this.pageSize,
...this.formData shelveOnTimeFrom: this.formData.shelveOnTimeFrom,
// pageNo: this.pageNo, redeemOrgId: this.formData.redeemOrgId,
// shelveOnTimeFrom: this.formData.shelveOnTimeFrom, classKey: this.formData.classKey,
// redeemOrgId: this.formData.redeemOrgId, shelveOnTimeTo: this.formData.shelveOnTimeTo
// pageTo: this.pageSize,
// classKey: this.formData.classKey,
// shelveOnTimeTo: this.formData.shelveOnTimeTo
} }
const { data, code, msg } = await requestGet(url, params) const { data, code, msg } = await requestPost(url, params)
if (code === 0) { if (code === 0) {
console.log("列表请求成功!!!!!!!!!!!!!!"); console.log("列表请求成功!!!!!!!!!!!!!!");
this.total = data.total || 0; this.total = data.total || 0;
@ -513,10 +510,12 @@
this.redeemerOrgId = val this.redeemerOrgId = val
}, },
// //
getOrgTreeList() { getOrgTreeList() {
console.log("ds;lfjksdl;");
this.$http this.$http
.post("/gov/org/customerAgencyUnit/page", {page:1,limit:10}) .post("/gov/org/customeragency/agencygridtree", {orgTypeFilter:this.orgTypeFilter})
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg); return this.$message.error(res.msg);
@ -536,12 +535,12 @@
return this.$message.error("网络错误"); return this.$message.error("网络错误");
}); });
}, },
handleDetail(){ handleDetail(row){
this.formTitle = '查看' this.formTitle = '查看'
this.showinfo = true this.showinfo = true
// this.$nextTick(() => { this.$nextTick(() => {
// this.$refs.ref_form.initForm("info", ""); this.$refs.ref_form_info.initForm("info", row.id);
// }); });
}, },
showAddClose(){ showAddClose(){
console.log("23132132d"); console.log("23132132d");
@ -554,16 +553,18 @@
this.$refs.ref_form.initForm("add", ""); this.$refs.ref_form.initForm("add", "");
}); });
}, },
handleEdit() { handleEdit(row) {
this.formTitle ='编辑' this.formTitle ='编辑'
this.showAdd = true this.showAdd = true
console.log("dsfgjlkdsfgjkl");
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.ref_form.initForm("edit", row); this.$refs.ref_form.initForm("edit", row.id);
}) })
}, },
// // // //
async loadOrgData() { async loadOrgData() {
const url = "/gov/org/agency/maporg"; const url = "/gov/org/agency/maporg";
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/agency/maporg"
let params = {}; let params = {};
const { data, code, msg } = await requestPost(url, params); const { data, code, msg } = await requestPost(url, params);
if (code === 0) { if (code === 0) {
@ -581,21 +582,29 @@
}, },
// //
resetSearch() { resetSearch() {
this.ownerName = ""; this.formData.latitude = "";
this.ownerPhone = ""; this.formData.longitude = "";
this.rentFlag = ""; this.formData.registerAddress = "";
this.purpose = ""; this.formData.dangerCompanyFlag = "";
this.remark = ""; this.formData.ninePlaceType = "";
this.updateStartDate = ""; this.formData.ninePlaceFlag = "";
this.updateEndDate = ""; this.formData.keyUnitFlag = "";
this.neighborHoodId = ""; this.formData.legalUserPhone = "";
this.buildingId = ""; this.formData.legalUserIdCard = "";
this.buildingUnitId = ""; this.formData.legalUserIdCardType = "";
this.houseId = ""; this.formData.legalUserName = "";
this.resiNumber =""; this.formData.socialCreditCode ="";
this.pageSize = 10; this.formData.name = "";
this.pageNo = 1; this.formData.property = "";
this.formData.type = "";
this.formData.agencyId ="";
this.formData.updatedTime = "";
this.formData.updatedBy = "";
this.formData.delFlag = "";
this.formData.revision ="";
this.formData.createdBy = "";
this.formData.createdTime = "";
this.formData.customerId = "";
}, },

473
src/views/modules/base/orgUnitManger/info.vue

@ -6,57 +6,78 @@
<el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" class="form"> <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" class="form">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="车牌号码" label-width="100px" prop="name"> <el-form-item label="所属区域" label-width="150px" prop="name">
<div>{{ formData.agencyName}}</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="车主姓名" label-width="100px" prop="name"> <el-form-item label="组织类型" label-width="150px" prop="name">
<div>{{ formData.type}}</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="车主电话" label-width="100px" prop="name"> <el-form-item label="企业性质" label-width="150px" prop="name">
<div>{{ formData.property}}</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="车主身份证" label-width="100px" prop="name"> <el-form-item label="组织名称" label-width="150px" prop="name">
<div>{{ formData.name}}</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="车辆品牌" label-width="100px" prop="name"> <el-form-item label="统一社会信用码" label-width="150px" prop="name">
<div>{{ formData.socialCreditCode}}</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="设备名称" prop="linkPhone" label-width="100px"> <el-form-item label="法人姓名" prop="linkPhone" label-width="150px">
<div>{{ formData.legalUserName}}</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="车辆颜色" prop="linkPhone" label-width="100px"> <el-form-item label="法人证件类型" prop="linkPhone" label-width="150px">
<div>{{ formData.legalUserIdCard}}</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="核载人数" prop="linkPhone" label-width="100px"> <el-form-item label="法人证件号码" prop="linkPhone" label-width="150px">
<div>{{ formData.agencyName}}</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="12">
<el-form-item label="购置日期" prop="linkPhone" label-width="100px"> <el-form-item label="法人联系方式" prop="linkPhone" label-width="150px">
<div>{{ formData.legalUserPhone}}</div>
<!-- <span style="margin: 0 10px"></span><el-date-picker
v-model="formData.shelveOnTimeTo" type="datetime" placeholder="结束时间"
format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="12">
<el-form-item label="备注" label-width="100px" prop="name"> <el-form-item label="是否重点单位" prop="linkPhone" label-width="150px">
<div>{{ formData.keyUnitFlag?"是":"否"}}</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="重点单位类型" prop="linkPhone" label-width="150px">
<div>{{ formData.keyUnitFlag}}</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否九小场所" prop="linkPhone" label-width="150px">
<div>{{ formData.ninePlaceFlag?"是":"否"}}</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="九小场所类型" prop="linkPhone" label-width="150px">
<div>{{ formData.ninePlaceType}}</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否危化企业" prop="linkPhone" label-width="150px">
<div>{{ formData.dangerCompanyFlag?"是":"否"}}</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="地址" prop="linkPhone" label-width="150px">
<div>{{ formData.searchValue}}</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row></el-form> </el-row></el-form>
@ -89,89 +110,33 @@
export default { export default {
data() { data() {
return { return {
showdisabled:false,
searchOptions:[],
fileList:[],
searchValue:"",
Organizationaltype:[
{ label: "社区", value: 1 },
{ label: "企业", value: 2 },
{ label: "学校", value: 3 },
],
SiteData:[],
tableDate:{},
formData: formData:
{ {
attrs:[],
positionId:"",//
address: "",//
longitude: this.$store.state.user.longitude, //
latitude: this.$store.state.user.latitude,//
},
uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
customerId: localStorage.getItem('customerId'),
},
} }
}, },
components: { Tinymce, UploadImage }, components: { Tinymce, UploadImage },
mounted() { mounted() {
this.getSiteTableData()
this.formData.agencyId=this.$store.state.user.agencyId
this.formData.agencyName=this.$store.state.user.agencyName
let { latitude, longitude } = this.$store.state.user;
if (!latitude || latitude == "" || latitude == "0") {
latitude = 39.9088810666821;
longitude = 116.39743841556731;
}
this.formData.latitude = latitude;
this.formData.longitude = longitude;
this.activityType()
}, },
methods: { methods: {
//
async getSiteTableData() {
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
const url = "/voluntary/position/list";
let params = {
name: "",
type: "",
pageNo: "",
pageSize: ""
}
const { data, code, msg } = await requestGet(url, params);
if (code === 0) {
console.log("列表请求成功!!!!!!!!!!!!!!");
// this.total = data.total || 0;
this.SiteData = data.list
} else {
}
},
// //
async initForm(type, unitId) { async initForm(type, unitId) {
console.log(type, unitId,"i就理解哦i");
if(type=="info"){
this.showdisabled=true
this.getTableDetail(unitId) this.getTableDetail(unitId)
}
if (type == "edit") {
this.getTableDetail(unitId)
}
}, },
// //
getTableDetail(id) { getTableDetail(id) {
console.log(id,"dskljfksdljf"); console.log(id,"dskljfksdljf");
let url = `/voluntary/positionVenues/edit/${id}`; let url = `/gov/org/customerAgencyUnit/${id}`;
requestGet(url).then((res) => { requestGet(url).then((res) => {
console.log(res); console.log(res);
if (res.code == 0) { if (res.code == 0) {
this.formData = res.data this.formData = res.data
this.searchValue= res.data.address
this.fileList=[{fileUrl:res.data.attrs[0].url}]
} else { } else {
this.$message.error(res.msg) this.$message.error(res.msg)
} }
@ -180,344 +145,8 @@
}, },
async activityType() {
this.$nextTick(() => {
if (!map) {
this.initMap(this.formData.latitude, this.formData.longitude);
console.log("map", map,this.formData.latitude, this.formData.longitude)
} else {
map.setCenter(this.formData.latitude, this.formData.longitude);
map.setMarker(this.formData.latitude, this.formData.longitude);
console.log("mapmapmap", map)
}
})
},
handleOnlineRegistration(value) {
//
if (value) {
this.online = true;
this.formData.online = 1;
} else {
this.online = false;
this.formData.cutOffTime = ''
this.formData.online = 0;
}
},
onChangeFileList(e) {
console.log(e, 'sssssb');
this.fileList = e.length > 0 ? e.map(item => ({
fileType: '0',
type:'image',
fileType: '0',
name:item.response.data.fileName,
fileUrl: item.response.data.url,
format: item.response.data.fileName.split('.').pop(),
url: item.response.data.url
})) : []; // efileList
if (e.length > 0) {
console.log(this.fileList,"this.fileList");
this.formData.attrs=this.fileList;
console.log(this.formData.attrs,"this.fileList");
} else {
this.formData.coverPic = '';
}
},
removedImg() {
this.formData.coverPic = ''
},
onChangeFileList1(e) {
console.log(e, 'sssssb');
this.fileList1 = e.length > 0 ? e.map(item => ({
fileType: '0',
fileUrl: item.response.data.url
})) : []; // efileList
if (e.length > 0) {
this.formData.brandImg = e[0].response.data.url;
} else {
this.formData.brandImg = '';
}
},
onChangeImgs(e, rowIndex = 0) {
console.log('onChangeFileList', e)
if (e.length > 0) {
this.activityImgs = []
e.forEach(item => {
let ob = {
fileType: '0',
fileUrl: item.response.data.url
}
this.activityImgs.push(ob)
})
}
},
// onChangeImgs(e) {
// this.activityImgs = [];
// if (e.length > 0) {
// e.forEach(item => {
// let ob = {
// fileType: '0',
// fileUrl: item.response.data.url
// };
// this.activityImgs.push(ob);
// });
// console.log('this.activityImgs',this.activityImgs)
// }
// },
handleChange(value) {},
handleTimeChange(time) {
if (time) {
const startTimeArray = util.dateFormatter(time[0], 'time').split('-')
console.log(startTimeArray);
const endTimeArray = util.dateFormatter(time[1], 'time').split('-')
console.log(endTimeArray);
this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2]
this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2]
// this.startTimeShow = startTimeArray[0] + '' + startTimeArray[1] + '' + startTimeArray[2] + ''
// this.endTimeShow = endTimeArray[0] + '' + endTimeArray[1] + '' + endTimeArray[2] + ''
} else {
this.formData.startTime = ''
this.formData.endTime = ''
}
},
async getDemandOptions() {
this.$http
.post("/actual/base/serviceitem/listAllCategory")
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg);
} else {
console.log(res.data);
this.demandOptions = this.getFlagData(
this.getTreeData(res.data),
"usableFlag"
);
}
})
.catch(() => {
return this.$message.error("网络错误");
});
},
getFlagData(data, flag) {
if (!Array.isArray(data)) return [];
let arr1 = data.filter((item) => item[flag]);
let arr2 = arr1.map((item) => {
if (item.childCateList)
return { ...item, childCateList: this.getFlagData(item.childCateList, flag) };
else return item;
});
return arr2;
},
getTreeData(data) {
if (!Array.isArray(data)) return [];
let arr = data.map((item) => {
let _item = {};
if (item.childCateList) {
if (item.childCateList.length === 0)
_item = { ...item, childCateList: undefined };
else _item = { ...item, childCateList: this.getTreeData(item.childCateList) };
} else {
_item = { ...item };
}
return _item;
});
return arr;
},
async loadGrid() {
const url = "/gov/org/customergrid/gridoption"
let params = {
agencyId: this.agencyId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.gridList = data
} else {
this.$message.error(msg)
}
},
async handleComfirm() {
console.log(this.formData," this.formData");
if (!this.formData.address) {
this.$message.error('请输入具体位置');
return;
}
if (!this.formData.attrs ) {
this.$message.error('请上传图片');
return;
}
if (!this.formData.linkPhone) {
this.$message.error('请填写联系电话');
return;
}
if (!this.formData.positionId) {
this.$message.error('请选择挂靠阵地');
return;
}
this.addActivity()
},
//
async addActivity() {
let url = '/voluntary/positionVenues/saveOrUpdate'
const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) {
this.$message({
type: 'success',
message: '操作成功'
})
// this.resetData()
this.$emit('showAddClose')
} else {
this.$message.error(msg)
}
},
handleCancle() {
console.log("sdlkfjklsdf ");
this.$emit('showAddClose')
},
// init
initMap(latitude, longitude) {
console.log(latitude, longitude,"564564568");
map = new daiMap(
document.getElementById("app_activity"),
{ latitude, longitude },
{
zoom: 16.2, //
pitch: 43.5, //
rotation: 45, //
}
);
//
/* map.on("dragend", (e) => {
this.handleMoveCenter(e);
});*/
map.on("click", (e) => {
this.handleMoveCenter(e);
});
map.setCenter(latitude, longitude);
map.setMarker(latitude, longitude);
},
async handleMoveCenter(e) {
//
// const { lat, lng } = map.getCenter();
const { lat, lng } = e.latLng;
this.formData.latitude = lat;
this.formData.longitude = lng;
map.setMarker(lat, lng);
let { msg, data } = await map.getAddress(lat, lng);
if (msg == "success") {
this.formData.address = data.address;
this.searchValue=data.address
console.log(this.formData.address," this.formData.address ");
this.searchValue = data.address
this.searchOptions = []
// console.log('data,this.searchValue ', this.searchValue)
}
},
async remoteMethod(query) {
console.log(query, "sfsvsdv");
if (query !== '') {
const { msg, data } = await map.searchNearby(query);
this.resultList = []
if (msg == "success" && data.resultList && data.resultList.length > 0) {
if (data.resultList && data.resultList.length > 0) {
this.resultList = data.resultList
console.log(this.resultList, "this.resultList");
this.searchOptions = this.resultList.map(item => {
return { value: `${item.id}`, label: `${item.address + item.title}` };
});
console.log(this.searchOptions, "this.searchOptions");
}
} else {
this.searchOptions = [
{
value: '0',
label: '未检索到结果'
}
]
}
} else {
this.searchOptions = [];
}
},
handleClickKey(index) {
let selPosition = this.resultList[index]
let lonlat = selPosition.lonlat.split(" ")
map.setCenter(lonlat[1], lonlat[0]);
map.setMarker(lonlat[1], lonlat[0]);
this.formData.latitude = lonlat[1];
this.formData.longitude = lonlat[0];
this.formData.address=selPosition.address + selPosition.nam
this.searchValue = selPosition.address + selPosition.name
console.log(this.formData.address," this.formData.address ");
},
},
computed: {
dataRule() {
return {
positionId: [
{ required: true, message: '请选择挂靠组织', trigger: 'blur' }
],
name: [
{ required: true, message: '请填写名称', trigger: 'blur' }
],
linkPhone: [
{ required: true, message: '电话不能为空不能为空', trigger: 'blur' },
{ pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }
],
fileList: [
{ required: true, message: '请选择封面图片', trigger: 'blur' }
],
address: [
{ required: true, message: '请选择位置', trigger: 'blur' }
],
}
},
}, },
props: { props: {

43
src/views/modules/base/vehicleManger/add.vue

@ -6,7 +6,7 @@
<el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" class="form"> <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" class="form">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属组织" prop="ownerName" label-width="100px"> <el-form-item label="所属组织" prop="agencyId" label-width="100px">
<el-cascader v-model="formData.agencyId" class="u-item-width-normal" ref="cascader_Ref" clearable size="small" <el-cascader v-model="formData.agencyId" class="u-item-width-normal" ref="cascader_Ref" clearable size="small"
:options="orgOptions" :props="orgOptionProps" :options="orgOptions" :props="orgOptionProps"
@change="handleChangeAgency"></el-cascader> @change="handleChangeAgency"></el-cascader>
@ -68,7 +68,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="核载人数" prop="carriersNum" label-width="100px"> <el-form-item label="核载人数" prop="carriersNum" label-width="100px">
<el-input-number @change="handleChange" :min="1" :max="10" <el-input-number v-model="formData.carriersNum" @change="handleChange" :min="1" :max="10"
label="描述文字"> label="描述文字">
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
@ -151,7 +151,7 @@
carNumber:"", carNumber:"",
customerId:this.$store.state.user.customerId, customerId:this.$store.state.user.customerId,
carTy:"", carTy:"",
carriersNum:"1", carriersNum:1,
acquistionDate:"", acquistionDate:"",
carOwnerName:"", carOwnerName:"",
carOwnerNum:"", carOwnerNum:"",
@ -193,7 +193,6 @@
// console.log(' ID:', this.formData.orgIdPath); // console.log(' ID:', this.formData.orgIdPath);
// }, // },
handleChangeAgency(valuePath) { handleChangeAgency(valuePath) {
console.log("选择的值:", valuePath, this.$refs.cascader_Ref.getCheckedNodes()[0].pathLabels.join(" / ")); // console.log("选择的值:", valuePath, this.$refs.cascader_Ref.getCheckedNodes()[0].pathLabels.join(" / ")); //
this.formData.orgIdPath =valuePath.toString(); // '-' this.formData.orgIdPath =valuePath.toString(); // '-'
this.formData.agencyId=valuePath[valuePath.length-1] this.formData.agencyId=valuePath[valuePath.length-1]
@ -571,23 +570,41 @@
computed: { computed: {
dataRule() { dataRule() {
return { return {
positionId: [ agencyId: [
{ required: true, message: '请选择挂靠组织', trigger: 'blur' } { required: true, message: '请选择组织不能为空', trigger: 'blur' }
], ],
name: [ carNumber: [
{ required: true, message: '请填写名称', trigger: 'blur' } { required: true, message: '车辆号码不能为空', trigger: 'blur' }
], ],
linkPhone: [ linkPhone: [
{ required: true, message: '电话不能为空不能为空', trigger: 'blur' }, { required: true, message: '电话不能为空不能为空', trigger: 'blur' },
{ pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' } { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }
], ],
carOwnerName: [
fileList: [ { required: true, message: '车主姓名不能为空', trigger: 'blur' }
{ required: true, message: '请选择封面图片', trigger: 'blur' } ],
carOwnerNum: [
{ required: true, message: '车主身份证不能为空', trigger: 'blur' }
],
carOwnerMobile: [
{ required: true, message: '车主电话不能为空', trigger: 'blur' }
],
carBrand: [
{ required: true, message: '车辆品牌不能为空', trigger: 'blur' }
], ],
address: [ carType: [
{ required: true, message: '请选择位置', trigger: 'blur' } { required: true, message: '车辆类型不能为空', trigger: 'blur' }
], ],
carColor: [
{ required: true, message: '车辆颜色不能为空', trigger: 'blur' }
],
carriersNum: [
{ required: true, message: '核载人数不能为空', trigger: 'blur' }
],
acquistionDate: [
{ required: true, message: '购置日期不能为空', trigger: 'blur' }
],
} }
}, },

6
src/views/modules/home/index.vue

@ -323,7 +323,7 @@
<div > <div >
<div <div
style="width: 100%;margin-top:26px;overflow-y: scroll; height:calc(100% - 79px);padding-bottom:15px; box-sizing: border-box"> style="width: 100%;margin-top:26px;overflow-y: scroll; height:calc(100% - 79px);padding-bottom:15px; box-sizing: border-box">
<el-table :data="StatisticsList" border :cell-style="columnbackgroundStyle" class="m-table-item"> <el-table :data="StatisticsList" border :cell-style="columnbackgroundStyle" class="m-table-item" :height="200">
<el-table-column label="省份" align="center" > <el-table-column label="省份" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<span style="color:#989898">{{ scope.row.province }}</span> <span style="color:#989898">{{ scope.row.province }}</span>
@ -335,12 +335,12 @@
@click="handelClickToResi(scope.row)">{{scope.row.userCount}}</span> @click="handelClickToResi(scope.row)">{{scope.row.userCount}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="占比" align="center" :show-overflow-tooltip="true"> <!-- <el-table-column label="占比" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="color:#ff1200;cursor: pointer;" <span style="color:#ff1200;cursor: pointer;"
@click="handelCLickJump(scope.row,'cateNonIntegrity')">{{scope.row.nonIntegratedNum}}</span> @click="handelCLickJump(scope.row,'cateNonIntegrity')">{{scope.row.nonIntegratedNum}}</span>
</template> </template>
</el-table-column> </el-table-column> -->
</el-table> </el-table>
</div> </div>

2
src/views/modules/peopleOpinons/cpts/eventDetail.vue

@ -108,7 +108,7 @@
<span class="u-info-title-2">选为"金点子"建议:</span> <span class="u-info-title-2">选为"金点子"建议:</span>
<!-- <span>{{info.goldenIdeaFlag==1?'是':'否'}}</span> --> <!-- <span>{{info.goldenIdeaFlag==1?'是':'否'}}</span> -->
<el-switch v-model="info.goldenIdeaFlag" :active-value=1 :inactive-value=0 <el-switch v-model="info.goldenIdeaFlag" :active-value=1 :inactive-value=0
active-color="#13ce66" inactive-color="#ff4949" @change="sendValue"> active-color="#13ce66" inactive-color="#c4c4c4" @change="sendValue">
</el-switch> </el-switch>
</div> </div>

Loading…
Cancel
Save