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

src/pages/login/index.vue

@@ -91,7 +91,7 @@ export default {
             let userInfo2 = decodeURIComponent(userInfoStr)
             let userInfoObj = JSON.parse(userInfo2)
             this.setToken(userInfoObj.usid) // vuex存储token
-            this.getByUserInfoCode().then((userInfo) => {
+            this.getByUserInfoCode(userInfoObj.usid).then((userInfo) => {
               if (userInfo !== '' && userInfo !== null) {
                 userInfo.workNum = userInfoObj.workNum
                 if (userInfo.userPic !== null) {
@@ -237,9 +237,9 @@ export default {
         })
     },
     // 获取用户信息
-    getByUserInfoCode () {
+    getByUserInfoCode (userId) {
       return new Promise((resolve, reject) => {
-        this.$http.get('person/userInfo/getByUserInfoCode', {
+        this.$http.get('person/userInfo/getByUserInfoCode?userId='+ userId, {
         }, {
           _this: this,
           prefix: '/foton'

src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue

@@ -14,7 +14,7 @@
           </el-form-item>
           <el-form-item label="项目名称" class="search-item">
             <el-input
-              v-model="localProTableSearch.productName"
+              v-model="projectLibrarySearch.projectName"
               placeholder="根据项目名称查找"
               :maxlength="100"
               clearable
@@ -22,7 +22,7 @@
           </el-form-item>
           <el-form-item label="项目分类" class="search-item">
             <el-select
-              v-model="localProTableSearch.productType"
+              v-model="projectLibrarySearch.projectSort"
               placeholder="请选择项目类别"
             >
               <el-option
@@ -34,7 +34,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="项目状态" class="search-item search-item-last">
-            <el-select v-model="localProTableSearch.productBrand" placeholder="请选择项目状态" clearable>
+            <el-select v-model="projectLibrarySearch.projectStatus" placeholder="请选择项目状态" clearable>
               <el-option
                 v-for="opr in xmztOptions"
                 :key="opr.value"
@@ -249,6 +249,13 @@ export default {
       ifMaintaince:"Maintenance",
 
       deptUser: [],
+      //查询3类
+      projectLibrarySearch: {
+        projectName: '',
+        projectSort: '',
+        projectStatus: '',
+
+      },
       // 查询条件
       localProTableSearch: {
         page: 1,
@@ -1085,17 +1092,21 @@ export default {
     },
     // 条件分页查询
     getLocalProductTableBtn () {
-      this.localProTableSearch.page = 1
-      this.localProTableSearch.advanceSearchVOStr = ''
+      this.projectLibrarySearch.page = 1
+
       this.getLocalProductTable()
     },
     // 查询本地产品
     getLocalProductTable () {
       this.localProTableSearch.prodectCode = this.ifMaintaince
-      console.log(this.localProTableSearch.prodectCode)
+      // console.log(this.localProTableSearch.prodectCode)
       this.localProTableSearch.dataType = this.insideTabsActiveName
       this.SarExportSearchEo = this.localProTableSearch
-      this.$http.get('sarStandProjectLibrary/queryProject', this.localProTableSearch, {
+      this.$http.get('sarStandProjectLibrary/queryProject',{
+        projectName: this.projectLibrarySearch.projectName,
+        projectClassification: this.projectLibrarySearch.projectSort,
+        projectStatus: this.projectLibrarySearch.projectStatus
+      },{
         _this: this, loading: 'loading'
       }, res => {
         // console.log(res.data)