From be87f5b10c7b73720dd9bca2ee84c367be96c887 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 3 Aug 2022 16:29:22 +0800
Subject: [PATCH] 1

---
 src/assets/img/shuju/command/close.png        | Bin 0 -> 425 bytes
 src/assets/scss/modules/visual/command.scss   |  21 +-
 .../modules/communityService/measure/info.vue | 773 ++++++++++--------
 .../modules/visual/command/cpts/eventInfo.vue |   2 +-
 src/views/modules/visual/command/cpts/map.vue |  10 +-
 src/views/modules/visual/command/index.vue    |   9 +-
 6 files changed, 467 insertions(+), 348 deletions(-)
 create mode 100644 src/assets/img/shuju/command/close.png

diff --git a/src/assets/img/shuju/command/close.png b/src/assets/img/shuju/command/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..a77645b342289b343177bfd81de26796061a1434
GIT binary patch
literal 425
zcmeAS@N?(olHy`uVBq!ia0vp^ZXnFU3?!Qw{%;3TDgizru0Yz<)YRD6*vQDp#KZ(h
z0@*+Ykc0!qRF2g^b=)OEe!&b%%HfgGwex=d{rCCH{bdXcjGCS<jv*e$mrmO)*yJG4
zChl&sl`Gr8#8g?;bR)C0fy&eqLOBdKpB-VYytnRt4-4Ps>i_EH+w}!MsZ8Je{9b&y
z68qY|Z<9(FntO6xy%aZjb=aoBtKn(7p7OoX+s^j$p0dApz|fI#@g^;qfCC{)>e5$|
z-rb*m=?F_@UZY!<u!)%Tg3fCUzDoly_(-yzZ56!WB+jUt%I)p4)!^th!_BVchQ`PG
zOOs6fN|Uy&t4uM^uY6*#IQ4@?;Pu@_>bzF-n_oK0En~jwZ>}9Zq5GwSUK)et47rf1
zP;FlMnDqba82`KOlYBFGj^YmPqU8!^9zBf_s)qbU?N1a=qy`B)<SLqSU9k!>c6_U9
zD)WWuQm{k5k}cmCuS>;_@70VMW~#pM`INmavQd)rOjN#DIQOsFEwg}u#=zj|>gTe~
HDWM4ftXi8G

literal 0
HcmV?d00001

diff --git a/src/assets/scss/modules/visual/command.scss b/src/assets/scss/modules/visual/command.scss
index 0df66287..d905e5ed 100644
--- a/src/assets/scss/modules/visual/command.scss
+++ b/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;
     }
 }
 
diff --git a/src/views/modules/communityService/measure/info.vue b/src/views/modules/communityService/measure/info.vue
index 36346c68..7c4b3dd8 100644
--- a/src/views/modules/communityService/measure/info.vue
+++ b/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"
-               :model="form"
-               class="div_form"
-               :rules="rules"
-               ref="ruleForm">
-        <el-form-item v-if="formType!=='add'"
-                      label="操作方式"
-                      :class="{'form-item':source==='visiual'}"
-                      prop="addType">
+    <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'"
+          label="操作方式"
+          :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,319 +41,400 @@
               form.status === 'have_order' ||
               (form.status == 'finished' && !form.evaluateFlag)
             ">完成</el-radio> -->
-            <el-radio label="finish"
-                      v-if="
-              (form.reportType == 'self_help' &&
-                form.serviceShowFlag &&
-                form.serviceType !== 'volunteer' &&
-                form.status !== 'finished') ||
-              form.status === 'assigned' ||
-              form.status === 'have_order' 
-            ">完成</el-radio>
+            <el-radio
+              label="finish"
+              v-if="
+                (form.reportType == 'self_help' &&
+                  form.serviceShowFlag &&
+                  form.serviceType !== 'volunteer' &&
+                  form.status !== 'finished') ||
+                form.status === 'assigned' ||
+                form.status === 'have_order'
+              "
+              >完成</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"
-                      v-model="form.gridName"
-                      :disabled="disabled"
-                      class="item_width_1"></el-input>
+        <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>
             <!-- <span >{{ form.gridName }}</span> -->
