From cb816f003210644cff393bbace03af0664776b64 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 16 Sep 2021 15:47:36 +0800
Subject: [PATCH 1/4] commit

---
 src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue | 1 +
 src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue | 1 +
 src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue | 1 +
 src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue | 1 +
 src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue | 1 +
 src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue | 1 +
 src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue | 1 +
 7 files changed, 7 insertions(+)

diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index 2978a6953..57e94c939 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -94,6 +94,7 @@
                     <el-table-column
                             prop="chapterNumber"
                             align="center"
+                            sortable
                             label="章条编号"
                             width="170px">
                         <template slot-scope="scope">
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
index 88a1ca485..de93015bb 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
@@ -76,6 +76,7 @@
           <el-table-column
             prop="chapterNumber"
             align="center"
+            sortable
             label="章条编号"
             width="170px">
           </el-table-column>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
index 237efc785..ccc396254 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
@@ -76,6 +76,7 @@
           <el-table-column
             prop="chapterNumber"
             align="center"
+            sortable
             label="章条编号"
             width="170px">
           </el-table-column>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
index 2a6b4bf0b..1f9d8477a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
@@ -88,6 +88,7 @@
           <el-table-column
             prop="chapterNumber"
             align="center"
+            sortable
             label="章条编号"
             width="170px">
           </el-table-column>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
index 9548f9b50..54be7acc5 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
@@ -89,6 +89,7 @@
             prop="chapterNumber"
             align="center"
             label="章条编号"
+            sortable
             width="170px">
           </el-table-column>
           <el-table-column
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
index 7ad799adc..cb709789e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
@@ -87,6 +87,7 @@
           </el-table-column>
           <el-table-column
             prop="chapterNumber"
+            sortable
             align="center"
             label="章条编号"
             width="170px">
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
index ad6a58fe2..0c6246efe 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
@@ -88,6 +88,7 @@
           <el-table-column
             prop="chapterNumber"
             align="center"
+            sortable
             label="章条编号"
             width="170px">
           </el-table-column>

From c529e1b77fc89b6eb5fa4a997697b51f901cda06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 16 Sep 2021 16:17:15 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/home1/components/release/index.vue  | 146 ++++++++----------
 .../components/solicitopinions/index.vue      |   2 +-
 2 files changed, 66 insertions(+), 82 deletions(-)

diff --git a/src/pages/home1/components/release/index.vue b/src/pages/home1/components/release/index.vue
index 872f0da42..3fe4a1059 100644
--- a/src/pages/home1/components/release/index.vue
+++ b/src/pages/home1/components/release/index.vue
@@ -3,102 +3,86 @@
   <div class="release">
     <ul>
       <li v-for="item in standardReleaseList" :key="item.id" class="time-title" >
-        <div style="height: 18px;">
-          <a @click="handlePreview(item)" class="table-jump">{{ item.standName }}</a>
-          <span class="time">{{item.issueTime ? $moment(item.issueTime).format('YYYY-MM-DD') : '' }}</span>
-        </div>
+          <div style="height: 18px;">
+            <a @click="handlePreview(item)" class="table-jump">{{ item.standName }}</a>
+              <span class="time">{{item.issueTime ? $moment(item.issueTime).format('YYYY-MM-DD') : '' }}</span>
+          </div>
       </li>
     </ul>
   </div>
 </template>
 
 <script>
