Browse Source

Merge branch 'dev-fivelayer0725'

master
dai 3 years ago
parent
commit
1012f883e2
  1. BIN
      src/assets/img/shuju/command/close.png
  2. 21
      src/assets/scss/modules/visual/command.scss
  3. 8
      src/views/modules/communityParty/regionalParty/units.vue
  4. 4
      src/views/modules/communityService/fuwujilu/addForm.vue
  5. 539
      src/views/modules/communityService/measure/info.vue
  6. 7
      src/views/modules/communityService/sqzzz/index.vue
  7. 1
      src/views/modules/visual/command/cpts/demandInfo.vue
  8. 42
      src/views/modules/visual/command/cpts/eventInfo.vue
  9. 10
      src/views/modules/visual/command/cpts/map.vue
  10. 2
      src/views/modules/visual/command/cpts/popup.vue
  11. 47
      src/views/modules/visual/command/cpts/serviceInfo.vue
  12. 2
      src/views/modules/visual/command/cpts/sidemenu-left.vue
  13. 231
      src/views/modules/visual/command/index.vue

BIN
src/assets/img/shuju/command/close.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 425 B

21
src/assets/scss/modules/visual/command.scss

@ -81,7 +81,7 @@
box-shadow: 0px 4px 8px 0px rgba(147, 147, 147, 0.26);
> input {
width: 420px;
width: 400px;
border: none;
line-height: 45px;
font-size: 18px;
@ -90,10 +90,17 @@
color: #333333;
}
> img {
.i-search {
margin: 0 16px;
width: 30px;
height: 30px;
width: 24px;
height: 24px;
}
.i-close {
margin-left: 15px;
opacity: 0.2;
width: 20px;
cursor: pointer;
}
.btn {
@ -206,7 +213,11 @@
}
.list {
min-height: 780px;
margin-right: -8px;
height: calc(825px - 120px);
overflow-y: auto;
overflow-x: hidden;
@include scrollBar;
}
}

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

