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

src/components/lawsTree/index.vue

@@ -1501,6 +1501,7 @@ export default {
         }
       }
     }
+    .ztree li span.button { width: 6px }
     .ztree li span.button.add {margin-left:2px; margin-right: -1px; background-position:-144px 0; vertical-align:top; *vertical-align:middle}
     div#rMenu {position:absolute; visibility:hidden; top:0;text-align: left;padding: 2px;}
     div#rMenu ul {

src/pages/details/otherStandardDetails/index.vue

@@ -61,7 +61,7 @@
                     standMap[sarStandardsInfoEO.standNature] || '-'
                   }}</span></p>
                 <p class="half">
-                  <label style=" margin-right: 132px;"
+                  <label style=" margin-right: 150px;"
                          title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
                   >文本状态</label>
                   <span style="color: #409EFF;">{{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}</span>
@@ -2904,7 +2904,6 @@ export default {
         location.half = half
         location.showAll = false
       })
-      console.log(standEO);
 
       this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', {
         id: this.$route.params.id
@@ -2925,6 +2924,7 @@ export default {
         })
         this.dynamicFormField = displayLocation
       })
+        console.log(displayLocation)
       sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
       this.loading = false
     })

src/pages/home1/components/solicitopinions/index.vue

@@ -2,9 +2,9 @@
 <template>
   <div class="solicitopinions">
     <ul>
-      <li v-for="item in domesticDynamics" :key="item.id" class="time-title">
+      <li v-for="item in domesticDynamics" :key="item.id" class="time-title" v-if="updateTime < item.endTime">
         <a class="title" :title="item.cname" @click="standForComments(item)">{{ item.cname }}</a>
-        <span class="time">{{item.endTime}}</span>
+        <span class="time">{{ item.endTime }}</span>
       </li>
     </ul>
   </div>
@@ -12,62 +12,83 @@
 
 <script>
 export default {
-  name: 'Solicitopinions',
+  name: "Solicitopinions",
   components: {},
   mixins: [],
   data() {
     return {
-      putTime: '',
+      updateTime: "",
-      domesticDynamics: [], //标准征求意见数据
+      putTime: "",
-    }
+      domesticDynamics: [] //标准征求意见数据
+    };
   },
   computed: {},
   watch: {},
   mounted() {
-    this.getDate()
+    this.getDate();
-    this.getAdvice()
+    this.getAdvice();
+    this.addDate();
   },
   methods: {
-  //截取时间
+    //获取当前年月日
-    getDate (date) {
+    addDate() {
-      return date != null ? date.substring(0, date.indexOf(' ')) : ''
+      const nowDate = new Date();
+      const date = {
+        year: nowDate.getFullYear(),
+        month: nowDate.getMonth() + 1,
+        date: nowDate.getDate()
+      };
+      const newmonth = date.month > 10 ? date.month : "0" + date.month;
+      const day = date.date > 10 ? date.date : "0" + date.date;
+      this.updateTime = date.year + "-" + newmonth + "-" + day;
+      console.log("当前时间" + this.updateTime);
+    },
+    //截取时间
+    getDate(date) {
+      return date != null ? date.substring(0, date.indexOf(" ")) : "";
     },
     //获取数据
     getAdvice() {
-       this.$http.get('slrs/sar-public-idea/SelectAllPage', {}, {
+      this.$http.get("slrs/sar-public-idea/SelectAllPage", {
-         _this: this
+        page: 1,
-       }, res => {
+        size: 1000,
-         this.domesticDynamics = res.data.records
+      }, {
-       }, e => {
+        _this: this
+      }, res => {
+        this.domesticDynamics = res.data.records
+      }, e => {
 
-       } )
+      });
     },
-    standForComments (item) {
+    standForComments(item) {
-      this.$store.commit('setDetailMap',this.$router.path)
+      this.$store.commit("setDetailMap", this.$router.path);
       this.$router.push({
-        name: 'consultationDetails',
+        name: "consultationDetails",
         query: {
           item: item
         }
-      })
+      });
-    },
+    }
-  },
+  }
-}
+};
 </script>
 
 <style lang="less" scoped>
 .solicitopinions {
   .time-title {
     margin: 15px;
+
     .time {
       float: right;
-      color:#FFFFFF;
+      color: #FFFFFF;
     }
+
     a {
       color: #ffffff;
+
       &:hover {
         color: #e9c851;
-        cursor:pointer;
+        cursor: pointer;
         text-decoration: underline;
       }
     }

src/pages/regulatoryRepository/standardForComments/index.vue

@@ -142,6 +142,7 @@ export default {
     // 查询表格
     sarStandCompareHis() {
       this.spinShow = true;
+      this.standCommonlySearch.type = 1;
       var form = this.standCommonlySearch;
       this.$http.get("slrs/sar-public-idea/SelectAllPage", form, {
         _this: this