From 55cfd6d7cfab78ab3ce96e00a5208082cfd4e128 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 26 May 2021 20:17:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../details/otherStandardDetails/index.vue    | 12 +--
 src/pages/home/components/EnterCard.vue       |  5 +-
 .../standAutoSplit/pages/itemSplitInfo.vue    | 88 ++++++++-----------
 .../standContrast/pages/contrastDetails.vue   |  8 +-
 4 files changed, 47 insertions(+), 66 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 6d9ed4995..c9a25f55b 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -14,15 +14,9 @@
           <div class="modular-header-btn">
             <el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
             <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
-            <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新LOG</el-button>
-            <el-button class="relation-btn" @click="knowledgeSharing">知识点分享</el-button>
-            <el-button class="relation-btn" @click="comparisonDialogOpen">比对</el-button>
-            <el-button class="relation-btn" @click="statusClick">符合性状态</el-button>
-            <put-question-button
-                     class="btn1"
-                    :resId="sarStandardsInfoEO.id"
-                    :resType="saveStandType"
-            ></put-question-button>
+            <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
+            <el-button class="relation-btn" @click="knowledgeSharing">标准问答</el-button>
+            <el-button class="relation-btn" @click="comparisonDialogOpen">标准分解单</el-button>
           </div>
         </div>
         <div class="basic-information-content">
diff --git a/src/pages/home/components/EnterCard.vue b/src/pages/home/components/EnterCard.vue
index c63efa210..b46a574c6 100644
--- a/src/pages/home/components/EnterCard.vue
+++ b/src/pages/home/components/EnterCard.vue
@@ -4,8 +4,8 @@
       <div>
         <i class="icon" :class="icon" />
       </div>
-      <div style="margin-top: 20px;">
-        <span>{{ label }}</span>
+      <div style="margin-top: 10px;">
+        <span class="card-font">{{ label }}</span>
       </div>
     </div>
   </div>