-  export default {
-    name: 'Release',
-    components: {},
-    mixins: [],
-    data() {
-      return {
-        putTime: '',
-        standardReleaseList: [],  //标准发布数据
-        updateTime:""
-      }
-    },
-    computed: {},
-    watch: {},
-    mounted() {
-      this.getDate()
-      this.getAdvice()
-      this.addDate()
-    },
-    methods: {
-      //获取当前年月日
-      addDate(){
-        const nowDate = new Date();
-        const date = {
-          year: nowDate.getFullYear(),
-          month: nowDate.getMonth() + 1,
-          date: nowDate.getDate(),
+export default {
+  name: 'Release',
+  components: {},
+  mixins: [],
+  data() {
+    return {
+      putTime: '',
+      standardReleaseList: [],  //标准发布数据
+    }
+  },
+  computed: {},
+  watch: {},
+  mounted() {
+    this.getDate()
+    this.getAdvice()
+    this.addDate()
+  },
+  methods: {
+    // 点击查看
+    handlePreview (item) {
+      let routeUrl = this.$router.resolve({
+        name: 'OtherStandardDetails',
+        params: {
+          id: item.id,
+          pageType: item.standType + '_STAND'
         }
-        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)
-      },
-      // 点击查看
-      handlePreview (item) {
-        let routeUrl = this.$router.resolve({
-          name: 'OtherStandardDetails',
-          params: {
-            id: item.id,
-            pageType: item.standType + '_STAND'
+      })
+      window.open(routeUrl.href, '_blank')
+    },
+    //截取时间
+    getDate (date) {
+      return date != null ? date.substring(0, date.indexOf(' ')) : ''
+    },
+    //获取数据
+    getAdvice() {
+      let obj = {}
+      obj.limit = 10
+      this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoByList', obj, {
+        _this: this
+      }, res => {
+        let arr = res.data
+        arr.forEach(item => {
+          if(item.standName !== ""){
+            this.standardReleaseList.push(item)
           }
         })
-        window.open(routeUrl.href, '_blank')
-      },
-      //截取时间
-      getDate (date) {
-        return date != null ? date.substring(0, date.indexOf(' ')) : ''
-      },
-      //获取数据
-      getAdvice() {
-        let obj = {}
-        obj.limit = 8
-        this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoByList', obj, {
-          _this: this
-        }, res => {
-          this.standardReleaseList = res.data
-          let arr = res.data
-          arr.forEach(item => {
-            if(item.standName !== ""){
-              this.standardReleaseList.push(item)
-            }
-          })
-        }, e => {
-        })
-      },
+      }, e => {
+      })
     },
+  },
 
-  }
+}
 </script>
 
 <style lang="less" scoped>
