From ad2004d4995bbe5dcdbfb4dddfe7413effb40fff Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Wed, 28 Sep 2022 15:27:40 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E6=88=BF=E7=A7=9F=E7=A7=9F=E8=B5=81=20?=
 =?UTF-8?q?=E5=90=88=E5=90=8C=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rent/rentcontractinfo-add-or-update.vue   | 77 ++++++++++++++++++-
 .../rent/rentcontractinfo-look-or-check.vue   | 17 +++-
 .../modules/plugins/rent/upload-image.vue     |  3 +-
 3 files changed, 90 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
index af71bc574..a472ca5a9 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
@@ -286,11 +286,36 @@
         </el-form-item>
         <br/>
 
-        <el-form-item label="合同附件" prop="fileList" label-width="140px">
+        <el-form-item label="合同照片" prop="fileList" label-width="140px">
           <template>
             <upload-image :defaultFileList="dataForm.fileList" :limit="6" @change="onChangeFileList"></upload-image>
           </template>
         </el-form-item>
+
+        <el-form-item label="合同附件" label-width="140px">
+          <template>
+            <el-upload
+              class="upload-demo"
+              multiple
+              :action="uploadUrl"
+              :data="{ customerId: customerId }"
+              :limit="limit"
+              :headers="$getElUploadHeaders()"
+              :on-success="(res, file) => handleFlieSuccess(res, file)"
+              :on-error="(res, file) => handleFlieError(res, file)"
+              :on-remove="(res) => handleFlieRemove(res)"
+              :on-exceed="(res) => handleFlieExceed(res)"
+              :before-upload="(file) => beforeFlieUpload(file)"
+              :on-preview="handlePreview"
+              :file-list="dataForm.docList">
+              <el-button size="small" type="primary">点击上传</el-button>
+              <div slot="tip" class="el-upload__tip">只能上传合同文件</div>
+            </el-upload>
+          </template>
+        </el-form-item>
+
+
+
       </el-form>
     <template slot="footer">
         <div class="resi-btns">
@@ -355,7 +380,8 @@ export default {
           idCardImgList: [],
           unit: ''
         }],
-        fileList: []
+        fileList: [],
+        docList: []
       },
       zzmmOptions: [
         { name: '党员', value: '党员' },
@@ -391,7 +417,10 @@ export default {
         buildingOptions: [],
         unitOptions: [],
         houseOptions: [],
-        agencyOptions: []
+        agencyOptions: [],
+        uploadUrl: `${window.SITE_CONFIG['apiURL']}/oss/file/uploadqrcodeV2`,
+        customerId: localStorage.getItem("customerId"),
+        limit: 3
     }
   },
   computed: {
@@ -537,6 +566,7 @@ export default {
           unit: ''
         }],
         fileList: [],
+        docList: [],
         agencyImgList: []
       }
     },
@@ -866,6 +896,43 @@ export default {
         this.editModeGetList()
       }).catch(() => {})
     },
+    handleFlieSuccess(res, file) {
+        if (res.code === 0 && res.msg === "success") {
+            let ob = {
+              fileType: '0',
+              fileUrl: file.response.data.url,
+              name: file.response.data.fileName
+            }
+            this.dataForm.docList.push(ob)
+        } else {
+            this.$message.error(res.msg)
+        }
+    },
+    handleFlieError(res, file) {
+        console.log(res)
+    },
+    handleFlieRemove(res) {
+      // console.log(JSON.stringify(res))
+        const delFile = res.fileUrl
+        this.dataForm.docList.forEach((item, key) => {
+            if (delFile == item.fileUrl) {
+              this.dataForm.docList.splice(key, 1)
+            }
+        })
+    },
+    handleFlieExceed(res) {
+        this.$message({
+          type: "warning",
+          message: `文件数量最多不超过${this.limit}个`,
+        })
+    },
+    beforeFlieUpload(file) {
+        console.log(file)
+    },
+    handlePreview(file) {
+      window.open(file.fileUrl)
+      // console.log(JSON.stringify(file));
+    },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
       this.$refs['dataForm'].validate((valid) => {
@@ -932,7 +999,9 @@ export default {
 }
 </style>
 <style lang="scss" scoped>
-
+    ::v-deep .el-upload-list__item.is-success.focusing .el-icon-close-tip {
+      display: none !important;
+    }
     .div_btn {
         display: flex;
         justify-content: flex-end;
diff --git a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
index 4bf8f7084..c56ac16ae 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
@@ -117,13 +117,17 @@
         </el-form-item>
         <br/>
 
-        <el-form-item label="合同附件" prop="fileList">
+        <el-form-item label="合同照片" prop="fileList">
             <template>
                 <label v-for="(item,index) in dataForm.fileList" :key="index">
                     <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="100" height="100" />
                 </label>
             </template>
         </el-form-item>
+
+        <el-form-item label="合同附件">
+            <label v-for="(item,index) in dataForm.docList" :key="index" @click="downFile(item.fileUrl)" class="file-l">{{ item.name }}</label>
+        </el-form-item>
         <el-form-item label="审核原因" prop="reason" v-if="dataForm.flag === '1' && dataForm.state === '2'">
             <el-input v-model="dataForm.reason" placeholder="审核原因" disabled></el-input>
         </el-form-item>
@@ -184,7 +188,8 @@ export default {
           lesseeHouseAddress: '',
         signDate: '',
         startDate: '',
-        endDate: ''
+        endDate: '',
+        docList: [],
       },
         dataListLoading: false,
         dialogVisible: false,
@@ -346,6 +351,9 @@ export default {
               })
           }).catch(() => {})
       },
