Merge remote-tracking branch 'origin/develop' into develop

src/pages/home1/components/searchGroup/index.vue

@@ -104,7 +104,7 @@ export default {
     height: 50px;
     border: 0;
     border-radius: 0px;
-    background-color: #1885f5;
+    background-color: #76b3f1;
   }
 }
 </style>

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -11,10 +11,6 @@
     </div>
     <transition name="el-zoom-in-top">
       <div v-show="heightShow" class="transition-box">
-<!--        <p class="transition-box-p">-->
-<!--          <label class="transition-box-label">国内/海外：</label>-->
-<!--          <span class="transition-box-span">{{ sarAccessEO.type === 'INLAND' ? '国内' : '海外' }}</span>-->
-<!--        </p>-->
         <p class="transition-box-p">
           <label class="transition-box-label">国家/地区：</label>
           <span class="transition-box-span">{{ sarAccessEO.countryShow }}</span>
@@ -36,7 +32,6 @@
                     class="icon-download"
                     v-btn-permission="'E5QPKLR9CFVXTV64N32C'"
             />
-<!--              v-btn-permission="'E5QPKLR9CFVXTV64N32C'"-->
             <i
                     title="下载带水印"
                     @click="downloadFileByWater(item.id,item.name)"
@@ -44,13 +39,6 @@
                     v-btn-permission="'43MBNPD59L2VYEQH4DSL'"
             />
               </p>
-<!--              v-btn-permission="'43MBNPD59L2VYEQH4DSL'"-->
-<!--            <span-->
-<!--              class="transition-box-span"-->
-<!--              v-for="item in fileInfoList"-->
-<!--              :key="item.id"-->
-<!--              @click="fileDownLoad(item.id)"-->
-<!--            >{{ item.name }}</span>-->
           </div>
           <span class="transition-box-span" v-else>-</span>
         </div>
@@ -179,33 +167,6 @@
                   sortable
           >
           </el-table-column>
-          <!--                <el-table-column-->
-          <!--                  prop="newPutTextTime"-->
-          <!--                  width="210px"-->
-          <!--                  label="新车型实施日期（项目）"-->
-          <!--                  sortable-->
-          <!--                >-->
-          <!--                </el-table-column>-->
-          <!--                <el-table-column-->
-          <!--                  prop="prodPutTextTime"-->
-          <!--                  width="210px"-->
-          <!--                  label="在产车实施日期（项目）"-->
-          <!--                  sortable-->
-          <!--                >-->
-          <!--                </el-table-column>-->
-          <!--                <el-table-column-->
-          <!--                  prop="eopPutTextTime"-->
-          <!--                  width="200px"-->
-          <!--                  label="EOP实施日期（项目）"-->
-          <!--                  sortable-->
-          <!--                >-->
-          <!--                </el-table-column>-->
-          <!--              <el-table-column-->
-          <!--                prop="synopsis"-->
-          <!--                width="100px"-->
-          <!--                show-overflow-tooltip-->
-          <!--                label="法规说明">-->
-          <!--              </el-table-column>-->
           <el-table-column
                   prop="performInfo"
                   width="280px"
@@ -1827,6 +1788,7 @@ export default {
       let accessRow = JSON.parse(sessionStorage.getItem('accessRow'))
       this.sarAccessEO = accessRow
       this.getFileInfo()
+      console.log('1818', this.selectInfobyAccid());
     })
 
     // 从数据库中查询各下拉框数据