From 51d56b8dd81942903e290b5d87b0eb4be03f7d5f Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Wed, 8 Dec 2021 17:56:27 +0800
Subject: [PATCH 1/2] commit

---
 .../pages/technologyInvolveProject.vue                     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
index d1a1a8024..331585b44 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
@@ -101,10 +101,11 @@
         <el-table-column
                 fixed="right"
                 label=""
-                width="50"
+                width="100"
                 align="center">
           <template slot-scope="scope">
-            <i class="el-icon-view btn-i" @click="handleProjectCompliance(scope.row)"></i>
+            <el-button class="common-button-primary" type="primary"  size="mini" @click="handleProjectCompliance(scope.row)">查看</el-button>
+<!--            <i class="el-icon-view btn-i" @click="handleProjectCompliance(scope.row)"></i>-->
           </template>
         </el-table-column>
       </el-table>
@@ -113,7 +114,7 @@
     </div>
     <!--    查看符合标准性弹窗-->
     <el-drawer
-            title="标准涉及项目符合性"
+            title="标准技术储备符合性"
             :visible.sync="showSarProStateModal"
             :wrapperClosable="false"
             size="1100px"

From 5a00318cd245471eb2bb5082a960d0c367c4eb4a Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Thu, 9 Dec 2021 09:30:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=BA=93=E5=9B=9B?=
 =?UTF-8?q?=E4=B8=AA=E6=97=A5=E6=9C=9F=E5=A4=9A=E9=80=89=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 35cb33d8c..52208b187 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -243,8 +243,8 @@
               <template slot-scope="scope">
                 <span
                     v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
-                    style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
-                <span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span>
+                    style="color: #F56C6C">{{ scope.row.issueTime }}</span>
+                <span v-else>{{ scope.row.issueTime }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -256,8 +256,8 @@
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
                 <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>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                    style="color: #F56C6C">{{ scope.row.SSRQ }}</span>
+                <span v-else>{{ scope.row.SSRQ }}</span>
 
               </template>
             </el-table-column>
@@ -270,8 +270,8 @@
               <template slot-scope="scope">
                 <span
                     v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
-                    style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ : '-' }}</span>
-                <span v-else>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ : '-' }}</span>
+                    style="color: #F56C6C">{{ scope.row.XCXSSRQ }}</span>
+                <span v-else>{{ scope.row.XCXSSRQ }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -282,8 +282,8 @@
               <template slot-scope="scope">
                 <span
                     v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
-                    style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ : '-' }}</span>
-                <span v-else>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ : '-' }}</span>
+                    style="color: #F56C6C">{{ scope.row.ZCCSSRQ }}</span>
+                <span v-else>{{ scope.row.ZCCSSRQ }}</span>
               </template>
             </el-table-column>
             <el-table-column