省重点实验室

src/layout/scientific/laboratory/award-1.vue

@@ -8,10 +8,10 @@
           </van-col>
           <van-col span="24" class="other">
             <van-col span="24" class="otherInfo">
-              单位：<span>{{ item.unit || '暂无' }}</span>
+              成果编号：<span>{{ item.resulnumber || '暂无' }}</span>
             </van-col>
             <van-col span="24" class="otherInfo">
-              职务：<span>{{ item.job || '暂无' }}</span>
+              研究方向：<span>{{ getData(item.direction) || '暂无' }}</span>
             </van-col>
           </van-col>
         </van-col>
@@ -26,13 +26,22 @@ export default {
   name: 'personnel-1',
   props: {
     list: { type: Array },
+    directionList: { type: Array },
   },
   components: {},
   data: function () {
     return {};
   },
   created() {},
-  methods: {},
+  methods: {
+    // 整理数据
+    getData(direction) {
+      if (direction && this.directionList) {
+        let data = this.directionList.find((i) => i.id == direction);
+        if (data) return data.name;
+      }
+    },
+  },
   computed: {
     ...mapState(['user']),
   },

src/layout/scientific/laboratory/contacts-1.vue

@@ -4,9 +4,9 @@
       <van-col span="24" class="main">
         <van-col span="24" class="one">
           <van-form>
-            <van-field v-model="info.unitName" name="unitName" label="依托单位名称" readonly />
-            <van-field v-model="info.unitPerson" name="unitPerson" label="单位联系人" readonly />
-            <van-field v-model="info.unitPhone" name="unitPhone" label="单位联系系电话" readonly />
+            <van-field v-model="info.unit_name" name="unitName" label="依托单位名称" readonly />
+            <van-field v-model="info.unit_person" name="unitPerson" label="单位联系人" readonly />
+            <van-field v-model="info.unit_phone" name="unitPhone" label="单位联系系电话" readonly />
           </van-form>
         </van-col>
       </van-col>

src/layout/scientific/laboratory/direction-1.vue

@@ -3,15 +3,12 @@
     <van-row>
       <van-col span="24" class="main">
         <van-col span="24" class="list" v-for="(item, index) in list" :key="index">
-          <van-col span="24" class="title textOver">
+          <van-col span="24" class="title">
             {{ item.name }}
           </van-col>
           <van-col span="24" class="other">
             <van-col span="24" class="otherInfo">
-              方向带头人：<span>{{ item.personName || '暂无' }}</span>
-            </van-col>
-            <van-col span="24" class="otherInfo">
-              核心成员：<span>{{ getData(item.persons) || '暂无' }}</span>
+              方向带头人：<span>{{ getData(item.person_id) || '暂无' }}</span>
             </van-col>
           </van-col>
         </van-col>
@@ -26,6 +23,7 @@ export default {
   name: 'direction-1',
   props: {
     list: { type: Array },
+    personnelList: { type: Array },
   },
   components: {},
   data: function () {
@@ -34,8 +32,11 @@ export default {
   created() {},
   methods: {
     // 整理数据
-    getData(data) {
-      return data.map((i) => i.personName).join(',');
+    getData(person_id) {
+      if (person_id && this.personnelList) {
+        let data = this.personnelList.find((i) => i.id == person_id);
+        if (data) return data.name;
+      }
     },
   },
   computed: {
@@ -45,7 +46,7 @@ export default {
     return { title: this.$route.meta.title };
   },
   watch: {
-    test: {
+    personnelList: {
       deep: true,
       immediate: true,
       handler(val) {},

src/layout/scientific/laboratory/director-1.vue

@@ -4,10 +4,10 @@
       <van-col span="24" class="main">
         <van-col span="24" class="one">
           <van-form>
-            <van-field v-model="info.chiefName" name="chiefName" label="实验室主任" readonly />
-            <van-field v-model="info.labPerson" name="labPerson" label="实验室联系人" readonly />
-            <van-field v-model="info.labPhone" name="labPhone" label="实验室联系人电话" readonly />
-            <van-field v-model="info.labEmail" name="labEmail" label="E-mail地址" readonly />
+            <van-field v-model="info.chief_name" name="chiefName" label="实验室主任" readonly />
+            <van-field v-model="info.lab_person" name="labPerson" label="实验室联系人" readonly />
+            <van-field v-model="info.lab_phone" name="labPhone" label="实验室联系人电话" readonly />
+            <van-field v-model="info.lab_email" name="labEmail" label="E-mail地址" readonly />
           </van-form>
         </van-col>
       </van-col>

src/layout/scientific/laboratory/equipment-1.vue

@@ -8,7 +8,10 @@
           </van-col>
           <van-col span="24" class="other">
             <van-col span="24" class="otherInfo">
-              设备价值：<span>{{ item.equipmentMoney || '暂无' }}万元</span>
+              设备价值：<span>{{ item.equipment_money || '暂无' }}万元</span>
+            </van-col>
+            <van-col span="24" class="otherInfo">
+              设备总数：<span>{{ item.equipment_numb || '暂无' }}</span>
             </van-col>
           </van-col>
         </van-col>

src/layout/scientific/laboratory/info-1.vue

@@ -5,9 +5,9 @@
         <van-col span="24" class="one">
           <van-form>
             <van-field v-model="info.name" name="name" label="实验室名称" readonly />
-            <van-field v-model="info.englishName" name="englishName" label="英文名称" readonly />
-            <van-field v-model="info.labAcreage" name="labAcreage" label="实验室面积" readonly />
-            <van-field v-model="info.labAddress" name="labAddress" label="实验室地址" readonly />
+            <van-field v-model="info.english_name" name="englishName" label="英文名称" readonly />
+            <van-field v-model="info.lab_acreage" name="labAcreage" label="实验室面积" readonly />
+            <van-field v-model="info.lab_address" name="labAddress" label="实验室地址" readonly />
           </van-form>
         </van-col>
       </van-col>

src/layout/scientific/laboratory/learning-1.vue

@@ -14,12 +14,9 @@
               职务：<span>{{ item.job || '暂无' }}</span>
             </van-col>
             <van-col span="24" class="otherInfo">
-              研究方向：<span>{{ item.directionId || '暂无' }}</span>
+              研究方向：<span>{{ item.direction_id || '暂无' }}</span>
             </van-col>
           </van-col>
-          <!-- <van-col span="24" class="btn">
-            <van-button type="info" size="small" @click="toView(item)">详细信息</van-button>
-          </van-col> -->
         </van-col>
       </van-col>
     </van-row>
@@ -85,12 +82,6 @@ export default {
         }
       }
     }
-    .btn {
-      text-align: center;
-      .van-button {
-        margin: 0 5px;
-      }
-    }
   }
 }
 </style>

src/layout/scientific/laboratory/list-1.vue

@@ -8,10 +8,10 @@
           </van-col>
           <van-col span="24" class="other">
             <van-col span="24" class="otherInfo">
-              实验室主任：<span>{{ item.chiefName || '暂无' }}</span>
+              实验室主任：<span>{{ item.lab_name || '暂无' }}</span>
             </van-col>
             <van-col span="24" class="otherInfo">
-              实验室联系人：<span>{{ item.labPerson || '暂无' }}</span>
+              实验室联系人：<span>{{ item.lab_person || '暂无' }}</span>
             </van-col>
           </van-col>
           <van-col span="24" class="btn">

src/layout/scientific/laboratory/outcome-1.vue

@@ -8,10 +8,7 @@
           </van-col>
           <van-col span="24" class="other">
             <van-col span="24" class="otherInfo">
-              单位：<span>{{ item.unit || '暂无' }}</span>
-            </van-col>
-            <van-col span="24" class="otherInfo">
-              职务：<span>{{ item.job || '暂无' }}</span>
+              重要成果：<span>{{ item.content || '暂无' }}</span>
             </van-col>
           </van-col>
         </van-col>

src/layout/scientific/laboratory/paper-1.vue

@@ -4,14 +4,14 @@
       <van-col span="24" class="main">
         <van-col span="24" class="list" v-for="(item, index) in list" :key="index">
           <van-col span="24" class="title textOver">
-            {{ item.name }}
+            {{ item.title }}
           </van-col>
           <van-col span="24" class="other">
             <van-col span="24" class="otherInfo">
-              单位：<span>{{ item.unit || '暂无' }}</span>
+              期刊及卷号：<span>{{ item.number || '暂无' }}</span>
             </van-col>
             <van-col span="24" class="otherInfo">
-              职务：<span>{{ item.job || '暂无' }}</span>
+              作者：<span>{{ getData(item.user_id) || '暂无' }}</span>
             </van-col>
           </van-col>
         </van-col>
@@ -26,13 +26,22 @@ export default {
   name: 'personnel-1',
   props: {
     list: { type: Array },
+    personnelList: { type: Array },
   },
   components: {},
   data: function () {
     return {};
   },
   created() {},
-  methods: {},
+  methods: {
+    // 整理数据
+    getData(user_id) {
+      if (user_id && this.personnelList) {
+        let data = this.personnelList.find((i) => i.id == user_id);
+        if (data) return data.name;
+      }
+    },
+  },
   computed: {
     ...mapState(['user']),
   },

src/layout/scientific/laboratory/patent-1.vue

@@ -3,15 +3,18 @@
     <van-row>
       <van-col span="24" class="main">
         <van-col span="24" class="list" v-for="(item, index) in list" :key="index">
-          <van-col span="24" class="title textOver">
+          <van-col span="24" class="title">
             {{ item.name }}
           </van-col>
           <van-col span="24" class="other">
             <van-col span="24" class="otherInfo">
-              单位：<span>{{ item.unit || '暂无' }}</span>
+              成果编号：<span>{{ item.resulnumber || '暂无' }}</span>
             </van-col>
             <van-col span="24" class="otherInfo">
-              职务：<span>{{ item.job || '暂无' }}</span>
+              获奖等级：<span>{{ item.level || '暂无' }}</span>
+            </van-col>
+            <van-col span="24" class="otherInfo">
+              研究方向：<span>{{ getData(item.direction) || '暂无' }}</span>
             </van-col>
           </van-col>
         </van-col>
@@ -26,13 +29,22 @@ export default {
   name: 'personnel-1',
   props: {
     list: { type: Array },
+    directionList: { type: Array },
   },
   components: {},
   data: function () {
     return {};
   },
   created() {},
-  methods: {},
+  methods: {
+    // 整理数据
+    getData(direction) {
+      if (direction && this.directionList) {
+        let data = this.directionList.find((i) => i.id == direction);
+        if (data) return data.name;
+      }
+    },
+  },
   computed: {
     ...mapState(['user']),
   },

src/views/scientific/laboratory/index.vue

@@ -24,21 +24,24 @@ export default {
     return {
       list: [],
       total: 0,
+      limit: 4,
     };
   },
   created() {
-    console.log('in function:');
-    this.init();
+    this.search();
   },
   methods: {
     ...mapActions(['query', 'fetch']),
-    async init() {
-      const res = await this.query({ table: 'BasicInformation', skip: 0, limit: 10 });
-      if (this.$checkRes(res)) {
+    async search({ skip = 0, limit = this.limit, ...info } = {}) {
+      const res = await this.query({ table: 'BasicInformation', skip, limit, ...info });
+      if (res.errcode == '0') {
         this.$set(this, 'list', res.data);
         this.$set(this, 'total', res.total);
       }
     },
+    toView(data) {
+      this.$router.push({ path: '/scientific/laboratory/info', query: { id: data.id } });
+    },
   },
 
   metaInfo() {

src/views/scientific/laboratory/info.vue

@@ -23,7 +23,7 @@
             <van-tab name="1" title="实力">
               <van-col span="24" class="tabs_1" :style="{ height: client.height - 240 + 'px' }" style="overflow-y: auto">
                 <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa', padding: '0 10px' }"> 主要研究方向 </van-divider>
-                <direction-1 :list="directionList"></direction-1>
+                <direction-1 :list="directionList" :personnelList="personnelList"></direction-1>
                 <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa', padding: '0 10px' }"> 承担科研项目 </van-divider>
                 <task-1 :list="taskList"></task-1>
                 <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa', padding: '0 10px' }"> 核心成员（固定人员） </van-divider>
@@ -34,12 +34,12 @@
             </van-tab>
             <van-tab name="2" title="成果">
               <van-col span="24" class="tabs_1" :style="{ height: client.height - 240 + 'px' }" style="overflow-y: auto">
-                <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa', padding: '0 10px' }"> 专利 </van-divider>
-                <award-1 :list="awardList"></award-1>
+                <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa', padding: '0 10px' }"> 制定标准明细 </van-divider>
+                <award-1 :list="awardList" :directionList="directionList"></award-1>
                 <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa', padding: '0 10px' }"> 论文 </van-divider>
-                <paper-1 :list="paperList"></paper-1>
+                <paper-1 :list="paperList" :personnelList="personnelList"></paper-1>
                 <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa', padding: '0 10px' }"> 奖励 </van-divider>
-                <patent-1 :list="patentList"></patent-1>
+                <patent-1 :list="patentList" :directionList="directionList"></patent-1>
                 <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa', padding: '0 10px' }"> 重大成果 </van-divider>
                 <outcome-1 :list="outcomeList"></outcome-1>
               </van-col>
@@ -64,29 +64,9 @@ import award1 from '@/layout/scientific/laboratory/award-1.vue';
 import paper1 from '@/layout/scientific/laboratory/paper-1.vue';
 import patent1 from '@/layout/scientific/laboratory/patent-1.vue';
 import outcome1 from '@/layout/scientific/laboratory/outcome-1.vue';
-
 import adminFrame from '@common/src/components/mobile-frame/mobile-main.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
-// 实验室
-const { mapActions } = createNamespacedHelpers('laboratory');
-// 学术委员会
-const { mapActions: committee } = createNamespacedHelpers('committee');
-// 研究方向
-const { mapActions: direction } = createNamespacedHelpers('direction');
-// 承担科研项目
-const { mapActions: task } = createNamespacedHelpers('task');
-// 核心成员(固定人员)
-const { mapActions: personnel } = createNamespacedHelpers('personnel');
-// 仪器设备
-const { mapActions: equipment } = createNamespacedHelpers('equipment');
-// 专利
-const { mapActions: award } = createNamespacedHelpers('award');
-// 论文
-const { mapActions: paper } = createNamespacedHelpers('paper');
-// 奖励
-const { mapActions: patent } = createNamespacedHelpers('patent');
-// 重要成果
-const { mapActions: outcome } = createNamespacedHelpers('outcome');
+const { mapActions } = createNamespacedHelpers('usual');
 export default {
   name: 'index',
   props: {},
@@ -113,205 +93,14 @@ export default {
       active: '2',
       // 详细信息
       info: {},
-      // 学术委员会
-      learningList: [
-        {
-          age: null,
-          createBy: '1',
-          createTime: '2021-09-17 13:36:25',
-          delFlag: '0',
-          directionId: '生物钟异常与癫痫病机理',
-          id: 'c6c020e1d88643f59db9a2f7b0c533cb',
-          job: null,
-          name: '李培军',
-          params: {},
-          remark: null,
-          searchValue: null,
-          title: null,
-          type: '2',
-          unit: '温州医科大学附属第二医院、育英儿童医院',
-          updateBy: null,
-          updateTime: null,
-        },
-      ],
-      // 主要研究方向
-      directionList: [
-        {
-          createBy: '1',
-          createTime: '2021-09-24 15:10:01',
-          delFlag: '0',
-          id: 'direction001',
-          name: '开创视觉光刺激治疗癫痫研究',
-          params: {},
-          personId: 'person001',
-          personName: '王江涛',
-          persons: [
-            {
-              createBy: null,
-              createTime: '2021-10-11 19:57:29',
-              direction: 'direction001',
-              id: '2896b42a57ec49b4aa2102d324fca81e',
-              params: {},
-              personId: 'person435',
-              personName: '张洪波',
-              remark: null,
-              searchValue: null,
-              updateBy: null,
-              updateTime: null,
-            },
-            {
-              createBy: null,
-              createTime: '2021-10-11 19:57:29',
-              direction: 'direction001',
-              id: '39ec9611c3814f738cf8118522e00c7a',
-              params: {},
-              personId: 'person1119',
-              personName: '李国亮',
-              remark: null,
-              searchValue: null,
-              updateBy: null,
-              updateTime: null,
-            },
-          ],
-          remark: null,
-          searchValue: null,
-          updateBy: '1',
-          updateTime: '2021-10-11 19:57:28',
-        },
-      ],
-      // 承担科研项目
-      taskList: [
-        {
-          cooperativeunit: '中心',
-          createBy: '1',
-          createTime: '2021-09-23 10:30:01',
-          delFlag: '0',
-          direction: 'direction001',
-          directionName: '开创视觉光刺激治疗癫痫研究',
-          fzuser: 'person001',
-          id: '6db0514ae17443e0a6017a30381df660',
-          labname: null,
-          laiyuancontent: '横向合作<横向合作',
-          money: 105,
-          name: '名称',
-          params: {},
-          participants: null,
-          persons: [
-            {
-              createBy: null,
-              createTime: '2021-10-09 09:52:14',
-              delFlag: '0',
-              id: '30501382e525433bba47df3ecc0789db',
-              params: {},
-              projectid: '6db0514ae17443e0a6017a30381df660',
-              remark: null,
-              searchValue: null,
-              updateBy: null,
-              updateTime: null,
-              userName: '张彤',
-              userid: 'person004',
-            },
-            {
-              createBy: null,
-              createTime: '2021-10-09 09:52:14',
-              delFlag: '0',
-              id: '4637ac39b76545dfb27718e9d8d169a0',
-              params: {},
-              projectid: '6db0514ae17443e0a6017a30381df660',
-              remark: null,
-              searchValue: null,
-              updateBy: null,
-              updateTime: null,
-              userName: '王江涛',
-              userid: 'person001',
-            },
-          ],
-          projectlevelone: 'xm666sss',
-          projectsource: '5',
-          projectsourcetwo: '21',
-          remark: null,
-          searchValue: null,
-          state: null,
-          statemoney: 5,
-          time: '2021-09-22',
-          updateBy: null,
-          updateTime: '2021-10-09 09:52:14',
-          userName: '王江涛',
-          usernum: '10',
-          userproportion: '30%',
-        },
-      ],
-      // 核心成员
-      personnelList: [
-        {
-          age: null,
-          createBy: '1',
-          createTime: '2021-09-17 00:00:00',
-          delFlag: '0',
-          educationale: null,
-          id: 'person001',
-          job: null,
-          make: null,
-          name: '王江涛',
-          params: {},
-          remark: null,
-          searchValue: null,
-          unit: '吉林大学第一医院小儿神经科',
-          updateBy: 'userid001',
-          updateTime: '2021-09-23 13:26:37',
-        },
-        {
-          age: null,
-          createBy: '2',
-          createTime: '2021-09-17 00:00:00',
-          delFlag: '0',
-          educationale: null,
-          id: 'person002',
-          job: null,
-          make: '1',
-          name: '刘光耀',
-          params: {},
-          remark: null,
-          searchValue: null,
-          unit: '吉林大学中日联谊医院',
-          updateBy: 'userid002',
-          updateTime: '2021-09-17 10:35:10',
-        },
-      ],
-      // 仪器设备
-      equipmentList: [
-        {
-          count1: null,
-          count2: null,
-          count3: null,
-          count4: null,
-          count5: null,
-          count6: null,
-          createBy: '1',
-          createTime: '2021-10-17 16:14:42',
-          delFlag: '0',
-          equipmentMoney: 50,
-          equipmentNumb: null,
-          id: '42d852f2bc9944feaca6671630b38aa0',
-          instrumentsNumb: 'Y',
-          name: '特种设备3',
-          params: {},
-          rate: 0.07778,
-          remark: null,
-          researchHour: 60,
-          searchValue: null,
-          servicesHour: 80,
-          updateBy: '特种设备3',
-          updateTime: '2021-10-17 16:25:37',
-        },
-      ],
-      // 专利
+      learningList: [],
+      directionList: [],
+      taskList: [],
+      personnelList: [],
+      equipmentList: [],
       awardList: [],
-      // 论文
       paperList: [],
-      // 奖励
       patentList: [],
-      // 重大成果
       outcomeList: [],
     };
   },
@@ -319,32 +108,37 @@ export default {
     if (this.id) await this.search();
   },
   methods: {
-    ...mapActions(['fetch']),
-    ...committee({ committeeQuery: 'query' }),
-    ...direction({ directionQuery: 'query' }),
-    ...task({ taskQuery: 'query' }),
-    ...personnel({ personnelQuery: 'query' }),
-    ...equipment({ equipmentQuery: 'query' }),
-    ...award({ awardQuery: 'query' }),
-    ...paper({ paperQuery: 'query' }),
-    ...patent({ patentQuery: 'query' }),
-    ...outcome({ outcomeQuery: 'query' }),
+    ...mapActions(['query', 'fetch']),
     async search() {
-      let res = await this.fetch(this.id);
-      if (this.$checkRes(res)) this.$set(this, `info`, res.data);
+      let res = await this.fetch({ table: 'BasicInformation', id: this.id });
+      if (res.errcode == '0') this.$set(this, `info`, res.data);
       // 学术委员会
-      res = await this.committeeQuery();
-      if (this.$checkRes(res)) console.log(res);
+      res = await this.query({ table: 'Committee', create_by: this.id });
+      if (res.errcode == '0') this.$set(this, `learningList`, res.data);
       // 主要研究方向
-      res = await this.directionQuery();
-      if (this.$checkRes(res)) console.log(res);
+      res = await this.query({ table: 'ResearchDirection', create_by: this.id });
+      if (res.errcode == '0') this.$set(this, `directionList`, res.data);
       // 承担科研项目
+      res = await this.query({ table: 'BearScience', create_by: this.id });
+      if (res.errcode == '0') this.$set(this, `taskList`, res.data);
       // 核心成员(固定人员)
+      res = await this.query({ table: 'FixedPersonnel', create_by: this.id });
+      if (res.errcode == '0') this.$set(this, `personnelList`, res.data);
       // 仪器设备
-      // 专利
+      res = await this.query({ table: 'Equipment', create_by: this.id });
+      if (res.errcode == '0') this.$set(this, `equipmentList`, res.data);
+      // 制定标准明细
+      res = await this.query({ table: 'Soa', create_by: this.id });
+      if (res.errcode == '0') this.$set(this, `awardList`, res.data);
       // 论文
+      res = await this.query({ table: 'Sopaper', create_by: this.id });
+      if (res.errcode == '0') this.$set(this, `paperList`, res.data);
       // 奖励
+      res = await this.query({ table: 'Sopatent', create_by: this.id });
+      if (res.errcode == '0') this.$set(this, `patentList`, res.data);
       // 重大成果
+      res = await this.query({ table: 'Outcome', create_by: this.id });
+      if (res.errcode == '0') this.$set(this, `outcomeList`, res.data);
     },
     // 返回
     back() {