From f5d20984dbe8d335db29b59339cba967bf6caa94 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Mon, 12 Jul 2021 18:08:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=BF=81=E7=A7=BB=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BA=93=E5=88=86=E9=A1=B5url=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=20=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InputForAllStandards.vue                  |  2 +-
 .../InputForStandAndForeign.vue               |  4 +-
 .../InputForStandards.vue                     |  4 +-
 .../InputForStandardsForEnterprise.vue        |  2 +-
 .../InputForStandardsForForeign.vue           |  2 +-
 .../details/otherStandardDetails/index.vue    | 95 +++++++++++--------
 .../components/warningStandard.vue            |  2 +-
 .../components/ProcessSearchAllStandard.vue   |  2 +-
 .../components/EnterpriseStandardDatabase.vue |  2 +-
 .../components/StandardSelect.vue             |  2 +-
 10 files changed, 66 insertions(+), 51 deletions(-)

diff --git a/src/components/CustomFormComponents/InputForAllStandards.vue b/src/components/CustomFormComponents/InputForAllStandards.vue
index 9921e957f..ed9bae380 100644
--- a/src/components/CustomFormComponents/InputForAllStandards.vue
+++ b/src/components/CustomFormComponents/InputForAllStandards.vue
@@ -226,7 +226,7 @@ export default {
         this.quoteIdList1 = []
         this.replaceLawsNumForm.quoteIdList = ''
       }
