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

Merge branch 'dev-fivelayer0725'

master
dai 3 years ago
parent
e572c76812 366636f0da
commit
1012f883e2
13 changed files with 695 additions and 557 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 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
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 425 B

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

@ -81,7 +81,7 @@
box-shadow: 0px 4px 8px 0px rgba(147, 147, 147, 0.26); box-shadow: 0px 4px 8px 0px rgba(147, 147, 147, 0.26);
> input { > input {
width: 420px; width: 400px;
border: none; border: none;
line-height: 45px; line-height: 45px;
font-size: 18px; font-size: 18px;
@ -90,10 +90,17 @@
color: #333333; color: #333333;
} }
> img { .i-search {
margin: 0 16px; margin: 0 16px;
width: 30px; width: 24px;
height: 30px; height: 24px;
}
.i-close {
margin-left: 15px;
opacity: 0.2;
width: 20px;
cursor: pointer;
} }
.btn { .btn {
@ -206,7 +213,11 @@
} }
.list { .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
View File

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

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

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

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

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

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

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

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

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

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

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

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

@ -628,9 +628,7 @@ export default {
}, },
async setDotMarker(item, posArr) { async setDotMarker(item, posArr) {
if (searchMarker) { this.removeDotMarker();
searchMarker.remove();
}
const marker = new Marker({ const marker = new Marker({
offsets: [0, -20], offsets: [0, -20],
}).setLnglat(posArr); }).setLnglat(posArr);
@ -659,6 +657,12 @@ export default {
searchMarker = marker; searchMarker = marker;
}, },
removeDotMarker() {
if (searchMarker) {
searchMarker.remove();
}
},
// 把地图缩放等级在原来基础上大一点 // 把地图缩放等级在原来基础上大一点
zoomInABit() { zoomInABit() {
// let current = scene.getZoom(); // let current = scene.getZoom();

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

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

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

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

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

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

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

@ -4,23 +4,24 @@
<div class="m-crumb"> <div class="m-crumb">
<div class="router_line"></div> <div class="router_line"></div>
<div class="div_router"> <div class="div_router">
<span class="router_parents" <span
class="router_parents"
v-for="(item, index) in runAgencyArray" v-for="(item, index) in runAgencyArray"
@click="handleClickAgency(index)" @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> <span class="router_child">{{ orgData.name }}</span>
</div> </div>
</div> </div>
<people v-if="orgLevel === 'people'" <people v-if="orgLevel === 'people'" :uid="selUserId" />
:uid="selUserId" />
<div v-show="orgLevel !== 'people'" <div v-show="orgLevel !== 'people'" class="g-cnt">
class="g-cnt"> <div class="m-map" @click="handleClickMapBox">
<div class="m-map" <grid-map
@click="handleClickMapBox"> ref="map"
<grid-map ref="map"
v-if="orgData.id" v-if="orgData.id"
@clickAgency="clickAgencyItem" @clickAgency="clickAgencyItem"
@clickDotBtn="handleClickDotBtn" @clickDotBtn="handleClickDotBtn"
@ -30,40 +31,54 @@
:dotList2="dotList2" :dotList2="dotList2"
:dotIcoList2="dotIcoList2" :dotIcoList2="dotIcoList2"
:gridCountData="gridCountData" :gridCountData="gridCountData"
:pitch="0" /> :pitch="0"
/>
<div class="m-mapmenu"> <div class="m-mapmenu">
<sidemenu-left :orgId="orgId" <sidemenu-left
@change="handleChangeMenuLeft"></sidemenu-left> :orgId="orgId"
@change="handleChangeMenuLeft"
></sidemenu-left>
</div> </div>
<div class="m-search"> <div class="m-search">
<div class="input"> <div class="input">
<img src="@/assets/img/shuju/command/search.png" /> <img class="i-search" src="@/assets/img/shuju/command/search.png" />
<input type="text" <input
type="text"
placeholder="请输入" placeholder="请输入"
@keyup.enter="handleSearch" @keyup.enter="handleSearch"
v-model="searchName" /> v-model="searchName"
<div class="btn" />
@click="handleSearch">搜索</div> <img
class="i-close"
@click="clearSearch"
src="@/assets/img/shuju/command/close.png"
/>
<div class="btn" @click="handleSearch">搜索</div>
</div> </div>
<div class="result" <div class="result" v-if="showedSearchResult">
v-if="showedSearchResult">
<template v-for="item in searchResult"> <template v-for="item in searchResult">
<div :key="'searchResult' + item.type" <div
:key="'searchResult' + item.type"
class="result-item" 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-type">{{ item.title }}</div>
<div class="result-more" <div
class="result-more"
@click.stop="handleClickSearchResultMore(item)" @click.stop="handleClickSearchResultMore(item)"
v-show="item.allList.length > 2"> v-show="item.allList.length > 2"
>
更多 更多
</div> </div>
<div class="result-ul"> <div class="result-ul">
<div class="result-li z-toe" <div
class="result-li z-toe"
:key="item.type + 'li' + index" :key="item.type + 'li' + index"
v-for="(li, index) in item.list" v-for="(li, index) in item.list"
@click.stop="handleClickSearchLi(li, item)"> @click.stop="handleClickSearchLi(li, item)"
>
<span v-if="item.type == 'position'">{{ <span v-if="item.type == 'position'">{{
li.name + " " + li.address li.name + " " + li.address
}}</span> }}</span>
@ -77,14 +92,15 @@
</div> </div>
</div> </div>
<div class="result-panel" <div class="result-panel" v-show="item.showedMore">
v-show="item.showedMore">
<div class="result-type">{{ item.title }}</div> <div class="result-type">{{ item.title }}</div>
<div class="result-ul"> <div class="result-ul">
<div class="result-li z-toe" <div
class="result-li z-toe"
:key="item.type + 'li2_' + index" :key="item.type + 'li2_' + index"
v-for="(li, index) in item.allList" v-for="(li, index) in item.allList"
@click.stop="handleClickSearchLi(li, item)"> @click.stop="handleClickSearchLi(li, item)"
>
<span v-if="item.type == 'position'">{{ <span v-if="item.type == 'position'">{{
li.name + " " + li.address li.name + " " + li.address
}}</span> }}</span>
@ -103,37 +119,38 @@
</div> </div>
</div> </div>
<div class="m-sidebar" <div class="m-sidebar" v-show="false">
v-show="false"> <div class="wrap" :class="[{ 'wrap-hidden': !showAgencyList }]">
<div class="wrap" <div @click="hideAgencyList" class="arrow_tip">
:class="[{ 'wrap-hidden': !showAgencyList }]"> <img src="@/assets/img/modules/visual/popup.png" alt />
<div @click="hideAgencyList"
class="arrow_tip">
<img src="@/assets/img/modules/visual/popup.png"
alt />
</div> </div>
<div class="div_agency_list"> <div class="div_agency_list">
<div class="agency_main"> <div class="agency_main">
<el-scrollbar style="height: 98%" <el-scrollbar
wrap-style="overflow-x:hidden"> style="height: 98%"
<div v-if="subAgencyArray.length > 0" wrap-style="overflow-x:hidden"
class="agency_list"> >
<div v-for="(item, index) in subAgencyArray" <div v-if="subAgencyArray.length > 0" class="agency_list">
<div
v-for="(item, index) in subAgencyArray"
:key="index" :key="index"
@click="clickAgencyItem(item, index)" @click="clickAgencyItem(item, index)"
:class="[ :class="[
'agency_item', 'agency_item',
{ agency_item_on: index % 2 == 0 }, { agency_item_on: index % 2 == 0 },
]"> ]"
>
<div class="agency_item_name">{{ item.name }}</div> <div class="agency_item_name">{{ item.name }}</div>
</div> </div>
</div> </div>
<div v-else> <div v-else>
<img src="@/assets/img/modules/visual/noData.png" <img
src="@/assets/img/modules/visual/noData.png"
alt="" alt=""
srcset="" srcset=""
class="no-data-img" /> class="no-data-img"
/>
</div> </div>
</el-scrollbar> </el-scrollbar>
</div> </div>
@ -150,32 +167,43 @@
</div> </div>
<div class="list"> <div class="list">
<sidemenu :orgId="orgId" <sidemenu
:orgId="orgId"
@change="handleChangeMenu" @change="handleChangeMenu"
:grandIcoList="dotIcoList"></sidemenu> :grandIcoList="dotIcoList"
></sidemenu>
</div> </div>
</cpt-card> </cpt-card>
</div> </div>
</div> </div>
<event-info v-if="pageType==='watch-event'" <event-info
v-if="pageType === 'watch-event'"
ref="ref_event" ref="ref_event"
:eventId="eventId" :eventId="eventId"
@handleClose="handleClose" /> @handleClose="handleClose"
/>
<service-info v-if="pageType==='create-service'" <service-info
v-if="pageType === 'create-service'"
ref="ref_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" ref="ref_demand"
:icResiUserId="icResiUserId" :icResiUserId="icResiUserId"
@handleClose="handleClose" /> :selGridId="selGridId"
@handleClose="handleClose"
/>
<qsydw v-if="pageType==='watch-xuncha'" <qsydw
v-if="pageType === 'watch-xuncha'"
ref="ref_xuncha" ref="ref_xuncha"
:enterpriseId="enterpriseId" :enterpriseId="enterpriseId"
@handleClose="handleClose" /> @handleClose="handleClose"
/>
<!-- <people v-if="pageType==='watch-resi'" <!-- <people v-if="pageType==='watch-resi'"
:uid="icResiUserId" :uid="icResiUserId"
@ -202,7 +230,7 @@ import qsydw from "@/views/modules/visual/command/cpts/qsydw";
let loading; //加载动画 let loading; //加载动画
function iniSearchResult () { function iniSearchResult() {
return [ return [
{ {
type: "position", type: "position",
@ -248,7 +276,7 @@ export default {
eventInfo, eventInfo,
serviceInfo, serviceInfo,
demandInfo, demandInfo,
qsydw qsydw,
}, },
props: {}, props: {},
@ -257,7 +285,7 @@ export default {
...mapGetters(["clientHeight"]), ...mapGetters(["clientHeight"]),
}, },
data () { data() {
return { return {
showAgencyList: false, showAgencyList: false,
@ -396,28 +424,28 @@ export default {
showedSearchResult: false, showedSearchResult: false,
searchResult: iniSearchResult(), searchResult: iniSearchResult(),
pageType: '', pageType: "",
icResiUserId: '', icResiUserId: "",
selGridId: '', selGridId: "",
eventId: '', eventId: "",
enterpriseId: '', enterpriseId: "",
}; };
}, },
watch: { watch: {
categoryKeys () { categoryKeys() {
this.requestMapDot(); this.requestMapDot();
}, },
categoryKeys2 () { categoryKeys2() {
this.requestMapDot2(); this.requestMapDot2();
}, },
searchName () { searchName() {
this.showedSearchResult = false; this.showedSearchResult = false;
this.searchResult = iniSearchResult(); this.searchResult = iniSearchResult();
}, },
}, },
async mounted () { async mounted() {
//加载组织数据 //加载组织数据
await this.loadOrgData(); await this.loadOrgData();
await this.requestMapDot(); await this.requestMapDot();
@ -425,36 +453,35 @@ export default {
}, },
methods: { methods: {
handleClickDotBtn (type, info) { handleClickDotBtn(type, info) {
this.pageType = type;
this.pageType = type
if (type == "create-service") { if (type == "create-service") {
// 点击网格发起服务 // 点击网格发起服务
} else if (type == "watch-resi") { } else if (type == "watch-resi") {
this.toSubAgency('people', info.icResiUserId) this.toSubAgency("people", info.icResiUserId);
this.icResiUserId = info.icResiUserId this.icResiUserId = info.icResiUserId;
// 查看居民详情 // 查看居民详情
} else if (type == "watch-event") { } else if (type == "watch-event") {
// 查看事件 // 查看事件
this.eventId = info.icEventId;
} else if (type == "create-demand") { } else if (type == "create-demand") {
// 发起需求 // 发起需求
this.icResiUserId = info.icResiUserId this.icResiUserId = info.icResiUserId;
this.selGridId = info.gridId this.selGridId = info.gridId;
} else if (type == "watch-xuncha") { } else if (type == "watch-xuncha") {
this.enterpriseId = info.enterpriseId;
this.enterpriseId = info.enterpriseId
} }
}, },
handleClose () { handleClose() {
this.pageType = ""; this.pageType = "";
}, },
handleClickMapBox () { handleClickMapBox() {
this.showedSearchResult = false; this.showedSearchResult = false;
}, },
handleTo (item) { handleTo(item) {
this.$router.push({ this.$router.push({
path: `/main-shuju/visual-basicinfo-people-list`, path: `/main-shuju/visual-basicinfo-people-list`,
query: { query: {
@ -465,12 +492,12 @@ export default {
}, },
}); });
}, },
hideAgencyList () { hideAgencyList() {
this.showAgencyList = !this.showAgencyList; this.showAgencyList = !this.showAgencyList;
}, },
//加载组织数据 //加载组织数据
async loadOrgData () { async loadOrgData() {
const url = "/gov/org/agency/maporg"; const url = "/gov/org/agency/maporg";
let params = { let params = {
orgId: this.orgId, orgId: this.orgId,
@ -493,13 +520,13 @@ export default {
} }
}, },
handleChangeMenuLeft (obj) { handleChangeMenuLeft(obj) {
this.coverageTypes2 = [obj.coverageType]; this.coverageTypes2 = [obj.coverageType];
this.categoryKeys2 = [obj.categoryKey]; this.categoryKeys2 = [obj.categoryKey];
this.placeType2 = obj.placeType; this.placeType2 = obj.placeType;
}, },
handleChangeMenu (list) { handleChangeMenu(list) {
console.log("handleChangeMenu", list); console.log("handleChangeMenu", list);
let categoryKeys = []; let categoryKeys = [];
let coverageTypes = []; let coverageTypes = [];
@ -518,6 +545,7 @@ export default {
subitem.categories.forEach((subitem2) => { subitem.categories.forEach((subitem2) => {
if (subitem2.selected) { if (subitem2.selected) {
categoryKeys.push(subitem2.categoryKey); categoryKeys.push(subitem2.categoryKey);
coverageTypes.push(subitem2.coverageType);
} }
}); });
}); });
@ -527,7 +555,7 @@ export default {
this.requestMapDot(); this.requestMapDot();
}, },
async requestMapDot () { async requestMapDot() {
if (!this.orgId) return; if (!this.orgId) return;
const url = "/data/aggregator/coverage/dataList"; const url = "/data/aggregator/coverage/dataList";
let params = { let params = {
@ -547,7 +575,7 @@ export default {
} }
}, },
async requestMapDot2 () { async requestMapDot2() {
if (!this.orgId) return; if (!this.orgId) return;
this.requestMapDot2Count(); this.requestMapDot2Count();
const url = "/data/aggregator/coverage/dataList-left"; 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"; const url = "/data/aggregator/coverage/dataList-left-subtotal";
let params = { let params = {
orgId: this.orgId, orgId: this.orgId,
@ -591,13 +619,13 @@ export default {
}, },
//子组件点击房间，刷新右侧list //子组件点击房间，刷新右侧list
refreshInfoList (selId, type) { refreshInfoList(selId, type) {
this.orgId = selId; this.orgId = selId;
this.level = ""; this.level = "";
}, },
//返回所选组织 //返回所选组织
handleClickAgency (index) { handleClickAgency(index) {
//如果是从小区返回，清空一下小区的人员显示列表 //如果是从小区返回，清空一下小区的人员显示列表
if (this.orgLevel === "neighborHood") { if (this.orgLevel === "neighborHood") {
this.$nextTick(() => { this.$nextTick(() => {
@ -629,7 +657,7 @@ export default {
}, },
//点击组织列表数据 //点击组织列表数据
clickAgencyItem (item, index) { clickAgencyItem(item, index) {
console.log(item); console.log(item);
if (item.level == "grid") { if (item.level == "grid") {
} else { } else {
@ -646,7 +674,7 @@ export default {
}, },
//下钻到下一级 type点击的类型:polygon 点击多边形（分为点击组织/小区） people 点击详情 //下钻到下一级 type点击的类型:polygon 点击多边形（分为点击组织/小区） people 点击详情
async toSubAgency (type, e) { async toSubAgency(type, e) {
//点击小区neighborHood显示楼栋，点击非小区，进入下一级地图 //点击小区neighborHood显示楼栋，点击非小区，进入下一级地图
if (type === "people") { if (type === "people") {
this.runNum++; this.runNum++;
@ -694,7 +722,7 @@ export default {
}, },
//刷新地图 //刷新地图
async refreshMap (isRefreshView) { async refreshMap(isRefreshView) {
//加载组织数据 //加载组织数据
await this.loadOrgData(); await this.loadOrgData();
@ -702,7 +730,7 @@ export default {
await this.requestMapDot2(); await this.requestMapDot2();
}, },
async handleSearch () { async handleSearch() {
const { searchName } = this; const { searchName } = this;
if (!searchName) { if (!searchName) {
return this.$message.error("请输入搜索内容"); 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); let data = await this.$refs.map.searchPos(this.searchName);
console.log("检索位置", data); console.log("检索位置", data);
@ -769,9 +802,9 @@ export default {
} }
}, },
handleClickSearchLi (li) { handleClickSearchLi(li) {
console.log('handleClickSearchLi', li) console.log("handleClickSearchLi", li);
if(!li.longitude){ if (!li.longitude) {
return this.$message.error("请先设置坐标"); return this.$message.error("请先设置坐标");
} }
this.$refs.map.setDotMarker(li, [ this.$refs.map.setDotMarker(li, [
@ -781,7 +814,7 @@ export default {
this.showedSearchResult = false; this.showedSearchResult = false;
}, },
handleClickSearchResultMore (item) { handleClickSearchResultMore(item) {
console.log(item); console.log(item);
let res = !item.showedMore; let res = !item.showedMore;
if (res) { if (res) {
@ -790,7 +823,7 @@ export default {
item.showedMore = !item.showedMore; item.showedMore = !item.showedMore;
}, },
//开启加载动画 //开启加载动画
startLoading () { startLoading() {
loading = Loading.service({ loading = Loading.service({
lock: true, //是否锁定 lock: true, //是否锁定
text: "正在加载……", //加载中需要显示的文字 text: "正在加载……", //加载中需要显示的文字
@ -799,7 +832,7 @@ export default {
}, },
//结束加载动画 //结束加载动画
endLoading () { endLoading() {
//clearTimeout(timer); //clearTimeout(timer);
if (loading) { if (loading) {
loading.close(); loading.close();

Write Preview
Loading…
Cancel
Save