dedsudiyu 2 年之前
父节点
当前提交
3cbdfd7202

+ 10 - 4
src/README.md

@@ -6,7 +6,6 @@
 # 针对矿大项目修改      针对布局与疏散图 适配多楼栋 多楼层
 
 views
-  emergencyEvacuationBigOne.vue(本地静态路由需要同步修改)
   comprehensive
     laboratoryManagement
       building
@@ -19,7 +18,12 @@ views
         indexOne.vue
         performEvacuationOne.vue
   
+静态路由修改项
+  path: '/emergencyEvacuationBig' 地址修改为  emergencyEvacuationBigOne
+  path: '/' 地址修改为  home
+其他修改项
   *  项目名称修改 => 实验室安全智能监测与控制系统
+  *  取消按钮首页注释  layout => components => Navbar.vue
         
         
         
@@ -27,7 +31,6 @@ views
         
 # 针对空军四医大项目   实验室-物联设备配置只有传感器与智能门禁
 views
-  loginOne.vue(本地静态路由需要同步修改)
   comprehensive
     laboratoryManagement
       subject
@@ -43,8 +46,11 @@ views
         indexOne.vue
   mine
     indexOne.vue
-  
+    
+静态路由修改项
+  path: '/login' 地址修改为  loginOne
+  path: '/' 地址修改为  loginOne
+其他修改项
   *  项目名称修改 => 危化品智能存储管理系统
-  
   *  按钮首页注释掉  layout => components => Navbar.vue
 

+ 10 - 0
src/assets/styles/ZDelement.scss

@@ -273,6 +273,16 @@ background: rgba(255,255,255,0);
   height:100%;
   background: url("../ZDimages/null-data-1.png") no-repeat 50% 50%;
 }
