From 3505d14d62f9256f474120c1ab281b29eb95ed60 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, 13 Jan 2022 14:32:59 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E8=8D=89=E7=A8=BF=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/processList/tabComponents/taskDraft/index.vue  | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index 603fb9510..754f3b156 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
@@ -107,15 +107,6 @@
               <span>{{ scope.row.creatTime ? $moment(scope.row.creatTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-                  prop="overTime"
-                  label="完成日期"
-                  align="center"
-          >
-            <template slot-scope="scope">
-              <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
-            </template>
-          </el-table-column>
           <el-table-column :label="$t('m.operation')" align="center" width="80">
             <template slot-scope="scope">
               <el-button size="mini" type="primary" @click="dealWith(scope.row)">办理</el-button>

From cbe8fe4da15d7060fe0197691b75c41e596e593d Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Thu, 13 Jan 2022 15:01:48 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E9=87=87=E6=A0=87=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=8F=AA=E6=9C=89=E6=B5=B7=E5=A4=96=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue             | 15 ++++++++++++++-
 .../pages/creatProcess/bzrk/step4.vue             |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 51493bb8b..d60390b86 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -160,6 +160,19 @@
                     clearable
                   ></el-input>
                 </el-form-item>
+                <!--<el-form-item label="归档位置">
+                  <el-input
+                    style="display: none"
+                    v-model="form.treeListId"
+                    placeholder="请"
+                    readonly
+                  ></el-input>
+                  <el-input
+                    v-model="form.treeListName"
+                    placeholder="请输入标准英文名称"
+                    readonly
+                  ></el-input>
+                </el-form-item>-->
               </el-col>
             </el-row>
           </div>
@@ -2575,7 +2588,7 @@ export default {
         this.quoteIdList1 = []
         this.replaceLawsNumForm.quoteIdList = ''
       }
-      this.replaceLawsNumForm.standType = this.form.standInData === '1' ? 'FOREIGN' : 'INLAND'
+      this.replaceLawsNumForm.standType = 'FOREIGN' // this.form.standInData === '1' ? 'FOREIGN' : 'INLAND'
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
         _this: this,
         loading: 'replaceLoading'
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index d7e5d2236..35421bf11 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -1998,7 +1998,7 @@ export default {
         this.quoteIdList1 = []
         this.replaceLawsNumForm.quoteIdList = ''
       }
-      this.replaceLawsNumForm.standType = this.form.standInData === '1' ? 'FOREIGN' : 'INLAND'
+      this.replaceLawsNumForm.standType = 'FOREIGN' // this.form.standInData === '1' ? 'FOREIGN' : 'INLAND'
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
         _this: this,
         loading: 'replaceLoading'

From 7f430892b44f14a064e8e271dfa91e24231f663d Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Thu, 13 Jan 2022 15:10:03 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=9B=BD=E5=86=85=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BB=A3=E6=9B=BF=E6=A0=87=E5=87=86=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue        | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index ee8617337..3c4728fe2 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -285,10 +285,13 @@
                 <span v-else>{{ scope.row.ZCCSSRQ }}</span>
               </template>
             </el-table-column>
+            <el-table-column
+              prop="dtbzh"
+              width="200"
+              label="代替标准号">
+            </el-table-column>
             <el-table-column
                 prop="textStatus"
-                sortable="custom"
-                width="110"
                 label="文本状态">
               <!--              <template slot="header" slot-scope="scope">-->
               <!--                <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
@@ -304,11 +307,6 @@
                 <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="replaceStandNum"
-              width="150"
-              label="代替标准号">
-            </el-table-column>
             <el-table-column fixed="right"
                              v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681')>0"
                              label="收藏" align="center" width="50px"

From 02b6b629ed8c7281b906a9425202d2bad8e5c72e 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, 13 Jan 2022 15:27:48 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/navMenu/index.vue               | 2 +-
 src/pages/home2/components/empennage/index.vue | 4 ++--
 src/pages/home2/components/navMenu/index.vue   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index c115b7ba8..a69eb65aa 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -721,7 +721,7 @@
       }
     }
     .el-menu-item {
-      padding-left: 29px !important;
+      padding-left: 0 !important;
       font-size: 16px;
       font-weight: normal;
       height: 40px;
diff --git a/src/pages/home2/components/empennage/index.vue b/src/pages/home2/components/empennage/index.vue
index e4bddce2a..7c89e6c9f 100644
--- a/src/pages/home2/components/empennage/index.vue
+++ b/src/pages/home2/components/empennage/index.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="link" id="link">
     <!--  此部分暂时这样写，到后面做修改    -->
-    <div style="display: inline-block;width: 15%;">
+    <div style="display: inline-block;width: 10%;">
       <span class="title borderRight">友情链接</span>
     </div>
     <div style="display: inline-block;width: 80%;text-align: center">
@@ -225,7 +225,7 @@ export default {
     word-break: break-all;
     line-height: normal;
     margin-top: 10px;
-    font-size: 5px;
+    //font-size: 5px;
   }
 }
 </style>
diff --git a/src/pages/home2/components/navMenu/index.vue b/src/pages/home2/components/navMenu/index.vue
index 862e81518..6387c84ba 100644
--- a/src/pages/home2/components/navMenu/index.vue
+++ b/src/pages/home2/components/navMenu/index.vue
@@ -81,7 +81,7 @@
               border-radius: 10px;
             }
             .menu-wrap {
-                height: 200px;
+                height: 175px;
                 display: flex;
                 flex-wrap: wrap;
                 justify-content: space-between;

From 54f03674d05387a391cf9b626c3125bdfa5cb8ec Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 13 Jan 2022 16:04:16 +0800
Subject: [PATCH 5/5] commit

---
 src/pages/localTool/standContrast/pages/seeDatalis.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/localTool/standContrast/pages/seeDatalis.vue b/src/pages/localTool/standContrast/pages/seeDatalis.vue
index 4f2cc8fb3..455d3ba0b 100644
--- a/src/pages/localTool/standContrast/pages/seeDatalis.vue
+++ b/src/pages/localTool/standContrast/pages/seeDatalis.vue
@@ -182,8 +182,8 @@ export default {
     },
     page () {
       this.spinShow = true
-      // this.$http.get('lawss/sarItemsCompareHis/page', {
-      this.$http.get('lawss/sarStandItemsCompareHis/page', {
+      this.$http.get('lawss/sarItemsCompareHis/page', {
+      // this.$http.get('lawss/sarStandItemsCompareHis/page', {
         page: this.splitInfoPage,
         pageSize: this.splitInfoPageSize,
         standHisId: JSON.parse(this.$route.query.row).id