+    downFile(fileUrl) {
+        window.open(fileUrl)
+    },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
       this.$refs['dataForm'].validate((valid) => {
@@ -376,6 +384,11 @@ export default {
         margin-top: 20px;
         text-align: center;
     }
+    .file-l{
+      margin-right: 10px;
+      color: #3ebef7;
+      cursor: pointer;
+    }
 </style>
 <style lang="scss">
 .rent {
diff --git a/src/views/modules/plugins/rent/upload-image.vue b/src/views/modules/plugins/rent/upload-image.vue
index 262e5bc65..5791c78ae 100644
--- a/src/views/modules/plugins/rent/upload-image.vue
+++ b/src/views/modules/plugins/rent/upload-image.vue
@@ -9,7 +9,8 @@
             :on-error="(res, file) => handleImgError(res, file)"
             :on-remove="(res) => handleImgRemove(res)"
             :on-exceed="(res) => handleImgExceed(res)"
-            :before-upload="(file) => beforeImgUpload(file)">
+            :before-upload="(file) => beforeImgUpload(file)"
+            accept="image/jpg,image/jpeg,image/png">
             <i slot="default" class="el-icon-plus"></i>
             <div slot="file" slot-scope="{file}">
                 <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">

From e74aa392e37df023989fc4384f805c8a9f04af3c Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 28 Sep 2022 15:39:01 +0800
Subject: [PATCH 2/8] =?UTF-8?q?4625=20=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=8A=A0=E5=88=B0=E6=89=B9=E9=87=8F=E6=B7=BB=E5=8A=A0=E9=87=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/epidemic/natFocus/natFocusAdd.vue    | 280 +++++++++++++++++-
 1 file changed, 275 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
index 2562d8bb7..1912e820b 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
@@ -159,15 +159,16 @@
               :inline="true"
               :model="formDataSearch"
               ref="ref_formSearch"
-              :label-width="'90px'"
+              label-width="90px"
             >
-              <el-form-item label="所属网格" label-width="80px">
+              <el-form-item label="所属网格">
                 <el-select
                   class="item_width_3"
                   v-model.trim="formDataSearch.gridId"
                   placeholder="请选择"
                   size="mini"
                   clearable
+                  @change="handleChangeGrid"
                 >
                   <el-option
                     v-for="item in gridList"
@@ -178,6 +179,115 @@
                   </el-option>
                 </el-select>
               </el-form-item>
+              <el-form-item label="所属小区" prop="neighborId">
+                <el-select
+                  v-model.trim="formDataSearch.neighborId"
+                  placeholder="请选择小区"
+                  size="small"
+                  clearable
+                  class="resi-cell-select"
+                  @clear="handleClearVillage"
+                  @change="handleChangeV"
+                >
+                  <el-option
+                    v-for="item in optionsV"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+                <el-select
+                  v-model.trim="formDataSearch.buildingId"
+                  placeholder="楼号"
+                  size="small"
+                  clearable
+                  style="width: 120px"
+                  class="resi-cell-select"
+                  @clear="handleClearBuild"
+                  @change="handleChangeB"
+                >
+                  <el-option
+                    v-for="item in optionsB"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+                <el-select
+                  v-model.trim="formDataSearch.unitId"
+                  placeholder="单元"
+                  size="small"
+                  clearable
+                  style="width: 120px"
+                  class="resi-cell-select"
+                  @click="handleClearDan"
+                  @change="handleChangeD"
+                >
+                  <el-option
+                    v-for="item in optionsD"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+                <el-select
+                  v-model.trim="formDataSearch.houseId"
+                  placeholder="房号"
+                  size="small"
+                  clearable
+                  style="width: 120px"
+                  class="resi-cell-select"
+                >
+                  <el-option
+                    v-for="item in optionsH"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="姓名" prop="name">
+                <el-input
+                  v-model="formDataSearch.name"
+                  size="small"
+                  class="list_item_width_1"
+                  clearable
+                  placeholder="请输入姓名"
+                >
+                </el-input>
+              </el-form-item>
+              <el-form-item label="手机号" prop="mobile">
+                <el-input
+                  v-model="formDataSearch.mobile"
+                  size="small"
+                  class="list_item_width_1"
+                  clearable
+                  placeholder="请输入手机号"
+                >
+                </el-input>
+              </el-form-item>
+              <el-form-item label="证件号" prop="idCard">
+                <el-input
+                  v-model="formDataSearch.idCard"
+                  size="small"
+                  class="list_item_width_1"
+                  clearable
+                  placeholder="请输入身份证号或护照号"
+                >
+                </el-input>
+              </el-form-item>
+              <el-form-item label="年龄" prop="age">
+                <inputRange
+                  v-model="formDataSearch.age"
+                  type="num"
+                  @change="handleAgeChange"
+                />
+              </el-form-item>
               <el-form-item label="核酸检测次数小于" label-width="150px">
                 <el-input-number
                   class="item_width_3"
@@ -190,7 +300,6 @@
               </el-form-item>
               <el-form-item
                 label="检测时间"
-                label-width="80px"
                 prop="startTime"
               >
                 <el-date-picker
@@ -323,7 +432,7 @@
               :inline="true"
               :model="formData2"
               ref="ref_form2"
-              :label-width="'90px'"
+              label-width="90px"
               :rules="dataRule1"
             >
               <el-form-item
@@ -441,6 +550,7 @@
 import { Loading } from "element-ui"; // 引入Loading服务
 import { requestPost } from "@/js/dai/request";
 import { mapGetters } from "vuex";
+import inputRange from "@/views/components/rangeInput.vue";
 
 let loading; // 加载动画
 export default {
@@ -458,8 +568,23 @@ export default {
         startDate: "",
         endDate: "",
         attentionType: 2,
+        neighborId: "",
+        buildingId: "",
+        unitId: "",
+        houseId: "",
+        name: "",
+        mobile: "",
+        idCard: "",
+        age: {},
+        startBirthDay: "",
+        endBirthDay: "",
       },
       timeRange: [],
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+      optionsG: [],
 
       formData1: {
         attentionType: 2,
@@ -497,7 +622,7 @@ export default {
     };
   },
 
-  components: {},
+  components: { inputRange },
 
   async mounted() {
     const { user } = this.$store.state;
@@ -649,6 +774,79 @@ export default {
 
     handleClick() {},
 
+    handleAgeChange(val) {
+      console.log("val----age---", val);
+      if (val.start) {
+        const e = this.computedBirth(val.start);
+        this.formDataSearch.endBirthDay = e;
+      } else {
+        this.formDataSearch.endBirthDay = "";
+      }
+      if (val.end) {
+        const s = this.computedBirth(val.end);
+        this.formDataSearch.startBirthDay = s;
+      } else {
+        this.formDataSearch.startBirthDay = "";
+      }
+    },
+
+    computedBirth(age) {
+      let now = new Date();
+      let nowYear = now.getFullYear();
+      let nowMonth = now.getMonth() + 1;
+      let nowDay = now.getDate(); // 按照减法原理，先day相减，不够向month借；然后month相减，不够向year借；最后year相减。
+      let subYear = nowYear - age;
+      if (nowMonth < 10) {
+        nowMonth = "0" + nowMonth;
+      }
+      if (nowDay < 10) {
+        nowDay = "0" + nowDay;
+      }
+      console.log(subYear + "-" + nowMonth + "-" + nowDay);
+      return subYear + "-" + nowMonth + "-" + nowDay;
+    },
+
+    handleClearVillage() {
+      this.formDataSearch.buildingId = "";
+      this.formDataSearch.unitId = "";
+      this.formDataSearch.houseId = "";
+    },
+    handleClearBuild() {
+      this.formDataSearch.buildingId = "";
+      this.formDataSearch.unitId = "";
+      this.formDataSearch.houseId = "";
+    },
+    handleClearDan() {
+      this.formDataSearch.unitId = "";
+      this.formDataSearch.houseId = "";
+    },
+    handleChangeGrid(val) {
+      console.log("val", val);
+      this.formDataSearch.neighborId = "";
+      this.formDataSearch.buildingId = "";
+      this.formDataSearch.unitId = "";
+      this.formDataSearch.houseId = "";
+      this.getValiheList();
+    },
+    handleChangeV(val) {
+      console.log("val", val);
+      this.formDataSearch.buildingId = "";
+      this.formDataSearch.unitId = "";
+      this.formDataSearch.houseId = "";
+      this.getBuildList();
+    },
+    handleChangeB(val) {
+      console.log("val", val);
+      this.formDataSearch.unitId = "";
+      this.formDataSearch.houseId = "";
+      this.getUniList();
+    },
+    handleChangeD(val) {
+      console.log("val", val);
+      this.formDataSearch.houseId = "";
+      this.getHouseList();
+    },
+
     async loadGrid() {
       const url = "/gov/org/customergrid/gridoption";
 
@@ -664,6 +862,78 @@ export default {
         this.$message.error(msg);
       }
     },
+    getValiheList() {
+      const { user } = this.$store.state;
+      this.$http
+        .post("/gov/org/icneighborhood/neighborhoodoption", {
+          gridId: this.formDataSearch.gridId,
+          agencyId: "",
+          // agencyId: user.agencyId
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsV = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    getBuildList() {
+      this.$http
+        .post("/gov/org/icbuilding/buildingoption", {
+          neighborHoodId: this.formDataSearch.neighborId,
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsB = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    getUniList() {
+      this.$http
+        .post("/gov/org/icbuildingunit/unitoption", {
+          buildingId: this.formDataSearch.buildingId,
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsD = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    getHouseList() {
+      this.$http
+        .post("/gov/org/ichouse/houseoption", {
+          unitId: this.formDataSearch.unitId,
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsH = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+
     handleComfirm() {
       if (this.activeName === "first") {
         this.$refs["ref_form1"].validate((valid, messageObj) => {

From 91b67787b46809bb315f7e13ff06f6e7df46bd5d Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 28 Sep 2022 17:14:06 +0800
Subject: [PATCH 3/8] 111

---
 .../communityService/ninePlaces/places/placesDetail.vue       | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/views/modules/communityService/ninePlaces/places/placesDetail.vue b/src/views/modules/communityService/ninePlaces/places/placesDetail.vue
index 2c0a3e1e8..7aab0f801 100644
--- a/src/views/modules/communityService/ninePlaces/places/placesDetail.vue
+++ b/src/views/modules/communityService/ninePlaces/places/placesDetail.vue
@@ -134,11 +134,7 @@ export default {
       }
     },
 
-
-
     handleCancle () {
-
-
       this.$emit('diaDetailClose')
 
     },

From 864bc8c242375000d57f762dc5854dd8f4cb42e4 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 29 Sep 2022 10:11:46 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E8=A7=A3=E5=86=B3master?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8F=91=E7=89=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/command/cpts/map.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/visual/command/cpts/map.vue b/src/views/modules/visual/command/cpts/map.vue
index 2653ee140..dd70c755b 100644
--- a/src/views/modules/visual/command/cpts/map.vue
+++ b/src/views/modules/visual/command/cpts/map.vue
@@ -531,10 +531,9 @@ export default {
           strokeOpacity: 0.1,
           stroke: "#000",
         });
-      scene.addLayer(dotBgLayer);
 
       dotLayer = new PointLayer({
-        zIndex: 21,
+        zIndex: 25,
       })
         .source(dotData)
         .shape("categoryKey", (k) => k)
@@ -543,6 +542,8 @@ export default {
           offsets: [0, 0],
           layerType: "fillImage",
         });
+
+      scene.addLayer(dotBgLayer);
       scene.addLayer(dotLayer);
 
       dotBgLayer.on("click", (e) => {
@@ -567,7 +568,7 @@ export default {
       });
 
       dotLayer2 = new PointLayer({
-        zIndex: 31,
+        zIndex: 30,
       })
         .source(dotData)
         .shape("categoryKey", (k) => k + "2")

From e4bb68311f87e4335bc795cfa858bf9a01cc19fc Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 29 Sep 2022 11:16:08 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8F=91=E7=89=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/shuju/grid/IS_KC.png           | Bin 0 -> 4373 bytes
 src/assets/img/shuju/grid/sr_gc.png           | Bin 0 -> 597 bytes
 src/views/modules/visual/command/cpts/map.vue |   2 +-
 src/views/modules/visual/command/index.vue    |   4 ++--
 4 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 src/assets/img/shuju/grid/IS_KC.png
 create mode 100644 src/assets/img/shuju/grid/sr_gc.png

diff --git a/src/assets/img/shuju/grid/IS_KC.png b/src/assets/img/shuju/grid/IS_KC.png
new file mode 100644
index 0000000000000000000000000000000000000000..48bd3208cb07e5a0d447ec345782a48ad3fa09d4
GIT binary patch
literal 4373
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
P00000NkvXXu0mjfxh#0b

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/grid/sr_gc.png b/src/assets/img/shuju/grid/sr_gc.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5a00bb7ee2ef629442f4ad9bc8f5c55efe118b9
GIT binary patch
literal 597
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+3?vf;>QaFeV{wqX6T`Z5GB1IgZvj3bu0Y!O
zjIY(vK+C;8Ci}fD4*8fL_BJ`>V|vibV!w~+es8nGz7_|)%@6sS9RLaf89rtQfTXwC
z0bjF&zNQC#%s|N345;ORkNH7w(*r={3shhZ5j^N)3S@&6Ll{6cK4yn}fr>%8fQli8
zfNTU=0aoT?4zvPj2*_lh0-zSKMIiHiKn?(z0I~~gHJA&Qf@p^b!W;&c1(}0_v@SZU
z0DT@<666=mz$GTFV`OY*=iuVw=N}jp5*iU16&;tHlA4y8S5Q(~Q(M>2*wozG*3s8L
zVcN{ubLY)pykg~=wHr5Y+kNQpkz*&$U$}nb=B;~AU%Y(%{@eE-KNU9IP6Qgh!PCVt
zMB;Mj`KNq`90XV%9PExREY}oifAp^E{ePnzea$D&j;s8BYBrm>Vp8)gR;M{RU*~l_
zx#bl1-@Vv1^Nifpvr99Uom>*!CpnSv``aA$O*s$0vhcewK9H1~+rZ;}`L@_Zc@Nq3
zf^)rGVwL14B$&MjS@urQvY}se&ZjF{7h_^KrA-NL+?7A4wrE#>`>oRpl+_ihn_o>*
y`Re-Wm{8$ccg4a&_xL-VN3>q>h$_B4DK2%;^s!Z)@ok{n89ZJ6T-G@yGywpykp0R4

literal 0
HcmV?d00001

diff --git a/src/views/modules/visual/command/cpts/map.vue b/src/views/modules/visual/command/cpts/map.vue
index dd70c755b..d80fa0d74 100644
--- a/src/views/modules/visual/command/cpts/map.vue
+++ b/src/views/modules/visual/command/cpts/map.vue
@@ -533,7 +533,7 @@ export default {
         });
 
       dotLayer = new PointLayer({
-        zIndex: 25,
+        zIndex: 20,
       })
         .source(dotData)
         .shape("categoryKey", (k) => k)
diff --git a/src/views/modules/visual/command/index.vue b/src/views/modules/visual/command/index.vue
index d135daabf..4971f977d 100644
--- a/src/views/modules/visual/command/index.vue
+++ b/src/views/modules/visual/command/index.vue
@@ -334,7 +334,7 @@ export default {
 
         yjdw: require("@/assets/img/shuju/command/ico/yjdw.png"),
         sr_gy: require("@/assets/img/shuju/command/ico/sr_gy.png"),
-        sr_gc: require("@/assets/img/shuju/command/ico/sr_gc.png"),
+        sr_gc: require("@/assets/img/shuju/grid/sr_gc.png"),
         whdw: require("@/assets/img/shuju/command/ico/whdw.png"),
         sr_ggld: require("@/assets/img/shuju/command/ico/sr_ggld.png"),
         lwh: require("@/assets/img/shuju/command/ico/lwh.png"),
@@ -424,7 +424,7 @@ export default {
         IS_DB: require("@/assets/img/shuju/command/ico3/IS_DB.png"),
         IS_MB: require("@/assets/img/shuju/command/ico3/IS_MB.png"),
         anzhibangjiao: require("@/assets/img/shuju/command/ico3/anzhibangjiao.png"),
-        IS_KC: require("@/assets/img/shuju/command/ico3/IS_KC.png"),
+        IS_KC: require("@/assets/img/shuju/grid/IS_KC.png"),
         IS_XFRY: require("@/assets/img/shuju/command/ico3/IS_XFRY.png"),
         IS_SD: require("@/assets/img/shuju/command/ico3/IS_SD.png"),
         IS_SN: require("@/assets/img/shuju/command/ico3/IS_SN.png"),

From f5bc90c249c680c613f93c38490822735bfbd0c9 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 29 Sep 2022 15:43:16 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           | 6 +++---
 src/views/modules/visual/command/cpts/map.vue | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index fb66b869c..de595a814 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -112,20 +112,20 @@ function cookApiDataItem(item) {
   function n2one(v) {
     let ret = [];
     for (let i = 0; i < v.length; i++) {
-      console.log("xxxxx", v[i]);
+      // console.log("xxxxx", v[i]);
       ret.push(v[i]);
       if (Array.isArray(v[i].children) && v[i].children.length > 0) {
         ret.push(...n2one(v[i].children));
       }
     }
-    console.log("aaaa", ret);
+    // console.log("aaaa", ret);
     return ret;
   }
 
   let allChildrenUrl = n2one(item.children)
     .filter((i) => i.url != "" && i.showFlag == 1)
     .map((i) => i.url);
-  console.log("))))))))))))", allChildrenUrl);
+  // console.log("))))))))))))", allChildrenUrl);
 
   if (item.children.length > 0) {
     if (item.url == "" || !allChildrenUrl.find((i) => i.url == item.url)) {
diff --git a/src/views/modules/visual/command/cpts/map.vue b/src/views/modules/visual/command/cpts/map.vue
index d80fa0d74..faaf0a6e4 100644
--- a/src/views/modules/visual/command/cpts/map.vue
+++ b/src/views/modules/visual/command/cpts/map.vue
@@ -516,6 +516,7 @@ export default {
 
     iniMapDot(scene) {
       const { darkStyle, lightStyle, dotIcoList, dotData } = this;
+      console.log('--------------------------图标', dotIcoList)
       Object.keys(dotIcoList).forEach((k) => {
         scene.addImage(k, dotIcoList[k]);
       });

From 466abc5f10fbe38b86d187cb4ce5f1364cf823b4 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 29 Sep 2022 17:38:46 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF--------=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/icvaccineprarmeter-add-or-update.vue  | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue b/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue
index 8a1c73255..0998cee12 100644
--- a/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue
+++ b/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue
@@ -220,7 +220,8 @@
             </el-option>
           </el-select>
       </el-form-item>
-      <el-form-item v-if="dataForm.isVaccination === '0'" label="原因" label-width="150px">
+      <el-form-item label="原因" label-width="150px">
+          <!--<el-form-item v-if="dataForm.isVaccination === '0'" label="原因" label-width="150px">-->
           <el-select class="item_width_2"
                      v-model.trim="dataForm.reason"
                      placeholder="请选择"
@@ -337,6 +338,14 @@
       return !this.dataForm.unitId
     },
     dataRule () {
+        var checkPhone = (rule, value, callback) => {
+            let moblie = /^1(3|4|5|6|7|8|9)\d{9}$/; let tel = /^(0[0-9]{2,3}\-)([2-9][0-9]{4,7})+(\-[0-9]{1,4})?$/
+            if (!moblie.test(this.dataForm.mobile) && !tel.test(this.dataForm.mobile)) {
+                return callback(new Error('请输入正确的手机号或座机号！'))
+            } else {
+                callback()
+            }
+        }
       return {
         customerId: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
@@ -384,7 +393,8 @@
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         mobile: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' },
+            { validator: checkPhone, trigger: 'blur' }
         ],
         idCard: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
@@ -728,16 +738,6 @@
       setTimeout(() => {
         this.btnDisable = false;
       }, 10000);
-      //验证手机号码
-      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/;
-      if (regPhone.test(this.dataForm.mobile) === false) {
-        this.btnDisable = false
-        this.$message({
-          type: 'warning',
-          message: '请输入正确的手机号码'
-        })
-        return false;
-      }
       if(this.dataForm.isVaccination === '1'){
           if(this.dataForm.firstVacTime === ''){
               this.$message({

From e629001e4ee9eb8812059d85bd675fd60b743464 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 30 Sep 2022 10:42:40 +0800
Subject: [PATCH 8/8] 11

---
 .../base/epidemic/natInfo/noNatDetail.vue     |   2 +-
 src/views/modules/base/epidemic/vaccin.vue    |   8 +-
 .../modules/base/epidemic/vaccinForm.vue      | 420 ++---------------
 .../communityService/worklog/workLog.vue      |  12 +-
 src/views/modules/worklog/icworklog.vue       | 427 ++++++++++--------
 5 files changed, 293 insertions(+), 576 deletions(-)

diff --git a/src/views/modules/base/epidemic/natInfo/noNatDetail.vue b/src/views/modules/base/epidemic/natInfo/noNatDetail.vue
index 8cf1bcb1b..79b06db74 100644
--- a/src/views/modules/base/epidemic/natInfo/noNatDetail.vue
+++ b/src/views/modules/base/epidemic/natInfo/noNatDetail.vue
@@ -25,7 +25,7 @@
           </div>
           <div class="info-prop">
             <span class="info-title-2">检测结果：</span>
-            <span>{{ formData.natResult==='0'?'阴性':'阳性' }}</span>
+            <span>{{ formData.natResult==='0'?'阴性':formData.natResult==='1'?'阳性':'--' }}</span>
           </div>
 
         </div>
diff --git a/src/views/modules/base/epidemic/vaccin.vue b/src/views/modules/base/epidemic/vaccin.vue
index 0d11f7407..f2e2874d7 100644
--- a/src/views/modules/base/epidemic/vaccin.vue
+++ b/src/views/modules/base/epidemic/vaccin.vue
@@ -100,7 +100,8 @@
                    class="diy-button--export"
                    size="small"
                    @click="handleExportModule">下载模板</el-button>
-        <el-upload :headers="$getElUploadHeaders()"  ref="upload"
+        <el-upload :headers="$getElUploadHeaders()"
+                   ref="upload"
                    :multiple="false"
                    :show-file-list="false"
                    :before-upload="beforeUpload"
@@ -243,8 +244,7 @@
                class="dialog-h"
                @closed="diaClose">
       <vaccinForm ref="ref_form"
-                  @dialogCancle="diaClose"
-                  @dialogOk="addFormOk"></vaccinForm>
+                  @dialogCancle="diaClose"></vaccinForm>
     </el-dialog>
     <el-dialog :visible.sync="addFormShow"
                :close-on-click-modal="false"
@@ -409,7 +409,7 @@ export default {
       this.formShow = true;
       const row1 = { ...row }
       let row2 = await this.getInfo(row1);
-      this.$refs.ref_form.initForm("detail", row2);
+      this.$refs.ref_form.initForm(row2);
     },
 
     handleAdd () {
diff --git a/src/views/modules/base/epidemic/vaccinForm.vue b/src/views/modules/base/epidemic/vaccinForm.vue
index edd196d7b..d001871fe 100644
--- a/src/views/modules/base/epidemic/vaccinForm.vue
+++ b/src/views/modules/base/epidemic/vaccinForm.vue
@@ -1,99 +1,47 @@
 <template>
-  <div class="epidemic-form">
+  <div>
     <div class="dialog-h-content scroll-h">
+      <div v-if="initLoading"
+           class="m-row">
+        <div class="m-info">
+          <div class="info-prop">
+            <span class="info-title-2">姓名：</span>
+            <span>{{ formData.name||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">手机号：</span>
+            <span>{{ formData.mobile||'--' }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">证件号：</span>
+            <span>{{ formData.idCard||'--' }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">接种时间：</span>
+            <span>{{ formData.inoculateTime||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">接种地点：</span>
+            <span>{{ formData.inoculateAddress||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">疫苗厂家：</span>
+            <span>{{ formData.manufacturer||'--'  }}</span>
+          </div>
+
+        </div>
+      </div>
 
-      <el-form ref="ref_form"
-               :inline="true"
-               :model="formData"
-               :rules="dataRule"
-               :disabled="formType==='detail'"
-               class="form">
-
-        <el-form-item label="姓名"
-                      prop="name"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_2"
-                    placeholder="请输入姓名"
-                    clearable
-                    :disabled="isFromResi"
-                    v-model="formData.name">
-          </el-input>
-
-        </el-form-item>
-
-        <el-form-item label="手机号"
-                      prop="mobile"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_2"
-                    placeholder="请输入手机号"
-                    clearable
-                    :disabled="isFromResi"
-                    v-model="formData.mobile">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="证件号"
-                      prop="idCard"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_2"
-                    placeholder="请输入身份证号或护照号"
-                    clearable
-                    :disabled="isFromResi"
-                    v-model="formData.idCard">
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="接种时间"
-                      style="display: block"
-                      prop="inoculateTime"
-                      label-width="150px">
-          <el-date-picker class="item_width_2"
-                          v-model="formData.inoculateTime"
-                          format="yyyy-MM-dd HH:mm"
-                          value-format="yyyy-MM-dd HH:mm"
-                          type="datetime"
-                          :picker-options="pickerOptions"
-                          clearable
-                          placeholder="选择时间">
-          </el-date-picker>
-        </el-form-item>
-
-        <el-form-item label="接种地点"
-                      prop="inoculateAddress"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    placeholder="请输入检测地点"
-                    clearable
-                    v-model="formData.inoculateAddress">
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="疫苗厂家"
-                      prop="manufacturer"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    placeholder="请输入检测地点"
-                    clearable
-                    v-model="formData.manufacturer" />
-        </el-form-item>
-
-      </el-form>
     </div>
 
-    <div class="form_div_btn">
+    <div class="div-btn">
       <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button v-if="formType != 'detail'"
-                 size="small"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
-    </div>
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
 
   </div>
 </template>
@@ -108,23 +56,7 @@ let loading // 加载动画
 export default {
   data () {
     return {
-      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
-      hideUploadEdit: false, // 隐藏'上传按钮'
-      limitNum: 1,
-      enterType: '1',//录入方式1 手动输入  2  选择居民
-      isFromResi: false,//是否从已有居民信息中选择
-
-      gridList: [],
-      personList: [],
-      pickerOptions: { //控制时间范围
-        disabledDate (time) {
-          return time.getTime() > (Date.now())
-        }
-      },
-
-      btnDisable: false,
-
-      icNatId: '',
+      initLoading: false,
       formData: {
         agencyId: '',//当前网格所属组织Id
         userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值
@@ -137,11 +69,7 @@ export default {
         manufacturer: ''
       },
 
-      fileList: [],
-      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
-      dialogImageUrl: '',
-      dialogVisible: false,
-      imgLoading: false,
+
 
     }
   },
@@ -149,8 +77,7 @@ export default {
   async mounted () {
     const { user } = this.$store.state
     this.agencyId = user.agencyId
-    //获取网格下拉框数据
-    // await this.loadGrid()
+
   },
 
   methods: {
@@ -158,79 +85,16 @@ export default {
       this.formData.content = ''
     },
 
-    async initForm (type, row) {
-      // this.startLoading()
-      this.formData.agencyId = this.agencyId
+    async initForm (row) {
 
-      // this.$refs['ref_form'].resetFields();
-      this.isFromResi = false
-      this.enterType = '1'
-      this.formType = type
 
       this.formData = { ...row }
       // this.endLoading()
       console.log('formData----', this.formData)
-
-    },
-
-    handleChangeEnterType (value) {
-      this.formData.name = ''
-      this.formData.mobile = ''
-      this.formData.idCard = ''
-      this.formData.gridId = ''
-      this.formData.userId = ''
-
-      this.$refs['ref_form'].resetFields();
-      if (value === '2') {
-        this.isFromResi = true
-      } else {
-        this.isFromResi = false
-      }
-
+      this.initLoading = true
     },
 
-    async loadGrid () {
-      const url = "/gov/org/customergrid/gridoption"
 
-      let params = {
-        agencyId: this.agencyId
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.gridList = data
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-    async handleSelGrid (value) {
-
-      const url = "/epmetuser/icresiuser/demandusers"
-
-      let params = {
-        agencyId: this.agencyId,
-        gridId: value
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.personList = data
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-    async handleSelPerson (personItem) {
-      this.formData.userId = personItem.demandUserId
-      this.formData.name = personItem.demandUserName
-      this.formData.mobile = personItem.demandUserMobile
-      this.formData.idCard = personItem.idCard
-    },
 
     async loadFormData () {
 
@@ -284,164 +148,15 @@ export default {
       }
     },
 
-    handleComfirm () {
-      this.$refs['ref_form'].validate((valid, messageObj) => {
-        if (!valid) {
-          app.util.validateRule(messageObj)
-
-        } else {
-          this.addNat()
-        }
-
-      })
-    },
-
-    async addNat () {
-      // if (this.imgLoading) {
-      //   this.$message({
-      //     type: 'warning',
-      //     message: '正在上传图片，请稍候重试'
-      //   })
-      //   return false;
-      // }
-      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
-      if (regPhone.test(this.formData.mobile) === false) {
-        this.btnDisable = false
-        this.$message({
-          type: 'warning',
-          message: '请输入正确的手机号码'
-        })
-        return false;
-      }
-      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)|(^[a-zA-Z0-9]{8,9}$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
-      if (regCard.test(this.formData.idCard) === false) {
-        this.btnDisable = false
-        this.$message({
-          type: 'warning',
-          message: '请输入正确的证件号码'
-        })
-        return false;
-      }
-
-      if (this.formData.isSelChannel) {
-        if (!this.formData.content) {
-          this.$message({
-            type: 'warning',
-            message: '请填写通知内容'
-          })
-          return false;
-        } else {
-          this.formData.channel = ['0']
-        }
-
-      } else {
-        this.formData.channel = []
-        this.formData.content = ''
-      }
-
-      this.btnDisable = true
-      setTimeout(() => {
-        this.btnDisable = false
-      }, 5000)
-
-      let url = ''
-      if (this.formType === 'add') {
-        url = '/epmetuser/icNat/add'
-        // url = "http://yapi.elinkservice.cn/mock/102/epmetuser/icNat/add"
-        this.formData.icNatId = ''
-
-      } else {
-        url = '/epmetuser/icNat/edit'
-        // url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/edit"
-      }
-
-
-      const { data, code, msg } = await requestPost(url, this.formData)
-
-      if (code === 0) {
-        this.$message({
-          type: 'success',
-          message: '操作成功'
-        })
-        this.resetData()
-        this.$emit('dialogOk')
-        this.btnDisable = false
-
-      } else {
-        this.btnDisable = false
-        this.$message.error(msg)
-      }
-
-    },
 
     handleCancle () {
-      this.resetData()
+      // this.resetData()
       this.$emit('dialogCancle')
 
     },
 
-    handleRemove (file, fileList) {
-      this.hideUploadEdit = fileList.length >= this.limitNum;
-      this.formData.fileName = ''
-      this.formData.attachmentUrl = ''
-      this.formData.attachmentType = ''
-      this.fileList = []
-
-    },
-    handlePictureCardPreview (file) {
-      this.dialogImageUrl = file.url;
-      this.dialogVisible = true;
-    },
-
-    handleEditChange (file, fileList) {
-      this.hideUploadEdit = fileList.length >= this.limitNum;
-
-    },
-
-    beforeUpload (file) {
-      const array = file.name.split('.')
-      const extension = array[array.length - 1]
-      // const isLt1M = (file.size / 1024 / 1024) < 5
-      if (extension !== 'jpg'
-        && extension !== 'png'
-        && extension !== 'gif'
-      ) {
-        this.$message.error('只能上传jpg、png、gif文件！')
-        return false
-      } else {
-        this.btnDisable = true
-      }
-      // if (!isLt1M) {
-      //   this.$message.error('上传文件大小不能超过 5MB!')
-      // }
-      // return isLt1M
-
-    },
-
-    handleFileSuccess (res, file) {
-
-      if (res.code === 0 && res.msg === 'success') {
-        const array = file.name.split('.')
-        const fileType = array[array.length - 1]
-
-        this.formData.fileName = file.name
-        this.formData.attachmentUrl = res.data.url
-        this.formData.attachmentType = 'image'
-
-        file.attachmentFormat = fileType
-        file.attachmentSize = file.size
-
-
-      } else {
-        this.$message.error(res.msg)
-      }
-      this.btnDisable = false
-    },
 
     resetData () {
-      this.icNatId = ''
-      this.fileList = []
-      this.hideUploadEdit = false
 
       this.formData = {
         icNatId: '',
@@ -481,40 +196,6 @@ export default {
     }
   },
   computed: {
-    dataRule () {
-      return {
-        name: [
-          { required: true, message: '姓名不能为空', trigger: 'blur' }
-        ],
-        idCard: [
-          { required: true, message: '证件号不能为空', trigger: 'blur' }
-        ],
-        mobile: [
-          { required: true, message: '手机号不能为空', trigger: 'blur' },
-        ],
-        natTime: [
-          { required: true, message: '检测时间不能为空', trigger: 'blur' },
-        ],
-
-        natAddress: [
-          { required: false },
-        ],
-        natResult: [
-          { required: true, message: '检测结果不能为空', trigger: 'blur' },
-        ],
-
-        isSelChannel: [
-          { required: false },
-        ],
-        channel: [
-          { required: false },
-        ],
-        content: [
-          { required: false },
-        ],
-
-      }
-    },
 
   },
   props: {
@@ -530,19 +211,8 @@ export default {
 </script>
 
 
-<style lang="scss" scoped >
-@import "@/assets/scss/modules/management/epidemic.scss";
-</style>
-
-<style lang='scss'>
-// 隐藏上传按钮
-.hide .el-upload--picture-card {
-  display: none;
-}
-// 添加/删除文件时去掉动画过渡
-.el-upload-list__item {
-  transition: none !important;
-}
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/detail-main.scss";
 </style>
 
 
diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue
index 9584d9954..6e7ad42ef 100644
--- a/src/views/modules/communityService/worklog/workLog.vue
+++ b/src/views/modules/communityService/worklog/workLog.vue
@@ -10,6 +10,7 @@
                         prop="gridId">
             <el-select v-model="workLog.gridId"
                        filterable
+                       size="small"
                        placeholder="请选择"
                        clearable>
               <el-option v-for="item in optionsG"
@@ -23,6 +24,7 @@
                         prop="serviceType">
             <el-select v-model="workLog.serviceType"
                        filterable
+                       size="small"
                        placeholder="请选择"
                        clearable>
               <el-option v-for="item in serviceTypeList"
@@ -153,35 +155,35 @@
                          align="center"
                          label="申请人"
                          show-overflow-tooltip
-                         max-width="100">
+                         width="100">
         </el-table-column>
         <el-table-column prop="applicantAddress"
                          header-align="center"
                          show-overflow-tooltip
                          align="center"
                          label="住址"
-                         width="80">
+                         min-width="130">
         </el-table-column>
         <el-table-column prop="serviceContent"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="服务内容"
-                         mix-width="230">
+                         min-width="150">
         </el-table-column>
         <el-table-column prop="applicantMobile"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="联系电话"
-                         width="100">
+                         width="110">
         </el-table-column>
         <el-table-column prop="principalName"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="责任人"
-                         width="130">
+                         width="100">
         </el-table-column>
         <el-table-column prop="serviceTime"
                          header-align="center"
diff --git a/src/views/modules/worklog/icworklog.vue b/src/views/modules/worklog/icworklog.vue
index aa58fd629..2bde74cf0 100644
--- a/src/views/modules/worklog/icworklog.vue
+++ b/src/views/modules/worklog/icworklog.vue
@@ -1,130 +1,176 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <el-card shadow="never"
+           class="aui-card--fill">
     <div class="mod-__icWorkLog} resi-container">
-      <el-card ref="searchCard" class="search-card">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item prop="gridId" label="所属组织">
-          <div class="resi-cell-value">
-            <el-cascader class="customer_cascader"
-                         ref="myCascader"
-                         clearable
-                         v-model="agencyIdArray"
-                         :options="orgOptions"
-                         :props="orgOptionProps"
-                         :show-all-levels="false"
-                         @change="handleChangeAgency"></el-cascader>
-          </div>
-        </el-form-item>
-        <el-form-item label="日志类型"
-                      prop="logType">
-          <el-select v-model="dataForm.logType"
-                     placeholder="请选择"
-                     size="small"
-                     clearable>
-            <el-option v-for="item in logTypeArr"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="网格员"
-                      prop="createdUser">
-          <el-input v-model="dataForm.createdUser"
-                    size="small"
-                    clearable
-                    placeholder="请输入网格员姓名">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="联系电话"
-                                     prop="createdUser">
-        <el-input v-model="dataForm.mobile"
-                  size="small"
-                  clearable
-                  placeholder="请输入联系电话">
-        </el-input>
-      </el-form-item>
-        <el-form-item label="日志时间" prop="startTime">
-          <el-date-picker v-model="dataForm.startTime"
-                          type="date"
-                          :picker-options="pickerBeginDateBefore"
-                          value-format="yyyy-MM-dd"
-                          format="yyyy-MM-dd"
-                          placeholder="选择日期"
-                          style="width:200px">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="至" prop="endTime">
-          <el-date-picker v-model="dataForm.endTime"
-                          type="date"
-                          :picker-options="pickerBeginDateAfter"
-                          value-format="yyyy-MM-dd"
-                          format="yyyy-MM-dd"
-                          placeholder="选择日期"
-                          style="width:200px">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" class="diy-button--search" @click="getDataList()">{{ $t('query') }}</el-button>
-
-          <el-button  style="margin-left:10px"
+      <el-card ref="searchCard"
+               class="search-card">
+        <el-form :inline="true"
+                 :model="dataForm"
+                 @keyup.enter.native="getDataList()">
+          <el-form-item prop="gridId"
+                        label="所属组织">
+            <div class="resi-cell-value">
+              <el-cascader class="customer_cascader"
+                           size="small"
+                           ref="myCascader"
+                           clearable
+                           v-model="agencyIdArray"
+                           :options="orgOptions"
+                           :props="orgOptionProps"
+                           :show-all-levels="false"
+                           @change="handleChangeAgency"></el-cascader>
+            </div>
+          </el-form-item>
+          <el-form-item label="日志类型"
+                        prop="logType">
+            <el-select v-model="dataForm.logType"
+                       placeholder="请选择"
+                       size="small"
+                       clearable>
+              <el-option v-for="item in logTypeArr"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="网格员"
+                        prop="createdUser">
+            <el-input v-model="dataForm.createdUser"
                       size="small"
-                      type="primary"
-                      class="diy-button--reset"
-                      @click="resetSearch">重置</el-button>
-        </el-form-item>
-        <!-- <el-button style="margin-left:10px"
+                      clearable
+                      placeholder="请输入网格员姓名">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="联系电话"
+                        prop="createdUser">
+            <el-input v-model="dataForm.mobile"
+                      size="small"
+                      clearable
+                      placeholder="请输入联系电话">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="日志时间"
+                        prop="startTime">
+            <el-date-picker v-model="dataForm.startTime"
+                            type="date"
+                            size="small"
+                            :picker-options="pickerBeginDateBefore"
+                            value-format="yyyy-MM-dd"
+                            format="yyyy-MM-dd"
+                            placeholder="选择日期"
+                            style="width:200px">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="至"
+                        prop="endTime">
+            <el-date-picker v-model="dataForm.endTime"
+                            type="date"
+                            size="small"
+                            :picker-options="pickerBeginDateAfter"
+                            value-format="yyyy-MM-dd"
+                            format="yyyy-MM-dd"
+                            placeholder="选择日期"
+                            style="width:200px">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary"
+                       size="small"
+                       class="diy-button--search"
+                       @click="getDataList()">{{ $t('query') }}</el-button>
+
+            <el-button style="margin-left:10px"
+                       size="small"
+                       type="primary"
+                       class="diy-button--reset"
+                       @click="resetSearch">重置</el-button>
+          </el-form-item>
+          <!-- <el-button style="margin-left:10px"
                    size="small"
                    type="primary"
                    class="diy-button--reset"
                    @click="resetSearch">重置</el-button> -->
-<!--        <el-form-item>-->
-<!--          <el-button type="primary" size="small"  @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>-->
-<!--        </el-form-item>-->
-       <!-- <el-form-item>
+          <!--        <el-form-item>-->
+          <!--          <el-button type="primary" size="small"  @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>-->
+          <!--        </el-form-item>-->
+          <!-- <el-form-item>
          <el-button size="small" style="margin-left:10px" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
        </el-form-item> -->
-      </el-form>
+        </el-form>
       </el-card>
       <el-card class="resi-card-table">
         <div class="resi-row-btn">
-          <el-button
-                  class="diy-button--add"
-                  size="small"
-                  @click="addOrUpdateHandle()"
-          >{{ $t('add') }}</el-button
-          >
-          <el-button @click="exportHandle()" class="diy-button--reset" size="small"
-          >导出</el-button
-          >
-          <el-button size="small" type="danger" @click="deleteHandle()">批量删除</el-button>
+          <el-button class="diy-button--add"
+                     size="small"
+                     @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button @click="exportHandle()"
+                     class="diy-button--reset"
+                     size="small">导出</el-button>
+          <el-button size="small"
+                     type="danger"
+                     @click="deleteHandle()">批量删除</el-button>
         </div>
-      <el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="title" label="标题" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="logType" label="日志类型" :formatter="categoryCodeFormatter" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="logDate" label="日志时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdUser" label="网格员" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)"> {{ userId == scope.row.createdBy ? $t('update') : '查看' }}</el-button>
-            <el-button type="text" v-if="userId == scope.row.createdBy" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
-      </el-pagination>
+        <el-table class="resi-table"
+                  v-loading="dataListLoading"
+                  :data="dataList"
+                  border
+                  @selection-change="dataListSelectionChangeHandle"
+                  style="width: 100%">
+          <el-table-column type="selection"
+                           header-align="center"
+                           align="center"
+                           width="50"></el-table-column>
+          <el-table-column prop="title"
+                           label="标题"
+                           header-align="center"
+                           align="center"></el-table-column>
+          <el-table-column prop="logType"
+                           label="日志类型"
+                           :formatter="categoryCodeFormatter"
+                           header-align="center"
+                           align="center"></el-table-column>
+          <el-table-column prop="logDate"
+                           label="日志时间"
+                           header-align="center"
+                           align="center"></el-table-column>
+          <el-table-column prop="createdUser"
+                           label="网格员"
+                           header-align="center"
+                           align="center"></el-table-column>
+          <el-table-column prop="mobile"
+                           label="联系电话"
+                           header-align="center"
+                           align="center"></el-table-column>
+          <el-table-column :label="$t('handle')"
+                           fixed="right"
+                           header-align="center"
+                           align="center"
+                           width="150">
+            <template slot-scope="scope">
+              <el-button type="text"
+                         size="small"
+                         @click="addOrUpdateHandle(scope.row.id)"> {{ userId == scope.row.createdBy ? $t('update') : '查看' }}</el-button>
+              <el-button type="text"
+                         v-if="userId == scope.row.createdBy"
+                         size="small"
+                         @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination :current-page="page"
+                       :page-sizes="[10, 20, 50, 100]"
+                       :page-size="limit"
+                       :total="total"
+                       layout="total, sizes, prev, pager, next, jumper"
+                       @size-change="pageSizeChangeHandle"
+                       @current-change="pageCurrentChangeHandle">
+        </el-pagination>
       </el-card>
       <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <add-or-update v-if="addOrUpdateVisible"
+                     ref="addOrUpdate"
+                     @refreshDataList="getDataList"></add-or-update>
     </div>
   </el-card>
 </template>
@@ -145,10 +191,10 @@ export default {
         exportURL: '/gov/org/icWorkLog/export'
       },
       userId: this.$store.state.user.id,
-      agencyIdArray:[],
+      agencyIdArray: [],
       orgOptions: [],
       logTypeArr: [],
-      orgOptionProps:{
+      orgOptionProps: {
         multiple: false,
         value: 'agencyId',
         label: 'agencyName',
@@ -168,22 +214,22 @@ export default {
     this.getCategrayList()
   },
   methods: {
-    getGridList() {
+    getGridList () {
       const { user } = this.$store.state
       this.$http
-              .post('/gov/org/customeragency/agencygridtree', {})
-              .then(({ data: res }) => {
-                if (res.code !== 0) {
-                  return this.$message.error(res.msg)
-                } else {
-                  console.log('获取组织树成功', res.data)
-                  this.orgOptions=[]
-                  this.orgOptions .push( res.data)
-                }
-              })
-              .catch(() => {
-                return this.$message.error('网络错误')
-              })
+        .post('/gov/org/customeragency/agencygridtree', {})
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取组织树成功', res.data)
+            this.orgOptions = []
+            this.orgOptions.push(res.data)
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
     },
     exportHandle () {
       const url = this.mixinViewModuleOptions.exportURL
@@ -254,20 +300,20 @@ export default {
       })
       return ca
     },
-    handleChangeAgency(val) {
+    handleChangeAgency (val) {
       let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
 
       if (obj) {
-        if(obj.level === 'grid'){
-          this.dataForm.gridId =  this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
-          this.dataForm.agencyId=''
-        }else{
+        if (obj.level === 'grid') {
+          this.dataForm.gridId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
+          this.dataForm.agencyId = ''
+        } else {
           this.dataForm.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
           this.dataForm.gridId = ''
         }
 
-      }else{
-        this.dataForm.agencyId=''
+      } else {
+        this.dataForm.agencyId = ''
         this.dataForm.gridId = ''
       }
     },
@@ -291,72 +337,71 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  @import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/buttonstyle.scss";
 
-  .resi-container .resi-card-table {
-    ::v-deep .el-table th {
-      color: #fff;
-      background-color: rgba(33, 149, 254, 1);
-      // border-right: 1px solid rgba(33, 149, 254, 1);
-    }
+.resi-container .resi-card-table {
+  ::v-deep .el-table th {
+    color: #fff;
+    background-color: rgba(33, 149, 254, 1);
+    // border-right: 1px solid rgba(33, 149, 254, 1);
   }
-  .resi-table {
-    ::v-deep .el-button--text {
-      text-decoration: underline;
-    }
-    ::v-deep .btn-color-del {
-      margin-left: 10px;
-      color: rgba(213, 16, 16, 1);
-    }
-    ::v-deep .btn-color-edit {
-      color: rgba(0, 167, 169, 1);
-    }
+}
+.resi-table {
+  ::v-deep .el-button--text {
+    text-decoration: underline;
   }
-
-  .resi-row-btn {
-    margin-bottom: 13px;
-    .upload-btn {
-      display: inline-block;
-      margin: 0 10px;
-    }
+  ::v-deep .btn-color-del {
+    margin-left: 10px;
+    color: rgba(213, 16, 16, 1);
+  }
+  ::v-deep .btn-color-edit {
+    color: rgba(0, 167, 169, 1);
   }
+}
 
-  .form-wr {
-    .input-width {
-      width: 260px;
+.resi-row-btn {
+  margin-bottom: 13px;
+  .upload-btn {
+    display: inline-block;
+    margin: 0 10px;
+  }
+}
 
-    }
-    .input-width-textarea {
-      width: 500px;
-    }
-    .imsg-list {
-      display: flex;
-      align-items: center;
-      .imgs-item {
-        position: relative;
-        margin-right: 10px;
-        .el-icon-delete {
-          position: absolute;
-          top: 0;
-          right: 0;
-          font-size: 18px;
-          color: red;
-          z-index: 3;
-          cursor: pointer;
-        }
+.form-wr {
+  .input-width {
+    width: 260px;
+  }
+  .input-width-textarea {
+    width: 500px;
+  }
+  .imsg-list {
+    display: flex;
+    align-items: center;
+    .imgs-item {
+      position: relative;
+      margin-right: 10px;
+      .el-icon-delete {
+        position: absolute;
+        top: 0;
+        right: 0;
+        font-size: 18px;
+        color: red;
+        z-index: 3;
+        cursor: pointer;
       }
     }
   }
-  .div-content {
-    width: 100%;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
+}
+.div-content {
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 </style>
 
 <style>
-  .el-table .warning-row {
-    background: #ffe168;
-  }
+.el-table .warning-row {
+  background: #ffe168;
+}
 </style>