From a3d43708e47db4b77ebf1437f7f9cebdf58f3786 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Thu, 11 Nov 2021 15:22:18 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=9F=A5=E6=89=BE?=
 =?UTF-8?q?=E6=A8=A1=E6=80=81=E6=A1=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/listTracking.vue                     | 163 +++++++++++++++++-
 1 file changed, 162 insertions(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
index 55774d81e..6bdaeff58 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
@@ -148,7 +148,7 @@
                 clearable
             />
 <!--            :disabled="this.addOrEdit !== 'add'"-->
-            <el-button type="primary" size="mini" @click="">手动查找</el-button>
+            <el-button type="primary" size="mini" @click="handleSelect">手动查找</el-button>
           </el-form-item>
           <el-form-item
               label="标准名称/政策名称"
@@ -267,6 +267,116 @@
         >
       </div>
     </el-drawer>
+    <el-drawer
+        :title="handleSelectTitle"
+        :wrapperClosable="false"
+        :visible.sync="selectModal"
+        size="1250px"
+        :styles="styles"
+        :close="cancelSelectModel">
+      <div class="demo-drawer-content">
+        <el-form
+            class="label-input-form"
+            style="margin-top: 15px;"
+            label-width="130px"
+            :modal="handleSelectForm"
+            :inline="true"
+        >
+          <el-form-item label="标准/政策来源" class="search-item">
+            <el-select
+                v-model="handleSelectForm.dataSource"
+                :popper-append-to-body="false"
+                placeholder="请选择标准/政策来源">
+              <el-option value="INLAND_STAND" label="国内标准库"></el-option>
+              <el-option value="FOREIGN_STAND" label="海外标准库"></el-option>
+              <el-option value="FOREIGN_LAWS" label="国内外政策库"></el-option>
+              <el-option value="BUSINESS_STAND" label="企业标准库"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="标准编号/政策编号" class="search-item">
+            <el-input
+                v-model="handleSelectForm.lawNumber"
+                placeholder="根据标准编号/政策编号查找"
+                clearable
+                :maxlength="100"></el-input>
+          </el-form-item>
+          <el-form-item label="标准名称/政策名称" class="search-item">
+            <el-input
+                v-model="handleSelectForm.lawName"
+                placeholder="根据标准名称/政策名称查找"
+                clearable
+                :maxlength="100"></el-input>
+          </el-form-item>
+          <el-form-item class="search-item btn-box">
+            <el-button
+                icon="el-icon-search"
+                type="primary"
+                class="common-button-primary"
+                round
+                @click="searchLawBtn">
+            </el-button>
+          </el-form-item>
+          <el-form-item class="search-item btn-box">
+            <el-button
+                class="common-button-default"
+                icon="el-icon-refresh-left"
+                round
+                type="default"
+                @click="clearLawBtn"></el-button>
+          </el-form-item>
+        </el-form>
+        <el-table
+            ref="selections"
+            tooltip-effect="dark"
+            style="width: 100%;overflow-y: auto;overflow-x: hidden;"
+            border
+            :height="300"
+            :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          fontWeight: 'bold', height: '48px'}"
+            @selection-change="handleSelectTableChange"
+        >
+          <el-table-column
+              type="selection"
+              width="55"
+              align="center">
+          </el-table-column>
+          <el-table-column
+              width="350"
+              align="center"
+              label="标准编号/政策编号">
+            <template slot-scope="scope">
+              <a v-if="scope.row.standYear" class="table-jump">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+              <a v-else class="table-jump">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+              prop="lawName"
+              align="center"
+              label="标准名称/政策名称">
+          </el-table-column>
+          <el-table-column
+              prop="textStatus"
+              align="center"
+              label="标准状态"
+              width="350">
+            <template slot-scope="scope">
+              <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <!--分页-->
+        <pagination
+            style="position: relative;"
+            :page="handleSelectPage"
+            :total="handleSelectTotal"
+            @pageChange="handleSelectPageChange"
+            @pageSizeChange="handleSelectPageSizeChange"></pagination>
+        <div slot="footer" class="demo-drawer-footer">
+          <el-button class="common-button-default" round icon="el-icon-close" @click="selectModal = false">取消</el-button>
+          <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="handleSelectConfirm">确定</el-button>
+        </div>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
@@ -275,6 +385,26 @@ export default {
   name: "listTracking",
   data () {
     return {
+      handleSelectPage: 1,
+      handleSelectTotal: 0,
+      textStatusMap: {}, // 文本状态id与name对应
+      handleSelectTableList:[],
+      handleSelectForm: {
+        dataSource: '',
+        lawNumber: '', // 标准编号/政策编号
+        lawName: '', // 标准名称/政策名称
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        total: 0,
+        standType: 'INLAND',
+        quoteIdList: '',
+        validFlag: '0',
+        menuId: 'nomenu'
+      },
+      //手动查找模态框的标题
+      handleSelectTitle: '手动查找',
+      //手动查找的模态框
+      selectModal: false,
       submitLoading: false,
       attrTypeOptions: [
         { label: '下拉选项', value: 'SEL_OPTION' },
@@ -398,6 +528,20 @@ export default {
     }
   },
   methods: {
+    handleSelectPageChange(page){
+
+    },
+    handleSelectPageSizeChange(pageSize){
+
+    },
+    // 手动查找 table选择事件
+    handleSelectTableChange (row) {
+      this.handleSelectTableList = row
+    },
+    //点击手动查找按钮
+    handleSelect() {
+      this.selectModal = true
+    },
     saveInfo () {
       this.$refs['attributeEO'].validate((valid) => {
         if (valid) {
@@ -448,6 +592,20 @@ export default {
           }
       })
     },
+    cancelSelectModel () {
+      // this.$nextTick(() => {
+      //   this.$refs['attributeEO'].resetFields()
+      //   this.attributeEO = {
+      //     id: '',
+      //     lawId: '',
+      //     lawName: '',
+      //     productType: '',
+      //     implTime: '',
+      //     implRequire: '',
+      //   }
+      // })
+      this.selectModal = false
+    },
     cancelModel () {
       this.$nextTick(() => {
         this.$refs['attributeEO'].resetFields()
@@ -639,6 +797,9 @@ export default {
   height: 100%;
   display: flex;
   flex-direction: column;
+    /deep/.el-form-item__label{
+      color: #333333;
+    }
   .container {
     display: flex;
     flex-direction: column;

From 4f01fbeebc96368e6e5c13025d4e8240cd94b9b9 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Thu, 11 Nov 2021 15:54:28 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E6=97=A5=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/unqualProcess.js                      |  10 +-
 src/assets/images/meeting.png                 | Bin 0 -> 8962 bytes
 src/components/navMenu/index.vue              |   5 +
 src/pages/localTool/standCalendar/index.vue   | 350 ++++++++++++++++++
 .../pages/creatProcess/bzhHy-ch/step3.vue     |   2 +
 .../pages/creatProcess/bzhHy-ch/step4.vue     |   1 +
 src/router/index.js                           |  11 +
 7 files changed, 378 insertions(+), 1 deletion(-)
 create mode 100644 src/assets/images/meeting.png
 create mode 100644 src/pages/localTool/standCalendar/index.vue

diff --git a/src/api/unqualProcess.js b/src/api/unqualProcess.js
index e736a6638..c3f3fc7b0 100644
--- a/src/api/unqualProcess.js
+++ b/src/api/unqualProcess.js
@@ -38,7 +38,7 @@ export function StandardsInfoPage (data) {
     params: data
   })
 }
-
+// 车型库清单的下拉列表
 export function solostarData (data) {
   return axios({
     url: 'api/sarStandProjectLibrary/solostar',
@@ -46,3 +46,11 @@ export function solostarData (data) {
     params: data
   })
 }
+// 活动日历查询接口
+export function meetingByMonth (params) {
+  return axios({
+    url: 'api/sapMeetInfo/getMeetingsByMonthType',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/assets/images/meeting.png b/src/assets/images/meeting.png
new file mode 100644
index 0000000000000000000000000000000000000000..c03a6bea1a990267eef70e49f65a9e376015c4f7
GIT binary patch
literal 8962
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
F{{f0W^6&rv

literal 0
HcmV?d00001

diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 1aba19d67..2dbb1d6ed 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -244,6 +244,11 @@ export default {
               path: '/standContrast',
               menuId: '1d83a6278f781419f628e9f5560f5c86'
             },
+            {
+              title: '标准化活动日历',
+              path: '/standCalendar',
+              menuId: '0ea66e3dd36873082b6851f69e92c8be'
+            },
             // {
             //   title: '标准比对库',
             //   path: '/standardComparisonLibrary',
diff --git a/src/pages/localTool/standCalendar/index.vue b/src/pages/localTool/standCalendar/index.vue
new file mode 100644
index 000000000..d92793959
--- /dev/null
+++ b/src/pages/localTool/standCalendar/index.vue
@@ -0,0 +1,350 @@
+<!--标准化活动日历-->
+<template>
+  <div class="standCalendar">
+    <el-row :gutter="24">
+      <el-col :span="12">
+        <el-card>
+          <div class="header">
+            <div class="date-picker" style="display: inline">
+              <span class="item">
+		            <el-select v-model="formData.year" @change="handleDate">
+                  <el-option v-for="item in year" :value="item">{{ item }}</el-option>
+                </el-select>
+              </span>
+              <span class="item">
+		            <el-select v-model="formData.month" @change="handleDate">
+			             <el-option v-for="item in month" :value="item">{{ item }}</el-option>
+                </el-select>
+	           </span>
+            </div>
+            <div style="float: right;display: inline;height: 30px;">
+              <el-button size="mini" @click="today">今天</el-button>
+            </div>
+          </div>
+          <el-calendar v-model="value">
+            <template slot="dateCell" slot-scope="{date, data}">
+              <div @click="calendarOnClick(data)">
+                <div class="calendar-day" style="text-align: center;">
+                  <span class="everyDay" style="line-height: 40px">
+                    {{ data.day.split('-').slice(2).join('-') }}
+                    <br/>
+                    <!-- 获取当前登录人的会议并表示出来-->
+                    <span v-for="item in dealMyDate(data.day)" :value="item.fillPeopleId">
+                      <el-tag class="tagOne"/>
+                      <el-tag v-if="userId === item.fillPeopleId" class="tagTwo"/>
+                    </span>
+                  </span>
+                </div>
+              </div>
+            </template>
+          </el-calendar>
+        </el-card>
+      </el-col>
+      <el-col :span="12">
+        <el-card style="height: 655px;overflow: auto">
+          <div class="title_time">{{ timeDay.day || nowDate }}</div>
+          <el-card class="card_info_empty " v-if="todayData.length === 0">
+            <div style="text-align: center">
+              <img  :src="require('@/assets/images/meeting.png')">
+            </div>
+            <div style="text-align: center;font-weight: bold;color: #99999a">暂无会议</div>
+          </el-card>
+          <el-card class="card_info" v-else v-for="item in todayData" :value="item">
+            <span v-for="res in item.attend" :key="res.fillPeopleId">
+               <el-tag v-if="userId === res.fillPeopleId" type="success" size="mini">会议</el-tag>
+              <el-tag v-else type="warning" size="mini">会议</el-tag>
+            </span>
+            <i style="margin-left: 10px;font-weight: bold">{{ item.title }}</i>
+            <div class="content_text">
+              <span>会议时间 : {{ $moment(item.date).format('YYYY-MM-DD HH:mm') }} </span>
+            </div>
+            <div class="content_text">
+              <span>参与人 : {{ item.partPeople.join('、') }} </span>
+            </div>
+            <div class="content_text2">
+              <span>会议内容 : {{ item.content }}</span>
+            </div>
+            <div class="content_text">
+                <span>会议附件 :
+                 <span v-if="item.files.length === 0">{{ '-' }}</span>
+                  <span v-for="res in item.files" :key="res.id" style="color: #409EFF;" @click="previews(res.id)">
+                    {{ res.name }}
+                   </span>
+                </span>
+            </div>
+          </el-card>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { meetingByMonth } from '@/api/unqualProcess.js'
+
+export default {
+  name: "calendar",
+  data() {
+    return {
+      userId: this.$store.getters.userInfo.userId,
+      year: [],
+      month: [],
+      formData: {
+        year: '',
+        month: '',
+      },
+      //点击日历获取当天会议数据
+      todayData: [],
+      // 全部会议数据
+      resDate: [],
+      // 点击日历获取暂时储存数组
+      timeDay: {},
+
+      // 上次点击的日期
+      lastYear: '',
+      lastMonth: '',
+      // 日历当前时间
+      value: new Date(),
+      // 当前时间
+      nowDate: '',
+    }
+  },
+  mounted() {
+    /** 获取当前日期*/
+    let yy = new Date().getFullYear();
+    let mm = new Date().getMonth() + 1;
+    let dd = new Date().getDate();
+    this.nowDate = yy + '-' + mm + '-' + dd
+    this.formData.year = yy + '年'
+    this.formData.month = mm + '月'
+    this.lastYear = yy
+    this.lastMonth = mm
+    this.getMonthData()
+    this.init()
+
+  },
+  methods: {
+    init() {
+      this.getYear();
+      this.getMonth();
+    },
+    getYear() {//获取年
+      let date = new Date;
+      let current_year = date.getFullYear();
+      for (let i = -2; i < 3; i++) {
+        let y = current_year - i;
+        this.year.push(y + '年');
+      }
+    },
+    getMonth() {//获取月
+      for (let i = 1; i < 13; i++) {
+        this.month.push(i + '月');
+      }
+    },
+    /** 获取当前月日历数据*/
+    getMonthData() {
+      let data = {
+        date: this.nowDate,
+        type: 1
+      }
+      meetingByMonth(data).then(res => {
+        // 对传参的数据转义
+        res.forEach(item => {
+          item.attend = JSON.parse(item.attend)
+          item.files = JSON.parse(item.files)
+          this.$set(item, 'partPeople', [])
+        })
+
+        res.forEach(item => {
+          item.attend.forEach(msgAtt => {
+            item.partPeople.push(msgAtt.fillPeople)
+          })
+        })
+        this.resDate = res
+        this.dealMyDate()
+
+        this.resDate.forEach(item=>{
+          if (item.date.slice(0,10) === this.nowDate) {
+            this.todayData.push(item)
+          }
+        })
+      })
+    },
+    /** 获取当前点击日历表格数据*/
+    calendarOnClick(val) {
+      this.todayData = []
+      this.timeDay = val
+      this.resDate.forEach(item => {
+        if (item.date.slice(0, 10) === this.timeDay.day) {
+          this.todayData.push(item)
+        }
+      })
+      // 点击日历头部日期变化
+      this.formData.year = val.day.slice(0, 4) + '年'
+      if (val.day.slice(5, 6) === '0') {
+        this.formData.month = val.day.slice(6, 7) + '月'
+      } else {
+        this.formData.month = val.day.slice(5, 7) + '月'
+      }
+    },
+    /** 点击今天按钮 */
+    today() {
+      this.value = new Date()
+      let yy = new Date().getFullYear();
+      let mm = new Date().getMonth() + 1;
+      let dd = new Date().getDate();
+      this.formData.year = yy + '年'
+      this.formData.month = mm + '月'
+      this.nowDate = yy + '-' + mm + '-' + dd
+      this.getMonthData()
+    },
+    /** 获取所有会议的时间及内容
+     * 并在日历上显示出标记*/
+    dealMyDate(v) {
+      let len = this.resDate.length
+      let res = ''
+      for (let i = 0; i < len; i++) {
+        if (this.resDate[i].date.slice(0, 10) === v) {
+          res = this.resDate[i].attend
+          break
+        }
+      }
+      return res
+    },
+    // 头部时间改变事件
+    handleDate() {
+      let selYear = this.formData.year.slice(0, 4)
+      let selMonth = ''
+      if (this.formData.month.slice(-3, -2) === '') {
+        selMonth = this.formData.month.slice(0, 1)
+      } else {
+        selMonth = this.formData.month.slice(0, 2)
+      }
+      let birthday = selYear + '-' + this.padding0(selMonth, 2) + '-' + '01'
+      this.nowDate = birthday
+      this.getMonthData()
+      // 根据头部日期调整，日历变化
+      let yearNum = ''
+      let monthNum = ''
+      if (this.lastYear !== selYear) {
+        yearNum = this.lastYear - selYear
+      } else {
+        yearNum = 0
+      }
+      if (this.lastMonth !== selMonth) {
+        monthNum = this.lastMonth - selMonth
+      } else {
+        monthNum = 0
+      }
+      this.lastYear = selYear
+      this.lastMonth = selMonth
+      this.value = new Date(this.value.setMonth(this.value.getMonth() - monthNum))
+      this.value = new Date(this.value.setFullYear(this.value.getFullYear() - yearNum))
+    },
+    //数字前填充0方法
+    padding0(num, length) {
+      for (let len = (num + '').length; len < length; len = num.length) {
+        num = '0' + num
+      }
+      return num
+    },
+    /** 点击对应附件进行下载*/
+    previews(val) {
+      let attId = val
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
+    },
+    aaa(val) {
+      console.log(val)
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/mixins';
+@import '~@/assets/styles/style';
+
+.standCalendar {
+  .date-picker {
+    .item {
+      /deep/ .el-input {
+        width: 88px;
+      }
+
+      /deep/ .el-input__icon {
+        line-height: 30px;
+      }
+
+      /deep/ .el-input--suffix .el-input__inner {
+        height: 30px;
+        padding-right: 0;
+      }
+    }
+  }
+
+  /deep/ .el-calendar__header {
+    display: none;
+  }
+
+  /deep/ .el-calendar-table thead th {
+    text-align: center;
+  }
+
+  .tagOne {
+    height: 15px;
+    width: 15px;
+    padding: 0;
+    background-color: #e6a23c
+  }
+
+  .tagTwo {
+    height: 15px;
+    width: 15px;
+    padding: 0;
+    background-color: #67c23a
+  }
+
+  .title_time {
+    font-weight: bold;
+  }
+
+  /deep/ .el-card__body {
+    padding: 10px;
+  }
+
+  .card_info_empty {
+    height: 500px;
+    margin-top: 10px;
+  }
+  .card_info {
+    height: 190px;
+    margin-top: 10px;
+
+    .content_text {
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      word-break: break-all;
+      line-height: normal;
+      margin-top: 10px;
+      font-size: 5px;
+    }
+
+    .content_text2 {
+      text-overflow: ellipsis;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 4;
+      line-clamp: 4;
+      -webkit-box-orient: vertical;
+      line-height: normal;
+      margin-top: 10px;
+      font-size: 5px;
+    }
+  }
+}
+
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
index 3ccdce6f2..51b783f53 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
@@ -259,6 +259,7 @@ export default {
       active: '1',
 
       ch_pageData: {
+        fillPeopleId: '',
         fillPeople: '',
         fillUnit: '',
         fillDept: '',
@@ -326,6 +327,7 @@ export default {
     getFormFieldList (item) {
       this.$nextTick(() => {
         this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
+        this.ch_pageData.fillPeopleId = this.$store.getters.userInfo.userId
         this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName
         this.roleForm = JSON.parse(JSON.stringify(item)).roleList
         // this.rh_pageData.comityFileNum = this.fileTextList
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue
index 0004af53d..f0d0bf333 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue
@@ -276,6 +276,7 @@ export default {
       this.$nextTick(() => {
         this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
         this.ch_pageData.myPartRole = [{
+          fillPeopleId: this.ch_pageData.fillPeopleId,
           fillPeople: this.ch_pageData.fillPeople,
           fillUnit: this.ch_pageData.fillUnit,
           fillDept: this.ch_pageData.fillDept,
diff --git a/src/router/index.js b/src/router/index.js
index ddfb259ef..a0c80586b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1589,6 +1589,17 @@ const routes = [
           menuId: 'B8UYM3WFCMGXR2BPF9JA'
         }
       },
+      {
+        path: '/standCalendar',
+        name: 'calendar',
+        component: () =>
+          import('@/pages/localTool/standCalendar'),
+        meta: {
+          requireAuth: false,
+          title: '标准化活动日历',
+          menuId: ''
+        }
+      },
       {
         path: '/itemSplitInfo',
         name: 'ItemSplitInfo',

From 8e45feb99cc23423b266a25b72861c8fe8d14bc2 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Thu, 11 Nov 2021 15:59:18 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E6=97=A5=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/localTool/standCalendar/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/localTool/standCalendar/index.vue b/src/pages/localTool/standCalendar/index.vue
index d92793959..75f0b1cd4 100644
--- a/src/pages/localTool/standCalendar/index.vue
+++ b/src/pages/localTool/standCalendar/index.vue
@@ -162,7 +162,7 @@ export default {
         })
         this.resDate = res
         this.dealMyDate()
-
+        this.todayData = []
         this.resDate.forEach(item=>{
           if (item.date.slice(0,10) === this.nowDate) {
             this.todayData.push(item)

From e04cb83cb82e81fd6e970dc4428402c07cb7f5a4 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Thu, 11 Nov 2021 16:10:09 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E6=97=A5=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/localTool/standCalendar/index.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/pages/localTool/standCalendar/index.vue b/src/pages/localTool/standCalendar/index.vue
index 75f0b1cd4..9aef279f1 100644
--- a/src/pages/localTool/standCalendar/index.vue
+++ b/src/pages/localTool/standCalendar/index.vue
@@ -66,7 +66,7 @@
             </div>
             <div class="content_text">
                 <span>会议附件 :
-                 <span v-if="item.files.length === 0">{{ '-' }}</span>
+                 <span v-if="item.files.length === '0'">{{ '-' }}</span>
                   <span v-for="res in item.files" :key="res.id" style="color: #409EFF;" @click="previews(res.id)">
                     {{ res.name }}
                    </span>
@@ -254,9 +254,6 @@ export default {
       if (attId != null && attId !== "") {
         window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
       }
-    },
-    aaa(val) {
-      console.log(val)
     }
   }
 }

From 7976e394766f14bd9bf44b172be87b55dbd78fb8 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Thu, 11 Nov 2021 16:18:37 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E6=97=A5=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/localTool/standCalendar/index.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/pages/localTool/standCalendar/index.vue b/src/pages/localTool/standCalendar/index.vue
index 9aef279f1..0973a7909 100644
--- a/src/pages/localTool/standCalendar/index.vue
+++ b/src/pages/localTool/standCalendar/index.vue
@@ -281,6 +281,9 @@ export default {
     }
   }
 
+  /deep/.el-calendar-table td.is-selected {
+    background-color: #f9e3e3;
+  }
   /deep/ .el-calendar__header {
     display: none;
   }

From 16a01b7d278a7eb60b56867be0da8abd25418da5 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Thu, 11 Nov 2021 16:49:38 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E6=97=A5=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/localTool/standCalendar/index.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/localTool/standCalendar/index.vue b/src/pages/localTool/standCalendar/index.vue
index 0973a7909..aa0bb6923 100644
--- a/src/pages/localTool/standCalendar/index.vue
+++ b/src/pages/localTool/standCalendar/index.vue
@@ -68,7 +68,7 @@
                 <span>会议附件 :
                  <span v-if="item.files.length === '0'">{{ '-' }}</span>
                   <span v-for="res in item.files" :key="res.id" style="color: #409EFF;" @click="previews(res.id)">
-                    {{ res.name }}
+                    {{ res.name }} {{ ';'}}
                    </span>
                 </span>
             </div>
@@ -114,6 +114,9 @@ export default {
     let yy = new Date().getFullYear();
     let mm = new Date().getMonth() + 1;
     let dd = new Date().getDate();
+    if (mm<10) {
+      mm = this.padding0(mm, 2)
+    }
     this.nowDate = yy + '-' + mm + '-' + dd
     this.formData.year = yy + '年'
     this.formData.month = mm + '月'

From fee582a82e7f3138ba14b81ca8511d6c40f65ec0 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Thu, 11 Nov 2021 16:56:56 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E6=97=A5=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/localTool/standCalendar/index.vue | 52 +++++++++++----------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/src/pages/localTool/standCalendar/index.vue b/src/pages/localTool/standCalendar/index.vue
index aa0bb6923..2f5644a44 100644
--- a/src/pages/localTool/standCalendar/index.vue
+++ b/src/pages/localTool/standCalendar/index.vue
@@ -151,37 +151,41 @@ export default {
         type: 1
       }
       meetingByMonth(data).then(res => {
-        // 对传参的数据转义
-        res.forEach(item => {
-          item.attend = JSON.parse(item.attend)
-          item.files = JSON.parse(item.files)
-          this.$set(item, 'partPeople', [])
-        })
-
-        res.forEach(item => {
-          item.attend.forEach(msgAtt => {
-            item.partPeople.push(msgAtt.fillPeople)
+        if (res.length !== 0) {
+          // 对传参的数据转义
+          res.forEach(item => {
+            item.attend = JSON.parse(item.attend)
+            item.files = JSON.parse(item.files)
+            this.$set(item, 'partPeople', [])
           })
-        })
-        this.resDate = res
-        this.dealMyDate()
-        this.todayData = []
-        this.resDate.forEach(item=>{
-          if (item.date.slice(0,10) === this.nowDate) {
-            this.todayData.push(item)
-          }
-        })
+
+          res.forEach(item => {
+            item.attend.forEach(msgAtt => {
+              item.partPeople.push(msgAtt.fillPeople)
+            })
+          })
+          this.resDate = res
+          this.dealMyDate()
+          this.todayData = []
+          this.resDate.forEach(item=>{
+            if (item.date.slice(0,10) === this.nowDate) {
+              this.todayData.push(item)
+            }
+          })
+        }
       })
     },
     /** 获取当前点击日历表格数据*/
     calendarOnClick(val) {
       this.todayData = []
       this.timeDay = val
-      this.resDate.forEach(item => {
-        if (item.date.slice(0, 10) === this.timeDay.day) {
-          this.todayData.push(item)
-        }
-      })
+      if (this.resDate.length !== 0) {
+        this.resDate.forEach(item => {
+          if (item.date.slice(0, 10) === this.timeDay.day) {
+            this.todayData.push(item)
+          }
+        })
+      }
       // 点击日历头部日期变化
       this.formData.year = val.day.slice(0, 4) + '年'
       if (val.day.slice(5, 6) === '0') {