Merge remote-tracking branch 'origin/develop' into develop

public/static/pdf/web/viewer.html

@@ -33,6 +33,9 @@ See https://github.com/adobe-type-tools/cmap-resources
     <link rel="stylesheet" href="../../zTree/css/demo.css" type="text/css">
     <link rel="stylesheet" href="../../zTree/css/zTreeStyle/zTreeStyle.css" type="text/css">
     <style>
+      body{
+        font: 56px Arial, Helvetica, simsun, sans-serif;
+      }
       /*.pdfViewer .page{*/
       /*  margin: 1px auto -8px 232px;*/
       /*}*/

public/static/pdf/web/viewer.js

@@ -6630,11 +6630,11 @@ var PDFPageView = function () {
         var coverWorkNum = "";
         var msg = ""
         if(userInfo != null){
-          coverUserName = userInfo.uName + ',';
+          coverUserName = userInfo.uName;
           if (userInfo.workNum != null) {
             coverWorkNum = userInfo.workNum + ',';
           }
-          msg = coverUserName + coverWorkNum;
+          msg = coverUserName;
         }
         var myDate = new Date();
         var mytime=myDate.toLocaleString();
@@ -6646,20 +6646,20 @@ var PDFPageView = function () {
         }
         //cover.innerText = userInfo.uName + "," + userInfo.workNum;
         var defaultSettings = {
-          watermark_txt: msg + mytime,
+          watermark_txt: msg,
           watermark_x: 0,//水印起始位置x轴坐标
           watermark_y: 0,//水印起始位置Y轴坐标
           watermark_rows: 10,//水印行数
           watermark_cols: 10,//水印列数
           watermark_x_space: 100,//水印x轴间隔
-          watermark_y_space: 180,//水印y轴间隔
+          watermark_y_space: 200,//水印y轴间隔
           watermark_color: 'rgba(192, 192, 192)',//水印字体颜色
-          watermark_alpha: 0.5,//水印透明度
+          watermark_alpha: 0.4,//水印透明度
-          watermark_fontsize: '25px',//水印字体大小
+          watermark_fontsize: '56px',//水印字体大小
           watermark_font: '微软雅黑',//水印字体
           watermark_width: 120,//水印宽度
           watermark_height: 80,//水印长度
-          watermark_angle: 60//水印倾斜度数
+          watermark_angle: 40//水印倾斜度数
         };
         var oTemp = document.createDocumentFragment();
 

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
+  })
+}

src/assets/styles/navMenu.less

@@ -73,14 +73,14 @@
       &.is-active {
         background: rgba(255, 255, 255, 0.1) !important;
       }
-      &:first-child {
+      //&:first-child {
-        border-top-left-radius: 15px;
+      //  border-top-left-radius: 15px;
-        border-top-right-radius: 15px;
+      //  border-top-right-radius: 15px;
-      }
+      //}
-      &:last-child {
+      //&:last-child {
-        border-bottom-left-radius: 15px;
+      //  border-bottom-left-radius: 15px;
-        border-bottom-right-radius: 15px;
+      //  border-bottom-right-radius: 15px;
-      }
+      //}
     }
   }
 }

src/components/navMenu/index.vue

@@ -68,8 +68,8 @@
     </div>
     <div class="tree-collapse" @click="handleToggleSideBar" :class="{ 'tree-close': isCollapse }">
       <!--切换折叠样式-->
-      <i class="el-icon-arrow-left" v-if="isCollapse === false"></i>
+      <i class="el-icon-arrow-left" style="font-weight: 600; font-size: 16px;" v-if="isCollapse === false"></i>
-      <i class="el-icon-arrow-right" v-if="isCollapse === true"></i>
+      <i class="el-icon-arrow-right" style="font-weight: 600; font-size: 16px;" v-if="isCollapse === true"></i>
     </div>
   </div>
 </template>
@@ -244,6 +244,11 @@ export default {
               path: '/standContrast',
               menuId: '1d83a6278f781419f628e9f5560f5c86'
             },
+            {
+              title: '标准化活动日历',
+              path: '/standCalendar',
+              menuId: '0ea66e3dd36873082b6851f69e92c8be'
+            },
             // {
             //   title: '标准比对库',
             //   path: '/standardComparisonLibrary',
