guhongwei %!s(int64=3) %!d(string=hai) anos
pai
achega
51ef457a71

+ 10 - 0
src/store/index.js

@@ -5,6 +5,13 @@ import * as umutations from '@common/src/store/user/mutations';
 import test from '@common/src/store/test';
 import login from '@common/src/store/login';
 import laboratory from '@common/src/store/laboratory';
+// 博硕培养情况
+import doctor from '@common/src/store/doctor';
+// 职称晋升
+import title from '@common/src/store/title';
+// 人才称号
+import personnelname from '@common/src/store/personnelname';
+
 Vue.use(Vuex);
 
 export default new Vuex.Store({
@@ -15,5 +22,8 @@ export default new Vuex.Store({
     test,
     login,
     laboratory,
+    doctor,
+    title,
+    personnelname,
   },
 });

+ 9 - 21
src/views/ranks/boshuo/index.vue

@@ -18,6 +18,7 @@ import info1 from '@/layout/ranks/boshuo/info-1.vue';
 import search1 from '@/layout/ranks/boshuo/search-1.vue';
 import adminFrame from '@common/src/components/mobile-frame/mobile-main.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
+const { mapActions } = createNamespacedHelpers('doctor');
 export default {
   name: 'index',
   props: {},
@@ -29,24 +30,7 @@ export default {
   },
   data: function () {
     return {
-      list: [
-        {
-          createBy: '1',
-          createTime: '2021-09-16 21:11:58',
-          delFlag: '0',
-          education: '2',
-          id: '3d8ad9a5e0a14e33a0dcf0dc740a2b57',
-          name: '陈博士',
-          params: {},
-          remark: null,
-          searchValue: null,
-          state: '2',
-          teacher: 'person1119',
-          updateBy: null,
-          updateTime: '2021-09-22 14:34:41',
-          userName: '李国亮',
-        },
-      ],
+      list: [],
       total: 0,
       limit: 5,
       // 查询
@@ -61,9 +45,13 @@ export default {
     await this.search();
   },
   methods: {
-    async search({ skip = 0, limit = this.limit, searchName, ...info } = {}) {
-      if (searchName) info.name = searchName;
-      console.log(this.searhForm);
+    ...mapActions(['query', 'fetch']),
+    async search({ skip = 0, limit = this.limit, ...info } = {}) {
+      const res = await this.query({ skip, limit, ...info });
+      if (this.$checkRes(res)) {
+        this.$set(this, `list`, res.rows);
+        this.$set(this, `total`, res.total);
+      }
     },
     // 查看信息
     async toView(data) {

+ 9 - 22
src/views/ranks/personnel/index.vue

@@ -18,6 +18,7 @@ import info1 from '@/layout/ranks/personnel/info-1.vue';
 import search1 from '@/layout/ranks/personnel/search-1.vue';
 import adminFrame from '@common/src/components/mobile-frame/mobile-main.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
+const { mapActions } = createNamespacedHelpers('personnelname');
 export default {
   name: 'index',
   props: {},
@@ -29,25 +30,7 @@ export default {
   },
   data: function () {
     return {
-      list: [
-        {
-          createBy: '1',
-          createTime: '2021-09-16 17:11:44',
-          delFlag: '0',
-          direction: '338fa9ec011644778ffc28040c835f2a',
-          directionName: null,
-          id: '62868565807c45a39c38038e85950171',
-          name: 'person001',
-          nekename: '11',
-          params: {},
-          remark: null,
-          searchValue: null,
-          time: '2021-09-08',
-          updateBy: null,
-          updateTime: '2021-09-22 20:12:18',
-          userName: '王江涛',
-        },
-      ],
+      list: [],
       total: 0,
       limit: 5,
       // 查询
@@ -62,9 +45,13 @@ export default {
     await this.search();
   },
   methods: {
-    async search({ skip = 0, limit = this.limit, searchName, ...info } = {}) {
-      if (searchName) info.name = searchName;
-      console.log(this.searhForm);
+    ...mapActions(['query', 'fetch']),
+    async search({ skip = 0, limit = this.limit, ...info } = {}) {
+      const res = await this.query({ skip, limit, ...info });
+      if (this.$checkRes(res)) {
+        this.$set(this, `list`, res.rows);
+        this.$set(this, `total`, res.total);
+      }
     },
     // 查看信息
     async toView(data) {

+ 9 - 21
src/views/ranks/title/index.vue

@@ -18,6 +18,7 @@ import info1 from '@/layout/ranks/title/info-1.vue';
 import search1 from '@/layout/ranks/title/search-1.vue';
 import adminFrame from '@common/src/components/mobile-frame/mobile-main.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
+const { mapActions } = createNamespacedHelpers('title');
 export default {
   name: 'index',
   props: {},
@@ -29,24 +30,7 @@ export default {
   },
   data: function () {
     return {
-      list: [
-        {
-          createBy: '1',
-          createTime: '2021-09-08 09:28:42',
-          delFlag: '1',
-          direction: '338fa9ec011644778ffc28040c835f2a',
-          directionName: null,
-          id: '1',
-          name: 'person146',
-          nekename: '1',
-          params: {},
-          remark: null,
-          searchValue: null,
-          updateBy: null,
-          updateTime: '2021-09-22 20:15:27',
-          userName: '张波',
-        },
-      ],
+      list: [],
       total: 0,
       limit: 5,
       // 查询
@@ -61,9 +45,13 @@ export default {
     await this.search();
   },
   methods: {
-    async search({ skip = 0, limit = this.limit, searchName, ...info } = {}) {
-      if (searchName) info.name = searchName;
-      console.log(this.searhForm);
+    ...mapActions(['query', 'fetch']),
+    async search({ skip = 0, limit = this.limit, ...info } = {}) {
+      const res = await this.query({ skip, limit, ...info });
+      if (this.$checkRes(res)) {
+        this.$set(this, `list`, res.rows);
+        this.$set(this, `total`, res.total);
+      }
     },
     // 查看信息
     async toView(data) {

+ 1 - 1
vue.config.js

@@ -23,7 +23,7 @@ module.exports = {
         target: 'http://broadcast.waityou24.cn',
       },
       [process.env.VUE_APP_BASE_API]: {
-        target: 'http://196.168.1.197:8112',
+        target: 'http://192.168.1.197:8112',
         changeOrigin: true,
         ws: false,
         pathRewrite: {