-      this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.replaceLawsNumForm, {
+      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
         _this: this,
         loading: 'replaceLoading'
       }, res => {
diff --git a/src/components/CustomFormComponents/InputForStandAndForeign.vue b/src/components/CustomFormComponents/InputForStandAndForeign.vue
index 25cd1b5f2..50545c954 100644
--- a/src/components/CustomFormComponents/InputForStandAndForeign.vue
+++ b/src/components/CustomFormComponents/InputForStandAndForeign.vue
@@ -238,7 +238,7 @@ export default {
       }
       this.replaceLawsNumForm.page = 1
       this.replacePage = 1
-      this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.replaceLawsNumForm, {
+      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
         _this: this,
         loading: 'replaceLoading'
       }, res => {
@@ -265,7 +265,7 @@ export default {
         this.replaceLawsNumForm.quoteIdList = ''
       }
       this.replaceLawsNumForm.standType = this.config.attrField === 'CBBH' ? 'FOREIGN' : 'INLAND'
-      this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.replaceLawsNumForm, {
+      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
         _this: this,
         loading: 'replaceLoading'
       }, res => {
diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue
index f21a6c117..13cd59906 100644
--- a/src/components/CustomFormComponents/InputForStandards.vue
+++ b/src/components/CustomFormComponents/InputForStandards.vue
@@ -226,7 +226,7 @@ export default {
       }
       this.replaceLawsNumForm.page = 1
       this.replacePage = 1
-      this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.replaceLawsNumForm, {
+      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
         _this: this,
         loading: 'replaceLoading'
       }, res => {
@@ -253,7 +253,7 @@ export default {
         this.replaceLawsNumForm.quoteIdList = ''
       }
       // this.replaceLawsNumForm.standType = this.config.attrField === 'CBBH' ? 'FOREIGN' : 'INLAND'
-      this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.replaceLawsNumForm, {
+      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
         _this: this,
         loading: 'replaceLoading'
       }, res => {
diff --git a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue
index d8d781c58..2dd49786c 100644
--- a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue
+++ b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue
@@ -256,7 +256,7 @@ export default {
       formData.standType = this.replaceLawsNumForm.dataSource === 'INLAND_STAND' ? 'INLAND'
           : this.replaceLawsNumForm.dataSource === 'FOREIGN_STAND' ? 'FOREIGN' : ''
       formData.standNumber = formData.numberName
-      let url  = this.replaceLawsNumForm.dataSource === 'BUSINESS' ? 'lawss/sarBussionessStand/getSarBussionStandPage' : 'lawss/sarStandardsInfo/getSarStandardsInfoPage'
+      let url  = this.replaceLawsNumForm.dataSource === 'BUSINESS' ? 'lawss/sarBussionessStand/getSarBussionStandPage' : 'sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage'
       this.$http.get(url, formData, {
         _this: this,
         loading: 'replaceLoading'
diff --git a/src/components/CustomFormComponents/InputForStandardsForForeign.vue b/src/components/CustomFormComponents/InputForStandardsForForeign.vue
index e05ff727d..31d90ad21 100644
--- a/src/components/CustomFormComponents/InputForStandardsForForeign.vue
+++ b/src/components/CustomFormComponents/InputForStandardsForForeign.vue
@@ -234,7 +234,7 @@ export default {
         this.quoteIdList1 = []
         this.replaceLawsNumForm.quoteIdList = ''
       }
-      this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.replaceLawsNumForm, {
+      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
         _this: this,
         loading: 'replaceLoading'
       }, res => {
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 867093e59..5ae4c2ef4 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -8,36 +8,6 @@
     <!--主体内容-->
     <div class="details-content">
       <div class="details-content-modular basic-information">
-        <div class="modular-header">
-          <div class="modular-header-title"><i class="icon-modular-title" /><span>标准信息</span>
-          </div>
-          <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()">更新记录</el-button>
-<!--            <el-button class="relation-btn" @click="knowledgeSharing">标准问答</el-button>-->
-<!--            <el-button class="relation-btn" @click="showItemsModel()">标准分解单</el-button>-->
-          </div>
-        </div>
-        <div class="basic-information-content">
-          <p><label>中文名称：</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
-          <p><label>英文名称：</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
-          <p style="color: #C42626;">
-            <label>标准号：</label>
-            <span v-if="sarStandardsInfoEO.standYear">{{ sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear }}</span>
-            <span v-else>{{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}</span>
-          </p>
-          <p>
-            <label
-              title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
-            >标准状态<i class="el-icon-warning-outline"></i>：</label>
-            <span style="color: #409EFF;">{{ sarStandardsInfoEO.textStatus || '-' }}</span>
-          </p>
-          <p><label>标准发布日期：</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
-<!--          <p><label>文本说明：</label><span style="color: #999999">{{ sarStandardsInfoEO.synopsis || '-' }}</span></p>-->
-<!--          <p><label>重要度：</label><span>{{ sarStandardsInfoEO.isRelateAccess === '1' ? 'A' : 'B'}}</span></p>-->
-<!--          <p><label>纳入标准法规清单的国家/地区：</label><span>{{ sarStandardsInfoEO.accessCountry || '-' }}</span></p>-->
-        </div>
       </div>
       <div
         class="details-content-modular clearfix"
@@ -45,10 +15,54 @@
         :key="index"
         v-if="item.isShowImp === '0'"
       >
-        <div class="modular-header">
+        <div class="modular-header" v-if="item.label !== '基础信息'">
           <div class="modular-header-title"><i class="icon-modular-title" /><span>{{ item.label }}</span></div>
         </div>
+        <div class="modular-header" v-if="item.label === '基础信息'">
+          <div class="modular-header-title"><i class="icon-modular-title" /><span>{{ item.label }}</span></div>
+          <div class="details-content-modular basic-information" style="border-top:none">
+            <div class="modular-header">
+              <!--          <div class="modular-header-title"><i class="icon-modular-title" /><span>基础信息</span>-->
+              <!--          </div>-->
+              <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()">更新记录</el-button>
+                <!--            <el-button class="relation-btn" @click="knowledgeSharing">标准问答</el-button>-->
+                <!--            <el-button class="relation-btn" @click="showItemsModel()">标准分解单</el-button>-->
+              </div>
+            </div>
+          </div>
+        </div>
         <div class="modular-content">
+          <template v-if="item.label === '基础信息'" >
+            <div class="details-content-modular basic-information" style="border-top:none">
+              <div class="basic-information-content">
+                <p><label>标准类别：</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>
+                <p style="color: #C42626;">
+                  <label>标准编号：</label>
+                  <span v-if="sarStandardsInfoEO.standYear">{{ sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear }}</span>
+                  <span v-else>{{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}</span>
+                </p>
+                <p><label>标准年份：</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>
+                <p><label>中文名称：</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
+                <p><label>英文名称：</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
+                <p><label>标准性质：</label><span>{{ sarStandardsInfoEO.standNature || '-' }}</span></p>
+                <p>
+                  <label
+                          title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
+                  >文本状态<i class="el-icon-warning-outline"></i>：</label>
+                  <span style="color: #409EFF;">{{ sarStandardsInfoEO.textStatus || '-' }}</span>
+                </p>
+                <p><label>发布日期：</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
+                <p><label>是否纳入认证清单：</label><span>{{sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-'}}</span></p>
+                <p><label>标准体系：</label><span>{{ sarStandardsInfoEO.standSystemName || '-' }}</span></p>
+                <!--          <p><label>文本说明：</label><span style="color: #999999">{{ sarStandardsInfoEO.synopsis || '-' }}</span></p>-->
+                <!--          <p><label>重要度：</label><span>{{ sarStandardsInfoEO.isRelateAccess === '1' ? 'A' : 'B'}}</span></p>-->
+                <!--          <p><label>纳入标准法规清单的国家/地区：</label><span>{{ sarStandardsInfoEO.accessCountry || '-' }}</span></p>-->
+              </div>
+            </div>
+          </template>
           <template
             v-for="(child, childIndex) in item.half"
             v-if="child.isShowImp === '0'"
@@ -225,20 +239,21 @@
                   v-for="(file, fileIndex) in child.value"
                   :key="fileIndex"
                 >
+                |{{file.id}}|
                   <!--发布稿、增补件单独设置下载权限-->
-                  <template v-if="child.attrField === 'FBGBJBD' || child.attrField === 'ZBJBD'">
+                  <template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG'
+                  || child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
+                  || child.attrField === 'JDWJ'">
                     <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
                     <i
                         title="下载"
                         @click="downloadFile(file.id)"
                         class="icon-download"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'WGJP2VRZSJ77EGH2447M' : '44KKMQHU3CNRRPNNF8VN'"
                     />
                     <i
                         title="下载带水印"
                         @click="downloadFileByWater(file.id, file.fileSuffix)"
                         class="icon-download2"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'EZVNMCLGSB5LWG6XRRL3' : 'VSUKQX3NZW4N8CT5VQE3'"
                     />
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
@@ -259,12 +274,12 @@
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
                 </p>
-                <el-button
-                  v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"
-                  @click="showItemsModel(child.attrField)"
-                  class="decomposition-btn"
-                  icon="icon-separate"
-                >标准分解单</el-button>
+<!--                <el-button-->
+<!--                  v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"-->
+<!--                  @click="showItemsModel(child.attrField)"-->
+<!--                  class="decomposition-btn"-->
+<!--                  icon="icon-separate"-->
+<!--                >标准分解单2</el-button>-->
               </div>
             </div>
 
diff --git a/src/pages/localTool/warningManage/components/warningStandard.vue b/src/pages/localTool/warningManage/components/warningStandard.vue
index ffd423d3b..acf990447 100644
--- a/src/pages/localTool/warningManage/components/warningStandard.vue
+++ b/src/pages/localTool/warningManage/components/warningStandard.vue
@@ -609,7 +609,7 @@ export default {
     getDomesticStandardTable (item) {
       this.sarStandardsSearch.page = this.configPage
       this.sarStandardsSearch.validFlag = 0
-      this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.sarStandardsSearch, {
+      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarStandardsSearch, {
         _this: this, loading: 'loading'
       }, res => {
         if (res.ok) {
diff --git a/src/pages/processCenter/pages/components/ProcessSearchAllStandard.vue b/src/pages/processCenter/pages/components/ProcessSearchAllStandard.vue
index b7450d320..994c0098d 100644
--- a/src/pages/processCenter/pages/components/ProcessSearchAllStandard.vue
+++ b/src/pages/processCenter/pages/components/ProcessSearchAllStandard.vue
@@ -317,7 +317,7 @@ export default {
 
         this.replaceLawsNumForm.quoteIdList = ''
 
-        this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.replaceLawsNumForm, {
+        this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
           _this: this,
           loading: 'replaceLoading'
         }, res => {
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index c5e4fd9f2..f29cbcf88 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -2983,7 +2983,7 @@ export default {
       }
       formData['attrSearchStr'] = JSON.stringify(attrSearchMap)
       this.SarExportSearchEo = item || this.sarBussionessSearch
-      this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', formData, {
+      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
         _this: this, loading: 'loading'
       }, res => {
         for (let i = 0; i < res.data.list.length; i++) {
diff --git a/src/pages/standardComparisonLibrary/components/StandardSelect.vue b/src/pages/standardComparisonLibrary/components/StandardSelect.vue
index 6a75d1999..bb2d60278 100644
--- a/src/pages/standardComparisonLibrary/components/StandardSelect.vue
+++ b/src/pages/standardComparisonLibrary/components/StandardSelect.vue
@@ -146,7 +146,7 @@ export default {
         menuId: 'nomenu',
         standType: 'ALL'
       }
-      this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage',
+      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',
         formData,
         {
           _this: this,