-  .release {
-    .time-title {
-      margin: 15px;
-      .time {
-        float: right;
-        color:#FFFFFF;
-      }
-      a {
-        color: #ffffff;
-        &:hover {
-          color: #e9c851;
-          cursor:pointer;
-          text-decoration: underline;
-        }
+.release {
+  .time-title {
+    margin: 15px;
+    .time {
+      float: right;
+      color:#FFFFFF;
+    }
+    a {
+      color: #ffffff;
+      &:hover {
+        color: #e9c851;
+        cursor:pointer;
+        text-decoration: underline;
       }
     }
   }
+}
 </style>
-
diff --git a/src/pages/home1/components/solicitopinions/index.vue b/src/pages/home1/components/solicitopinions/index.vue
index 675997379..689255518 100644
--- a/src/pages/home1/components/solicitopinions/index.vue
+++ b/src/pages/home1/components/solicitopinions/index.vue
@@ -40,7 +40,7 @@ export default {
     getAdvice() {
       this.$http.get("slrs/sar-public-idea/SelectAllPage", {
         page: 1,
-        size: 1000
+        size: 10
       }, {
         _this: this
       }, res => {

From 1e1c7eee89aeeedd9bb084ddf5808b8dd8b2f502 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 16 Sep 2021 16:51:05 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home1/components/solicitopinions/index.vue |  9 ++-------
 .../standardForComments/index.vue              |  4 ++--
 .../pags/consultationDetails.vue               | 18 +++++++++---------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/pages/home1/components/solicitopinions/index.vue b/src/pages/home1/components/solicitopinions/index.vue
index 689255518..3bed9ea18 100644
--- a/src/pages/home1/components/solicitopinions/index.vue
+++ b/src/pages/home1/components/solicitopinions/index.vue
@@ -4,7 +4,7 @@
     <ul>
       <li v-for="item in domesticDynamics" :key="item.id" class="time-title">
         <div style="height: 18px">
-          <a class="title" :title="item.cname" @click="standForComments(item)">{{ item.cname }}</a>
+          <a class="title" :title="item.cname" @click="standForComments(item)">{{ item.cid }}</a>
           <span class="time">{{ item.endTime }}</span>
         </div>
       </li>
@@ -44,12 +44,7 @@ export default {
       }, {
         _this: this
       }, res => {
-        let arr = res.data.records;
-        arr.forEach(item => {
-          if (item.cname !== "") {
-            this.domesticDynamics.push(item);
-          }
-        });
+        this.domesticDynamics = res.data.records
       }, e => {
 
       });
diff --git a/src/pages/regulatoryRepository/standardForComments/index.vue b/src/pages/regulatoryRepository/standardForComments/index.vue
index 66500fdb5..cc2d4744b 100644
--- a/src/pages/regulatoryRepository/standardForComments/index.vue
+++ b/src/pages/regulatoryRepository/standardForComments/index.vue
@@ -74,11 +74,11 @@
               </template>
             </el-table-column>
             <el-table-column
-              prop="cname"
+              prop="cid"
               label="标准名称/政策名称"
               align="center">
               <template slot-scope="scope">
-                <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.cname }}</a>
+                <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.cid }}</a>
               </template>
             </el-table-column>
             <el-table-column
diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index 9f421b5d9..0118fab41 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -10,21 +10,21 @@
     <transition name="el-zoom-in-top">
       <div v-show="heightShow" class="transition-box">
         <p class="transition-box-p">
-          <label class="transition-box-label">标准号：</label>
+          <label class="transition-box-label">标准名称：</label>
           <span class="transition-box-span table-jump"
                 @click="handlePreview(itemData)"
           >
                       {{ this.$route.query.item.cid }}
                     </span>
         </p>
-        <p class="transition-box-p">
-          <label class="transition-box-label">标准名称：</label>
-          <span class="transition-box-span table-jump"
-                @click="handlePreview(itemData)"
-          >
-                      {{ this.$route.query.item.cname || '-' }}
-                    </span>
-        </p>
+<!--        <p class="transition-box-p">-->
+<!--          <label class="transition-box-label">标准名称：</label>-->
+<!--          <span class="transition-box-span table-jump"-->
+<!--                @click="handlePreview(itemData)"-->
+<!--          >-->
+<!--                      {{ this.$route.query.item.cname || '-' }}-->
+<!--                    </span>-->
+<!--        </p>-->
         <p class="transition-box-p">
           <label class="transition-box-label">附件：</label>
           <span class="file-box" v-if="fileInfoList.length > 0">

From 690931315ef6f74371d919a8290c549a1dd6e5f6 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Thu, 16 Sep 2021 16:52:47 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E6=B3=95=E8=A7=84=EF=BC=8C=E5=BA=9F=E6=AD=A2=E5=92=8C=E8=A2=AB?=
 =?UTF-8?q?=E4=BB=A3=E6=9B=BF=E7=9A=84=E8=A6=81=E7=BA=A2=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreignStandardsAndRegulations/index.vue  | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index c156c9622..2d4057c99 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -181,7 +181,10 @@
               label="标准号"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
+                    scope.row.standSortShow
+                  }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                <a v-else-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{
                     scope.row.standSortShow
                   }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
                 <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
@@ -194,7 +197,8 @@
               label="标准名称"
             >
               <template slot-scope="scope">
-                <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
               </template>
             </el-table-column>
             <el-table-column
@@ -203,7 +207,10 @@
               width="110px"
               label="发布日期">
               <template slot-scope="scope">
-                <div style="color: #2d8cf0">
+                <div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
+                    {{ formatIssueDate(scope.row.issueTime) }}
+                </div>
+                <div v-else style="color: #2d8cf0">
                     {{ formatIssueDate(scope.row.issueTime) }}
                 </div>
               </template>
@@ -215,7 +222,8 @@
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span style="color: #2d8cf0">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</span>
+                <span v-else style="color: #2d8cf0">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</span>
 
               </template>
             </el-table-column>
@@ -225,7 +233,8 @@
               width="150px"
               label="新车型实施日期">
               <template slot-scope="scope">
-                <span style="color: #2d8cf0">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
+                <span v-else style="color: #2d8cf0">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -234,7 +243,8 @@
               width="150px"
               label="在产车实施日期">
               <template slot-scope="scope">
-                <span style="color: #2d8cf0">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
+                <span v-else style="color: #2d8cf0">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -248,7 +258,8 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <span style="color: #2d8cf0">{{ textStatusMap[scope.row.textStatus] }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ textStatusMap[scope.row.textStatus] }}</span>
+                <span v-else style="color: #2d8cf0">{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="50" fixed="right">