@ -574,16 +574,12 @@ export default {
if (code === 0) {
if (data.type) {
if (data.msg) {
this.$message({
type: "success",
message: "同步成功"
message: data.msg || "同步成功"
});
this.loadTable()
} else {
this.$message.error(data.msg)
}
this.loadTable()
} else {
this.$message.error(data.msg)
}

4
src/views/modules/communityService/fuwujilu/addForm.vue

@ -1,6 +1,6 @@
<template>
<div>
<div :class="{'visiual-form':source==='visiual'}">
<div class="dialog-h-content scroll-h" :class="{'visiual-form':source==='visiual'}">
<el-form v-if="formType==='add'"
ref="ref_form"
@ -146,6 +146,7 @@
<el-date-picker v-model="formData.serviceTimeStart"
:picker-options="startPickerOptions"
class="item_width_2"
style="width:220px"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
value="yyyy-MM-dd"
@ -155,6 +156,7 @@
<el-date-picker v-model="formData.serviceTimeEnd"
:picker-options="endPickerOptions"
class="item_width_2 data-tag"
style="width:220px"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
value="yyyy-MM-dd"

539
src/views/modules/communityService/measure/info.vue

@ -1,25 +1,36 @@
<template>
<div>
<el-card :class="{'box-card':source==='visiual'}">
<el-form label-width="120px"
<el-card :class="{ 'box-card': source === 'visiual' }">
<el-form
label-width="120px"
:model="form"
class="div_form"
:rules="rules"
ref="ruleForm">
<el-form-item v-if="formType!=='add'"
ref="ruleForm"
>
<el-form-item
v-if="formType !== 'add'"
label="操作方式"
:class="{'form-item':source==='visiual'}"
prop="addType">
:class="{ 'form-item': source === 'visiual' }"
prop="addType"
>
<el-radio-group v-model="addType">
<el-radio label="look">查看</el-radio>
<template v-if="form.reportType != 'self_help'">
<el-radio label="edit"
v-if="form.status === 'pending'">修改</el-radio>
<el-radio label="cancel"
v-if="form.status !== 'finished' && form.status !== 'canceled'">取消</el-radio>
<el-radio label="edit" v-if="form.status === 'pending'"
>修改</el-radio
>
<el-radio
label="cancel"
v-if="form.status !== 'finished' && form.status !== 'canceled'"
>取消</el-radio
>
</template>
<el-radio label="appoint"
v-if="form.status === 'pending' || form.status === 'assigned'">指派</el-radio>
<el-radio
label="appoint"
v-if="form.status === 'pending' || form.status === 'assigned'"
>指派</el-radio
>
<!-- <el-radio label="finish"
v-if="
(form.reportType == 'self_help' &&
@ -30,7 +41,8 @@
form.status === 'have_order' ||
(form.status == 'finished' && !form.evaluateFlag)
">完成</el-radio> -->
<el-radio label="finish"
<el-radio
label="finish"
v-if="
(form.reportType == 'self_help' &&
form.serviceShowFlag &&
@ -38,232 +50,293 @@
form.status !== 'finished') ||
form.status === 'assigned' ||
form.status === 'have_order'
">完成</el-radio>
"
>完成</el-radio
>
</el-radio-group>
</el-form-item>
<el-form-item label="所属网格"
:class="{'form-item':source==='visiual'}"
prop="gridId">
<div :class="{'visiual-form':source==='visiual'}">
<el-input v-if="disabled"
<el-form-item
label="所属网格"
:class="{ 'form-item': source === 'visiual' }"
prop="gridId"
>
<div :class="{ 'visiual-form': source === 'visiual' }">
<el-input
v-if="disabled"
v-model="form.gridName"
:disabled="disabled"
class="item_width_1"></el-input>
class="item_width_1"
></el-input>
<!-- <span >{{ form.gridName }}</span> -->
<el-select v-else
<el-select
v-else
v-model="form.gridId"
filterable
placeholder="请选择"
class="item_width_1"
clearable
:disabled="disabled"
@change="handleGridChange">
<el-option v-for="item in disabled ? optionsG : optionsEditG"
@change="handleGridChange"
>
<el-option
v-for="item in disabled ? optionsG : optionsEditG"
:key="item.value"
:label="item.label"
:value="item.value">
:value="item.value"
>
</el-option>
</el-select>
</div>
</el-form-item>
<el-form-item label="需求类型"
:class="{'form-item':source==='visiual'}"
prop="categoryCode">
<div :class="{'visiual-form':source==='visiual'}">
<el-input v-if="disabled"
<el-form-item
label="需求类型"
:class="{ 'form-item': source === 'visiual' }"
prop="categoryCode"
>
<div :class="{ 'visiual-form': source === 'visiual' }">
<el-input
v-if="disabled"
v-model="form.categoryName"
:disabled="disabled"
class="item_width_1"
clearable></el-input>
<el-cascader v-else
clearable
></el-input>
<el-cascader
v-else
v-model="form.categoryCodeArr"
:options="demandOptions"
:disabled="disabled"
clearable
class="item_width_1"
@change="handleCateSlect"></el-cascader>
@change="handleCateSlect"
></el-cascader>
</div>
</el-form-item>
<el-form-item label="上报类型"
:class="{'form-item':source==='visiual'}"
prop="reportType">
<div :class="{'visiual-form':source==='visiual'}">
<el-input v-if="disabled"
<el-form-item
label="上报类型"
:class="{ 'form-item': source === 'visiual' }"
prop="reportType"
>
<div :class="{ 'visiual-form': source === 'visiual' }">
<el-input
v-if="disabled"
v-model="form.reportTypeName"
:disabled="disabled"
class="item_width_1"></el-input>
<el-select v-else
class="item_width_1"
></el-input>
<el-select
v-else
v-model="form.reportType"
filterable
class="item_width_1"
placeholder="请选择"
clearable
:disabled="disabled">
<el-option v-for="item in reportOptions"
:disabled="disabled"
>
<el-option
v-for="item in reportOptions"
:key="item.value"
:label="item.label"
:value="item.value">
:value="item.value"
>
</el-option>
</el-select>
</div>
</el-form-item>
<el-form-item label="上报人"
:class="{'form-item':source==='visiual'}"
prop="reportUserName">
<div :class="{'visiual-form':source==='visiual'}">
<el-input v-model="form.reportUserName"
<el-form-item
label="上报人"
:class="{ 'form-item': source === 'visiual' }"
prop="reportUserName"
>
<div :class="{ 'visiual-form': source === 'visiual' }">
<el-input
v-model="form.reportUserName"
:disabled="disabled"
placeholder="请输入"
class="item_width_1"
clearable></el-input>
clearable
></el-input>
</div>
</el-form-item>
<el-form-item label="上报人手机号"
:class="{'form-item':source==='visiual'}"
prop="reportUserMobile">
<div :class="{'visiual-form':source==='visiual'}">
<el-input v-model="form.reportUserMobile"
<el-form-item
label="上报人手机号"
:class="{ 'form-item': source === 'visiual' }"
prop="reportUserMobile"
>
<div :class="{ 'visiual-form': source === 'visiual' }">
<el-input
v-model="form.reportUserMobile"
:disabled="disabled"
placeholder="请输入"
class="item_width_1"
maxlength="11"
clearable></el-input>
clearable
></el-input>
</div>
</el-form-item>
<el-form-item label="上报时间"
:class="{'form-item':source==='visiual'}"
prop="reportTime">
<div :class="{'visiual-form':source==='visiual'}">
<el-date-picker v-model="form.reportTime"
<el-form-item
label="上报时间"
:class="{ 'form-item': source === 'visiual' }"
prop="reportTime"
>
<div :class="{ 'visiual-form': source === 'visiual' }">
<el-date-picker
v-model="form.reportTime"
type="datetime"
class="item_width_1"
clearable
:disabled="disabled"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间">
placeholder="选择日期时间"
>
</el-date-picker>
</div>
</el-form-item>
<el-form-item label="需求人"
:class="{'form-item':source==='visiual'}"
prop="demandUserId">
<div :class="{'visiual-form':source==='visiual'}">
<el-input v-if="disabled"
<el-form-item
label="需求人"
:class="{ 'form-item': source === 'visiual' }"
prop="demandUserId"
>
<div :class="{ 'visiual-form': source === 'visiual' }">
<el-input
v-if="disabled"
v-model="form.demandUserName"
:disabled="disabled"
class="item_width_1"></el-input>
<el-select v-else
v-model="selectDemandUser"
class="item_width_1"
></el-input>
<el-select
v-else
v-model="form.demandUserId"
class="item_width_1"
filterable
:disabled="disabled"
placeholder="请选择"
clearable
@change="handleDemandChange">
<el-option v-for="item in demandUserList"
@change="handleDemandChange"
>
<el-option
v-for="item in demandUserList"
:key="item.demandUserId"
:label="item.label"
:value="item">
:value="item.demandUserId"
>
</el-option>
</el-select>
</div>
</el-form-item>
<el-form-item label="服务时间"
:class="{'form-item':source==='visiual'}"
prop="wantServiceTime">
<div :class="{'visiual-form':source==='visiual'}">
<el-date-picker v-model="form.wantServiceTime"
<el-form-item
label="服务时间"
:class="{ 'form-item': source === 'visiual' }"
prop="wantServiceTime"
>
<div :class="{ 'visiual-form': source === 'visiual' }">
<el-date-picker
v-model="form.wantServiceTime"
type="datetime"
clearable
:disabled="disabled"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间">
placeholder="选择日期时间"
>
</el-date-picker>
</div>
</el-form-item>
<el-form-item label="需求内容"
:class="{'form-item':source==='visiual'}"
prop="content">
<div :class="{'visiual-form':source==='visiual'}">
<el-input v-model="form.content"
<el-form-item
label="需求内容"
:class="{ 'form-item': source === 'visiual' }"
prop="content"
>
<div :class="{ 'visiual-form': source === 'visiual' }">
<el-input
v-model="form.content"
:autosize="{ minRows: 2, maxRows: 10 }"
:disabled="disabled"
type="textarea"
clearable
class="cell-width-area"
placeholder="请输入内容"></el-input>
placeholder="请输入内容"
></el-input>
</div>
</el-form-item>
<el-form-item v-if="
<el-form-item
v-if="
addType === 'add' ||
addType === 'appoint' ||
addType == 'finish' ||
(addType == 'look' && form.serviceShowFlag)
"
:class="{'form-item':source==='visiual'}"
:class="{ 'form-item': source === 'visiual' }"
label="服务方"
prop="serviceType">
<div :class="{'visiual-form':source==='visiual'}">
prop="serviceType"
>
<div :class="{ 'visiual-form': source === 'visiual' }">
<template v-if="disabled && addType !== 'appoint'">
<el-input v-model="form.serviceShowName"
<el-input
v-model="form.serviceShowName"
:disabled="disabled"
class="item_width_1"></el-input>
class="item_width_1"
></el-input>
</template>
<template v-else>
<el-select v-model="form.serviceType"
<el-select
v-model="form.serviceType"
class="item_width_1-small"
placeholder="请选择"
clearable
:disabled="disabled && addType !== 'appoint'"
@change="handleServiceChange('add', $event)">
<el-option v-for="item in serviceOptions"
@change="handleServiceChange('add', $event)"
>
<el-option
v-for="item in serviceOptions"
:key="item.value"
:label="item.label"
:value="item.value">
:value="item.value"
>
</el-option>
</el-select>
-
<el-select v-model="form.serverId"
<el-select
v-model="form.serverId"
class="item_width_1-middle"
filterable
placeholder="请选择"
clearable
:disabled="disabled && addType !== 'appoint'">
<el-option v-for="item in serviceOptiondList"
:disabled="disabled && addType !== 'appoint'"
>
<el-option
v-for="item in serviceOptiondList"
:key="item.value"
:label="item.label"
:value="item.value">
:value="item.value"
>
</el-option>
</el-select>
</template>
</div>
</el-form-item>
<el-form-item v-if="addType == 'look' && form.status == 'canceled'"
<el-form-item
v-if="addType == 'look' && form.status == 'canceled'"
label="取消时间"
:class="{'form-item':source==='visiual'}"
prop="cancelTime">
:class="{ 'form-item': source === 'visiual' }"
prop="cancelTime"
>
<span>{{ form.cancelTime }}</span>
</el-form-item>
<template v-if="
<template
v-if="
(addType == 'finish' && form.reportType != 'self_help') ||
(addType == 'look' && form.status == 'finished')
">
<el-form-item label="实际服务时间"
:class="{'form-item':source==='visiual'}"
prop="serviceStartTime">
<div :class="{'visiual-form':source==='visiual'}">
<el-date-picker v-model="finishServiceTime"
"
>
<el-form-item
label="实际服务时间"
:class="{ 'form-item': source === 'visiual' }"
prop="serviceStartTime"
>
<div :class="{ 'visiual-form': source === 'visiual' }">
<el-date-picker
v-model="finishServiceTime"
class="item_width_1-min"
clearable
:disabled="disabled && addType != 'finish'"
@ -272,50 +345,68 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd HH:mm:ss"
@change="handelBlurServiceTime">
@change="handelBlurServiceTime"
>
</el-date-picker>
</div>
</el-form-item>
<el-form-item label="完成情况"
:class="{'form-item':source==='visiual'}"
prop="finishResult">
<el-radio v-model="form.finishResult"
<el-form-item
label="完成情况"
:class="{ 'form-item': source === 'visiual' }"
prop="finishResult"
>
<el-radio
v-model="form.finishResult"
label="resolved"
:disabled="disabled && addType != 'finish'">已解决</el-radio>
<el-radio v-model="form.finishResult"
:disabled="disabled && addType != 'finish'"
>已解决</el-radio
>
<el-radio
v-model="form.finishResult"
label="unresolved"
:disabled="disabled && addType != 'finish'">未解决</el-radio>
:disabled="disabled && addType != 'finish'"
>未解决</el-radio
>
</el-form-item>
<el-form-item label="评价"
<el-form-item
label="评价"
prop="score"
:class="{'form-item':source==='visiual'}"
class="form-score">
<el-rate v-model="form.score"
:class="{ 'form-item': source === 'visiual' }"
class="form-score"
>
<el-rate
v-model="form.score"
:allow-half="true"
:disabled="disabled && addType != 'finish'"></el-rate>
:disabled="disabled && addType != 'finish'"
></el-rate>
</el-form-item>
<el-form-item label="备注"
:class="{'form-item':source==='visiual'}"
prop="finishDesc">
<div :class="{'visiual-form':source==='visiual'}">
<el-input v-model="form.finishDesc"
<el-form-item
label="备注"
:class="{ 'form-item': source === 'visiual' }"
prop="finishDesc"
>
<div :class="{ 'visiual-form': source === 'visiual' }">
<el-input
v-model="form.finishDesc"
:autosize="{ minRows: 2, maxRows: 10 }"
:disabled="disabled && addType != 'finish'"
type="textarea"
clearable
class="cell-width-area"
placeholder="请输入内容"></el-input>
placeholder="请输入内容"
></el-input>
</div>
</el-form-item>
</template>
<template v-if="addType == 'finish' && form.reportType == 'self_help'">
<el-form-item label="实际服务时间"
:class="{'form-item':source==='visiual'}"
prop="serviceStartTime">
<div :class="{'visiual-form-pickerrange':source==='visiual'}">
<el-date-picker v-model="finishServiceTime"
<el-form-item
label="实际服务时间"
:class="{ 'form-item': source === 'visiual' }"
prop="serviceStartTime"
>
<div :class="{ 'visiual-form-pickerrange': source === 'visiual' }">
<el-date-picker
v-model="finishServiceTime"
class="item_width_1-min"
clearable
:disabled="disabled && addType != 'finish'"
@ -324,25 +415,26 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd HH:mm:ss"
@change="handelBlurServiceTime">
@change="handelBlurServiceTime"
>
</el-date-picker>
</div>
</el-form-item>
</template>
</el-form>
<div class="div-btn ">
<el-button size="small"
@click="handlerClose">关闭</el-button>
<el-button v-if="addType != 'look'"
style="margin-left:20px"
<div class="div-btn">
<el-button size="small" @click="handlerClose">关闭</el-button>
<el-button
v-if="addType != 'look'"
style="margin-left: 20px"
type="primary"
size="small"
@click="handleSubmit">提交</el-button>
@click="handleSubmit"
>提交</el-button
>
</div>
</el-card>
</div>
</template>
@ -363,25 +455,26 @@ export default {
// type: String,
// default: "look",
// },
source: {//manage visiual
source: {
//manage visiual
type: String,
default: 'manage'
default: "manage",
},
icResiUserId: {
type: String,
default: ''
default: "",
},
selGridId: {
type: String,
default: ''
}
default: "",
},
},
data () {
data() {
return {
btnLoading: false,
pageLoading: false,
addType: 'look',
addType: "look",
form: {
gridId: "",
categoryCodeArr: [],
@ -449,42 +542,52 @@ export default {
computed: {
...mapGetters(["clientHeight", "iframeHeight"]),
disabled () {
disabled() {
return this.addType != "edit" && this.addType != "add";
},
},
watch: {
addType (val) {
addType(val) {
this.formatRowForm(val);
},
"form.demandUserId": function (val) {
this.handleDemandChange(val);
},
},
async created () {
async created() {
if (this.selGridId) {
this.form.gridId = this.selGridId;
}
this.customerId = localStorage.getItem("customerId");
this.getGridList('addorupdate');
this.getGridList("addorupdate");
this.getDemandOptions();
await this.getDemandUserList();
this.getServiceuserList();
this.getDictOptions();
if (this.formType === 'add') {
this.addType = 'add'
if (this.formType === "add") {
this.addType = "add";
} else {
this.getInfo();
}
if (this.icResiUserId && this.formType === "add") {
this.demandUserList.forEach((item) => {
if (item.demandUserId == this.icResiUserId)
this.form.demandUserId = item.demandUserId;
});
}
this.pageLoading = true;
},
methods: {
filterEdit (id) {
filterEdit(id) {
const { user } = this.$store.state;
return id === user.agencyId;
},
handleCateSlect (val) {
handleCateSlect(val) {
console.log("val", val);
if (val.length === 1) {
this.demandOptions.forEach((item) => {
@ -496,31 +599,41 @@ export default {
this.form.categoryCode = val[1];
}
},
handleDemandChange (val) {
console.log("val", val, this.selectDemandUser);
this.selectDemandUser = val.label;
this.form.demandUserName = val.demandUserName;
this.form.demandUserMobile = val.demandUserMobile;
this.form.demandUserId = val.demandUserId;
handleDemandChange(val) {
console.log("val", val);
// this.selectDemandUser = val;
if (val) {
const { demandUserList } = this;
let item = demandUserList.find((item) => item.demandUserId == val);
if (item) {
this.form.demandUserName = item.demandUserName;
this.form.demandUserMobile = item.demandUserMobile;
return;
}
}
this.form.demandUserName = "";
this.form.demandUserMobile = "";
},
handelBlurServiceTime (val) {
handelBlurServiceTime(val) {
console.log("val", val);
if (val.length > 0) {
this.form.serviceStartTime = val[0];
this.form.serviceEndTime = val[1];
}
},
handleServiceChange (type, val) {
handleServiceChange(type, val) {
if (val === "social_org") {
if (type === "add") this.getServiceuserList(val, "add_demand");
else this.getServiceuserList(val, "query_demand");
} else this.getServiceuserList(val, "");
},
handleGridChange (val) {
this.getDemandUserList();
async handleGridChange(val) {
console.log("网格改变了", val);
await this.getDemandUserList();
this.form.demandUserId = "";
},
handelBlurServiceTime (val) {
handelBlurServiceTime(val) {
console.log("val", val);
if (val.length > 0) {
this.form.serviceStartTime = val[0];
@ -528,23 +641,23 @@ export default {
}
},
handleServiceChange (type, val) {
handleServiceChange(type, val) {
if (val === "social_org") {
if (type === "add") this.getServiceuserList(val, "add_demand");
else this.getServiceuserList(val, "query_demand");
} else this.getServiceuserList(val, "");
},
handleAdd (addType) {
handleAdd(addType) {
this.addType = addType;
this.dialogVisible = true;
},
handlerClose () {
handlerClose() {
this.$emit("close");
},
async formatRowForm (addType) {
async formatRowForm(addType) {
this.addType = addType;
const { form: row } = this;
@ -559,12 +672,10 @@ export default {
if (addType == "finish") {
if (row.serviceStartTime && row.serviceEndTime) {
this.finishServiceTime = [row.serviceStartTime, row.serviceEndTime];
} else {
this.finishServiceTime = []
this.finishServiceTime = [];
}
this.form.finishResult = "resolved";
this.form.score = 5;
}
@ -578,16 +689,12 @@ export default {
if (item.value === row.categoryCode)
this.form.categoryCode = [row.categoryCode];
});
this.demandUserList.forEach((item) => {
if (item.demandUserId == row.demandUserId)
this.selectDemandUser = item.label;
});
}
this.dialogVisible = true;
},
async appointAjax () {
async appointAjax() {
const _form = {
demandRecId: this.form.demandRecId,
serviceType: this.form.serviceType,
@ -611,7 +718,7 @@ export default {
this.btnLoading = false;
},
async finishAjax () {
async finishAjax() {
const { reportType, serviceShowFlag, serviceType } = this.form;
const _form = {
demandRecId: this.form.demandRecId,
@ -640,7 +747,7 @@ export default {
this.btnLoading = false;
},
async editCate () {
async editCate() {
const categoryCode = this.form.categoryCode;
if (Array.isArray(categoryCode)) {
if (categoryCode.length === 1) {
@ -676,7 +783,7 @@ export default {
this.btnLoading = false;
},
handleSubmit () {
handleSubmit() {
this.$refs.ruleForm.validate(async (valid) => {
if (valid) {
this.btnLoading = true;
@ -692,7 +799,7 @@ export default {
});
},
async addNew () {
async addNew() {
const _form = {
...this.form,
};
@ -702,9 +809,8 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg);
} else {
this.$emit("handleClose")
this.$emit("handleClose");
return this.$message.success("需求上报成功");
}
})
.catch(() => {
@ -713,7 +819,7 @@ export default {
this.btnLoading = false;
},
handleDel () {
handleDel() {
let params = {
demandRecId: this.demandRecId,
};
@ -734,7 +840,7 @@ export default {
});
},
getTreeData (data) {
getTreeData(data) {
if (!Array.isArray(data)) return [];
let arr = data.map((item) => {
let _item = {};
@ -750,7 +856,7 @@ export default {
return arr;
},
getFlagData (data, flag) {
getFlagData(data, flag) {
if (!Array.isArray(data)) return [];
let arr1 = data.filter((item) => item[flag]);
let arr2 = arr1.map((item) => {
@ -762,7 +868,7 @@ export default {
return arr2;
},
async getGridList (type, agencyId) {
async getGridList(type, agencyId) {
const { user } = await this.$store.state;
console.log("user---ppp", user);
// addorupdate query
@ -786,7 +892,7 @@ export default {
});
},
async getDemandUserList () {
async getDemandUserList() {
const { user } = await this.$store.state;
console.log("user---ppp", user);
const params = {
@ -803,17 +909,6 @@ export default {
} else {
console.log("获取查询详情成功", res.data);
this.demandUserList = res.data;
if (this.icResiUserId && this.formType === 'add') {
this.demandUserList.forEach((item) => {
if (item.demandUserId == this.icResiUserId)
this.selectDemandUser = item.label;
});
this.form.demandUserId = this.icResiUserId
this.form.gridId = this.selGridId
}
}
})
.catch(() => {
@ -821,7 +916,7 @@ export default {
});
},
async getDemandOptions () {
async getDemandOptions() {
this.$http
.post("/heart/icresidemanddict/demandoption")
.then(({ data: res }) => {
@ -840,7 +935,7 @@ export default {
});
},
async getServiceuserList (serviceType, query) {
async getServiceuserList(serviceType, query) {
if (!serviceType) return false;
const { demandUserId } = this.form;
const params = {
@ -864,7 +959,7 @@ export default {
});
},
async getDictOptions () {
async getDictOptions() {
this.$http
.post("/sys/dict/data/dictlist", { dictType: "user_demand_status" })
.then(({ data: res }) => {
@ -910,7 +1005,7 @@ export default {
});
},
async getInfo () {
async getInfo() {
let params = {
demandRecId: this.demandRecId,
};
@ -929,8 +1024,10 @@ export default {
],
};
this.finishServiceTime = [this.form.serviceStartTime, this.form.serviceEndTime]
this.finishServiceTime = [
this.form.serviceStartTime,
this.form.serviceEndTime,
];
}
})
.catch(() => {

7
src/views/modules/communityService/sqzzz/index.vue

@ -520,15 +520,12 @@ export default {
if (code === 0) {
if (data.type) {
if (data.msg) {
this.$message({
type: "success",
message: "同步成功"
message: data.msg || "同步成功"
});
this.loadTable()
} else {
this.$message.error(data.msg)
}
} else {
this.$message.error(data.msg)

1
src/views/modules/visual/command/cpts/demandInfo.vue

@ -17,6 +17,7 @@
:formType="'add'"
:icResiUserId="icResiUserId"
:selGridId="selGridId"
@close="handleClose"
@handleClose="handleClose"
@handleOk="handleOk"
@dialogOk="handleEditSuccess" />

42
src/views/modules/visual/command/cpts/eventInfo.vue

@ -4,24 +4,25 @@
<cpt-card>
<div class="title">
<img src="@/assets/img/shuju/title-tip.png" />
<span>需求详情</span>
<span>事件详情</span>
</div>
<div class="btn-close"
@click="handleClose">
<div class="btn-close" @click="handleClose">
<img src="@/assets/img/shuju/people/close.png" />
</div>
<event-info v-if="loading"
<event-info
v-if="loading"
ref="eleEditForm"
:pageType="pageType"
:eventId="eventId"
:eventDetailData="eventDetailData"
:source="'visiual'"
@close="handleClose"
@handleClose="handleClose"
@handleOk="handleOk"
@dialogOk="handleEditSuccess" />
@dialogOk="handleEditSuccess"
/>
</cpt-card>
</div>
</div>
@ -38,7 +39,7 @@ export default {
props: {
eventId: {
type: String,
required: 'true'
required: "true",
},
},
@ -47,25 +48,24 @@ export default {
eventInfo,
},
data () {
data() {
return {
loading: false,
pageType: 'dispose',
pageType: "dispose",
// eventId: '',
eventDetailData: {},
};
},
async mounted () {
this.loading = false
await this.handleSearch()
this.loading = true
async mounted() {
this.loading = false;
await this.handleSearch();
this.loading = true;
},
methods: {
async handleSearch () {
async handleSearch() {
const url = "/gov/project/icEvent/detail";
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
@ -74,7 +74,6 @@ export default {
});
if (code === 0) {
this.eventDetailData = { ...data };
this.pageType = "dispose";
} else {
@ -82,20 +81,19 @@ export default {
}
},
handleClose () {
handleClose() {
this.pageType = "";
this.$emit("handleClose")
this.$emit("handleClose");
// this.eventId = ""
},
handleOk () {
handleOk() {
this.pageType = "";
// this.eventId = ""
this.pageNo = 1
this.pageNo = 1;
},
handleEditSuccess () {
handleEditSuccess() {
this.handleClose();
},
},
};

10
src/views/modules/visual/command/cpts/map.vue

@ -628,9 +628,7 @@ export default {
},
async setDotMarker(item, posArr) {
if (searchMarker) {
searchMarker.remove();
}
this.removeDotMarker();
const marker = new Marker({
offsets: [0, -20],
}).setLnglat(posArr);
@ -659,6 +657,12 @@ export default {
searchMarker = marker;
},
removeDotMarker() {
if (searchMarker) {
searchMarker.remove();
}
},
//
zoomInABit() {
// let current = scene.getZoom();

2
src/views/modules/visual/command/cpts/popup.vue

@ -794,7 +794,7 @@ export default {
.m-pop {
@include scrollBar2;
width: 380px;
max-width: 380px;
color: #333;
font-size: 14px;
line-height: 20px;

47
src/views/modules/visual/command/cpts/serviceInfo.vue

@ -7,18 +7,19 @@
<span>发起服务</span>
</div>
<div class="btn-close"
@click="handleClose">
<div class="btn-close" @click="handleClose">
<img src="@/assets/img/shuju/people/close.png" />
</div>
<add-form ref="demandEditForm"
<add-form
ref="demandEditForm"
:source="'visiual'"
:formType="'add'"
@close="handleClose"
@handleClose="handleClose"
@handleOk="handleOk"
@dialogOk="handleEditSuccess" />
@dialogOk="handleEditSuccess"
/>
</cpt-card>
</div>
</div>
@ -33,34 +34,31 @@ import addForm from "@/views/modules/communityService/fuwujilu/addForm";
export default {
name: "dialogInfo",
props: {
},
props: {},
components: {
cptCard,
addForm
addForm,
},
data () {
data() {
return {
loading: false,
pageType: 'dispose',
eventId: '1529724450524061698',
pageType: "dispose",
eventId: "1529724450524061698",
eventDetailData: {},
};
},
async mounted () {
this.loading = false
await this.handleSearch()
this.loading = true
async mounted() {
this.loading = false;
await this.handleSearch();
this.loading = true;
},
methods: {
async handleSearch () {
async handleSearch() {
const url = "/gov/project/icEvent/detail";
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
@ -69,7 +67,6 @@ export default {
});
if (code === 0) {
this.eventDetailData = { ...data };
this.pageType = "dispose";
} else {
@ -77,20 +74,20 @@ export default {
}
},
handleClose () {
handleClose() {
this.pageType = "";
this.$emit("handleClose")
this.$emit("handleClose");
// this.eventId = ""
},
handleOk () {
handleOk() {
this.pageType = "";
// this.eventId = ""
this.pageNo = 1
this.pageNo = 1;
this.handleClose();
},
handleEditSuccess () {
handleEditSuccess() {
this.handleClose();
},
},
};

2
src/views/modules/visual/command/cpts/sidemenu-left.vue

@ -156,6 +156,8 @@ export default {
//
async requestList() {
if (!this.orgId) return;
const url = "/data/aggregator/coverage/analysis/governedTargetCategories";
let params = {
agencyId: this.orgId,

231
src/views/modules/visual/command/index.vue

@ -4,23 +4,24 @@
<div class="m-crumb">
<div class="router_line"></div>
<div class="div_router">
<span class="router_parents"
<span
class="router_parents"
v-for="(item, index) in runAgencyArray"
@click="handleClickAgency(index)"
:key="index">{{ item.name }}<span class="arrow">></span></span>
:key="index"
>{{ item.name }}<span class="arrow">></span></span
>
<span class="router_child">{{ orgData.name }}</span>
</div>
</div>
<people v-if="orgLevel === 'people'"
:uid="selUserId" />
<people v-if="orgLevel === 'people'" :uid="selUserId" />
<div v-show="orgLevel !== 'people'"
class="g-cnt">
<div class="m-map"
@click="handleClickMapBox">
<grid-map ref="map"
<div v-show="orgLevel !== 'people'" class="g-cnt">
<div class="m-map" @click="handleClickMapBox">
<grid-map
ref="map"
v-if="orgData.id"
@clickAgency="clickAgencyItem"
@clickDotBtn="handleClickDotBtn"
@ -30,40 +31,54 @@
:dotList2="dotList2"
:dotIcoList2="dotIcoList2"
:gridCountData="gridCountData"
:pitch="0" />
:pitch="0"
/>
<div class="m-mapmenu">
<sidemenu-left :orgId="orgId"
@change="handleChangeMenuLeft"></sidemenu-left>
<sidemenu-left
:orgId="orgId"
@change="handleChangeMenuLeft"
></sidemenu-left>
</div>
<div class="m-search">
<div class="input">
<img src="@/assets/img/shuju/command/search.png" />
<input type="text"
<img class="i-search" src="@/assets/img/shuju/command/search.png" />
<input
type="text"
placeholder="请输入"
@keyup.enter="handleSearch"
v-model="searchName" />
<div class="btn"
@click="handleSearch">搜索</div>
v-model="searchName"
/>
<img
class="i-close"
@click="clearSearch"
src="@/assets/img/shuju/command/close.png"
/>
<div class="btn" @click="handleSearch">搜索</div>
</div>
<div class="result"
v-if="showedSearchResult">
<div class="result" v-if="showedSearchResult">
<template v-for="item in searchResult">
<div :key="'searchResult' + item.type"
<div
:key="'searchResult' + item.type"
class="result-item"
v-show="item.list.length > 0">
v-show="item.list.length > 0"
>
<div class="result-type">{{ item.title }}</div>
<div class="result-more"
<div
class="result-more"
@click.stop="handleClickSearchResultMore(item)"
v-show="item.allList.length > 2">
v-show="item.allList.length > 2"
>
更多
</div>
<div class="result-ul">
<div class="result-li z-toe"
<div
class="result-li z-toe"
:key="item.type + 'li' + index"
v-for="(li, index) in item.list"
@click.stop="handleClickSearchLi(li, item)">
@click.stop="handleClickSearchLi(li, item)"
>
<span v-if="item.type == 'position'">{{
li.name + " " + li.address
}}</span>
@ -77,14 +92,15 @@
</div>
</div>
<div class="result-panel"
v-show="item.showedMore">
<div class="result-panel" v-show="item.showedMore">
<div class="result-type">{{ item.title }}</div>
<div class="result-ul">
<div class="result-li z-toe"
<div
class="result-li z-toe"
:key="item.type + 'li2_' + index"
v-for="(li, index) in item.allList"
@click.stop="handleClickSearchLi(li, item)">
@click.stop="handleClickSearchLi(li, item)"
>
<span v-if="item.type == 'position'">{{
li.name + " " + li.address
}}</span>
@ -103,37 +119,38 @@
</div>
</div>
<div class="m-sidebar"
v-show="false">
<div class="wrap"
:class="[{ 'wrap-hidden': !showAgencyList }]">
<div @click="hideAgencyList"
class="arrow_tip">
<img src="@/assets/img/modules/visual/popup.png"
alt />
<div class="m-sidebar" v-show="false">
<div class="wrap" :class="[{ 'wrap-hidden': !showAgencyList }]">
<div @click="hideAgencyList" class="arrow_tip">
<img src="@/assets/img/modules/visual/popup.png" alt />
</div>
<div class="div_agency_list">
<div class="agency_main">
<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"
<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 class="agency_item_name">{{ item.name }}</div>
</div>
</div>
<div v-else>
<img src="@/assets/img/modules/visual/noData.png"
<img
src="@/assets/img/modules/visual/noData.png"
alt=""
srcset=""
class="no-data-img" />
class="no-data-img"
/>
</div>
</el-scrollbar>
</div>
@ -150,32 +167,43 @@
</div>
<div class="list">
<sidemenu :orgId="orgId"
<sidemenu
:orgId="orgId"
@change="handleChangeMenu"
:grandIcoList="dotIcoList"></sidemenu>
:grandIcoList="dotIcoList"
></sidemenu>
</div>
</cpt-card>
</div>
</div>
<event-info v-if="pageType==='watch-event'"
<event-info
v-if="pageType === 'watch-event'"
ref="ref_event"
:eventId="eventId"
@handleClose="handleClose" />
@handleClose="handleClose"
/>
<service-info v-if="pageType==='create-service'"
<service-info
v-if="pageType === 'create-service'"
ref="ref_service"
@handleClose="handleClose" />
@handleClose="handleClose"
/>
<demand-info v-if="pageType==='create-demand'"
<demand-info
v-if="pageType === 'create-demand'"
ref="ref_demand"
:icResiUserId="icResiUserId"
@handleClose="handleClose" />
:selGridId="selGridId"
@handleClose="handleClose"
/>
<qsydw v-if="pageType==='watch-xuncha'"
<qsydw
v-if="pageType === 'watch-xuncha'"
ref="ref_xuncha"
:enterpriseId="enterpriseId"
@handleClose="handleClose" />
@handleClose="handleClose"
/>
<!-- <people v-if="pageType==='watch-resi'"
:uid="icResiUserId"
@ -202,7 +230,7 @@ import qsydw from "@/views/modules/visual/command/cpts/qsydw";
let loading; //
function iniSearchResult () {
function iniSearchResult() {
return [
{
type: "position",
@ -248,7 +276,7 @@ export default {
eventInfo,
serviceInfo,
demandInfo,
qsydw
qsydw,
},
props: {},
@ -257,7 +285,7 @@ export default {
...mapGetters(["clientHeight"]),
},
data () {
data() {
return {
showAgencyList: false,
@ -396,28 +424,28 @@ export default {
showedSearchResult: false,
searchResult: iniSearchResult(),
pageType: '',
icResiUserId: '',
selGridId: '',
eventId: '',
enterpriseId: '',
pageType: "",
icResiUserId: "",
selGridId: "",
eventId: "",
enterpriseId: "",
};
},
watch: {
categoryKeys () {
categoryKeys() {
this.requestMapDot();
},
categoryKeys2 () {
categoryKeys2() {
this.requestMapDot2();
},
searchName () {
searchName() {
this.showedSearchResult = false;
this.searchResult = iniSearchResult();
},
},
async mounted () {
async mounted() {
//
await this.loadOrgData();
await this.requestMapDot();
@ -425,36 +453,35 @@ export default {
},
methods: {
handleClickDotBtn (type, info) {
this.pageType = type
handleClickDotBtn(type, info) {
this.pageType = type;
if (type == "create-service") {
//
} else if (type == "watch-resi") {
this.toSubAgency('people', info.icResiUserId)
this.icResiUserId = info.icResiUserId
this.toSubAgency("people", info.icResiUserId);
this.icResiUserId = info.icResiUserId;
//
} else if (type == "watch-event") {
//
this.eventId = info.icEventId;
} else if (type == "create-demand") {
//
this.icResiUserId = info.icResiUserId
this.selGridId = info.gridId
this.icResiUserId = info.icResiUserId;
this.selGridId = info.gridId;
} else if (type == "watch-xuncha") {
this.enterpriseId = info.enterpriseId
this.enterpriseId = info.enterpriseId;
}
},
handleClose () {
handleClose() {
this.pageType = "";
},
handleClickMapBox () {
handleClickMapBox() {
this.showedSearchResult = false;
},
handleTo (item) {
handleTo(item) {
this.$router.push({
path: `/main-shuju/visual-basicinfo-people-list`,
query: {
@ -465,12 +492,12 @@ export default {
},
});
},
hideAgencyList () {
hideAgencyList() {
this.showAgencyList = !this.showAgencyList;
},
//
async loadOrgData () {
async loadOrgData() {
const url = "/gov/org/agency/maporg";
let params = {
orgId: this.orgId,
@ -493,13 +520,13 @@ export default {
}
},
handleChangeMenuLeft (obj) {
handleChangeMenuLeft(obj) {
this.coverageTypes2 = [obj.coverageType];
this.categoryKeys2 = [obj.categoryKey];
this.placeType2 = obj.placeType;
},
handleChangeMenu (list) {
handleChangeMenu(list) {
console.log("handleChangeMenu", list);
let categoryKeys = [];
let coverageTypes = [];
@ -518,6 +545,7 @@ export default {
subitem.categories.forEach((subitem2) => {
if (subitem2.selected) {
categoryKeys.push(subitem2.categoryKey);
coverageTypes.push(subitem2.coverageType);
}
});
});
@ -527,7 +555,7 @@ export default {
this.requestMapDot();
},
async requestMapDot () {
async requestMapDot() {
if (!this.orgId) return;
const url = "/data/aggregator/coverage/dataList";
let params = {
@ -547,7 +575,7 @@ export default {
}
},
async requestMapDot2 () {
async requestMapDot2() {
if (!this.orgId) return;
this.requestMapDot2Count();
const url = "/data/aggregator/coverage/dataList-left";
@ -571,7 +599,7 @@ export default {
}
},
async requestMapDot2Count () {
async requestMapDot2Count() {
const url = "/data/aggregator/coverage/dataList-left-subtotal";
let params = {
orgId: this.orgId,
@ -591,13 +619,13 @@ export default {
},
//list
refreshInfoList (selId, type) {
refreshInfoList(selId, type) {
this.orgId = selId;
this.level = "";
},
//
handleClickAgency (index) {
handleClickAgency(index) {
//
if (this.orgLevel === "neighborHood") {
this.$nextTick(() => {
@ -629,7 +657,7 @@ export default {
},
//
clickAgencyItem (item, index) {
clickAgencyItem(item, index) {
console.log(item);
if (item.level == "grid") {
} else {
@ -646,7 +674,7 @@ export default {
},
// type:polygon / people
async toSubAgency (type, e) {
async toSubAgency(type, e) {
//neighborHood
if (type === "people") {
this.runNum++;
@ -694,7 +722,7 @@ export default {
},
//
async refreshMap (isRefreshView) {
async refreshMap(isRefreshView) {
//
await this.loadOrgData();
@ -702,7 +730,7 @@ export default {
await this.requestMapDot2();
},
async handleSearch () {
async handleSearch() {
const { searchName } = this;
if (!searchName) {
return this.$message.error("请输入搜索内容");
@ -748,7 +776,12 @@ export default {
}
},
async searchPos () {
clearSearch() {
this.searchName = "";
this.$refs.map.removeDotMarker();
},
async searchPos() {
let data = await this.$refs.map.searchPos(this.searchName);
console.log("检索位置", data);
@ -769,9 +802,9 @@ export default {
}
},
handleClickSearchLi (li) {
console.log('handleClickSearchLi', li)
if(!li.longitude){
handleClickSearchLi(li) {
console.log("handleClickSearchLi", li);
if (!li.longitude) {
return this.$message.error("请先设置坐标");
}
this.$refs.map.setDotMarker(li, [
@ -781,7 +814,7 @@ export default {
this.showedSearchResult = false;
},
handleClickSearchResultMore (item) {
handleClickSearchResultMore(item) {
console.log(item);
let res = !item.showedMore;
if (res) {
@ -790,7 +823,7 @@ export default {
item.showedMore = !item.showedMore;
},
//
startLoading () {
startLoading() {
loading = Loading.service({
lock: true, //
text: "正在加载……", //
@ -799,7 +832,7 @@ export default {
},
//
endLoading () {
endLoading() {
//clearTimeout(timer);
if (loading) {
loading.close();

Loading…
Cancel
Save