-            <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"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
+            <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"
+                :key="item.value"
+                :label="item.label"
+                :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"
-                      v-model="form.categoryName"
-                      :disabled="disabled"
-                      class="item_width_1"
-                      clearable></el-input>
-            <el-cascader v-else
-                         v-model="form.categoryCodeArr"
-                         :options="demandOptions"
-                         :disabled="disabled"
-                         clearable
-                         class="item_width_1"
-                         @change="handleCateSlect"></el-cascader>
+        <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
+              v-model="form.categoryCodeArr"
+              :options="demandOptions"
+              :disabled="disabled"
+              clearable
+              class="item_width_1"
+              @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"
-                      v-model="form.reportTypeName"
-                      :disabled="disabled"
-                      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"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
+        <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
+              v-model="form.reportType"
+              filterable
+              class="item_width_1"
+              placeholder="请选择"
+              clearable
+              :disabled="disabled"
+            >
+              <el-option
+                v-for="item in reportOptions"
+                :key="item.value"
+                :label="item.label"
+                :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"
-                      :disabled="disabled"
-                      placeholder="请输入"
-                      class="item_width_1"
-                      clearable></el-input>
+        <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>
           </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"
-                      :disabled="disabled"
-                      placeholder="请输入"
-                      class="item_width_1"
-                      maxlength="11"
-                      clearable></el-input>
+        <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>
           </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"
-                            type="datetime"
-                            class="item_width_1"
-                            clearable
-                            :disabled="disabled"
-                            value-format="yyyy-MM-dd HH:mm:ss"
-                            placeholder="选择日期时间">
+        <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="选择日期时间"
+            >
             </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"
-                      v-model="form.demandUserName"
-                      :disabled="disabled"
-                      class="item_width_1"></el-input>
-            <el-select v-else
-                       v-model="selectDemandUser"
-                       class="item_width_1"
-                       filterable
-                       :disabled="disabled"
-                       placeholder="请选择"
-                       clearable
-                       @change="handleDemandChange">
-              <el-option v-for="item in demandUserList"
-                         :key="item.demandUserId"
-                         :label="item.label"
-                         :value="item">
+        <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="form.demandUserId"
+              class="item_width_1"
+              filterable
+              :disabled="disabled"
+              placeholder="请选择"
+              clearable
+              @change="handleDemandChange"
+            >
+              <el-option
+                v-for="item in demandUserList"
+                :key="item.demandUserId"
+                :label="item.label"
+                :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"
-                            type="datetime"
-                            clearable
-                            :disabled="disabled"
-                            value-format="yyyy-MM-dd HH:mm:ss"
-                            placeholder="选择日期时间">
+        <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="选择日期时间"
+            >
             </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"
-                      :autosize="{ minRows: 2, maxRows: 10 }"
-                      :disabled="disabled"
-                      type="textarea"
-                      clearable
-                      class="cell-width-area"
-                      placeholder="请输入内容"></el-input>
+        <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>
           </div>
         </el-form-item>
-        <el-form-item v-if="
-        addType === 'add' ||
-          addType === 'appoint' ||
-          addType == 'finish' ||
-          (addType == 'look' && form.serviceShowFlag)
-        "
-                      :class="{'form-item':source==='visiual'}"
-                      label="服务方"
-                      prop="serviceType">
-
-          <div :class="{'visiual-form':source==='visiual'}">
+        <el-form-item
+          v-if="
+            addType === 'add' ||
+            addType === 'appoint' ||
+            addType == 'finish' ||
+            (addType == 'look' && form.serviceShowFlag)
+          "
+          :class="{ 'form-item': source === 'visiual' }"
+          label="服务方"
+          prop="serviceType"
+        >
+          <div :class="{ 'visiual-form': source === 'visiual' }">
             <template v-if="disabled && addType !== 'appoint'">
-              <el-input v-model="form.serviceShowName"
-                        :disabled="disabled"
-                        class="item_width_1"></el-input>
+              <el-input
+                v-model="form.serviceShowName"
+                :disabled="disabled"
+                class="item_width_1"
+              ></el-input>
             </template>
             <template v-else>
-              <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"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
+              <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"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
                 </el-option>
               </el-select>
               -
-              <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"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
+              <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"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
                 </el-option>
               </el-select>
             </template>
           </div>
         </el-form-item>
-        <el-form-item v-if="addType == 'look' && form.status == 'canceled'"
-                      label="取消时间"
-                      :class="{'form-item':source==='visiual'}"
-                      prop="cancelTime">
+        <el-form-item
+          v-if="addType == 'look' && form.status == 'canceled'"
+          label="取消时间"
+          :class="{ 'form-item': source === 'visiual' }"
+          prop="cancelTime"
+        >
           <span>{{ form.cancelTime }}</span>
         </el-form-item>