@@ -31,6 +31,7 @@ export default {
     background: rgba(182, 213, 255, 0.22);
     margin-left: 10px;
     display: flex;
+    flex-direction: column;
     justify-content: center;
     align-items: center;
     cursor: pointer;
diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
index d03242420..bcddb0367 100644
--- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
@@ -36,14 +36,14 @@
       <div class="tree-right">
         <div class="content">
           <div class="action-bar">
-            <el-button v-btn-permission="'SRE2ZRX3MJSSH5YYLRGH'" round size="mini" @click="importItemInfo" ><i class="iconfont">&#xe6de;</i>导入</el-button>
-            <el-button v-btn-permission="'KPEQQ6YM53S98RKUC9GZ'"  round size="mini" @click="exportItemInfo"><i class="iconfont">&#xe6e9;</i>导出</el-button>
-            <el-button v-btn-permission="'V4YJY54NVWSYHA2EF3PQ'"  round size="mini" @click="judgebatchDeleteItem"><i class="iconfont">&#xe61b;</i>删除</el-button>
-            <el-button v-btn-permission="'QULWGFSB3NMP84REU7BP'"  round size="mini" @click="uploadImportModal"><i class="iconfont">&#xe825;</i>模板下载</el-button>
-            <el-button v-btn-permission="'8WS6LEYJSYNQU9YCS7U2'"  round size="mini" @click="batchCopy">批量复制</el-button>
-            <el-button v-btn-permission="'TE39XUT4KRTPZGQH5KLF'"  round size="mini" @click="combineItems">合并条款</el-button>
-            <el-button v-btn-permission="'P5NLYUS4XTP9P676XDEW'"  round size="mini" @click="openSubmitAndExamine" v-if="this.$route.query.result === '1'">提交</el-button>
-            <el-button v-if="auditFlag==='1'" round size="mini" @click="splitCheckBtn">审核</el-button>
+            <el-button v-btn-permission="'SRE2ZRX3MJSSH5YYLRGH'"  size="mini" @click="importItemInfo" ><i class="iconfont">&#xe6de;</i>导入</el-button>
+            <el-button v-btn-permission="'KPEQQ6YM53S98RKUC9GZ'"   size="mini" @click="exportItemInfo"><i class="iconfont">&#xe6e9;</i>导出</el-button>
+            <el-button v-btn-permission="'V4YJY54NVWSYHA2EF3PQ'"   size="mini" @click="judgebatchDeleteItem"><i class="iconfont">&#xe61b;</i>删除</el-button>
+            <el-button v-btn-permission="'QULWGFSB3NMP84REU7BP'"   size="mini" @click="uploadImportModal"><i class="iconfont">&#xe825;</i>模板下载</el-button>
+            <el-button v-btn-permission="'8WS6LEYJSYNQU9YCS7U2'"   size="mini" @click="batchCopy">批量复制</el-button>
+            <el-button v-btn-permission="'TE39XUT4KRTPZGQH5KLF'"   size="mini" @click="combineItems">合并条款</el-button>
+            <el-button v-btn-permission="'P5NLYUS4XTP9P676XDEW'"   size="mini" @click="openSubmitAndExamine" v-if="this.$route.query.result === '1'">提交</el-button>
+            <el-button v-if="auditFlag==='1'"  size="mini" @click="splitCheckBtn">审核</el-button>
             <!--<el-button size="mini" @click="$message.warning('需求暂不明确')" v-if="this.$route.query.result === '1'">提交</el-button>-->
           </div>
           <el-table
@@ -79,7 +79,7 @@
             </el-table-column>
             <el-table-column
               prop="itermsConditions"
-              label="内容简介"
+              label="条款内容"
               width="250"
               fixed="left"
               show-overflow-tooltip
@@ -89,43 +89,30 @@
                 <div class="itemsText" @click="itemsTextDialog(scope.row.itemsNum, scope.row.itermsConditions)">{{ scope.row.itermsConditions ? scope.row.itermsConditions.replace(/<.*?>/ig, ' ') : '' }}</div>
               </template>
             </el-table-column>
+            <el-table-column
+              prop="dutyEngineerShow"
+              label="解读内容"
+              width="150">
+            </el-table-column>
+            <el-table-column
+              prop="foShow"
+              label="实施日期">
+            </el-table-column>
+            <el-table-column
+              label="适用车型"
+              width="150">
+              <template slot-scope="scope">{{ getDicTypeName('applyArcticOptions', scope.row.applyArctic) }}</template>
+            </el-table-column>
             <el-table-column
               prop="responsibleUnitShow"
               label="责任部门"
               width="150">
             </el-table-column>
-            <el-table-column
-              prop="foShow"
-              label="FO">
-            </el-table-column>
-            <el-table-column
-              prop="dutyEngineerShow"
-              label="项目评估角色"
-              width="150">
-            </el-table-column>
             <el-table-column
               prop="svppsShow"
-              label="SVPPS"
+              label="责任工程师"
               width="150">
             </el-table-column>
-            <el-table-column
-              label="适用车辆类型"
-              width="150">
-              <template slot-scope="scope">{{ getDicTypeName('applyArcticOptions', scope.row.applyArctic) }}</template>
-            </el-table-column>
-            <el-table-column
-              prop="claimTypeShow"
-              label="要求类型"
-              width="150">
-            </el-table-column>
-            <el-table-column
-              prop="busStandCover"
-              label="企标覆盖关系"
-              width="150">
-              <template slot-scope="scope">
-                <span>{{ getDicTypeName('BZFGGXOUIUJ', scope.row.busStandCover) }}</span>
-              </template>
-            </el-table-column>
             <el-table-column :label="$t('m.operation')" align="center" width="50" :resizable="false" fixed="right">
               <template slot-scope="scope">
                 <div @click.stop style="display: inline-block">
@@ -341,8 +328,8 @@
         </el-form>
       </div>
       <div class="demo-drawer-footer">
-        <el-button size="mini" icon="el-icon-close" round style="margin-right: 8px" @click="modalItemaddShowflag = false">{{$t('m.cancel')}}</el-button>
-        <el-button size="mini" icon="el-icon-check" round type="primary" @click="updateItemInfo" :loading="isSubmit">{{$t('m.submit')}}</el-button>
+        <el-button size="mini" icon="el-icon-close"  style="margin-right: 8px" @click="modalItemaddShowflag = false">{{$t('m.cancel')}}</el-button>
+        <el-button size="mini" icon="el-icon-check"  type="primary" @click="updateItemInfo" :loading="isSubmit">{{$t('m.submit')}}</el-button>
       </div>
     </el-drawer>
     <!-- 查看属性 -->
@@ -522,7 +509,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer">
-        <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="newMenu">提交</el-button>
+        <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="newMenu">提交</el-button>
         <el-button class="common-button-default" icon="el-icon-close" @click="menuModalFlag = false">取消</el-button>
       </div>
     </el-dialog>
@@ -626,7 +613,7 @@
         </el-formItem>
       </el-form>
       <div slot="footer" class="demo-drawer-footer">
-        <el-button type="primary" round class="common-button-primary" icon="el-icon-check" :loading="sumbitLoading" @click="submitAndExamine">提交</el-button>
+        <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" :loading="sumbitLoading" @click="submitAndExamine">提交</el-button>
         <el-button class="common-button-default" icon="el-icon-close" @click="cancelSubmitAndExamineForm">取消</el-button>
       </div>
     </el-dialog>
@@ -640,17 +627,16 @@
       <span slot="footer" class="dialog-footer">
       <el-button
           type="danger"
-          size="primary"
+          size="mini"
           @click="splitCheck(1)"
           class="common-button-primary"
-          round
           :loading="submitLoading"
       >驳回</el-button>
       <el-button
           @click="splitCheck(0)"
           type="primary"
           class="common-button-primary"
-          round
+          size="mini"
           :loading="submitLoading"
       >通过</el-button>
     </span>
@@ -1038,7 +1024,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning',
         confirmButtonClass: 'common-button-primary',
-        roundButton: true
+        roundButton: false
       }).then(() => {
         let listAgain = {}
         listAgain.msgResult = state
@@ -1260,7 +1246,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning',
         confirmButtonClass: 'common-button-primary',
-        roundButton: true
+        roundButton: false
       }).then(() => {
         this.$http.delete('lawss/sarFileSplitMenu/deleteMenu', {
           id: this.selectSarMenu.id
@@ -1400,7 +1386,7 @@ export default {
           cancelButtonText: '取消',
           type: 'warning',
           confirmButtonClass: 'common-button-primary',
-          roundButton: true
+          roundButton: false
         }).then(() => {
           window.open('/api/lawss/sarFileSplitItems/exportSplitInfoZip?ids=null&infoId=' + this.infoId + '&exportName=' + exportName)
         }).catch(() => {})
@@ -1435,7 +1421,7 @@ export default {
           cancelButtonText: '取消',
           type: 'warning',
           confirmButtonClass: 'common-button-primary',
-          roundButton: true
+          roundButton: false
         }).then(() => {
           this.deleteItemsModal = false
 
@@ -1510,7 +1496,7 @@ export default {
           cancelButtonText: '取消',
           type: 'warning',
           confirmButtonClass: 'common-button-primary',
-          roundButton: true
+          roundButton: false
         }).then(() => {
           let ids = []
           this.selectedAllList.map((item, index) => {
@@ -1948,7 +1934,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning',
         confirmButtonClass: 'common-button-primary',
-        roundButton: true
+        roundButton: false
       }).then(() => {
         this.$http.postData('lawss/sarFileSplitMenu/copyMenu', treeNode, {
           _this: this, loading: 'loading'
@@ -2092,7 +2078,7 @@ export default {
             cancelButtonText: '取消',
             type: 'warning',
             confirmButtonClass: 'common-button-primary',
-            roundButton: true
+            roundButton: false
           }).then(() => {
             this.$http.postData('lawss/sarFileSplitMenu/copyMenuNotChildren', command[0], {
               _this: this, loading: 'loading'
diff --git a/src/pages/localTool/standContrast/pages/contrastDetails.vue b/src/pages/localTool/standContrast/pages/contrastDetails.vue
index 2ae3d6461..fa6580cf1 100644
--- a/src/pages/localTool/standContrast/pages/contrastDetails.vue
+++ b/src/pages/localTool/standContrast/pages/contrastDetails.vue
@@ -17,11 +17,11 @@
                   <el-button
                     icon="el-icon-search"
                     type="primary"
-                    round
+                    size="mini"
                     class="common-button-primary"
                     @click="getSarFileSplitInfoEOPage">
                   </el-button>
-                  <el-button icon="el-icon-refresh-left" class="common-button-default" @click="clearSearchStand"></el-button>
+                  <el-button size="mini" icon="el-icon-refresh-left" class="common-button-default" @click="clearSearchStand"></el-button>
                 </el-formItem>
               </el-form>
             </div>
@@ -104,12 +104,12 @@
                 <el-formItem class="search-item">
                   <el-button
                     icon="el-icon-search"
-                    round
+                    size="mini"
                     type="primary"
                     class="common-button-primary"
                     @click="getSarFileSplitInfoEOPage2">
                   </el-button>
-                  <el-button icon="el-icon-refresh-left" class="common-button-default" @click="clearSearchStand2"></el-button>
+                  <el-button size="mini" icon="el-icon-refresh-left" class="common-button-default" @click="clearSearchStand2"></el-button>
                 </el-formItem>
               </el-form>
             </div>