zc

src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -398,7 +398,7 @@ import {
   queryHardByTypeList, subjectTriggerModes,
 } from '@/api/laboratory/subject'
 import { listData} from "@/api/system/dict/data";
-import { filterDept } from "@/api/medicUniversity-3_1/index";
+import { listDepartments } from "@/api/system/dept";
 import addSubject from "./addSubject.vue";
 import deviceList from "./deviceList.vue";
 import admissionConfiguration from "./admissionConfiguration.vue";
@@ -1122,7 +1122,7 @@ export default {
     },
     /** 查询学院列表 */
     getDeptList() {
-      filterDept().then(response => {
+      listDepartments().then(response => {
         this.$set(this, 'deptOptions', response.data)
       });
     },
@@ -1145,18 +1145,6 @@ export default {
             console.log("订阅成功:" + this.mtopicOne+self.subId);
           }
         });
-        // for(let i = 0; i< self.mqttIdList.length;i++){
-        //   this.client.subscribe(this.mtopic+self.mqttIdList[i], (err) => {
-        //     if (!err) {
-        //       console.log("订阅成功:" + this.mtopic+self.mqttIdList[i]);
-        //     }
-        //   });
-        //   this.client.subscribe(this.mtopicOne+self.mqttIdList[i], (err) => {
-        //     if (!err) {
-        //       console.log("订阅成功:" + this.mtopicOne+self.mqttIdList[i]);
-        //     }
-        //   });
-        // }
       });
       this.client.on("message", (topic, message) => {
         // console.log('message',message)

src/views/comprehensive/laboratoryManagement/subject/indexOne.vue

@@ -283,7 +283,7 @@ import mqtt from 'mqtt'
 import flvjs from 'flv.js'
 import { hardWareControl,alarmControl } from "@/api/laboratory/hardware";
 import { authListSubject,subjectInfo,updateSubject,mangerVoice,startUrl,getDetalis } from "@/api/laboratory/subject";
-import { filterDept } from "@/api/medicUniversity-3_1/index";
+import { listDepartments } from "@/api/system/dept";
 // import addSubject from "./addSubject.vue";
 // import deviceList from "./deviceListOne.vue";
 // import admissionConfiguration from "./admissionConfiguration.vue";
@@ -802,7 +802,7 @@ export default {
     },
     /** 查询学院列表 */
     getDeptList() {
-      filterDept().then(response => {
+      listDepartments().then(response => {
         this.$set(this, 'deptOptions', response.data)
       });
     },
@@ -825,18 +825,6 @@ export default {
             console.log("订阅成功:" + this.mtopicOne+self.subId);
           }
         });
-        // for(let i = 0; i< self.mqttIdList.length;i++){
-        //   this.client.subscribe(this.mtopic+self.mqttIdList[i], (err) => {
-        //     if (!err) {
-        //       console.log("订阅成功:" + this.mtopic+self.mqttIdList[i]);
-        //     }
-        //   });
-        //   this.client.subscribe(this.mtopicOne+self.mqttIdList[i], (err) => {
-        //     if (!err) {
-        //       console.log("订阅成功:" + this.mtopicOne+self.mqttIdList[i]);
-        //     }
-        //   });
-        // }
       });
       this.client.on("message", (topic, message) => {
         // console.log('message',message)

src/views/hierarchicalControl/hierarchicalControl/gradeManage/index.vue

@@ -77,8 +77,8 @@
 </template>
 
 <script>
+  import { listDepartments } from "@/api/system/dept";
   import { listGradeManage, getGradeManage, delGradeManage, addGradeManage, updateGradeManage } from "@/api/laboratory/gradeManage";
-  import { filterDept } from "@/api/medicUniversity-3_1/index";
   import { listClassifiedAll } from "@/api/laboratory/classified";
   import { listClasstypeAll } from "@/api/laboratory/classtype";
   import { labMoldQueryOption } from "@/api/laboratory/subjectClass";
@@ -212,7 +212,7 @@
     mounted(){
       this.getListClassifiedAll();
       this.getListClasstypeAll();
-      this.filterDept();
+      this.listDepartments();
       this.labMoldQueryOption();
       this.getList();
     },
@@ -245,8 +245,8 @@
         });
       },
       //获取学院
-      filterDept(){
-        filterDept().then(response => {
+      listDepartments(){
+        listDepartments().then(response => {
           let list = [];
           for(let i=0;i<response.data.length;i++){
             list.push({label:response.data[i].deptName, value:response.data[i].deptId,})

src/views/hierarchicalControl/hierarchicalControl/gradeManageRecord/index.vue

@@ -158,7 +158,7 @@
 </template>
 
 <script>
-import { filterDept } from "@/api/medicUniversity-3_1/index";
+  import { listDepartments } from "@/api/system/dept";
 import { listGradeManageRecord, getGradeManageRecord, delGradeManageRecord, addGradeManageRecord, updateGradeManageRecord } from "@/api/laboratory/gradeManageRecord";
 import { listClassifiedAll } from "@/api/laboratory/classified";
 import { listClasstypeAll } from "@/api/laboratory/classtype";
@@ -220,7 +220,7 @@ export default {
     this.getList();
   },
   mounted(){
-    this.filterDept();
+    this.listDepartments();
     this.getListClassifiedAll();
     this.getListClasstypeAll();
     this.queryOption();
@@ -284,8 +284,8 @@ export default {
       });
     },
     //获取学院
-    filterDept(){
-      filterDept().then(response => {
+    listDepartments(){
+      listDepartments().then(response => {
         this.deptList = response.data;
       });
     },

src/views/secureAccess/whitelist/index.vue

@@ -33,7 +33,7 @@
         <el-table-column label="姓名" align="left" prop="userName"/>
         <el-table-column label="工号" align="left" prop="userNumber"/>
         <el-table-column label="联系方式" align="left" prop="userTelephone"/>
-        <el-table-column label="学院" align="left" prop="deptName"/>
+        <el-table-column label="部门" align="left" prop="deptName"/>
         <el-table-column label="操作" align="center" width="160" v-if="tableButtonType">
           <template slot-scope="scope">
             <div class="table-button-box">