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

src/pages/details/consultationDetails/index.vue

@@ -0,0 +1,15 @@
+<template>
+<div>
+  征求意见详情
+</div>
+</template>
+
+<script>
+export default {
+  name: "consultationDetails"
+};
+</script>
+
+<style scoped>
+
+</style>

src/pages/details/otherStandardDetails/index.vue

@@ -5,6 +5,9 @@
     <div class="details-header">
       <span>{{sarStandardsInfoEO.standSortShow || ''}} {{sarStandardsInfoEO.standNumber}}-{{sarStandardsInfoEO.standYear}} 《{{sarStandardsInfoEO.standName}}》 标准详情</span>
     </div>
+    <div class="details-fraction">
+      <span>9.5分</span>
+    </div>
     <!--主体内容-->
     <div class="details-content">
       <div class="details-content-modular basic-information">
@@ -2795,6 +2798,7 @@ export default {
           & > p{
             min-height: 55px;
             line-height: 55px;
+            border-bottom: 1px solid #E5E5E5;
           }
         }
       }
@@ -2812,6 +2816,18 @@ export default {
         width: 100%;
       }
     }
+    .details-fraction{
+      float: right;
+      width:270px;
+      height:80px;
+      line-height: 80px;
+      text-align: center;
+      font-size: 30px;
+      font-weight: bold;
+      color: #e88218;
+      margin-top: -80px;
+      background: #E5E5E5;
+    }
     /deep/.details-content{
       /*padding: 0 67px;*/
       .details-content-modular{
@@ -3007,7 +3023,6 @@ export default {
       }
       .basic-information{
         border-top: 2px dashed #D1D1D1;
-        border-bottom: 2px dashed #D1D1D1;
         .modular-header{
           height: 60px;
           border-bottom: none;
@@ -3016,6 +3031,7 @@ export default {
           & > p{
             min-height: 55px;
             line-height: 55px;
+            border-bottom: 1px solid #E5E5E5;
           }
         }
       }

src/pages/localTool/standardWarning.vue

@@ -3,8 +3,8 @@
   <div id="dynamicInformation" class="dynamic-information v-class">
     <div class="dynamic-content">
       <!-- 实施预警 -->
-      <div class="dynamic" style="overflow-y: scroll">
+      <div class="dynamic" style="overflow-y: auto;">
-        <div class="container">
+        <div class="container" :style="containerStyle">
           <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="标准预警" name="STANDARD">
               <div class="dynamic-content">
@@ -51,7 +51,7 @@
                     </el-table-column>
                     <el-table-column prop="putTime" label="新车型实施日期" align="center" sortable>
                       <template slot-scope="scope">
-                        {{(scope.row.putTime ? scope.row.putTime.substring(0, 11): '')}}
+                        {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}
                       </template>
                     </el-table-column>
                     <el-table-column prop="standName" label="适用车型" align="center">
@@ -99,7 +99,7 @@
                     </el-table-column>
                     <el-table-column prop="putTime" label="在产车实施日期" align="center" sortable>
                       <template slot-scope="scope">
-                        {{(scope.row.putTime ? scope.row.putTime.substring(0, 11): '')}}
+                        {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}
                       </template>
                     </el-table-column>
                     <el-table-column prop="standName" label="适用车型" align="center">
@@ -148,12 +148,12 @@
                     </el-table-column>
                     <el-table-column prop="putTime" label="实施日期" align="center" sortable>
                       <template slot-scope="scope">
-                        {{(scope.row.putTime ? scope.row.putTime.substring(0, 11): '')}}
+                        {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}
                       </template>
                     </el-table-column>
                     <el-table-column prop="putTime" label="预警日期" align="center" sortable>
                       <template slot-scope="scope">
-                        {{(scope.row.putTime ? scope.row.putTime.substring(0, 11): '')}}
+                        {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}
                       </template>
                     </el-table-column>
                     <el-table-column prop="standName" label="适用车型" align="center">
@@ -202,12 +202,12 @@
                     </el-table-column>
                     <el-table-column prop="putTime" label="实施日期" align="center" sortable>
                       <template slot-scope="scope">
-                        {{(scope.row.putTime ? scope.row.putTime.substring(0, 11): '')}}
+                        {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}
                       </template>
                     </el-table-column>
                     <el-table-column prop="putTime" label="预警日期" align="center" sortable>
                       <template slot-scope="scope">
-                        {{(scope.row.putTime ? scope.row.putTime.substring(0, 11): '')}}
+                        {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}
                       </template>
                     </el-table-column>
                     <el-table-column prop="standName" label="适用车型" align="center">
@@ -233,10 +233,12 @@
               <div class="dynamic-content">
                 <h5>实施预警</h5>
                 <div class="content" style="height: 100%; padding-top: 5px; ">
+                  <div class="content-group">
                     <el-divider content-position="left" class="dynamic-child-title">新车型实施日期预警</el-divider>
+                    <div class="table-wrap">
                       <el-table
                         :data="newTypeDatas"
-                    :height="height"
+                        :height="tableHeight"
                         border
                         :resizable="false"
                         :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
@@ -253,14 +255,24 @@
                         </el-table-column>
                         <el-table-column prop="putTime" label="新车型实施日期" align="center" sortable>
                           <template slot-scope="scope">
-                        {{(scope.row.putTime ? scope.row.putTime.substring(0, 11): '')}}
+                            {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}
                           </template>
                         </el-table-column>
                       </el-table>
+                    </div>
+                    <pagination
+                      style="position: static;"
+                      :page="newModelPageConfig.page"
+                      :total="newModelPageConfig.total"
+                      @pageChange="page => handlePageChange('newModel', page)"
+                      @pageSizeChange="pageSize => handlePageSizeChange('newModel', pageSize)"></pagination>
+                  </div>
+                  <div class="content-group">
                     <el-divider content-position="left" class="dynamic-child-title">在产车实施日期预警</el-divider>
+                    <div class="table-wrap">
                       <el-table
                         :data="productionVehicleDatas"
-                    :height="height"
+                        :height="tableHeight"
                         border
                         :resizable="false"
                         :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
@@ -277,11 +289,19 @@
                         </el-table-column>
                         <el-table-column prop="putTime" label="在产车实施日期" align="center" sortable>
                           <template slot-scope="scope">
-                        {{(scope.row.putTime ? scope.row.putTime.substring(0, 11): '')}}
+                            {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}
                           </template>
                         </el-table-column>
                       </el-table>
                     </div>
+                    <pagination
+                      style="position: static;"
+                      :page="newModelPageConfig.page"
+                      :total="newModelPageConfig.total"
+                      @pageChange="page => handlePageChange('newModel', page)"
+                      @pageSizeChange="pageSize => handlePageSizeChange('newModel', pageSize)"></pagination>
+                  </div>
+                </div>
               </div>
             </el-tab-pane>
           </el-tabs>
@@ -293,26 +313,27 @@
 </template>
 
 <script>
-import { mapMutations } from 'vuex'
+import { mapMutations } from "vuex";
+
 export default {
-  name: 'standardWarning',
+  name: "standardWarning",
   data() {
     return {
-      activeName: 'STANDARD',   //tab 默认选中值
+      activeName: "STANDARD",   //tab 默认选中值
       // 头部搜索框
       dynamic: {
-        keyWord: '',
+        keyWord: "",
-        openData: '',
+        openData: "",
-        closeData: ''
+        closeData: ""
       },
       MsgInterInfoEOPage: {
-        msgType: ''
+        msgType: ""
       },
       MsgDynamicInfoEOPage: {
-        msgType: ''
+        msgType: ""
       },
       MsgResourceInfoEOPage: {
-        msgType: ''
+        msgType: ""
       },
       height: null,
       productionVehicleDatas: [],
@@ -340,19 +361,36 @@ export default {
       swiperIndex: -1,
       dynamicFormRules: {
         keyWord: [
-          { type: 'string', max: 100, message: '关键字长度不能超过100个字符', trigger: 'blur' }
+          { type: "string", max: 100, message: "关键字长度不能超过100个字符", trigger: "blur" }
         ]
-      }
+      },
-    }
+      newModelPageConfig: {
+        page: 1,
+        total: 0
+      },
+      tableHeight: 0
+    };
   },
   methods: {
     // 切换tab
     handleClick(tab, event) {
-      console.log(tab, event);
+      switch (tab.name) {
+        case "POLICY":
+          const computedHeight = () => {
+            this.tableHeight = $(".content-group").find(".table-wrap").height();
+          }
+          this.$nextTick(() => {
+            computedHeight()
+            window.addEventListener('resize', computedHeight)
+            this.$once('hook:beforeDestroy', () => {
+              window.removeEventListener('resize', computedHeight)
+            })
+          });
+      }
     },
     //查找适用车型
     searchBtnClick() {
-      console.log('查找适用车型');
+      console.log("查找适用车型");
     },
     /**
      * @author liruohao
@@ -391,192 +429,192 @@ export default {
     //   }
     // },
     showStandDetails(item) {
-      let getStandId = item.sarId
+      let getStandId = item.sarId;
-      let getStandType = item.sortName
+      let getStandType = item.sortName;
-      this.$http.get('lawss/sarMenu/judgeSarMenuByRole', {
+      this.$http.get("lawss/sarMenu/judgeSarMenuByRole", {
         sarId: getStandId,
         sarType: getStandType,
-        isExit: '1'
+        isExit: "1"
       }, {
         _this: this
       }, res => {
         if (res.ok) {
-          let pageTpe = ''
+          let pageTpe = "";
-          let id = ''
+          let id = "";
-          let routename = ''
+          let routename = "";
-          if (getStandType === 'INLAND_STAND' || getStandType === 'FOREIGN_STAND') {
+          if (getStandType === "INLAND_STAND" || getStandType === "FOREIGN_STAND") {
-            if (this.$hasPermission('SSA6WR4HV8')) {
+            if (this.$hasPermission("SSA6WR4HV8")) {
-              pageTpe = getStandType
+              pageTpe = getStandType;
-              id = getStandId
+              id = getStandId;
-              routename = 'OtherStandardDetails'
+              routename = "OtherStandardDetails";
             } else {
-              this.$message.error('无权访问')
+              this.$message.error("无权访问");
             }
-          } else if (getStandType === 'INLAND_LAWS' || getStandType === 'FOREIGN_LAWS') {
+          } else if (getStandType === "INLAND_LAWS" || getStandType === "FOREIGN_LAWS") {
-            if (this.$hasPermission('A2HDHMEA6W')) {
+            if (this.$hasPermission("A2HDHMEA6W")) {
-              pageTpe = getStandType
+              pageTpe = getStandType;
-              id = getStandId
+              id = getStandId;
-              routename = 'OtherLawsDetails'
+              routename = "OtherLawsDetails";
             } else {
-              this.$message.error('无权访问')
+              this.$message.error("无权访问");
             }
-          } else if (getStandType === 'BUSSIONESS_STAND') {
+          } else if (getStandType === "BUSSIONESS_STAND") {
-            if (this.$hasPermission('YJUHC32R7G')) {
+            if (this.$hasPermission("YJUHC32R7G")) {
-              pageTpe = 'BUSINESS_STAND'
+              pageTpe = "BUSINESS_STAND";
-              id = getStandId
+              id = getStandId;
-              routename = 'OtherBussStandardDetails'
+              routename = "OtherBussStandardDetails";
             } else {
-              this.$message.error('无权访问')
+              this.$message.error("无权访问");
             }
           }
-          if (routename !== '') {
+          if (routename !== "") {
             let routeUrl = this.$router.resolve({
               name: routename,
               params: {
                 id: id,
                 pageType: pageTpe
               }
-            })
+            });
-            window.open(routeUrl.href, '_blank')
+            window.open(routeUrl.href, "_blank");
           }
         } else {
-          this.$message.error(res.message)
+          this.$message.error(res.message);
         }
       }, e => {
-      })
+      });
     },
     // 获取国内动态
     queryMsgByPage() {
-      this.MsgDynamicInfoEOPage.msgType = 'INLAND'
+      this.MsgDynamicInfoEOPage.msgType = "INLAND";
-      this.MsgDynamicInfoEOPage.rowLimit = 10
+      this.MsgDynamicInfoEOPage.rowLimit = 10;
-      this.$http.get('lawss/msgDynamicInfo/page', this.MsgDynamicInfoEOPage, {
+      this.$http.get("lawss/msgDynamicInfo/page", this.MsgDynamicInfoEOPage, {
         _this: this,
-        loading: 'loading.inlandLoading'
+        loading: "loading.inlandLoading"
       }, res => {
-        this.inlandMsgList = res.data.list
+        this.inlandMsgList = res.data.list;
       }, e => {
-      })
+      });
     },
     // 国内动态更多查看
     dynamicDomestic() {
-      this.$store.commit('setDetailMap', this.$route.path)
+      this.$store.commit("setDetailMap", this.$route.path);
       this.$router.push({
-        name: 'DomesticDynamics'
+        name: "DomesticDynamics"
-      })
+      });
     },
     // 国际动态更多查看
     dynamicInternational() {
       this.$router.push({
-        name: 'InternationalDynamics'
+        name: "InternationalDynamics"
-      })
+      });
     },
 
     // 获取国外动态
     queryForeignMsgByPage() {
-      this.MsgInterInfoEOPage.msgType = 'FOREIGN'
+      this.MsgInterInfoEOPage.msgType = "FOREIGN";
-      this.MsgInterInfoEOPage.rowLimit = 10
+      this.MsgInterInfoEOPage.rowLimit = 10;
-      this.$http.get('lawss/msgDynamicInfo/page', this.MsgInterInfoEOPage, {
+      this.$http.get("lawss/msgDynamicInfo/page", this.MsgInterInfoEOPage, {
         _this: this,
-        loading: 'loading.foreignLoading'
+        loading: "loading.foreignLoading"
       }, res => {
-        this.foreignMsgList = res.data.list
+        this.foreignMsgList = res.data.list;
       }, e => {
-      })
+      });
     },
     // 资料中心更多查看
     informationCenter() {
-      this.$store.commit('setDetailMap', this.$route.path)
+      this.$store.commit("setDetailMap", this.$route.path);
       this.$router.push({
-        name: 'InformationCenter'
+        name: "InformationCenter"
-      })
+      });
     },
     // 实施预警更多查看
     dynamicWarning() {
-      this.$store.commit('setDetailMap', this.$route.path)
+      this.$store.commit("setDetailMap", this.$route.path);
       this.$router.push({
-        name: 'ImplementWarning'
+        name: "ImplementWarning"
-      })
+      });
     },
     // 获取资料中心
     queryResourceMsgByPage() {
-      this.MsgResourceInfoEOPage.msgType = 'RESOURCE'
+      this.MsgResourceInfoEOPage.msgType = "RESOURCE";
-      this.MsgResourceInfoEOPage.rowLimit = 10
+      this.MsgResourceInfoEOPage.rowLimit = 10;
-      this.$http.get('lawss/msgDynamicInfo/page', this.MsgResourceInfoEOPage, {
+      this.$http.get("lawss/msgDynamicInfo/page", this.MsgResourceInfoEOPage, {
         _this: this,
-        loading: 'loading.resourceLoading'
+        loading: "loading.resourceLoading"
       }, res => {
-        this.resourceMsgList = res.data.list
+        this.resourceMsgList = res.data.list;
       }, e => {
-      })
+      });
     },
     showMsgDetails(id, pageType) {
-      this.$store.commit('setDetailMap', this.$route.path)
+      this.$store.commit("setDetailMap", this.$route.path);
       this.$router.push({
-        name: 'DomesticDynamicsDetails',
+        name: "DomesticDynamicsDetails",
         params: {
           id: id,
           pageType: pageType
         }
-      })
+      });
     },
     showDynmicMsgDetails(item) {
-      let isContains = 0
+      let isContains = 0;
       if (this.roleModuleList != null && this.roleModuleList.length > 0) {
         for (let module in this.roleModuleList) {
           if (this.roleModuleList[module].id === item.msgMode) {
-            isContains = 1
+            isContains = 1;
-            break
+            break;
           }
         }
         if (isContains === 1) {
-          this.$store.commit('setDetailMap', this.$route.path)
+          this.$store.commit("setDetailMap", this.$route.path);
           this.$router.push({
-            name: 'DomesticDynamicsDetails',
+            name: "DomesticDynamicsDetails",
             params: {
               id: item.id,
-              pageType: item.msgType + '_MSG'
+              pageType: item.msgType + "_MSG"
             }
-          })
+          });
         } else {
-          this.$message.error('当前角色无权限查看此信息')
+          this.$message.error("当前角色无权限查看此信息");
         }
       } else {
-        this.$message.error('当前角色无权限查看此信息')
+        this.$message.error("当前角色无权限查看此信息");
       }
     },
     queryProductionVehicleByPage() {
-      this.$http.get('lawss/msgSarPutTime/page', {
+      this.$http.get("lawss/msgSarPutTime/page", {
-        sarPutType: 'ZCCSSRQ',
+        sarPutType: "ZCCSSRQ",
         pageSize: 5
       }, {
         _this: this
       }, res => {
-        this.productionVehicleDatas = res.data.list
+        this.productionVehicleDatas = res.data.list;
       }, e => {
-      })
+      });
     },
     queryNewTypeByPage() {
-      this.$http.get('lawss/msgSarPutTime/page', {
+      this.$http.get("lawss/msgSarPutTime/page", {
-        sarPutType: 'XCXSSRQ',
+        sarPutType: "XCXSSRQ",
         pageSize: 5
       }, {
         _this: this
       }, res => {
-        this.newTypeDatas = res.data.list
+        this.newTypeDatas = res.data.list;
       }, e => {
-      })
+      });
     },
     queryNewProductionByPage() {
-      this.$http.get('lawss/msgSarPutTime/page', {
+      this.$http.get("lawss/msgSarPutTime/page", {
-        warnType: 'STAND',
+        warnType: "STAND",
-        sarPutType: 'NEWPRODUCT',
+        sarPutType: "NEWPRODUCT",
         pageSize: 5
       }, {
         _this: this
       }, res => {
-        this.newProductionDatas = res.data.list
+        this.newProductionDatas = res.data.list;
       }, e => {
-      })
+      });
     },
     /*
      *@description:新车型条款预警Table
@@ -585,16 +623,16 @@ export default {
      *@date: 2020-09-16 10:02:10
     */
     querynewCarWarningByPage() {
-      this.$http.get('lawss/msgSarPutTime/page', {
+      this.$http.get("lawss/msgSarPutTime/page", {
-        warnType: 'ITEM',
+        warnType: "ITEM",
-        sarPutType: 'NEWCAR',
+        sarPutType: "NEWCAR",
         pageSize: 5
       }, {
         _this: this
       }, res => {
-        this.newCarWarning = res.data.list
+        this.newCarWarning = res.data.list;
       }, e => {
-      })
+      });
     },
     /*
      *@description:在产车条款预警Table
@@ -603,16 +641,16 @@ export default {
      *@date: 2020-09-16 10:02:19
     */
     queryProducCarWarningByPage() {
-      this.$http.get('lawss/msgSarPutTime/page', {
+      this.$http.get("lawss/msgSarPutTime/page", {
-        warnType: 'ITEM',
+        warnType: "ITEM",
-        sarPutType: 'PRODUCT',
+        sarPutType: "PRODUCT",
         pageSize: 5
       }, {
         _this: this
       }, res => {
-        this.producCarWarning = res.data.list
+        this.producCarWarning = res.data.list;
       }, e => {
-      })
+      });
     },
     /**
      * @description: 本地动态搜索
@@ -623,28 +661,28 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           this.$router.push({
-            name: 'QueryDynamicInformation',
+            name: "QueryDynamicInformation",
             query: {
               keywords: this.dynamic.keyWord,
-              startTime: this.dynamic.openData !== '' ? this.dateFormat(this.dynamic.openData) : '',
+              startTime: this.dynamic.openData !== "" ? this.dateFormat(this.dynamic.openData) : "",
-              endTime: this.dynamic.closeData !== '' ? this.dateFormat(this.dynamic.closeData) : ''
+              endTime: this.dynamic.closeData !== "" ? this.dateFormat(this.dynamic.closeData) : ""
             }
-          })
+          });
         } else {
-          this.$message.error('请检查表单是否填写正确')
+          this.$message.error("请检查表单是否填写正确");
         }
-      })
+      });
     },
     // 获取轮播图
     getHorseLantern() {
-      this.$http.get('lawss/msgDynamicInfo/queryNewsPic', {
+      this.$http.get("lawss/msgDynamicInfo/queryNewsPic", {
         rowLimit: 5
       }, {
         _this: this
       }, res => {
-        this.imgInformationList = res.data.list
+        this.imgInformationList = res.data.list;
       }, e => {
-      })
+      });
     },
 
     /**
@@ -653,21 +691,21 @@ export default {
      * @date: 2018/10/26 14:08:38
      */
     imgInformationDetail(information) {
-      this.setDetailMap(this.$route.path)
+      this.setDetailMap(this.$route.path);
       this.$router.push({
-        name: 'DomesticDynamicsDetails',
+        name: "DomesticDynamicsDetails",
         params: {
           id: information.id,
           pageType: information.msgType
         }
-      })
+      });
     },
     isNew(pubTime) {
-      if (pubTime != null && pubTime !== '' && pubTime !== undefined) {
+      if (pubTime != null && pubTime !== "" && pubTime !== undefined) {
-        pubTime = pubTime.replace(new RegExp(/-/gm), '/')
+        pubTime = pubTime.replace(new RegExp(/-/gm), "/");
-        return new Date().getTime() - new Date(pubTime).getTime() < 7 * 24 * 3600 * 1000
+        return new Date().getTime() - new Date(pubTime).getTime() < 7 * 24 * 3600 * 1000;
       } else {
-        return ''
+        return "";
       }
     },
     /**
@@ -676,13 +714,13 @@ export default {
      * @date: 2018/11/01 10:20:12
      */
     dateFormat(date) {
-      let year = new Date(date).getFullYear()
+      let year = new Date(date).getFullYear();
-      let month = new Date(date).getMonth() + 1
+      let month = new Date(date).getMonth() + 1;
-      let day = new Date(date).getDate()
+      let day = new Date(date).getDate();
-      return year + '-' + (month < 10 ? '0' + month : month) + '-' + (day < 10 ? '0' + day : day)
+      return year + "-" + (month < 10 ? "0" + month : month) + "-" + (day < 10 ? "0" + day : day);
     },
     getDate(date) {
-      return date !== undefined && date != null ? date.split(' ')[0] : ''
+      return date !== undefined && date != null ? date.split(" ")[0] : "";
     },
     /**
      * @description: 轮播点击
@@ -691,20 +729,38 @@ export default {
      */
     swiperClick(index) {
       if (index === 6 || index === 0) {
-        this.imgInformationDetail(this.imgInformationList[0])
+        this.imgInformationDetail(this.imgInformationList[0]);
       } else {
-        this.imgInformationDetail(this.imgInformationList[index - 1])
+        this.imgInformationDetail(this.imgInformationList[index - 1]);
       }
     },
     // 查询当前登录人拥有的全部模块权限
     showRoleModules() {
-      this.$http.get('lawss/msgModule/selectMsgModuleByRole', {}, {_this: this}, res => {
+      this.$http.get("lawss/msgModule/selectMsgModuleByRole", {}, { _this: this }, res => {
         if (res.data) {
-          this.roleModuleList = res.data
+          this.roleModuleList = res.data;
         }
-      })
+      });
     },
-    ...mapMutations(['setDetailMap'])
+
+    handlePageChange(field, page) {
+      switch (field) {
+        case "newModel":
+          break;
+        case "":
+          break;
+      }
+    },
+
+    handlePageSizeChange(field, pageSize) {
+      switch (field) {
+        case "newModel":
+          break;
+        case "":
+          break;
+      }
+    },
+    ...mapMutations(["setDetailMap"])
   },
   props: {
     reload: {
@@ -713,50 +769,58 @@ export default {
   },
   computed: {
     showSwiper() {
-      return this.imgInformationList.length
+      return this.imgInformationList.length;
+    },
+    containerStyle() {
+      return this.activeName === 'POLICY' ? {
+        height: '100%'
+      } : {}
     }
   },
-  watch: {
+  watch: {},
-  },
   mounted() {
-    this.height = $('.content').height() * 0.4
+    this.height = $(".content").height() * 0.4;
     window.onresize = () => {
-      this.height = $('.content').height() * 0.4
+      this.height = $(".content").height() * 0.4;
-    }
+    };
     // this.queryMsgByPage()
     // this.queryForeignMsgByPage()
     // this.queryResourceMsgByPage()
-    this.queryNewTypeByPage()
+    this.queryNewTypeByPage();
-    this.queryProductionVehicleByPage()
+    this.queryProductionVehicleByPage();
     // this.queryNewProductionByPage()
     // this.querynewCarWarningByPage()
     // this.queryProducCarWarningByPage()
     // this.showRoleModules()
-    this.getHorseLantern()
+    this.getHorseLantern();
     for (let key in this.dynamic) {
-      this.dynamic[key] = ''
+      this.dynamic[key] = "";
-    }
     }
   }
+};
 </script>
 
 <style lang="less" scoped>
 @import "~@/assets/styles/style";
 @import "~@/assets/styles/mixins";
+
 #dynamicInformation {
   background: #fff;
   padding-top: 10px;
   width: 100%;
   height: 100%;
+
   .dynamic-header {
     height: 300px;
     background: @homeSectionBgColor;
+
     .dynamic-header-left {
       width: 750px;
       height: 100%;
       border-right: 1px solid #ddd;
       float: left;
       background: #eee;
+
       .wrapper {
         overflow: hidden;
         width: 100%;
@@ -767,21 +831,26 @@ export default {
         cursor: pointer;
         border: 1px solid #eee;
         border-right: none;
+
         .swiper-pagination {
           .swiper-pagination-bullet {
             width: 10px;
             height: 10px;
             outline: none;
+
             &:hover {
               cursor: pointer;
             }
+
             &.swiper-pagination-bullet-active {
               background: #fff;
             }
           }
         }
+
         .swiper-container {
           height: 100%;
+
           .swiper-img {
             width: 100%;
             height: 100%;
@@ -789,6 +858,7 @@ export default {
         }
       }
     }
+
     .dynamic-header-right {
       padding: 10px;
       float: left;
@@ -797,14 +867,17 @@ export default {
       align-items: center;
       width: calc(~"100% - 750px");
       height: 100%;
+
       .dynamic-search {
         width: 300px;
+
         .dynamic-search-line {
           width: 100%;
           height: 4px;
           background: @boxBgColor;
           margin-bottom: 5px;
         }
+
         .dynamic-search-center {
           .search-btn {
             padding: 0;
@@ -813,6 +886,7 @@ export default {
             font-size: 12px;
           }
         }
+
         h5 {
           font-size: 18px;
           line-height: 30px;
@@ -822,6 +896,7 @@ export default {
           user-select: none;
           font-weight: 600;
         }
+
         .dynamic-label-input-form {
           .el-form-item {
             margin-bottom: 5px;
@@ -829,28 +904,34 @@ export default {
         }
       }
     }
+
     @media screen and (min-width: 1920px) {
       .dynamic-header-left {
         width: 1200px;
       }
+
       .dynamic-header-right {
         width: calc(~"100% - 1200px");
       }
     }
   }
+
   .container {
     /deep/ .el-tabs__header {
       height: 50px;
     }
   }
+
   .dynamic-content {
     height: 100%;
     overflow-y: hidden;
     width: 100%;
     position: relative;
+
     .dynamic {
       width: 100%;
       height: 100%;
+
       .dynamic-content {
         h5 {
           margin-left: 20px;
@@ -862,12 +943,14 @@ export default {
           user-select: none;
           font-weight: 600;
         }
+
         .dynamic-line {
           width: 100%;
           height: 4px;
           background: @boxBgColor;
           margin-bottom: 5px;
         }
+
         .more {
           cursor: pointer;
           color: #12508e;
@@ -882,63 +965,77 @@ export default {
           //   transition: all 0.2s linear;
           // }
         }
+
         .dynamic-loop-container {
           position: relative;
           min-height: 160px;
+
           .dynamic-loop {
             cursor: pointer;
             width: 100%;
             padding: 5px 18px;
+
             &:hover {
               .domestic-loop-header {
                 color: @baseColor;
               }
+
               .loop-content-left {
                 text-decoration: underline;
                 color: @baseColor;
               }
             }
+
             .domestic-loop-header {
               font-size: 15px;
               height: 20px;
               line-height: 20px;
               .flex();
               align-items: center;
+
               .domestic-title {
                 max-width: 80%;
                 .ellipsis();
               }
             }
+
             .newInformation {
               color: #e4393c;
             }
+
             .time {
               position: absolute;
               right: 0.1rem;
               //top: 0;
             }
+
             .newI {
               font-style: italic;
               color: #e4393c;
               font-weight: bold;
               margin-right: 5px;
             }
+
             .domestic-loop-content {
               width: 100%;
               height: 20px;
               line-height: 20px;
               .flex();
+
               .loop-content-left {
                 padding-left: 30px;
                 flex: 1;
                 overflow: hidden;
+
                 .left-content {
                   width: 100%;
+
                   p {
                     .ellipsis();
                   }
                 }
               }
+
               .loop-content-right {
                 width: 150px;
                 .flex();
@@ -947,12 +1044,57 @@ export default {
             }
           }
         }
+
         .content {
           padding-bottom: 10px;
           height: calc(~'100% - 40px');
         }
       }
+
+      ::v-deep {
+        .el-tabs {
+          height: 100%;
+          display: flex;
+          flex-direction: column;
+
+          .el-tabs__content {
+            flex: 1;
+            overflow: hidden;
+
+            .el-tab-pane {
+              &:last-child {
+                height: 100%;
+
+                .dynamic-content {
+                  display: flex;
+                  flex-direction: column;
+
+                  .content {
+                    flex: 1;
+                    overflow: hidden;
+                    display: flex;
+                    flex-direction: column;
+
+                    .content-group {
+                      flex: 1;
+                      overflow: hidden;
+                      display: flex;
+                      flex-direction: column;
+
+                      .table-wrap {
+                        flex: 1;
+                        overflow: hidden;
                       }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+
     .dynamic-child-title {
       color: #515a6e;
       margin: 24px 0;

src/pages/regulatoryRepository/standardForComments/index.vue

@@ -1,5 +1,5 @@
 <comment>
-# 标准对比
+# 标准征求意见
 </comment>
 <template>
   <div class="standardForComments">
@@ -15,10 +15,12 @@
               <el-input v-model="newNumOrName" class="s-c-input" placeholder="请输入关键字" clearable :maxlength="100" @keyup.enter.native="sarStandCompareHis()"></el-input>
             </el-formItem>
             <el-formItem label="开始日期" class="search-item">
-              <el-input v-model="newNumOrName" class="s-c-input" placeholder="" clearable :maxlength="100" @keyup.enter.native="sarStandCompareHis()"></el-input>
+              <el-datePicker v-model="newNumOrName1" :editable="false"
+                             placeholder="请选择开始日期"></el-datePicker>
             </el-formItem>
             <el-formItem label="结束日期" class="search-item">
-              <el-input v-model="newNumOrName" class="s-c-input" placeholder="请输入关键字" clearable :maxlength="100" @keyup.enter.native="sarStandCompareHis()"></el-input>
+              <el-datePicker v-model="newNumOrName2" :editable="false"
+                             placeholder="请选择结束日期"></el-datePicker>
             </el-formItem>
             <el-formItem class="search-item btn-box">
               <el-button
@@ -64,6 +66,9 @@
               prop="oldStandName"
               label="标准名称/政策名称"
               align="center">
+              <template slot-scope="scope">
+                <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.oldStandName }}</a>
+              </template>
             </el-table-column>
             <el-table-column
               prop="createTime"
@@ -119,6 +124,8 @@ export default {
       standCommonlySearch: {},
       oldNumOrName: '',
       newNumOrName: '',
+      newNumOrName1: '',
+      newNumOrName2: '',
       standInfoList: [],
       tableHeight: null,
       total: 0,
@@ -266,39 +273,49 @@ export default {
       this.drawerModal = false
       this.$refs.drawerModalTree.treeReload()
     },
-    // 查看
+    // 点击查看
-    handlePreview (params) {
+    handlePreview (item) {
-      if (params.compareType === '条款比对') {
+       let routeUrl = this.$router.resolve({
-        this.$store.commit('setDetailMap', this.$route.path)
+         name: 'consultationDetails',
-        this.$router.push({
+         params: {
-          name: 'SeeDatalis',
+           id: item.id,
-          query: {
+           pageType: 'INLAND_STAND'
-            row: JSON.stringify(params)
          }
        })
-      } else {
+      window.open(routeUrl.href, '_blank')
-        let rowDataLeft = {}
-        let rowDataRight = {}
-        rowDataLeft.showNumber = params.oldStandNum
-        rowDataLeft.standName = params.oldStandName
-        rowDataLeft.standNameSplit = null
-        rowDataLeft.standNumSplit = null
-        rowDataRight.showNumber = params.newStandNum
-        rowDataRight.standName = params.newStandName
-        rowDataRight.standNameSplit = null
-        rowDataRight.standNumSplit = null
-        this.$store.commit('setDetailMap', this.$route.path)
-        this.$router.push({
-          name: 'TextComparison',
-          query: {
-            id: params.id,
-            flag: '查看',
-            rowDataLeft: JSON.stringify(rowDataLeft),
-            rowDataRight: JSON.stringify(rowDataRight)
-          }
-        })
-      }
     },
+    // handlePreview (params) {
+    //   if (params.compareType === '条款比对') {
+    //     this.$store.commit('setDetailMap', this.$route.path)
+    //     this.$router.push({
+    //       name: 'SeeDatalis',
+    //       query: {
+    //         row: JSON.stringify(params)
+    //       }
+    //     })
+    //   } else {
+    //     let rowDataLeft = {}
+    //     let rowDataRight = {}
+    //     rowDataLeft.showNumber = params.oldStandNum
+    //     rowDataLeft.standName = params.oldStandName
+    //     rowDataLeft.standNameSplit = null
+    //     rowDataLeft.standNumSplit = null
+    //     rowDataRight.showNumber = params.newStandNum
+    //     rowDataRight.standName = params.newStandName
+    //     rowDataRight.standNameSplit = null
+    //     rowDataRight.standNumSplit = null
+    //     this.$store.commit('setDetailMap', this.$route.path)
+    //     this.$router.push({
+    //       name: 'TextComparison',
+    //       query: {
+    //         id: params.id,
+    //         flag: '查看',
+    //         rowDataLeft: JSON.stringify(rowDataLeft),
+    //         rowDataRight: JSON.stringify(rowDataRight)
+    //       }
+    //     })
+    //   }
+    // },
     // 删除
     delFileEditInfo (id) {
       this.$confirm('是否删除?', '提示', {

src/router/index.js

@@ -2397,6 +2397,18 @@ const routes = [
           menuId: 'SSA6WR4HV8'
         }
       },
+      {
+        path: '/consultationDetails/:id/:pageType',
+        name: 'consultationDetails',
+        component: () =>
+          import('@/pages/details/consultationDetails/index'),
+        meta: {
+          requireAuth: true,
+          title: '征求意见详情',
+          isBoolean: true,
+          menuId: ''
+        }
+      },
       {
         path: '/standInvolveProjectTwo',
         name: 'standInvolveProjectTwo',