-        <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"
-                              class="item_width_1-min"
-                              clearable
-                              :disabled="disabled && addType != 'finish'"
-                              type="datetimerange"
-                              range-separator="至"
-                              start-placeholder="开始日期"
-                              end-placeholder="结束日期"
-                              value-format="yyyy-MM-dd HH:mm:ss"
-                              @change="handelBlurServiceTime">
+        <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"
+                class="item_width_1-min"
+                clearable
+                :disabled="disabled && addType != 'finish'"
+                type="datetimerange"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                @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"
-                      label="resolved"
-                      :disabled="disabled && addType != 'finish'">已解决</el-radio>
-            <el-radio v-model="form.finishResult"
-                      label="unresolved"
-                      :disabled="disabled && addType != 'finish'">未解决</el-radio>
+          <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"
+              label="unresolved"
+              :disabled="disabled && addType != 'finish'"
+              >未解决</el-radio
+            >
           </el-form-item>
-          <el-form-item label="评价"
-                        prop="score"
-                        :class="{'form-item':source==='visiual'}"
-                        class="form-score">
-            <el-rate v-model="form.score"
-                     :allow-half="true"
-                     :disabled="disabled && addType != 'finish'"></el-rate>
+          <el-form-item
+            label="评价"
+            prop="score"
+            :class="{ 'form-item': source === 'visiual' }"
+            class="form-score"
+          >
+            <el-rate
+              v-model="form.score"
+              :allow-half="true"
+              :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"
-                        :autosize="{ minRows: 2, maxRows: 10 }"
-                        :disabled="disabled && addType != 'finish'"
-                        type="textarea"
-                        clearable
-                        class="cell-width-area"
-                        placeholder="请输入内容"></el-input>
+          <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>
             </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"
-                              class="item_width_1-min"
-                              clearable
-                              :disabled="disabled && addType != 'finish'"
-                              type="datetimerange"
-                              range-separator="至"
-                              start-placeholder="开始日期"
-                              end-placeholder="结束日期"
-                              value-format="yyyy-MM-dd HH:mm:ss"
-                              @change="handelBlurServiceTime">
+          <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'"
+                type="datetimerange"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                @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"
-                   type="primary"
-                   size="small"
-                   @click="handleSubmit">提交</el-button>
+      <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
+        >
       </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(() => {
diff --git a/src/views/modules/visual/command/cpts/eventInfo.vue b/src/views/modules/visual/command/cpts/eventInfo.vue
index 87592c9f..fc7ddf58 100644
--- a/src/views/modules/visual/command/cpts/eventInfo.vue
+++ b/src/views/modules/visual/command/cpts/eventInfo.vue
@@ -18,7 +18,7 @@
           :eventId="eventId"
           :eventDetailData="eventDetailData"
           :source="'visiual'"
-                            @close="handleClose"
+          @close="handleClose"
           @handleClose="handleClose"
           @handleOk="handleOk"
           @dialogOk="handleEditSuccess"
diff --git a/src/views/modules/visual/command/cpts/map.vue b/src/views/modules/visual/command/cpts/map.vue
index 499d1f3c..fccd8c22 100644
--- a/src/views/modules/visual/command/cpts/map.vue
+++ b/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();
diff --git a/src/views/modules/visual/command/index.vue b/src/views/modules/visual/command/index.vue
index 79983645..0b445919 100644
--- a/src/views/modules/visual/command/index.vue
+++ b/src/views/modules/visual/command/index.vue
@@ -43,13 +43,14 @@
 
         <div class="m-search">
           <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"
               placeholder="请输入"
               @keyup.enter="handleSearch"
               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">
@@ -189,6 +190,7 @@
       v-if="pageType === 'create-demand'"
       ref="ref_demand"
       :icResiUserId="icResiUserId"
+      :selGridId="selGridId"
       @handleClose="handleClose"
     />
 
@@ -769,6 +771,11 @@ export default {
       }
     },
 
+    clearSearch(){
+      this.searchName = '';
+      this.$refs.map.removeDotMarker();
+    },
+
     async searchPos() {
       let data = await this.$refs.map.searchPos(this.searchName);