@@ -528,14 +533,14 @@ export default {
     display: none;
   }
   &:not(.is-collapse) {
-    width: 212px;
+    width: 180px;
     background: #0068B7;
     background-size: 100% 100%;
     .logo {
       padding: 10px;
       text-align: left;
       img {
-        width: 160px;
+        width: 150px;
         height: 61px;
         margin-top: -7px;
       }
@@ -569,7 +574,7 @@ export default {
   }
   /deep/:not(.is-collapse) .el-menu-item.is-active{
     background: #fff !important;
-    color: #4091FF !important;
+    color: #0068B7 !important;
   }
 }
 .has-no-read{
@@ -592,7 +597,7 @@ export default {
 /*  }*/
 /*}*/
 .is-active /deep/.shangqi-icon {
-  color: #4091FF;
+  color: #0068B7;
 }
 /deep/.el-submenu__title i {
   color: #fff;
@@ -601,7 +606,7 @@ export default {
   color: #fff;
 }
 .nav-menu{
-  background-color: #4091FF;
+  background-color: #0068B7;
   scrollbar-width: none;
   -ms-overflow-style: none; /* IE 10+ */
 }
@@ -690,6 +695,10 @@ export default {
   }
   .el-menu-item {
     padding-left: 29px !important;
+    font-size: 15px;
+    font-weight: normal;
+    height: 40px;
+    line-height: 40px;
     div {
     }
   }
@@ -712,4 +721,5 @@ export default {
     }
   }
 }
+
 </style>

src/pages/config/pages/linkManage/index.vue

@@ -267,7 +267,7 @@
                 this.$refs['sarStandardsInfoForm'].validate((valid) => {
                     if (valid) {
                         if (this.type === 1) {
-                            this.$http.postData('/sarUrl/tsUrl/add', {
+                            this.$http.postData('sarUrl/tsUrl/add', {
                                 ...this.sarStandardsInfoEO,
                             }, {
                                 _this: this,

src/pages/localTool/standCalendar/index.vue

@@ -0,0 +1,356 @@
+<!--标准化活动日历-->
+<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>
+          <span 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>
+          </span>
+          <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();
+    if (mm<10) {
+      mm = this.padding0(mm, 2)
+    }
+    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 => {
+        if (res.length !== 0) {
+          // 对传参的数据转义
+          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.todayData = []
+          this.resDate.forEach(item=>{
+            if (item.date.slice(0,10) === this.nowDate) {
+              this.todayData.push(item)
+            }
+          })
+        }
+      })
+    },
+    /** 获取当前点击日历表格数据*/
+    calendarOnClick(val) {
+      this.todayData = []
+      this.timeDay = val
+      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') {
+        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;
+      }
+    }
+  }
+}
+</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-table td.is-selected {
+    background-color: #f9e3e3;
+  }
+  /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 {
+    margin-top: 50px;
+  }
+  .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>

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

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,

src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue

@@ -472,10 +472,13 @@ export default {
     },
     //提交事件
     handleSubmit() {
+      let dataListChildren = []
+      this.dataList.forEach(item => {
+        dataListChildren.push(item.children)
+      })
       this.isSubmit = true;
-      console.log(this.dataList);
       this.listForm.commentText = this.commentText;
-      this.listForm.children = this.dataList[0].children
+      this.listForm.children = dataListChildren
       this.listForm.dataList = this.dataList
       const json = JSON.stringify(this.listForm);
       this.$http.post("lawss/activiti/completeTask", {

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;

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -1,8 +1,8 @@
 <!-- 标准法规库 - 国内标准法规-->
 <template>
   <div id="domesticStandardDatabase" :class="{ 'tree-close': sideClose }" class="demo-spin-article v-class">
-    <div class="tree-content" :class="{ 'tree-closed': sideClose }">
+    <div id="left" class="tree-content" :class="{ 'tree-closed': sideClose }">
-      <div style="width: 100%">
+      <div style="width: 100%" class="left">
         <el-input
           placeholder="输入树状图体系"
           v-model="filterText">
@@ -61,7 +61,8 @@
         <i class="el-icon-arrow-right" v-if="sideClose === true"></i>
       </div>
     </div>
-    <div class="tree-right">
+    <div id="resize"></div>
+    <div id="right" class="tree-right">
       <!--高级查询 ------------按钮-->
       <table-tools-bar
         @search="getDomesticStandardTableBtn(sarStandardsSearch)"
@@ -186,12 +187,12 @@
             <el-table-column
                 v-if="isPermission('b17f1d035219c47344032e261342d87d,c09dc12531085e30e39bbdc6cb6116ba,5aedea192a77b14c364f19bdcee3513a')>0"
               type="selection"
-              width="55"
+              min-width="5%"
               align="center">
             </el-table-column>
             <el-table-column
               label="标准号"
-              width="130"
+              min-width="15%"
             >
               <template slot-scope="scope">
                 <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
@@ -211,7 +212,7 @@
               show-overflow-tooltip
               prop="standName"
               label="标准名称"
-              width="350"
+              min-width="45%"
             >
               <template slot-scope="scope">
                 <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
@@ -221,7 +222,7 @@
             <el-table-column
               prop="issueTime"
               sortable="custom"
-              width="91px"
+              min-width="13%"
               label="发布日期">
               <template slot-scope="scope">
                 <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
@@ -231,7 +232,7 @@
             <el-table-column
               prop="SSRQ"
               sortable="custom"
-              width="91px"
+              min-width="13%"
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
@@ -244,7 +245,7 @@
             <el-table-column
               prop="XCXSSRQ"
               sortable="custom"
-              width="91px"
+              min-width="13%"
               label="新车型实施日期">
               <template slot-scope="scope">
                 <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
@@ -254,7 +255,7 @@
             <el-table-column
               prop="ZCCSSRQ"
               sortable="custom"
-              width="91px"
+              min-width="13%"
               label="在产车实施日期">
               <template slot-scope="scope">
                 <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
@@ -264,7 +265,7 @@
             <el-table-column
               prop="textStatus"
               sortable="custom"
-              width="75px"
+              min-width="10%"
               label="文本状态">
               <!--              <template slot="header" slot-scope="scope">-->
               <!--                <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
@@ -278,7 +279,7 @@
                 <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
-            <el-table-column v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681')>0" label="操作" align="center" width="75">
+            <el-table-column v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681')>0" label="操作" align="center" min-width="10%">
               <template slot-scope="scope">
                 <div  v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681') == 1"
                       @command="handleCommand"
@@ -2488,6 +2489,36 @@ export default {
     }
   },
   methods: {
+    // 左右拖动事件
+    dragControllerLR: function() {
+      var resize = document.getElementById("resize");
+      var left = document.getElementById("left");
+      var right = document.getElementById("right");
+      var box = document.getElementById("domesticStandardDatabase");
+      resize.onmousedown = function(e){
+        var startX = e.clientX;
+        resize.left = resize.offsetLeft;
+        document.onmousemove = function(e){
+          var endX = e.clientX;
+
+          var moveLen = resize.left + (endX - startX);
+          var maxT = box.clientWidth - resize.offsetWidth;
+          if(moveLen<150) moveLen = 150;
+          if(moveLen>maxT-150) moveLen = maxT-150;
+
+          resize.style.left = moveLen;
+          left.style.width = moveLen + "px";
+          right.style.width = (box.clientWidth - moveLen - 5) + "px";
+        }
+        document.onmouseup = function(evt){
+          document.onmousemove = null;
+          document.onmouseup = null;
+          resize.releaseCapture && resize.releaseCapture();
+        }
+        resize.setCapture && resize.setCapture();
+        return false;
+      }
+    },
     isPermission (value) {
       let hasCount = 0
       let set =new Set( value.split(","))
@@ -5104,6 +5135,7 @@ export default {
   async mounted() {
     // 进入页面后查询树形结构目录
     await this.selectMenu()
+    this.dragControllerLR()
     // 进入页面后查询标准体系树形结构目录 引用 数据字典配置
     // await this.selectStandardMenu()
     this.treeReload = true
@@ -5166,6 +5198,24 @@ export default {
 }
 </script>
 <style lang="less" scoped>
+  #left{
+    width:calc(30% - 5px);
+    height:100%;
+    float:left;
+  }
+
+  #resize{
+    width:5px;
+    height:100%;
+    cursor: w-resize;
+    float:left;
+  }
+
+  #right{
+    float:right;
+    width:70%;
+    height:100%;
+  }
   /deep/.contentTitle{
      width: 100%;
    }

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -2,7 +2,7 @@
 <template>
   <div id="EnterpriseStandardDatabase" :class="{ 'tree-close': sideClose }" class="v-class">
 <!--左侧树-->
-    <div class="tree-content" :class="{ 'tree-closed': sideClose }" >
+    <div id="left" class="tree-content" :class="{ 'tree-closed': sideClose }" >
       <div style="width: 100%">
           <el-input
                   placeholder="输入树状图体系"
@@ -61,8 +61,9 @@
         <i class="el-icon-arrow-right" v-if="sideClose === true"></i>
       </div>
     </div>
-<!--右侧内容-->
+    <div id="resize"></div>
-    <div class="tree-right v-class">
+      <!--右侧内容-->
+    <div id="right" class="tree-right v-class">
       <table-tools-bar
         @search="getBussionStandTableBtn(sarBussionessSearch)"
         @reset="clearAllSearch('sarBussionessSearch')"
@@ -284,7 +285,7 @@
           <el-table-column
               v-if="isPermission('374205ce36a859a158ca4db196d151b7,784d26f527a659eefe84d5e5a53deb96,2d41ebdb6150ba1af52fd753086d77dc')>0"
             type="selection"
-            width="55"
+              min-width="5%"
             align="center">
           </el-table-column>
 
@@ -298,7 +299,7 @@
           <el-table-column
             show-overflow-tooltip
             label="企标编号"
-            width="130"
+            min-width="15%"
           >
             <template slot-scope="scope">
 <!--                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>-->
@@ -311,7 +312,7 @@
             show-overflow-tooltip
             prop="standName"
             label="中文名称"
-            width="350"
+            min-width="35%"
           >
             <template slot-scope="scope">
               <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -323,7 +324,7 @@
             show-overflow-tooltip
             prop="standEnName"
             label="英文名称"
-            width="350"
+            min-width="35%"
           >
             <template slot-scope="scope">
               <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
@@ -335,7 +336,7 @@
             prop="issueTime"
             label="发布日期"
             sortable
-            width="91"
+            min-width="13%"
           >
             <template slot-scope="scope">
               <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
@@ -347,7 +348,7 @@
             prop="putTime"
             label="实施日期"
             sortable
-            width="91"
+            min-width="13%"
           >
             <template slot-scope="scope">
               <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
@@ -360,7 +361,7 @@
                     sortable
                     prop="standStatusShow"
                     label="文本状态"
-                    width="75"
+                    min-width="10%"
             >
 
               <template slot-scope="scope">
@@ -376,7 +377,7 @@
               </template>
           </el-table-column>
 
-            <el-table-column v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf')>0" label="操作" align="center" width="75">
+            <el-table-column v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf')>0" label="操作" align="center" min-width="10%">
               <template slot-scope="scope">
               <div  v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf') == 1"
                     @command="handleCommand"
@@ -1972,7 +1973,37 @@ export default {
     }
   },
   methods: {
-    isPermission (value) {
+      // 左右拖动事件
+      dragControllerLR: function() {
+          var resize = document.getElementById("resize");
+          var left = document.getElementById("left");
+          var right = document.getElementById("right");
+          var box = document.getElementById("EnterpriseStandardDatabase");
+          resize.onmousedown = function(e){
+              var startX = e.clientX;
+              resize.left = resize.offsetLeft;
+              document.onmousemove = function(e){
+                  var endX = e.clientX;
+
+                  var moveLen = resize.left + (endX - startX);
+                  var maxT = box.clientWidth - resize.offsetWidth;
+                  if(moveLen<150) moveLen = 150;
+                  if(moveLen>maxT-150) moveLen = maxT-150;
+
+                  resize.style.left = moveLen;
+                  left.style.width = moveLen + "px";
+                  right.style.width = (box.clientWidth - moveLen - 5) + "px";
+              }
+              document.onmouseup = function(evt){
+                  document.onmousemove = null;
+                  document.onmouseup = null;
+                  resize.releaseCapture && resize.releaseCapture();
+              }
+              resize.setCapture && resize.setCapture();
+              return false;
+          }
+      },
+      isPermission (value) {
       let hasCount = 0
       let set =new Set( value.split(","))
       let menuList = store.getters.getMenuList
@@ -4055,7 +4086,8 @@ export default {
     this.treeReload = true
     // 进入页面后查询树形结构目录
     this.selectMenuList()
-    // 查询各下拉框数据
+    this.dragControllerLR()
+      // 查询各下拉框数据
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this
     }, res => {
@@ -4107,6 +4139,24 @@ export default {
 </script>
 
 <style lang="less" scoped>
+    #left{
+        width:calc(30% - 5px);
+        height:100%;
+        float:left;
+    }
+
+    #resize{
+        width:5px;
+        height:100%;
+        cursor: w-resize;
+        float:left;
+    }
+
+    #right{
+        float:right;
+        width:70%;
+        height:100%;
+    }
     /deep/.contentTitle{
         width: 100%;
     }

src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div id="foreignRegulationsDatabase" :class="{ 'tree-close': sideClose }" class="v-class">
     <!--左侧树-->
-    <div class="tree-content" :class="{ 'tree-closed': sideClose }" >
+    <div id="left" class="tree-content" :class="{ 'tree-closed': sideClose }" >
       <div style="width: 100%">
         <el-input
                 placeholder="输入树状图体系"
@@ -59,8 +59,9 @@
         <i class="el-icon-arrow-right" v-if="sideClose === true"></i>
       </div>
     </div>
+    <div id="resize"></div>
     <!--右侧内容-->
-    <div class="tree-right v-class">
+    <div id="right" class="tree-right v-class">
       <table-tools-bar
               @search="getBussionStandTableBtn(lawsStandInfoSearch)"
               @reset="clearAllSearch('lawsStandInfoSearch')"
@@ -183,7 +184,7 @@
               v-if="isPermission('fd83032ae5f41a0021b00e93c88edbbj,fd83032ae5f41a0021b00e93c88edbbe,fd83032ae5f41a0021b00e93c88edbbd')>0"
 
               type="selection"
-                  width="55"
+              min-width="5%"
                   align="center">
           </el-table-column>
 
@@ -197,7 +198,7 @@
           <el-table-column
                   show-overflow-tooltip
                   label="政策编号"
-                  width="130"
+                  min-width="15%"
           >
             <template slot-scope="scope">
               <!--                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>-->
@@ -210,7 +211,7 @@
                   show-overflow-tooltip
                   prop="lawsName"
                   label="中文名称"
-                  width="350"
+                  min-width="45%"
           >
             <template slot-scope="scope">
               <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsName }}</a>
@@ -222,7 +223,7 @@
                   show-overflow-tooltip
                   prop="lawsEnName"
                   label="英文名称"
-                  width="350"
+                  min-width="45%"
           >
             <template slot-scope="scope">
               <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsEnName }}</a>
@@ -234,7 +235,7 @@
                   prop="issueTime"
                   label="发文日期"
                   sortable
-                  width="91"
+                  min-width="13%"
           >
             <template slot-scope="scope">
               <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
@@ -246,7 +247,7 @@
                   prop="XCXSSRQLAWS"
                   label="新车实施日期"
                   sortable
-                  width="91"
+                  min-width="13%"
           >
             <template slot-scope="scope">
               <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
@@ -259,7 +260,7 @@
                   sortable
                   prop="standStatusShow"
                   label="文本状态"
-                  width="75"
+                  min-width="10%"
           >
 
             <template slot-scope="scope">
@@ -276,7 +277,7 @@
           </el-table-column>
 
 
-          <el-table-column v-if="isPermission('fd83032ae5f41a0021b00e93c88edbbo,fd83032ae5f41a0021b00e93c88edbbr,fd83032ae5f41a0021b00e93c88edbbk')>0" label="操作" align="center" width="75">
+          <el-table-column v-if="isPermission('fd83032ae5f41a0021b00e93c88edbbo,fd83032ae5f41a0021b00e93c88edbbr,fd83032ae5f41a0021b00e93c88edbbk')>0" label="操作" align="center" min-width="10%">
             <template slot-scope="scope">
 
             <div  v-if="isPermission('fd83032ae5f41a0021b00e93c88edbbo,fd83032ae5f41a0021b00e93c88edbbr,fd83032ae5f41a0021b00e93c88edbbk') == 1"
@@ -2139,6 +2140,36 @@
       }
     },
     methods: {
+      // 左右拖动事件
+      dragControllerLR: function() {
+        var resize = document.getElementById("resize");
+        var left = document.getElementById("left");
+        var right = document.getElementById("right");
+        var box = document.getElementById("foreignRegulationsDatabase");
+        resize.onmousedown = function(e){
+          var startX = e.clientX;
+          resize.left = resize.offsetLeft;
+          document.onmousemove = function(e){
+            var endX = e.clientX;
+
+            var moveLen = resize.left + (endX - startX);
+            var maxT = box.clientWidth - resize.offsetWidth;
+            if(moveLen<150) moveLen = 150;
+            if(moveLen>maxT-150) moveLen = maxT-150;
+
+            resize.style.left = moveLen;
+            left.style.width = moveLen + "px";
+            right.style.width = (box.clientWidth - moveLen - 5) + "px";
+          }
+          document.onmouseup = function(evt){
+            document.onmousemove = null;
+            document.onmouseup = null;
+            resize.releaseCapture && resize.releaseCapture();
+          }
+          resize.setCapture && resize.setCapture();
+          return false;
+        }
+      },
       isPermission (value) {
         let hasCount = 0
         let set =new Set( value.split(","))
@@ -4186,6 +4217,7 @@
       this.treeReload = true
       // 进入页面后查询树形结构目录
       this.selectMenuList()
+      this.dragControllerLR()
       // 查询各下拉框数据
       this.$http.get('sys/dictype/getDicTypeListCode', '', {
         _this: this
@@ -4252,6 +4284,24 @@
 </script>
 
 <style lang="less" scoped>
+  #left{
+    width:calc(30% - 5px);
+    height:100%;
+    float:left;
+  }
+
+  #resize{
+    width:5px;
+    height:100%;
+    cursor: w-resize;
+    float:left;
+  }
+
+  #right{
+    float:right;
+    width:70%;
+    height:100%;
+  }
   /deep/.contentTitle{
     width: 100%;
   }

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -1,7 +1,7 @@
 <!--标准法规--海外标准法规-->
 <template>
   <div id="foreignStandardsAndRegulations" :class="{ 'tree-close': sideClose }" class="demo-spin-article v-class">
-    <div class="tree-content" :class="{ 'tree-closed': sideClose }">
+    <div id="left" class="tree-content" :class="{ 'tree-closed': sideClose }">
       <div style="width: 100%">
         <el-input
           placeholder="输入树状图体系"
@@ -61,7 +61,8 @@
         <i class="el-icon-arrow-right" v-if="sideClose === true"></i>
       </div>
     </div>
-    <div class="tree-right">
+    <div id="resize"></div>
+    <div id="right" class="tree-right">
       <!--高级查询 ------------按钮-->
       <table-tools-bar>
         <div slot="content">
@@ -183,12 +184,12 @@
             <el-table-column
                 v-if="isPermission('4d01342db0f56f01bfceaee7b46904f4,8871ed1be74cf65851659514880bb50a,29bf24bbd156c06f136cc89b1c7b2bb0')>0"
                 type="selection"
-              width="55"
+              min-width="5%"
               align="center">
             </el-table-column>
             <el-table-column
               label="标准号"
-              width="130"
+              min-width="15%"
             >
               <template slot-scope="scope">
                 <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
@@ -210,7 +211,7 @@
               show-overflow-tooltip
               prop="standName"
               label="标准名称"
-              width="350"
+              min-width="45%"
             >
               <template slot-scope="scope">
                 <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
@@ -227,7 +228,7 @@
             <el-table-column
               prop="issueTime"
               sortable="custom"
-              width="91px"
+              min-width="13%"
               label="发布日期">
               <template slot-scope="scope">
                 <div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
@@ -244,7 +245,7 @@
             <el-table-column
               prop="SSRQ"
               sortable="custom"
-              width="91px"
+              min-width="13%"
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
@@ -261,7 +262,7 @@
             <el-table-column
               prop="XCXSSRQ"
               sortable="custom"
-              width="91px"
+              min-width="13%"
               label="新车型实施日期">
               <template slot-scope="scope">
                 <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
@@ -278,7 +279,7 @@
             <el-table-column
               prop="ZCCSSRQ"
               sortable="custom"
-              width="91px"
+              min-width="13%"
               label="在产车实施日期">
               <template slot-scope="scope">
                 <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
@@ -295,7 +296,7 @@
             <el-table-column
               prop="textStatus"
               sortable="custom"
-              width="75px"
+              min-width="10%"
               label="文本状态">
               <!--              <template slot="header" slot-scope="scope">-->
               <!--                <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
@@ -312,7 +313,7 @@
                 <span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
-            <el-table-column v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e')>0" label="操作" align="center" width="75">
+            <el-table-column v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e')>0" label="操作" align="center" min-width="10%">
               <template slot-scope="scope">
 
               <div  v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e') == 1"
@@ -2325,6 +2326,36 @@ export default {
     }
   },
   methods: {
+    // 左右拖动事件
+    dragControllerLR: function() {
+      var resize = document.getElementById("resize");
+      var left = document.getElementById("left");
+      var right = document.getElementById("right");
+      var box = document.getElementById("foreignStandardsAndRegulations");
+      resize.onmousedown = function(e){
+        var startX = e.clientX;
+        resize.left = resize.offsetLeft;
+        document.onmousemove = function(e){
+          var endX = e.clientX;
+
+          var moveLen = resize.left + (endX - startX);
+          var maxT = box.clientWidth - resize.offsetWidth;
+          if(moveLen<150) moveLen = 150;
+          if(moveLen>maxT-150) moveLen = maxT-150;
+
+          resize.style.left = moveLen;
+          left.style.width = moveLen + "px";
+          right.style.width = (box.clientWidth - moveLen - 5) + "px";
+        }
+        document.onmouseup = function(evt){
+          document.onmousemove = null;
+          document.onmouseup = null;
+          resize.releaseCapture && resize.releaseCapture();
+        }
+        resize.setCapture && resize.setCapture();
+        return false;
+      }
+    },
     isPermission (value) {
       let hasCount = 0
       let set =new Set( value.split(","))
@@ -4803,6 +4834,7 @@ export default {
     // 进入页面后查询树形结构目录
     this.menuTreeLoading = true
     await this.selectMenu()
+    this.dragControllerLR()
     this.menuTreeLoading = false
     this.treeReload = true
     // 从数据库中查询各下拉框数据
@@ -4871,6 +4903,24 @@ export default {
 </script>
 
 <style lang="less" scoped>
+  #left{
+    width:calc(30% - 5px);
+    height:100%;
+    float:left;
+  }
+
+  #resize{
+    width:5px;
+    height:100%;
+    cursor: w-resize;
+    float:left;
+  }
+
+  #right{
+    float:right;
+    width:70%;
+    height:100%;
+  }
   /deep/.contentTitle{
     width: 100%;
   }
@@ -4920,6 +4970,7 @@ export default {
   .el-tree-node {
     position: relative;
     padding-left: 0px; // 缩进量
+    line-height: 30px;
   }
 
   .el-tree-node__children {

src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue

@@ -183,7 +183,7 @@
         <!--            <el-table-column label="操作" align="center" width="50" fixed="right">-->
         <!--              <template slot-scope="scope">-->
         <!--                <div @click.stop style="display: inline-block">-->
-        <!--                  <el-dropdown trigger="click" @command="handleCommand">-->
+        <!--                  <el-dropdown trigger="click" @command="">-->
         <!--                    <i class="iconfont">&#xe61e;</i>-->
         <!--                    <el-dropdown-menu slot="dropdown">-->
         <!--                      <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'887ec926ad9a2b85395159db38885d96'">查看</el-dropdown-item>-->
@@ -196,180 +196,6 @@
     </div>
     <pagination :page="sarSarAccessEOSearch.page" :total="sarAccessListTotal" @pageChange="pageChange"
                 @pageSizeChange="pageSizeChange"></pagination>
-    <el-drawer
-        title='查看'
-        :visible.sync="historySee"
-        destroy-on-close
-        :wrapperClosable="false"
-        class="seeHisToryDraw"
-        size="1000px"
-    >
-      <div class="demo-drawer-content">
-        <div class="el-drawer-form" style="height: auto">
-          <el-form
-              class="label-input-form"
-              label-width="150px"
-              ref="nonAddForm"
-              style="width: 100%;"
-              :model="historySeeForm"
-          >
-            <el-form-item class="add-form-item" label="标准编号:">
-              <div class="seeItem">{{ historySeeForm.standId }}</div>
-            </el-form-item>
-            <el-form-item class="add-form-item" label="标准名称:">
-              <div class="seeItem">{{ historySeeForm.standName }}</div>
-            </el-form-item>
-            <el-form-item class="add-form-item" label="条款号:">
-              <div class="seeItem">{{ historySeeForm.itemsNum }}</div>
-            </el-form-item>
-            <el-form-item class="add-form-item" label="条款名称:">
-              <div class="seeItem">{{ historySeeForm.itemsName }}</div>
-            </el-form-item>
-            <el-form-item class="add-form-item" label="产品线:">
-              <div class="seeItem">{{ historySeeForm.productLine }}</div>
-            </el-form-item>
-            <el-form-item class="add-form-item" label="项目名称:">
-              <div class="seeItem">{{ historySeeForm.productName }}</div>
-            </el-form-item>
-            <el-form-item class="add-form-item" label="责任部门:">
-              <div class="seeItem">{{ historySeeForm.responsibleUnit }}</div>
-            </el-form-item>
-            <el-form-item class="add-form-item" label="责任工程师:">
-              <div class="seeItem">{{ historySeeForm.dutyEngineer }}</div>
-            </el-form-item>
-            <el-form-item class="add-form-item" label="认证工程师:">
-              <div class="seeItem">{{ historySeeForm.authEngineer }}</div>
-            </el-form-item>
-            <el-form-item class="add-form-item" label="质量工程师:">
-              <div class="seeItem">{{ historySeeForm.qaEngineer }}</div>
-            </el-form-item>
-            <el-form-item class="add-form-item" label="要求关闭时间:">
-              <div class="seeItem">{{ historySeeForm.actualCloseTime }}</div>
-            </el-form-item>
-          </el-form>
-        </div>
-        <div class="typebox" v-if="historySeeForm.inconItemEOList != null && historySeeForm.inconItemEOList.length > 0">
-          <el-divider content-position="left">不符合项</el-divider>
-          <div class="typeitem" v-for="(item, index) in historySeeForm.inconItemEOList" :key="index">
-            <div class="typeitems">
-              <div class="itemsLeft">条款号:</div>
-              <div class="itemsRight">{{ item.itemNum }}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">涉及项目:</div>
-              <div class="itemsRight">{{ item.productNameShow }}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">目前状态:</div>
-              <!--              <div class="itemsRight" v-if="item.itemState == '2'">符合</div>-->
-              <div class="itemsRight">不符合</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">设计完成时间:</div>
-              <div class="itemsRight">{{ (item.stepFirTime ? item.stepFirTime.substring(0, 10) : '') }}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">佐证材料:</div>
-              <!--              <div class="itemsRight">{{item.supportFile}}</div>-->
-              <div class="itemsRight">
-                <p
-                    class="files-title"
-                    v-for="(file, fileIndex) in item.supportFileList"
-                    :key="fileIndex"
-                >
-                  <span>{{ file.oldFileName }}</span>
-                  <i title="下载" @click="downloadFile(file.id)" class="icon-download"/>
-                </p>
-              </div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">备注信息:</div>
-              <div class="itemsRight">{{ item.remark }}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">验证完成时间:</div>
-              <div class="itemsRight">{{ (item.stepSecTime ? item.stepSecTime.substring(0, 10) : '') }}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">佐证材料:</div>
-              <div class="itemsRight">
-                <p
-                    class="files-title"
-                    v-for="(file, fileIndex) in item.secSupportFileList"
-                    :key="fileIndex"
-                >
-                  <span>{{ file.oldFileName }}</span>
-                  <i title="下载" @click="downloadFile(file.id)" class="icon-download"/>
-                </p>
-              </div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">备注信息:</div>
-              <div class="itemsRight">{{ item.secRemark }}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">整改完成时间:</div>
-              <div class="itemsRight">{{ (item.stepThiTime ? item.stepThiTime.substring(0, 10) : '') }}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">佐证材料:</div>
-              <div class="itemsRight">
-                <p
-                    class="files-title"
-                    v-for="(file, fileIndex) in item.thrSupportFileList"
-                    :key="fileIndex"
-                >
-                  <span>{{ file.oldFileName }}</span>
-                  <i title="下载" @click="downloadFile(file.id)" class="icon-download"/>
-                </p>
-              </div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">备注信息:</div>
-              <div class="itemsRight">{{ item.thrRemark }}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">责任部门:</div>
-              <div class="itemsRight">{{ item.responseUnitShow }}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">责任工程师:</div>
-              <div class="itemsRight">{{ item.responseEnginShow }}</div>
-            </div>
-          </div>
-        </div>
-        <div class="typebox"
-             v-if="historySeeForm.besureItemEOList != null && historySeeForm.besureItemEOList.length > 0">
-          <el-divider content-position="left">待验证项</el-divider>
-          <div class="typeitem" v-for="(item, index) in historySeeForm.besureItemEOList" :key="index">
-            <div class="typeitems">
-              <div class="itemsLeft">条款号:</div>
-              <div class="itemsRight">{{ item.itemNum }}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">涉及项目:</div>
-              <div class="itemsRight">{{ item.productNameShow }}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">责任部门:</div>
-              <div class="itemsRight">{{ item.responseUnitShow }}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">责任工程师:</div>
-              <div class="itemsRight">{{ item.responseEnginShow }}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">验证时间:</div>
-              <div class="itemsRight">{{ (item.validTime ? item.validTime.substring(0, 11) : '') }}</div>
-            </div>
-            <div class="typeitems">
-              <div class="itemsLeft">验证结果:</div>
-              <div class="itemsRight">待验证</div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </el-drawer>
   </div>
 </template>
 <script>
@@ -397,12 +223,6 @@ export default {
         validFlag: 0
       },
       loading: false,
-      // 搜索条件字段
-      historySearch: {
-        standId: '', // 标准号/名称
-        productName: '', // 项目名称
-        responsibleUnit: '' // 责任部门
-      },
       zNodesSItem: [],
       // table列表数据
       historyList: [],
@@ -523,45 +343,6 @@ export default {
         }
       }
     },
-    typeColor(row, type) {
-      this.$confirm('确定修改此标准分级?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        var color = ''
-        if (type === 1) {
-          if (row.color === '#f00') {
-            color = '#ff0'
-          } else {
-            color = '#f00'
-          }
-        } else {
-          color = '#f00'
-        }
-        this.$http.postData('lawss/sarInconformInfo/updateInconformInfo',
-            {
-              id: row.id,
-              color: color
-            }, {
-              _this: this
-            }, res => {
-              if (res.ok) {
-                this.getTableBtn()
-              } else {
-                this.$message({
-                  type: 'error',
-                  message: '修改失败!'
-                })
-              }
-            })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消修改'
-        })
-      })
-    },
     detailsStandard(item) {
       this.$http.post('lawss/sarTestItem/validateStandNumber', {
         standnumber: item.standNum
@@ -580,55 +361,6 @@ export default {
       }, e => {
       })
     },
-    getOrgTreeSource() {
-      this.$http.get('sys/org/getTree', {}, {_this: this},
-          res => {
-            if (res.ok) {
-              let treeNode = []
-              res.data.map((item, index) => {
-                let treeItem = {}
-                for (let key in item) {
-                  if (key === 'orgName') {
-                    treeItem.name = item[key]
-                  } else {
-                    treeItem[key] = item[key]
-                  }
-                }
-                treeNode[index] = treeItem
-              })
-              this.zNodesSItem = treeNode
-              // this.searchInlandNodes = treeNode
-            }
-          }, e => {
-          })
-    },
-    // 更多
-    handleCommand(command) {
-      switch (command[1]) {
-        case '查看':
-          this.showUser(command[0])
-          break
-      }
-    },
-    // 查看方法
-    showUser(row) {
-      this.historySeeForm = JSON.parse(JSON.stringify(row))
-      this.historySee = true
-      this.$nextTick(() => {
-        const arr = []
-        let questionType = []
-        questionType = this.historySeeForm.quesType.split(',')
-        questionType.map((item) => {
-          this.optionList.map((opr) => {
-            if (item === opr.value) {
-              item = opr.label
-              arr.push(item)
-            }
-          })
-        })
-        this.historySeeForm.quesType = arr.toString()
-      })
-    },
     // 分页事件
     pageChange(page) {
       this.sarSarAccessEOSearch.page = page
@@ -644,47 +376,6 @@ export default {
         name: 'NonConfomity'
       })
     },
-    // 未符合项table selected事件
-    handleRowChange(selection) {
-      //
-    },
-    // 分页查询未符合项数据
-    getTableBtn() {
-      this.$http.get('sarStandUnqualified/sar-stand-unqualified/history', {
-        ...this.historySearch,
-        current: this.pageNo,
-        size: this.pageSize,
-      }, {
-        _this: this
-      }, res => {
-        console.log(res);
-        this.historyList = res.data.records
-        this.total = res.data.total
-      }, e => {
-        console.log(e);
-      })
-    },
-    // getTableBtn () {
-    //   this.$http.get('sarStandUnqualified/sar-stand-unqualified/history', {
-    //     ...this.historySearch,
-    //     current: this.pageNo,
-    //     size: this.pageSize,
-    //   }, {
-    //     _this: this,
-    //     loading: 'loading'
-    //   }, res => {
-    //     console.log(res);
-    //     if (res.ok) {
-    //       this.historyList = res.data.records
-    //       this.total = res.data.count
-    //     } else {}
-    //   }, e => {
-    //   })
-    // },
-    treeClickSearch(treeId, treeNode) {
-      this.historySearch.responseUnit = treeNode.id
-      this.historySearch.responseUnitShow = treeNode.name
-    },
 // 清空 查询条件
     clearAllSearch(search = true) {
       this.sarSarAccessEOSearch = {
@@ -704,22 +395,8 @@ export default {
       this.searchSarAccessBtn()
       console.log(this.sarSarAccessEOSearch)
     },
-    /**
-     * @Description: 跳转流程
-     */
-    processCenterClick(item) {
-      let routeUrl = this.$router.resolve({
-        name: 'ProcessDetail',
-        query: {
-          prcNum: item
-        }
-      })
-      window.open(routeUrl.href, '_blank')
-    }
   },
   mounted() {
-    // this.getTableBtn()
-    // this.getOrgTreeSource()
       // 分页查询数据
       this.searchSarAccess()
   }

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',