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

1

master
dai 3 years ago
parent
c055045196
commit
be87f5b10c
6 changed files with 467 additions and 348 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. 417
      src/views/modules/communityService/measure/info.vue
  4. 10
      src/views/modules/visual/command/cpts/map.vue
  5. 9
      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;
} }
} }

417
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,172 +50,217 @@
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
label="所属网格"
:class="{ 'form-item': source === 'visiual' }" :class="{ 'form-item': source === 'visiual' }"
prop="gridId"> prop="gridId"
>
<div :class="{ 'visiual-form': source === 'visiual' }"> <div :class="{ 'visiual-form': source === 'visiual' }">
<el-input v-if="disabled" <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
label="需求类型"
:class="{ 'form-item': source === 'visiual' }" :class="{ 'form-item': source === 'visiual' }"
prop="categoryCode"> prop="categoryCode"
>
<div :class="{ 'visiual-form': source === 'visiual' }"> <div :class="{ 'visiual-form': source === 'visiual' }">
<el-input v-if="disabled" <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
label="上报类型"
:class="{ 'form-item': source === 'visiual' }" :class="{ 'form-item': source === 'visiual' }"
prop="reportType"> prop="reportType"
>
<div :class="{ 'visiual-form': source === 'visiual' }"> <div :class="{ 'visiual-form': source === 'visiual' }">
<el-input v-if="disabled" <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
label="上报人"
:class="{ 'form-item': source === 'visiual' }" :class="{ 'form-item': source === 'visiual' }"
prop="reportUserName"> prop="reportUserName"
>
<div :class="{ 'visiual-form': source === 'visiual' }"> <div :class="{ 'visiual-form': source === 'visiual' }">
<el-input v-model="form.reportUserName" <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
label="上报人手机号"
:class="{ 'form-item': source === 'visiual' }" :class="{ 'form-item': source === 'visiual' }"
prop="reportUserMobile"> prop="reportUserMobile"
>
<div :class="{ 'visiual-form': source === 'visiual' }"> <div :class="{ 'visiual-form': source === 'visiual' }">
<el-input v-model="form.reportUserMobile" <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
label="上报时间"
:class="{ 'form-item': source === 'visiual' }" :class="{ 'form-item': source === 'visiual' }"
prop="reportTime"> prop="reportTime"
>
<div :class="{ 'visiual-form': source === 'visiual' }"> <div :class="{ 'visiual-form': source === 'visiual' }">
<el-date-picker v-model="form.reportTime" <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
label="需求人"
:class="{ 'form-item': source === 'visiual' }" :class="{ 'form-item': source === 'visiual' }"
prop="demandUserId"> prop="demandUserId"
>
<div :class="{ 'visiual-form': source === 'visiual' }"> <div :class="{ 'visiual-form': source === 'visiual' }">
<el-input v-if="disabled" <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
label="服务时间"
:class="{ 'form-item': source === 'visiual' }" :class="{ 'form-item': source === 'visiual' }"
prop="wantServiceTime"> prop="wantServiceTime"
>
<div :class="{ 'visiual-form': source === 'visiual' }"> <div :class="{ 'visiual-form': source === 'visiual' }">
<el-date-picker v-model="form.wantServiceTime" <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
label="需求内容"
:class="{ 'form-item': source === 'visiual' }" :class="{ 'form-item': source === 'visiual' }"
prop="content"> prop="content"
>
<div :class="{ 'visiual-form': source === 'visiual' }"> <div :class="{ 'visiual-form': source === 'visiual' }">
<el-input v-model="form.content" <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' ||
@ -211,59 +268,75 @@
" "
: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="实际服务时间" >
<el-form-item
label="实际服务时间"
:class="{ 'form-item': source === 'visiual' }" :class="{ 'form-item': source === 'visiual' }"
prop="serviceStartTime"> prop="serviceStartTime"
>
<div :class="{ 'visiual-form': source === 'visiual' }"> <div :class="{ 'visiual-form': source === 'visiual' }">
<el-date-picker v-model="finishServiceTime" <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
label="完成情况"
:class="{ 'form-item': source === 'visiual' }" :class="{ 'form-item': source === 'visiual' }"
prop="finishResult"> prop="finishResult"
<el-radio v-model="form.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
label="备注"
:class="{ 'form-item': source === 'visiual' }" :class="{ 'form-item': source === 'visiual' }"
prop="finishDesc"> prop="finishDesc"
>
<div :class="{ 'visiual-form': source === 'visiual' }"> <div :class="{ 'visiual-form': source === 'visiual' }">
<el-input v-model="form.finishDesc" <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
label="实际服务时间"
:class="{ 'form-item': source === 'visiual' }" :class="{ 'form-item': source === 'visiual' }"
prop="serviceStartTime"> prop="serviceStartTime"
>
<div :class="{ 'visiual-form-pickerrange': source === 'visiual' }"> <div :class="{ 'visiual-form-pickerrange': source === 'visiual' }">
<el-date-picker v-model="finishServiceTime" <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,7 +415,8 @@
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>
@ -332,17 +424,17 @@
</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: [],
@ -458,23 +551,33 @@ export default {
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;
}, },
@ -497,11 +600,19 @@ export default {
} }
}, },
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);
@ -516,8 +627,10 @@ export default {
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) {
@ -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,10 +689,6 @@ 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;
@ -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(() => {
@ -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(() => {
@ -929,8 +1024,10 @@ export default {
], ],
}; };
this.finishServiceTime = [this.form.serviceStartTime, this.form.serviceEndTime] this.finishServiceTime = [
this.form.serviceStartTime,
this.form.serviceEndTime,
];
} }
}) })
.catch(() => { .catch(() => {

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();

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

@ -43,13 +43,14 @@
<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 <input
type="text" type="text"
placeholder="请输入" placeholder="请输入"
@keyup.enter="handleSearch" @keyup.enter="handleSearch"
v-model="searchName" v-model="searchName"
/> />
<img class="i-close" @click="clearSearch" src="@/assets/img/shuju/command/close.png" />
<div class="btn" @click="handleSearch">搜索</div> <div class="btn" @click="handleSearch">搜索</div>
</div> </div>
<div class="result" v-if="showedSearchResult"> <div class="result" v-if="showedSearchResult">
@ -189,6 +190,7 @@
v-if="pageType === 'create-demand'" v-if="pageType === 'create-demand'"
ref="ref_demand" ref="ref_demand"
:icResiUserId="icResiUserId" :icResiUserId="icResiUserId"
:selGridId="selGridId"
@handleClose="handleClose" @handleClose="handleClose"
/> />
@ -769,6 +771,11 @@ export default {
} }
}, },
clearSearch(){
this.searchName = '';
this.$refs.map.removeDotMarker();
},
async searchPos() { async searchPos() {
let data = await this.$refs.map.searchPos(this.searchName); let data = await this.$refs.map.searchPos(this.searchName);

Write Preview
Loading…
Cancel
Save