dedsudiyu 1 ヶ月 前
コミット
fcc45505af

+ 6 - 6
src/api/index.js

@@ -157,19 +157,19 @@ export function laboratoryExitLineExecuteEvacuation(data) {
   })
 }
 //首页-风险预警统计
-export function laboratoryBigViewCollegeEventStatistics(query) {
+export function laboratoryBigViewCollegeEventStatistics(data) {
     return request({
         url: '/laboratory/bigView/collegeEventStatistics',
-        method: 'get',
-        params: query
+        method: 'post',
+        data: data
     })
 }
 //首页-安全准入办理统计
-export function laboratoryBigViewListCollegeApplyColumn(query) {
+export function laboratoryBigViewListCollegeApplyColumn(data) {
     return request({
         url: '/laboratory/bigView/listCollegeApplyColumn',
-        method: 'get',
-        params: query
+        method: 'post',
+        data: data
     })
 }
 //安全准入办理列表

+ 6 - 2
src/components/newSubVideoComponent.vue

@@ -49,7 +49,7 @@
         queryParams: {
           page: 1,
           pageSize: 2,
-          deptId: localStorage.getItem('deptId')=='1'?'':localStorage.getItem('deptId'),
+          deptId: !localStorage.getItem('deptId')?'':localStorage.getItem('deptId'),
         },
         total: 0,//总数
         videoList: [],
@@ -81,7 +81,11 @@
       },
       //初始化
       initialize() {
-        laboratorySubRelInfoSelectInfoAndSensor(this.queryParams).then((res) => {
+        let obj = JSON.parse(JSON.stringify(this.queryParams))
+        if(!obj.deptId){
+          obj.buildId = localStorage.getItem('buildId');
+        }
+        laboratorySubRelInfoSelectInfoAndSensor(obj).then((res) => {
           if (res.data.records[0]) {
             res.data.records.forEach((bigItem)=>{
               if(bigItem.sensorList){

+ 11 - 3
src/components/personnelAdmittanceECharts/personnelAdmittanceECharts.vue

@@ -66,7 +66,11 @@
       },
       //实验室分类分级
       laboratoryBigViewsSubTypeLevelCount() {
-        laboratoryBigViewsSubTypeLevelCount({}).then(response => {
+        let obj = {};
+        if(!localStorage.getItem('deptId')){
+          obj.buildId = localStorage.getItem('buildId');
+        }
+        laboratoryBigViewsSubTypeLevelCount(obj).then(response => {
           if (response.code == 200) {
             this.$set(this, 'classifyList', response.data.classType)
             let dataVal = response.data.levelType
@@ -157,8 +161,12 @@
       },
       //安全准入办理统计
       laboratoryBigViewListCollegeApplyColumn() {
-        let self = this
-        laboratoryBigViewListCollegeApplyColumn({}).then((res) => {
+        let self = this;
+        let obj = {};
+        if(!localStorage.getItem('deptId')){
+          obj.buildId = localStorage.getItem('buildId');
+        }
+        laboratoryBigViewListCollegeApplyColumn(obj).then((res) => {
           if (res.code == 200) {
             let illegalX = []
             let illegalData = []

+ 7 - 1
src/views/courtyardManage/classifyGradeDetail.vue

@@ -159,7 +159,13 @@
     },
     methods: {
       laboratoryLabDeptTreeLargeTree() {
-        laboratoryLabDeptTreeLargeTree({ deptId: localStorage.getItem('deptId') }).then(response => {
+        let obj = {};
+        if(!localStorage.getItem('deptId')){
+          obj.buildingId = localStorage.getItem('buildId');
+        }else{
+          obj.deptId = localStorage.getItem('deptId');
+        }
+        laboratoryLabDeptTreeLargeTree(obj).then(response => {
           this.$set(this, 'buildingOptions', response.data)
           this.laboratoryBigViewGetFloorListByBigView(response.data[0].id, response.data[0].buildFloorVoList[0].id)
         })

+ 16 - 9
src/views/courtyardManage/courtyardHome.vue

@@ -6,14 +6,14 @@
         <img class="left_t_l" src="@/assets/image/index_icon5.png"/>
         <div class="left_t_l1"></div>
         <div class="left_t_c">
-          <li :class="{'checked_li':checkedNum==0}" @click="checkedNumButton(0)">校院通知</li>
+          <li :class="{'checked_li':checkedNum==0}" @click="checkedNumButton(0)" v-if="deptId">校院通知</li>
           <li :class="{'checked_li':checkedNum==1}" @click="checkedNumButton(1)">预警事件</li>
-          <li :class="{'checked_li':checkedNum==2}" @click="checkedNumButton(2)">工作计划</li>
+          <li :class="{'checked_li':checkedNum==2}" @click="checkedNumButton(2)" v-if="deptId">工作计划</li>
         </div>
         <div class="left_t_n">
           <el-carousel ref="el-carousel" class="swiper-container" @change="checkedNumChange" :interval="6000"
                        trigger="click" direction="vertical" indicator-position="none" height="410px">
-            <el-carousel-item class="swiper-wrapper">
+            <el-carousel-item  v-if="deptId" class="swiper-wrapper">
               <div class="swiper-slide">
                 <!--院校通知-->
                 <div class="left_t_r" v-if="infoList">
@@ -59,7 +59,7 @@
                 </div>
               </div>
             </el-carousel-item>
-            <el-carousel-item class="swiper-wrapper">
+            <el-carousel-item  v-if="deptId" class="swiper-wrapper">
               <div class="swiper-slide">
                 <!--工作计划-->
                 <div class="left_t_r3" v-if="workList">
@@ -149,7 +149,6 @@
       return {
         showType:true,
         circularLogo: localStorage.getItem('circularLogo'),
-        deptName: null,
         deptId: null,
         mtopicTwo: 'manage/work' + localStorage.getItem('userId'),
         timer: null,//定时器
@@ -196,7 +195,6 @@
       }
     },
     created() {
-      this.$set(this, 'deptName', localStorage.getItem('deptName'))
       this.$set(this, 'deptId', localStorage.getItem('deptId'))
     },
     mounted() {
@@ -213,6 +211,7 @@
       checkDept(){
         let self = this;
         if(!this.warningList[0]){
+          this.$set(this, 'deptId', localStorage.getItem('deptId'))
           this.$set(this,'showType',false);
           setTimeout(function(){
             self.$set(self,'showType',true);
@@ -313,7 +312,11 @@
       //预案执行统计
       laboratoryBigViewCollegeEventStatistics() {
         let self = this
-        laboratoryBigViewCollegeEventStatistics({}).then((res) => {
+        let obj = {};
+        if(!localStorage.getItem('deptId')){
+          obj.buildId = localStorage.getItem('buildId');
+        }
+        laboratoryBigViewCollegeEventStatistics(obj).then((res) => {
           if (res.code == 200) {
             let dataX = []
             let dataValue = []
@@ -343,7 +346,11 @@
       //预警事件
       warningPlanFun: function() {
         let self = this
-        systemWarningNoticeNoMenuList({ page: 1, pageSize: 6 }).then((res) => {
+        let obj = { page: 1, pageSize: 6 };
+        if(!localStorage.getItem('deptId')){
+          obj.buildId = localStorage.getItem('buildId');
+        }
+        systemWarningNoticeNoMenuList(obj).then((res) => {
           if (res.code == 200) {
             this.$set(self, 'planList', res.data.records)
           }
@@ -508,7 +515,7 @@
       },
       //获取报警信息
       laboratoryBigViewSelectTriggerInfo: function() {
-        let self = this
+        let self = this;
         laboratoryBigViewSelectTriggerInfo().then((res) => {
           if (res.code == 200) {
             for (let i = 0; i < res.data.length; i++) {

+ 3 - 0
src/views/courtyardManage/eventList.vue

@@ -175,6 +175,9 @@
             getAjaxList: function () {
                 let obj = JSON.parse(JSON.stringify(this.editForm))
                 obj.deptId = localStorage.getItem('deptId');
+                if(!localStorage.getItem('deptId')){
+                  obj.buildId = localStorage.getItem('buildId');
+                }
                 if(this.dateRange[0]){
                     obj.startTime = this.dateRange[0]+'T00:00:00'
                     obj.endTime = this.dateRange[1]+'T23:59:59'

+ 3 - 0
src/views/courtyardManage/planDetail.vue

@@ -143,6 +143,9 @@
             getAjaxList: function () {
                 let _this = this;
                 let obj = JSON.parse(JSON.stringify(this.editForm))
+                if(!localStorage.getItem('deptId')){
+                  obj.buildId = localStorage.getItem('buildId');
+                }
                 if (this.dateRange[0]) {
                     obj.startTime = this.dateRange[0]+'T00:00:00';
                     obj.endTime = this.dateRange[1]+'T23:59:59';

+ 7 - 1
src/views/emergencyManagement/pageComponent/deptListComponent.vue

@@ -183,7 +183,13 @@
       //新树
       laboratoryLabDeptTreeLargeTree() {
         let self = this;
-        laboratoryLabDeptTreeLargeTree({deptId:localStorage.getItem('deptId')}).then(response => {
+        let obj = {};
+        if(!localStorage.getItem('deptId')){
+          obj.buildingId = localStorage.getItem('buildId');
+        }else{
+          obj.deptId = localStorage.getItem('deptId');
+        }
+        laboratoryLabDeptTreeLargeTree(obj).then(response => {
           let list = this.forTreeId(response.data);
           this.$nextTick(()=>{
             //写入楼层下数据

+ 1 - 1
src/views/headerComponent.vue

@@ -73,7 +73,7 @@
         this.$set(this,'setCheckIndex',index);
         localStorage.setItem('setCheckIndex', index);
         if(this.deptList[index].level == 1){
-          localStorage.setItem('deptId','');
+          localStorage.removeItem('deptId');
         }else{
           localStorage.setItem('deptId',this.deptList[index].deptId);
         }

+ 4 - 3
src/views/login.vue

@@ -215,15 +215,16 @@
           let newList = [
             {
               deptId: res.data.userInfo.deptId,
-              name: '数据汇总',
+              name: '崇慧楼',
               level: 1,
-              token: token
+              token: token,
             }
           ];
           newList = newList.concat(list);
           localStorage.setItem('deptList', JSON.stringify(newList));
           localStorage.setItem('deptName', res.data.userInfo.deptName)
-          localStorage.setItem('deptId', res.data.userInfo.deptId)
+          localStorage.removeItem('deptId');
+          localStorage.setItem('buildId','101093843117592803');
           this.fullScreen()
           setTimeout(function () {
             self.$router.push({path: '/home'});

+ 5 - 1
src/views/videoSurveillance/pageComponent/deptListComponent.vue

@@ -141,7 +141,6 @@
       laboratoryLabDeptTreeLargeTree() {
         let self = this;
         let obj = {
-            deptId:localStorage.getItem('deptId'),
             levelIds:[],
         };
         if (this.inputType == 1){
@@ -154,6 +153,11 @@
             obj.levelIds.push(self.checkLeveList[i].levelId)
           }
         }
+        if(!localStorage.getItem('deptId')){
+          obj.buildingId = localStorage.getItem('buildId');
+        }else{
+          obj.deptId = localStorage.getItem('deptId');
+        }
         laboratoryLabDeptTreeLargeTree(obj).then(response => {
           if(!response.data[0]){
               this.msgSuccess('未找到相关数据')