Merge branch 'master' of http://47.110.224.240:13000/pengqiang/xiangan_pc

src/components/user-select/index.vue

@@ -29,17 +29,18 @@ export default {
       dataList: []
     }
   },
-  watch: {
-    deptId(newVal, oldval) {
-      if (newVal) {
-        this.getDataList()
-      } else {
-        this.dataList = []
-      }
-    }
-  },
+  // watch: {
+  //   deptId(newVal, oldval) {
+  //     if (newVal) {
+  //       this.getDataList()
+  //     } else {
+  //       this.dataList = []
+  //     }
+  //   }
+  // },
   mounted() {
     this.getDataList()
+    this.getDataList()
   },
   methods: {
     // 添加项目时，获取人员列表

src/page-subspecialty/router/index.js

@@ -74,7 +74,7 @@ export const moduleRoutes = {
     {
       path: '/subjectMgt',
       name: 'subjectMgt',
-      meta: { title: '样本库', isTab: true },
+      meta: { title: '科研工作台 / 课题 / 课题列表', isTab: true },
       component: () => import('@/page-subspecialty/views/modules/scientificManagement/subjectMgt/index')
     },
     {

src/page-subspecialty/views/modules/scientificManagement/subjectMgt/log/index.vue

@@ -5,10 +5,9 @@
         <el-form-item>
           <el-input v-model="input" placeholder="关键词" class="input-with-select" clearable>
             <el-select slot="prepend" v-model="select" placeholder="请选择">
-              <el-option label="用户名" value="username" />
-              <el-option label="用户姓名" value="realName" />
-              <el-option label="用户操作" value="action" />
-              <el-option label="IP地址" value="ip" />
+              <el-option label="工号" value="operateUserJobNumber" />
+              <el-option label="用户姓名" value="operateUserName" />
+              <el-option label="用户操作" value="operateInfo" />
             </el-select>
             <el-button slot="append" icon="el-icon-search" @click="getDataList()">{{ $t('query') }}</el-button>
           </el-input>
@@ -21,14 +20,12 @@
         style="width: 100%;"
         @sort-change="dataListSortChangeHandle"
       >
-        <el-table-column prop="creatorName" :label="'账号'" header-align="center" align="center" width="120" />
-        <el-table-column prop="realName" :label="'用户姓名'" header-align="center" align="center" width="120" />
-        <el-table-column prop="operation" :label="'用户操作'" />
-        <!-- <el-table-column prop="projectName" :label="'课题'" header-align="center" align="center" show-overflow-tooltip /> -->
-        <el-table-column prop="ip" :label="'操作IP'" width="125" header-align="center" />
-        <el-table-column prop="createDate" :label="'操作时间'" header-align="center" sortable="custom" width="160" />
+        <el-table-column prop="operateUserJobNumber" :label="'工号'" header-align="center" align="center" width="120" />
+        <el-table-column prop="operateUserName" :label="'用户姓名'" header-align="center" align="center" width="120" />
+        <el-table-column prop="operateInfo" :label="'用户操作'" />
+        <el-table-column prop="projectName" :label="'课题'" header-align="center" align="center" show-overflow-tooltip />
+        <el-table-column prop="operateTime" :label="'操作时间'" header-align="center" sortable="custom" width="180" />
       </el-table>
-
       <!-- 分页 -->
       <el-pagination
         :current-page="page"
@@ -50,16 +47,16 @@ export default {
   data() {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/sys/log/operation/page4User',
+        getDataListURL: '/operate/log/page',
         getDataListIsPage: true
       },
-      select: 'action',
+      select: 'operateInfo',
       input: '',
       dataForm: {
-        username: '',
-        realName: '',
-        action: '',
-        ip: ''
+        projectId: this.$route.query.projectId,
+        operateUserJobNumber: '',
+        operateUserName: '',
+        operateInfo: '',
       }
     }
   },
@@ -71,14 +68,20 @@ export default {
     dataFormHandle() {
       const inputValue = !(this.input) ? null : this.input
       switch (this.select) {
-        case 'realName':
-          this.dataForm.realName = inputValue
+        case 'operateUserName':
+          this.dataForm.operateUserName = inputValue
+          this.dataForm.operateUserJobNumber = ''
+          this.dataForm.operateInfo = ''
           break
-        case 'action':
-          this.dataForm.action = inputValue
+        case 'operateUserJobNumber':
+          this.dataForm.operateUserJobNumber = inputValue
+          this.dataForm.operateUserName = ''
+          this.dataForm.operateInfo = ''
           break
-        case 'ip':
-          this.dataForm.ip = inputValue
+        case 'operateInfo':
+          this.dataForm.operateInfo = inputValue
+          this.dataForm.operateUserJobNumber = ''
+          this.dataForm.operateUserName = ''
           break
       }
     }

src/page-subspecialty/views/modules/scientificManagement/sys/project-add-or-update.vue

@@ -276,10 +276,8 @@ export default {
       this.dataForm.drugApprovalNumber = this.dataForm.drugApprovalNumber || file.name.substring(0, file.name.lastIndexOf('.'))
       // this.dataForm.filePathList = response.data.filePath
       // this.dataForm.filePathList = [...this.dataForm.filePathList, ...response.data.filePath]
-      console.log(response, response.data.filePath, file, fileList)
-
+      // console.log(response, response.data.filePath, file, fileList)
       this.dataForm.filePathList.push(response.data.filePath[0])
-
       // const filePathList = []
       // fileList.forEach(item => {
       //   console.log(item, item.response.data.filePath[0])
@@ -303,9 +301,7 @@ export default {
     },
     // 表单提交
     dataFormSubmitHandle: debounce(function() {
-      console.log(123)
       this.$refs.dataForm.validate((valid) => {
-        console.log(valid)
         if (!valid) { return false }
         this.$http[!this.dataForm.id ? 'post' : 'put']('/project', this.dataForm)
           .then(({ data: res }) => {