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

src/api/unqualProcess.js

@@ -57,9 +57,8 @@ export function meetingByMonth (params) {
 
 export function addUn (params) {
   return axios({
-    url: 'api/sarStandUnqualified/sar-stand-unqualified/add',
+    url: 'api/sarStandUnqualified/sar-stand-unqualified/addOne',
     method: 'post',
-    params,
+    data: params
-    content: 'json'
   })
 }

src/pages/localTool/standContrast/pages/textComparison.vue

@@ -528,7 +528,7 @@ export default {
         return el.offsetTop - el.parentNode.offsetTop;
       }
       const offsetTop = getElementTop(domId)
-      /*$('#contentRight').children('.wrap-right').animate({scrollTop: offsetTop},500)*/
+      $('#contentRight').children('.wrap-right').animate({scrollTop: offsetTop},500)
     }
   },
   components: {

src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue

@@ -228,12 +228,12 @@
             </el-form-item>
             <!--            项目名称-->
             <el-form-item label="项目名称" class="serch-form-item">
-              <el-input v-model="projectLibrarySearch.projectName" placeholder="根据项目名称" clearable :maxlength="500"
+              <el-input v-model="localProTableSearch.projectName" placeholder="根据项目名称" clearable :maxlength="500"
                         @keyup.enter.native="getLocalProductTableBtn"></el-input>
             </el-form-item>
             <!--            项目分类-->
             <el-form-item label="项目分类" class="serch-form-item">
-              <el-select v-model="projectLibrarySearch.projectClassification" placeholder="根据项目分类" clearable
+              <el-select v-model="localProTableSearch.projectClassification" placeholder="根据项目分类" clearable
                          @keyup.enter.native="getLocalProductTableBtn">
                 <el-option v-for="opt in productTypeOptions" :value="opt.value === undefined ? '' :opt.label"
                            :key="opt.label" :label="opt.label">{{ opt.label }}
@@ -242,7 +242,7 @@
             </el-form-item>
             <!--            项目状态-->
             <el-form-item label="项目状态" class="serch-form-item">
-              <el-select v-model="projectLibrarySearch.projectStatus" placeholder="根据项目状态" clearable
+              <el-select v-model="localProTableSearch.projectStatus" placeholder="根据项目状态" clearable
                          @keyup.enter.native="getLocalProductTableBtn">
                 <el-option v-for="opt in xmztOptions" :value="opt.value === undefined ? '' :opt.label" :key="opt.label"
                            :label="opt.label">{{ opt.label }}
@@ -485,6 +485,8 @@ export default {
       pageSize: this.$store.getters.userInfo.configContent,
       // 查询条件
       localProTableSearch: {
+        projectClassification: '',
+        projectStatus: '',
         validFlag: 0,
         // 项目编号
         projectNumber: "",