+.el-table-min-img-box{
+  .el-table__empty-text{
+    background: red;
+    color:rgba(0,0,0,0);
+    width:100%;
+    height:100%;
+    background: url("../ZDimages/null-data-1.png") no-repeat 50% 50%;
+    background-size: 12%;
+  }
+}
 /*======================el-dialog弹窗居中*/
 .el-dialog__wrapper{
   position: fixed; top: 0; left: 0; right: 0; bottom: 0; display: -webkit-box;  -webkit-box-align: center;-webkit-box-pack: center;

+ 2 - 2
src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -260,7 +260,7 @@ import mqtt from 'mqtt'
 import flvjs from 'flv.js'
 import { hardWareControl,alarmControl } from "@/api/laboratory/hardware";
 import { authListSubject,subjectInfo,updateSubject,mangerVoice,startUrl,startUrlJiNanDaXue } from "@/api/laboratory/subject";
-import { listDepartments } from "@/api/system/dept";
+import { filterDept } from "@/api/medicUniversity-3_1/index";
 import addSubject from "./addSubject.vue";
 import deviceList from "./deviceList.vue";
 import admissionConfiguration from "./admissionConfiguration.vue";
@@ -822,7 +822,7 @@ export default {
     },
     /** 查询学院列表 */
     getDeptList() {
-      listDepartments().then(response => {
+      filterDept().then(response => {
         this.$set(this, 'deptOptions', response.data)
       });
     },

+ 2 - 2
src/views/comprehensive/laboratoryManagement/subject/indexOne.vue

@@ -279,7 +279,7 @@ import mqtt from 'mqtt'
 import flvjs from 'flv.js'
 import { hardWareControl,alarmControl } from "@/api/laboratory/hardware";
 import { authListSubject,subjectInfo,updateSubject,mangerVoice,startUrl,startUrlWC,getDetalis } from "@/api/laboratory/subject";
-import { listDepartments } from "@/api/system/dept";
+import { filterDept } from "@/api/medicUniversity-3_1/index";
 import addSubject from "./addSubject.vue";
 import deviceList from "./deviceListOne.vue";
 import admissionConfiguration from "./admissionConfiguration.vue";
@@ -854,7 +854,7 @@ export default {
     },
     /** 查询学院列表 */
     getDeptList() {
-      listDepartments().then(response => {
+      filterDept().then(response => {
         this.$set(this, 'deptOptions', response.data)
       });
     },

+ 2 - 2
src/views/comprehensive/laboratoryManagement/subject/indexTwo.vue

@@ -260,7 +260,7 @@ import mqtt from 'mqtt'
 import flvjs from 'flv.js'
 import { hardWareControl,alarmControl } from "@/api/laboratory/hardware";
 import { authListSubject,subjectInfo,updateSubject,mangerVoice,startUrl,startUrlWC } from "@/api/laboratory/subject";
-import { listDepartments } from "@/api/system/dept";
+import { filterDept } from "@/api/medicUniversity-3_1/index";
 import addSubject from "./addSubject.vue";
 import deviceList from "./deviceList.vue";
 import admissionConfiguration from "./admissionConfiguration.vue";
@@ -822,7 +822,7 @@ export default {
     },
     /** 查询学院列表 */
     getDeptList() {
-      listDepartments().then(response => {
+      filterDept().then(response => {
         this.$set(this, 'deptOptions', response.data)
       });
     },

+ 1 - 1
src/views/comprehensive/personnel/teacher/userList.vue

@@ -137,7 +137,7 @@
       this.getDicts("work_class").then(response => {
         this.workClass = response.data;
       });
-      this.getListClasstypeAll();
+      // this.getListClasstypeAll();
       this.getListClassifiedAll();
       this.listDepartments();
       this.optionselect();

+ 1 - 1
src/views/comprehensive/personnel/teacher/userListOne.vue

@@ -143,7 +143,7 @@
       this.getDicts("work_class").then(response => {
         this.workClass = response.data;
       });
-      this.getListClasstypeAll();
+      // this.getListClasstypeAll();
       this.getListClassifiedAll();
       this.listDepartments();
       this.optionselect();

+ 2 - 2
src/views/creditViolation/record_my/index.vue

@@ -106,7 +106,7 @@
           <p class="reset-button-one" @click="resetQuery">重置</p>
         </el-form-item>
       </el-form>
-      <el-table v-loading="loading" border :data="recordList" v-if="queryParams.pointsType == 2">
+      <el-table class="el-table-min-img-box" v-loading="loading" border :data="recordList" v-if="queryParams.pointsType == 2">
         <!--<el-table-column label="姓名" align="left" prop="userName" />-->
         <el-table-column label="奖励分变动信息" align="left" prop="messageContent"/>
         <el-table-column label="时间" align="left" prop="createTime" />
@@ -117,7 +117,7 @@
         </el-table-column>
         <el-table-column label="奖励分余额" align="left"  prop="surplusPoints"/>
       </el-table>
-      <el-table v-loading="loading" border :data="recordList" v-if="queryParams.pointsType == 1">
+      <el-table class="el-table-min-img-box" v-loading="loading" border :data="recordList" v-if="queryParams.pointsType == 1">
         <!--<el-table-column label="姓名" align="left" prop="userName" />-->
         <el-table-column label="信用分变动信息" align="left" prop="messageContent"/>
         <el-table-column label="时间" align="left" prop="createTime" />

+ 4 - 4
src/views/hierarchicalControl/hierarchicalControl/gradeManage/addPage.vue

@@ -222,7 +222,7 @@
 <script>
   import subjectList from "./subjectList.vue"
   import { addGradeManage,getGradeManage,updateGradeManage,listInfo } from "@/api/laboratory/gradeManage";
-  import { listDepartments } from "@/api/system/dept";
+  import { filterDept } from "@/api/medicUniversity-3_1/index";
   import { listClassifiedAll } from "@/api/laboratory/classified";
   import { listClasstypeAll } from "@/api/laboratory/classtype";
   import { queryOption } from "@/api/laboratory/labMold";
@@ -337,7 +337,7 @@
 
     },
     mounted(){
-      this.listDepartments();
+      this.filterDept();
       this.getListClassifiedAll();
       this.getListClasstypeAll();
       this.queryOption();
@@ -372,8 +372,8 @@
         this.$set(this,'total',this.tableUserList.length);
       },
       //获取学院
-      listDepartments(){
-        listDepartments().then(response => {
+      filterDept(){
+        filterDept().then(response => {
           this.deptList = response.data;
         });
       },

+ 4 - 4
src/views/hierarchicalControl/hierarchicalControl/gradeManage/index.vue

@@ -77,7 +77,7 @@
 
 <script>
   import { listGradeManage, getGradeManage, delGradeManage, addGradeManage, updateGradeManage } from "@/api/laboratory/gradeManage";
-  import { listDepartments } from "@/api/system/dept";
+  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";
@@ -211,7 +211,7 @@
     mounted(){
       this.getListClassifiedAll();
       this.getListClasstypeAll();
-      this.listDepartments();
+      this.filterDept();
       this.labMoldQueryOption();
       this.getList();
     },
@@ -244,8 +244,8 @@
         });
       },
       //获取学院
-      listDepartments(){
-        listDepartments().then(response => {
+      filterDept(){
+        filterDept().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,})

+ 7 - 7
src/views/hierarchicalControl/hierarchicalControl/gradeManage/userList.vue

@@ -86,7 +86,7 @@
 </template>
 
 <script>
-  import { listDepartments } from "@/api/system/dept";
+  import { filterDept } from "@/api/medicUniversity-3_1/index";
   import { optionselect } from "@/api/laboratory/gradeManage";
   import { listUser } from "@/api/permissionRequired";
   import { listClassifiedAll } from "@/api/laboratory/classified";
@@ -129,9 +129,9 @@
 
     },
     mounted(){
-      this.getListClasstypeAll();
+      // this.getListClasstypeAll();
       this.getListClassifiedAll();
-      this.listDepartments();
+      this.filterDept();
       this.optionselect();
     },
     methods:{
@@ -147,9 +147,9 @@
         console.log("data",data);
         let self = this;
         this.resetQuery();
-        this.getListClasstypeAll();
+        // this.getListClasstypeAll();
         this.getListClassifiedAll();
-        this.listDepartments();
+        this.filterDept();
         this.optionselect();
         this.userOpen = !this.userOpen;
         if(data){
@@ -170,8 +170,8 @@
         // }
       },
       //获取学院
-      listDepartments(){
-        listDepartments().then(response => {
+      filterDept(){
+        filterDept().then(response => {
           this.deptList = response.data;
         });
       },

+ 4 - 4
src/views/hierarchicalControl/hierarchicalControl/gradeManageRecord/index.vue

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

+ 6 - 6
src/views/medicUniversity-3_1/indexHome.vue

@@ -359,12 +359,12 @@
         //化学品分类统计
         chemicalClassifyMix(){
           chemicalClassifyMix().then(response => {
-            let newList = [];
-            for(let i=0;i<response.data.length;i++){
-              if(i<6){
-                newList.push(response.data[i]);
-              }
-            }
+            let newList = response.data;
+            // for(let i=0;i<response.data.length;i++){
+            //   if(i<6){
+            //     newList.push(response.data[i]);
+            //   }
+            // }
             this.chemicalClassifyMixList = JSON.parse(JSON.stringify(newList));
             let list = [];
             for(let i=0;i<newList.length;i++){