diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue
index 2ce3f679f..0afef8433 100644
--- a/src/components/CustomFormComponents/InputForStandards.vue
+++ b/src/components/CustomFormComponents/InputForStandards.vue
@@ -59,7 +59,7 @@
                 type="primary"
                 class="common-button-primary"
                 round
-                @click="getReplaceLawsNumRowFirst">
+                @click="getReplaceLawsNumRowFirst(true)">
               </el-button>
             </el-form-item>
             <el-form-item class="search-item btn-box">
@@ -217,7 +217,10 @@ export default {
       this.getReplaceLawsNumRow()
     },
     // 代替政策号 请求数据
-    getReplaceLawsNumRowFirst () {
+    getReplaceLawsNumRowFirst (val) {
+      if (val) {
+        this.replaceLawsNumForm.page = '1'
+      }
       if (this.sarBussionessLawsEO.replaceLawsNum !== null && this.sarBussionessLawsEO.replaceLawsNum !== '') {
         this.replaceLawsNumForm.quoteIdList = this.quoteIdList1.toString() === '' ? '' : this.quoteIdList1
       } else {
diff --git a/src/components/CustomFormComponents/InputForStandardsForForeign.vue b/src/components/CustomFormComponents/InputForStandardsForForeign.vue
index 31d90ad21..08d4408ee 100644
--- a/src/components/CustomFormComponents/InputForStandardsForForeign.vue
+++ b/src/components/CustomFormComponents/InputForStandardsForForeign.vue
@@ -53,7 +53,7 @@
                 type="primary"
                 class="common-button-primary"
                 round
-                @click="getReplaceLawsNumRow">
+                @click="getReplaceLawsNumRow(true)">
               </el-button>
             </el-form-item>
             <el-form-item class="search-item btn-box">
@@ -126,7 +126,7 @@
         @pageChange="pageChangeReplace"
         @pageSizeChange="pageSizeChangeReplace"></pagination>
       <div slot="footer" class="demo-drawer-footer">
-        <el-button class="common-button-default" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
+        <el-button class="common-button-default" round icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
         <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
       </div>
     </el-dialog>
@@ -227,7 +227,10 @@ export default {
       this.getReplaceLawsNumRow()
     },
     // 代替政策号 请求数据
-    getReplaceLawsNumRow () {
+    getReplaceLawsNumRow (val) {
+      if (val) {
+        this.replaceLawsNumForm.page = '1'
+      }
       if (this.sarBussionessLawsEO.replaceLawsNum !== null && this.sarBussionessLawsEO.replaceLawsNum !== '') {
         this.replaceLawsNumForm.quoteIdList = this.quoteIdList1.toString() === '' ? '' : this.quoteIdList1
       } else {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index cc10b90c5..60757cd0d 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -86,12 +86,6 @@
           prop="countryArea"
           label="国家/地区"
           align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.countryArea !== null && scope.row.countryArea.indexOf(',')  > 0">
-              <span>{{ scope.row.countryArea }}</span>
-            </span>
-            <span v-else>{{ countryAreaMap[scope.row.countryArea] }}</span>
-          </template>
         </el-table-column>
         <el-table-column
           prop="detailedListName"
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index cd7aa0210..5acda4c83 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -1480,6 +1480,18 @@ export default {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
         })
+        this.sarAccessInfoSearchList.forEach(item => {
+          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+          this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+          this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+          this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+          this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+          this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+          this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+          this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+          this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+        })
         this.drawerTotal = res.data.list.length
       }, e => {
       })
@@ -2007,6 +2019,13 @@ export default {
         _this: this
       }, res => {
         this.sarAccessInfoList = res.data
+        this.sarAccessInfoList.forEach(item => {
+          if (item.standYear === null) {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber
+          } else {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+          }
+        })
       }, e => {
       })
     },
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index 5ed5e64f2..3cdc9baf3 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -151,7 +151,7 @@
                 size="small"
               >
                 <el-option
-                  v-for="item in energyKindOptions"
+                  v-for="item in categoryOptions"
                   :value="item.value"
                   :key="item.value"
                   :label="item.label"
@@ -414,7 +414,7 @@ export default {
       // 适用车型
       applyArcticOptions: [],
       // 能源类型
-      energyKindOptions: [],
+      categoryOptions: [],
       // 责任部门
       zrbmOptions: [],
       // 适用产品线
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index ecc960290..5f6fb4930 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -944,6 +944,7 @@ export default {
     },
     // 点击清空查询条件 按钮事件
     clearSearchLaws () {
+      this.sarAccessInfoSearch.standName = ''
       this.sarAccessInfoSearch.advanceSearchVOStr = ''
       this.sarAccessInfoSearch.applyArctic = '' // 能源种类
       this.sarAccessInfoSearch.keywords = '' // 关键字
@@ -1288,6 +1289,18 @@ export default {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
         })
+        this.sarAccessInfoSearchList.forEach(item => {
+          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+          this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+          this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+          this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+          this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+          this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+          this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+          this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+          this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+        })
         this.drawerTotal = res.data.list.length
       }, e => {
 
@@ -1818,6 +1831,13 @@ export default {
         _this: this
       }, res => {
         this.sarAccessInfoList = res.data
+        this.sarAccessInfoList.forEach(item => {
+          if (item.standYear === null) {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber
+          } else {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+          }
+        })
       }, e => {
 
       })
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 3f0e84dbf..67196879a 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -942,6 +942,7 @@ export default {
     },
     // 点击清空查询条件 按钮事件
     clearSearchLaws () {
+      this.sarAccessInfoSearch.standName = ''
       this.sarAccessInfoSearch.advanceSearchVOStr = ''
       this.sarAccessInfoSearch.applyArctic = '' // 能源种类
       this.sarAccessInfoSearch.keywords = '' // 关键字
@@ -1818,6 +1819,25 @@ export default {
         _this: this
       }, res => {
         this.sarAccessInfoList = res.data
+        this.sarAccessInfoList.forEach(item => {
+          if (item.standYear === null) {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber
+          } else {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+          }
+        })
+        this.sarAccessInfoSearchList.forEach(item => {
+          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+          this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+          this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+          this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+          this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+          this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+          this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+          this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+          this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+        })
       }, e => {
 
       })
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 59181280b..e9d5466b6 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -1573,9 +1573,9 @@ export default {
           {type: 'string', max: 1000, message: '文本说明不能超过1000个字符', trigger: 'change'}
         ],
         standYear: [
-          // {required: true, message: '标准年份/系列不能为空', trigger: 'change'},
-          {validator: this.verify.testItemCode, trigger: 'change'},
-          {type: 'string', max: 20, message: '标准年份/系列不能超过20个字符', trigger: 'change'}
+          {required: true, message: '标准年份不能为空', trigger: 'change'},
+          {validator: this.verify.testNumberCode, trigger: 'change'},
+          {type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'}
         ],
         standName: [
           {required: true, message: '中文名称不能为空', trigger: 'change'},
@@ -1583,7 +1583,7 @@ export default {
         ],
         standEnName: [
           {required: true, message: '英文名称不能为空', trigger: 'change'},
-          {type: 'string', max: 1000, message: '英文名称不能超过1000个字符', trigger: 'change'}
+          {type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'}
           // {validator: this.verify.valiateEnName, trigger: 'blur'}
         ],
         // standState: [
@@ -2005,7 +2005,7 @@ export default {
           item.collectBtn = !item.collectBtn
           item.cancelCollectBtn = !item.cancelCollectBtn
           item.collectId = res.data.id
-          this.$message.success(res.message)
+          // this.$message.success(res.message)
         } else {
           this.$message.warning(res.message)
         }
@@ -2074,7 +2074,7 @@ export default {
           Object.keys(item.attrInfoMap || {}).forEach((key) => {
             item.attrInfoMap[key] = item.attrInfoMap[key] === null ? '' : item.attrInfoMap[key]
             if (item.attrInfoMap[key] || item.attrInfoMap[key] === '') {
-              this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key])
+              this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key] === '[]' ? '' : item.attrInfoMap[key])
             }
           })
           const dynamicFormField = this.sarStandardsInfoEO
@@ -2756,7 +2756,7 @@ export default {
                               const value = nowstandinfo[item.attrField]
                               // 时间格式处理
                               if (item.attrType === 'DATE_PICKER' && value) {
-                                  nowstandinfo[item.attrField] = this.$dateFormat(this.sarStandardsInfoEO[item.attrField], 'yyyy-MM-dd hh:mm:ss')
+                                  nowstandinfo[item.attrField] = this.sarStandardsInfoEO[item.attrField]
                               }
                               // 数组处理
                               if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') {
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 9cf6991c4..f73e7aa91 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -585,16 +585,23 @@ export default {
             ids+=',\''+this.selectList[i].standId+'\''
           }
           const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
-              'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName
-          console.log(exportURL + "MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM")
+              'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
+          console.log(exportURL)
           window.open(exportURL)
           this.$message.success('导出信息成功')
         }
       } else if (this.saveExportType === 'all') {
         console.log(this.selectList);
+        let ids = ''
+        if (this.selectList.length === 0) {
+          ids='\''+this.dataList[0].standId+'\''
+          for(let i=1;i<this.dataList.length;i++){
+            ids+=',\''+this.dataList[i].standId+'\''
+          }
+        }
         const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
-            'exportType' + this.saveExportType + '&ids=' + this.selectList.join(',') + '&exportName=' + this.exportName
-        console.log(exportURL + "MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM")
+            'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
+        console.log(exportURL)
         window.open(exportURL)
         this.$message.success('导出信息成功')
       }
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index 3ef6e2189..38daf3d9b 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -116,7 +116,7 @@
               prop="standId"
               fixed="left"
               width="180"
-              label="标准编号">
+              label="标准号">
 <!--              <template slot-scope="scope">-->
 <!--                <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standId }}</a>-->
 <!--&lt;!&ndash;                {{ scope.row.standId }}&ndash;&gt;-->
@@ -229,7 +229,7 @@
                 style="width: 100%;"
                 :model="historySeeForm"
               >
-                <el-form-item class="add-form-item" label="标准编号:">
+                <el-form-item class="add-form-item" label="标准号:">
                   <div class="seeItem">{{historySeeForm.standId}}</div>
                 </el-form-item>
                 <el-form-item class="add-form-item" label="标准名称:">