From 084c1ece24e1083a6aa96bf9aac36f0c9270749a Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 15 Aug 2022 09:48:38 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/modules/visual/command.scss |  2 +-
 src/views/modules/visual/command/index.vue  | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/assets/scss/modules/visual/command.scss b/src/assets/scss/modules/visual/command.scss
index d905e5ed1..ee0138343 100644
--- a/src/assets/scss/modules/visual/command.scss
+++ b/src/assets/scss/modules/visual/command.scss
@@ -63,7 +63,7 @@
 
 .m-search {
     position: absolute;
-    z-index: 200;
+    z-index: 4;
     left: 0;
     right: 0;
     top: 30px;
diff --git a/src/views/modules/visual/command/index.vue b/src/views/modules/visual/command/index.vue
index bf861c991..ce4427adf 100644
--- a/src/views/modules/visual/command/index.vue
+++ b/src/views/modules/visual/command/index.vue
@@ -18,7 +18,7 @@
 
     <people v-if="orgLevel === 'people'" :uid="selUserId" />
 
-    <div v-show="orgLevel !== 'people'" class="g-cnt">
+    <div class="g-cnt">
       <div class="m-map" @click="handleClickMapBox">
         <grid-map
           ref="map"
@@ -207,9 +207,11 @@
       @handleClose="handleClose"
     />
 
-    <!-- <people v-if="pageType==='watch-resi'"
-          :uid="icResiUserId"
-          ref="ref_people"></people> -->
+    <people
+      v-if="pageType === 'watch-resi'"
+      :uid="icResiUserId"
+      ref="ref_people"
+    ></people>
   </div>
 </template>
 
@@ -482,8 +484,11 @@ export default {
           };
         }
       } else if (type == "watch-resi") {
-        this.toSubAgency("people", info.icResiUserId);
+        // this.toSubAgency("people", info.icResiUserId);
         this.icResiUserId = info.icResiUserId;
+        this.$router.push({
+          path: `/main-shuju/visual-basicinfo-people/${info.icResiUserId}`,
+        });
         // 查看居民详情
       } else if (type == "watch-event") {
         // 查看事件
@@ -550,7 +555,7 @@ export default {
       this.categoryKeys2 = [obj.categoryKey];
       this.placeType2 = obj.placeType;
       this.categoryNames2 = [obj.categoryName];
-      console.log(obj)
+      console.log(obj);
     },
 
     handleChangeMenu(list) {

From 1e737993aa751e41a9486df103c009edd9f10f3f Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 15 Aug 2022 09:51:41 +0800
Subject: [PATCH 2/7] 0

---
 src/views/modules/visual/command/index.vue | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/views/modules/visual/command/index.vue b/src/views/modules/visual/command/index.vue
index ce4427adf..56017d830 100644
--- a/src/views/modules/visual/command/index.vue
+++ b/src/views/modules/visual/command/index.vue
@@ -16,8 +16,6 @@
       </div>
     </div>
 
-    <people v-if="orgLevel === 'people'" :uid="selUserId" />
-
     <div class="g-cnt">
       <div class="m-map" @click="handleClickMapBox">
         <grid-map
@@ -206,12 +204,6 @@
       :enterpriseId="enterpriseId"
       @handleClose="handleClose"
     />
-
-    <people
-      v-if="pageType === 'watch-resi'"
-      :uid="icResiUserId"
-      ref="ref_people"
-    ></people>
   </div>
 </template>
 

From acff3a6edda93171d1719df9826c29f53f9d0f64 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 15 Aug 2022 13:39:52 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=8B=89=E5=8F=96?=
 =?UTF-8?q?=E5=88=86=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../worklog/icworklog-add-or-update.vue       | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/worklog/icworklog-add-or-update.vue b/src/views/modules/worklog/icworklog-add-or-update.vue
index 0b28978eb..c0af91597 100644
--- a/src/views/modules/worklog/icworklog-add-or-update.vue
+++ b/src/views/modules/worklog/icworklog-add-or-update.vue
@@ -13,6 +13,7 @@
                         :key="item.value"
                         :label="item.label"
                         :value="item.value"
+                        :disabled="item.disabled"
                 >
                 </el-option>
             </el-select>
@@ -69,7 +70,6 @@
         </el-form-item> -->
 
         <el-form-item label="照片"
-                        label-width="150px"
                         style="display:block">
             <el-upload :class="['avatar-uploader', {'hide': hideUploadBtn}] "
                        ref="uploadPic"
@@ -102,6 +102,7 @@ export default {
     return {
       formType: '',
       visible: false,
+      gridState: true,
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
       logTypeArr: [],
       optionsG: [],
@@ -117,24 +118,17 @@ export default {
         remark: '',
         mobile: '',
         fileList: [],
-        // imageList: [],//	图片集合	
+        // imageList: [],//	图片集合
       },
       hideUploadBtn: false
     }
   },
   created () {
-    this.getGridList()
     this.getCategrayList()
   },
   computed: {
     dataRule () {
       return {
-        agencyId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        gridId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         title: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
@@ -153,6 +147,7 @@ export default {
   methods: {
     init () {
       this.visible = true
+      this.getGridList()
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         this.dataForm.fileList = []
@@ -171,6 +166,15 @@ export default {
           ...this.dataForm,
           ...res.data
         }
+
+        const grid = this.optionsG.filter(item => item.value === res.data.gridId)
+        if (grid.length < 1) {
+          this.gridState = false
+          this.optionsG.push({label:res.data.gridName, value:res.data.gridId, disabled: true})
+        } else {
+          this.gridState = true
+        }
+
         const { id } = this.$store.state.user
         if (this.dataForm.createdBy == id) { // 是本人可以修改
           this.formType = 'update'
@@ -197,9 +201,9 @@ export default {
       }
     },
     getGridList() {
-      const { user } = this.$store.state
+      this.optionsG = []
       this.$http
-        .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'query' })
+        .post('/gov/mine/agency/getmygrids')
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -327,6 +331,11 @@ export default {
     },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
+      if (!this.gridState) {
+        this.dataForm.gridId = ''
+        this.gridState = true
+        return this.$message.error("请重新选择网格")
+      }
       if (this.dataForm.content.length < 70) {
         return this.$message.error("内容不能少于70字")
       }

From 3678f109e149dd335584d1d280ac353b9cec5ab2 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 15 Aug 2022 13:53:16 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/worklog/icworklog-add-or-update.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/worklog/icworklog-add-or-update.vue b/src/views/modules/worklog/icworklog-add-or-update.vue
index c0af91597..be6427e3f 100644
--- a/src/views/modules/worklog/icworklog-add-or-update.vue
+++ b/src/views/modules/worklog/icworklog-add-or-update.vue
@@ -10,9 +10,9 @@
             >
                 <el-option
                         v-for="item in optionsG"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
+                        :key="item.gridId"
+                        :label="item.gridName"
+                        :value="item.gridId"
                         :disabled="item.disabled"
                 >
                 </el-option>
@@ -170,7 +170,7 @@ export default {
         const grid = this.optionsG.filter(item => item.value === res.data.gridId)
         if (grid.length < 1) {
           this.gridState = false
-          this.optionsG.push({label:res.data.gridName, value:res.data.gridId, disabled: true})
+          this.optionsG.push({gridName:res.data.gridName, gridId:res.data.gridId, disabled: true})
         } else {
           this.gridState = true
         }

From e96196bd170c2163f438ee825dea8bafb9c6b9e5 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 15 Aug 2022 15:51:44 +0800
Subject: [PATCH 5/7] bug

---
 src/views/modules/worklog/icworklog-add-or-update.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/worklog/icworklog-add-or-update.vue b/src/views/modules/worklog/icworklog-add-or-update.vue
index be6427e3f..bacf3a21e 100644
--- a/src/views/modules/worklog/icworklog-add-or-update.vue
+++ b/src/views/modules/worklog/icworklog-add-or-update.vue
@@ -167,8 +167,8 @@ export default {
           ...res.data
         }
 
-        const grid = this.optionsG.filter(item => item.value === res.data.gridId)
-        if (grid.length < 1) {
+        const grid = this.optionsG.filter(item => item.gridId === res.data.gridId)
+        if (grid.length < 1 && res.data.gridId !== '') {
           this.gridState = false
           this.optionsG.push({gridName:res.data.gridName, gridId:res.data.gridId, disabled: true})
         } else {
@@ -201,7 +201,6 @@ export default {
       }
     },
     getGridList() {
-      this.optionsG = []
       this.$http
         .post('/gov/mine/agency/getmygrids')
         .then(({ data: res }) => {

From ea614acb75af9e1680565089052b0155e6632505 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 16 Aug 2022 13:53:56 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/cpts/map/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/modules/visual/cpts/map/index.vue b/src/views/modules/visual/cpts/map/index.vue
index 0c8bae15c..80110912b 100644
--- a/src/views/modules/visual/cpts/map/index.vue
+++ b/src/views/modules/visual/cpts/map/index.vue
@@ -29,6 +29,7 @@ let posLayer;
 let circleLayer;
 let dotLayer;
 let dotBgLayer;
+let dotLayer2;
 
 export default {
   name: "l7",

From 90f1ba7d68ae2c319abd396d11807206836a866d Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 16 Aug 2022 16:40:22 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E6=97=A5=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityParty/calendar/cpts/calendar.vue | 167 ++++++++++++++++++
 .../modules/communityParty/calendar/index.vue |  45 +++++
 2 files changed, 212 insertions(+)
 create mode 100644 src/views/modules/communityParty/calendar/cpts/calendar.vue
 create mode 100644 src/views/modules/communityParty/calendar/index.vue

diff --git a/src/views/modules/communityParty/calendar/cpts/calendar.vue b/src/views/modules/communityParty/calendar/cpts/calendar.vue
new file mode 100644
index 000000000..f8a71faf6
--- /dev/null
+++ b/src/views/modules/communityParty/calendar/cpts/calendar.vue
@@ -0,0 +1,167 @@
+<template>
+  <div>
+    <el-row>
+      <!-- 左侧，提示早班、晚班或者上午、下午 -->
+      <el-col :span="1">
+        <div class="date-con tip-con">
+          <el-col
+            v-for="item in 6"
+            :key="item"
+            class="date thisMonth tip"
+            :span="1"
+          >
+            <div class="morning">早班</div>
+            <div class="evening">晚班</div>
+          </el-col>
+        </div>
+      </el-col>
+      <!-- 右侧，周一到周五具体内容 -->
+      <el-col :span="11">
+        <!-- 第一行表头，周一到周日 -->
+        <div class="top-con">
+          <div class="top" v-for="item in top" :key="item">星期{{ item }}</div>
+        </div>
+        <!-- 日历号 -->
+        <div class="date-con">
+          <div
+            class="date"
+            :class="[item.thisMonth, item.isToday, item.afterToday]"
+            v-for="(item, index) in visibleCalendar"
+            :key="index"
+          >
+            <div>{{ item.day }}</div>
+            <div class="morning">张三，李四</div>
+            <div class="evening">王五，赵六</div>
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    time: {
+      type: Object,
+      default: () => {
+        return {
+          year: new Date().getFullYear(),
+          month: new Date().getMonth(),
+        };
+      },
+    },
+  },
+  data() {
+    return {
+      top: ["一", "二", "三", "四", "五", "六", "日"],
+    };
+  },
+  created() {
+    console.log("123", this.time);
+  },
+  methods: {
+    // 获取
+  },
+  computed: {
+    // 获取当前月份显示日历,共42天
+    visibleCalendar() {
+      // 获取今天的年月日
+      const today = new Date();
+      today.setHours(0);
+      today.setMinutes(0);
+      today.setSeconds(0);
+      today.setMilliseconds(0);
+
+      const calendarArr = [];
+      // 获取当前月份第一天
+      const currentFirstDay = new Date(this.time.year, this.time.month, 1);
+      // 获取第一天是周几
+      const weekDay = currentFirstDay.getDay();
+      // 用当前月份第一天减去周几前面几天，就是看见的日历的第一天
+      const startDay = currentFirstDay - (weekDay - 1) * 24 * 3600 * 1000;
+      // 我们统一用42天来显示当前显示日历
+      for (let i = 0; i < 42; i++) {
+        const date = new Date(startDay + i * 24 * 3600 * 1000);
+        calendarArr.push({
+          date: new Date(startDay + i * 24 * 3600 * 1000),
+          year: date.getFullYear(),
+          month: date.getMonth(),
+          day: date.getDate(),
+          // 是否在当月
+          thisMonth:
+            date.getFullYear() === today.getFullYear() &&
+            date.getMonth() === today.getMonth()
+              ? "thisMonth"
+              : "",
+          // 是否是今天
+          isToday:
+            date.getFullYear() === today.getFullYear() &&
+            date.getMonth() === today.getMonth() &&
+            date.getDate() === today.getDate()
+              ? "isToday"
+              : "",
+          // 是否在今天之后
+          afterToday: date.getTime() >= today.getTime() ? "afterToday" : "",
+        });
+      }
+      return calendarArr;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.top-con {
+  display: flex;
+  align-items: center;
+  .top {
+    width: 14.285%;
+    background-color: rgb(242, 242, 242);
+    padding: 10px 0;
+    margin: 5px;
+    text-align: center;
+  }
+}
+.date-con {
+  display: flex;
+  flex-wrap: wrap;
+  .date {
+    width: 14.285%;
+    text-align: center;
+    padding: 5px;
+    .morning {
+      padding: 10px 0;
+      background-color: rgba(220, 245, 253, 0.3);
+    }
+    .evening {
+      padding: 10px 0;
+      background-color: rgba(220, 244, 209, 0.3);
+    }
+  }
+  .thisMonth {
+    .morning {
+      background-color: rgb(220, 245, 253);
+    }
+    .evening {
+      background-color: rgb(220, 244, 209);
+    }
+  }
+  .isToday {
+    font-weight: 700;
+    .morning {
+      background-color: rgb(169, 225, 243);
+    }
+    .evening {
+      background-color: rgb(193, 233, 175);
+    }
+  }
+}
+.tip-con {
+  margin-top: 51px;
+  .tip {
+    margin-top: 21px;
+    width: 100%;
+  }
+}
+</style>
diff --git a/src/views/modules/communityParty/calendar/index.vue b/src/views/modules/communityParty/calendar/index.vue
new file mode 100644
index 000000000..61ec69266
--- /dev/null
+++ b/src/views/modules/communityParty/calendar/index.vue
@@ -0,0 +1,45 @@
+<template>
+  <div class="g-cnt">
+    <calendar></calendar>
+  </div>
+</template>
+
+<script>
+import { requestPost, requestGet } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import calendar from "./cpts/calendar";
+
+export default {
+  name: "party-calendar",
+  components: {
+    calendar,
+  },
+  data() {
+    return {};
+  },
+  async mounted() {
+    // await this.getPartyOggList()
+  },
+  methods: {
+    async getPartyOggList() {
+      const url = "/resi/partymember/icPartyOrg/getSearchTreelist";
+      let params = {
+        agencyId: this.$store.state.user.agencyId,
+      };
+      const { data, code, msg } = await requestGet(url, params);
+      console.log("data-orgparty----o", data);
+      if (code === 0) {
+        this.partyOrgList = this.deepArrTOnull(data);
+      } else {
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.g-cnt {
+  background-color: #ffffff;
+  padding: 20px;
+}
+</style>