zc

README.md

@@ -97,17 +97,19 @@
     
 ### 2.功能标识表
 
-| 功能标识 | 功能名称 | 备注 |
-|  ---- | ---- |  ---- | 
-| type == 10 | 实验室危险源 | 前端生成 |
-| type == 9 | 化学品 | 前端生成 |
-| type == 8 | 化学品柜 | 前端生成 |
-| type == 7 | 培训课程 | 前端生成 |
-| type == 6 | 专项检查 | 前端生成 |
-| type == 5 | 实验室详情 | 后端生成 |
-| type == 3 | 危险源列表 | 后端生成 |
-| type == 2 | 安全制度 | 后端生成 |
-| type == 1 | MSDS说明书 | 前端端生成 |
+| 功能标识 | 功能名称 | 业务字段 | 备注 |
+|  ---- | ---- | ---- | ---- | 
+| type == 12 | 化学品终端扫码双人认证 | doorId,subId,macId | 前端生成 |
+| type == 11 | 化学品终端扫码单人登录 | code,subId,macId | 前端生成 |
+| type == 10 | 实验室危险源 | -- | 前端生成 |
+| type == 9 | 化学品 | -- | 前端生成 |
+| type == 8 | 化学品柜 | -- | 前端生成 |
+| type == 7 | 培训课程 | -- | 前端生成 |
+| type == 6 | 专项检查 | -- | 前端生成 |
+| type == 5 | 实验室详情 | -- | 后端生成 |
+| type == 3 | 危险源列表 | -- | 后端生成 |
+| type == 2 | 安全制度 | -- | 后端生成 |
+| type == 1 | MSDS说明书 | -- | 前端端生成 |
 
     
 ## 五.版本相关

src/views/creditViolation/credit/markconfig/index.vue

@@ -406,8 +406,15 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      let self = this;
       this.$refs["form"].validate(valid => {
         if (valid) {
+          for(let i=0;i<self.form.configDetailList.length;i++){
+            if(self.form.configDetailList[i].beginScore >= self.form.configDetailList[i].endScore){
+              this.msgError('信用分值区间,最小值不能大于等于最大值')
+              return
+            }
+          }
           let newObj = JSON.parse(JSON.stringify(this.form));
           let obj = {
             passMark:newObj.passMark,

src/views/emergencyManagement/evacuation/emergencyEvacuation/newEvacuationBigData.vue

@@ -464,7 +464,7 @@
     },
     data() {
       return {
-        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://'+localStorage.getItem('fileBrowseEnvironment')+ localStorage.getItem('videoCover'),
         //当前路由状态
         routeType:false,
         //全局MQTT相关

src/views/emergencyManagement/evacuation/emergencyEvacuation/newEvacuationBigDataHome.vue

@@ -124,7 +124,7 @@
     },
     data() {
       return {
-        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://'+localStorage.getItem('fileBrowseEnvironment')+ localStorage.getItem('videoCover'),
         //当前路由状态
         routeType:false,
         containerType:false,

src/views/emergencyManagement/performEvacuation/performEvacuationBig.vue

@@ -28,7 +28,7 @@
       }
     },
     mounted () {
-      //this.getList();
+
     },
     methods: {
       goPage(type,data){

src/views/emergencyManagement/performEvacuation/performEvacuationData.vue

@@ -20,6 +20,28 @@
     },
     methods: {
 
+      //全屏页面跳转
+      goRoute(){
+        if(this.routeType){
+          this.$router.push({
+            path: "/emergencyManagement/newPerformEvacuation",
+            query: {
+              buildId: this.$route.query.buildId?this.$route.query.buildId:(this.propsBigData.buildId?this.propsBigData.buildId:''),
+              floorId:this.$route.query.floorId?this.$route.query.floorId:(this.propsBigData.floorId?this.propsBigData.floorId:''),
+              subId:this.$route.query.subId?this.$route.query.subId:(this.propsBigData.subId?this.propsBigData.subId:''),
+            }
+          })
+        }else{
+          this.$router.push({
+            path: "/newEvacuationBigData",
+            query: {
+              buildId: this.$route.query.buildId?this.$route.query.buildId:(this.propsBigData.buildId?this.propsBigData.buildId:''),
+              floorId:this.$route.query.floorId?this.$route.query.floorId:(this.propsBigData.floorId?this.propsBigData.floorId:''),
+              subId:this.$route.query.subId?this.$route.query.subId:(this.propsBigData.subId?this.propsBigData.subId:''),
+            }
+          })
+        }
+      },
     },
   }
 </script>

src/views/emergencyManagement/performEvacuation/performEvacuationHome.vue

@@ -3,9 +3,9 @@
   <div class="performEvacuationHome" ref="maxBox">
     <div class="top-title-box">
       <div class="top-title-img-box">应 急 处 置</div>
-      <div class="top-title-button-box">
+      <div class="top-title-button-box" @click="goRoute">
         <i class="el-icon-switch-button"></i>
-        <p @click="goRoute">{{routeType?'退出全屏':'全屏'}}</p>
+        <p>{{routeType?'退出全屏':'全屏'}}</p>
       </div>
     </div>
     <div class="content-box">
@@ -17,6 +17,7 @@
             <el-select v-model="buildingId" placeholder="请选择"
                        :popper-append-to-body="false"
                        @change="buildingChange"
+                       style="width:240px;"
                        class="building-select-box">
               <el-option
                 v-for="item in buildingOptions"
@@ -28,35 +29,146 @@
           </div>
           <!--实时人数-->
           <div class="content-num-box">
-
+            <img src="@/assets/ZDimages/emergencyManagement/newImg/icon_zhpt_rs.png">
+            <p>实时人数：</p>
+            <p>{{floorUserNum}} 人</p>
           </div>
         </div>
         <!--楼层图/楼层选择-->
         <div class="content-map-select-box">
           <!--楼层图-->
           <div class="content-map-box">
-
+            <div class="newEvacuation-map-max-big-box"
+                 v-if="mapType"
+                 :style="'width:'+mapData.width+'px;height:'+mapData.height+'px;transform: scale('+mapData.zoomData+');margin-top:-'+mapData.height/2+'px;margin-left:-'+mapData.width/2+'px;'">
+              <div class="newEvacuation-map-big-box"
+                   :style="'width:'+mapData.width+'px;height:'+mapData.height+'px;'">
+                <div class="newEvacuation-map-for-box for-map-box-one"
+                     :class="!item.planType && checkSubId ==item.subId ? 'room-type-one':(
+                           item.planType && checkSubId !=item.subId ? 'room-type-two':(
+                           item.planType && checkSubId ==item.subId ? 'room-type-three':(
+                           !item.loginAdmin ? 'room-type-noe':''
+                           )))"
+                     @click="checkSubClick(item)"
+                     v-for="(item,index) in mapList" :key="item.key" v-if="item.type == 1"
+                     :style="'top:'+item.y+'px;left:'+item.x+'px;width:'+item.w+'px;height:'+item.h+'px;'+(item.levelColor?'background-color:'+item.levelColor+';':'')">
+                  <div class="newEvacuation-map-for-min-box">
+                    <!--名称/实验室名称-->
+                    <el-tooltip class="item" effect="dark" :content="item.roomType == '-99'?item.roomName:(item.subName?item.subName:'未绑定')" placement="top">
+                      <p class="map-for-name-p" :style="'margin-top:'+((item.h/2)-20)+'px;'">{{item.roomType == '-99'?item.roomName:(item.subName?item.subName:'未绑定')}}</p>
+                    </el-tooltip>
+                    <!--编号-->
+                    <el-tooltip class="item" effect="dark" :content="'('+item.roomNum+')'" placement="top">
+                      <p class="map-for-num-p">({{item.roomNum}})</p>
+                    </el-tooltip>
+                    <!--门-->
+                    <div class="position-box"
+                         :class="minItem.toward=='top'?'center-move-door-p-t':(minItem.toward=='bottom'?'center-move-door-p-b':(minItem.toward=='left'?'center-move-door-p-l':(minItem.toward=='right'?'center-move-door-p-r':'')))"
+                         v-for="(minItem,minIndex) in item.doorList" :key="minIndex"
+                         :style="'top:'+minItem.y+'px;left:'+minItem.x+'px;width:'+minItem.w+'px;height:'+minItem.h+'px;'"></div>
+                    <!--实验室人数-->
+                    <div v-if="item.online!=null" class="user-num-box" :class="item.doorList[0].toward == 'top'?'user-num-two':'user-num-one'">
+                      <img src="@/assets/ZDimages/emergencyManagement/icon_pmt_ry.png">
+                      <p>{{item.online}} 人</p>
+                    </div>
+                  </div>
+                </div>
+                <div class="newEvacuation-map-for-box for-map-box"
+                     v-for="(item,indexOne) in mapList" :key="item.key" v-if="item.type == 2"
+                     :style="'top:'+item.y+'px;left:'+item.x+'px;width:'+item.w+'px;height:'+item.h+'px;'">
+                  <div class="newEvacuation-map-for-min-box">
+                    <!--灯-->
+                    <div class="position-box"
+                         :class="
+                        minItem.state=='1'&&minItem.openType?'lightTopOn':(minItem.state=='1'&&!minItem.openType?'lightTopOff':
+                        (minItem.state=='2'&&minItem.openType?'lightBottomOn':(minItem.state=='2'&&!minItem.openType?'lightBottomOff':
+                        (minItem.state=='3'&&minItem.openType?'lightLeftOn':(minItem.state=='3'&&!minItem.openType?'lightLeftOff':
+                        (minItem.state=='4'&&minItem.openType?'lightRightOn':(minItem.state=='4'&&!minItem.openType?'lightRightOff':'')))))))"
+                         v-for="(minItem,minIndex) in item.lightList" :key="minIndex"
+                         :style="'top:'+minItem.y+'px;left:'+minItem.x+'px;width:'+minItem.w+'px;height:'+minItem.h+'px;'"></div>
+                  </div>
+                </div>
+                <div class="newEvacuation-map-for-box for-map-box-two"
+                     v-for="(item,indexTwo) in mapList" :key="item.key" v-if="item.type == 3"
+                     :class="item.roomCheckType?'for-map-box-two-check':''"
+                     :style="'top:'+item.y+'px;left:'+item.x+'px;width:'+item.w+'px;height:'+item.h+'px;'">
+                  <div class="newEvacuation-map-for-min-box"></div>
+                </div>
+                <div class="plan-map-for-box" :class="checkPlanId == item.subId?'check-plan-map-for-box':''"
+                     :style="'width:'+item.width+'px;height:'+item.height+'px;left:'+item.left+'px;top:'+item.top+'px;'"
+                     @click="checkPlanButton(item.subId)"
+                     v-for="(item,index) in planMapList" :key="item.subId" v-if="item.planType">
+                  <div class="plan-top-button-box">
+                    <p></p>
+                    <p class="el-icon-close" @click="offPlanShade(index)"></p>
+                  </div>
+                  <div class="plan-time-box">
+                    <img src="@/assets/ZDimages/emergencyManagement/icon_dp_bjsj.png">
+                    <p>{{item.riskPlanTriggerTime}}</p>
+                  </div>
+                  <div class="plan-text-box">
+                    <p class="plan-title-p" :class="item.riskPlanLevel==1?'color-type-1':(item.riskPlanLevel==2?'color-type-2':(item.riskPlanLevel==3?'color-type-3':(item.riskPlanLevel==4?'color-type-4':'')))">{{item.riskPlanLevelName}}</p>
+                    <p class="plan-text-p">{{item.name}}</p>
+                  </div>
+                  <!--<p class="plan-button-p" @click="shadeButton(7,item.groupId)">结束预案</p>-->
+                </div>
+              </div>
+            </div>
+            <p class="null-mapList" v-if="!mapList[0]">暂无数据</p>
           </div>
           <!--楼层选择-->
           <div class="content-select-box">
-
+            <div class="for-select-box">
+              <p class="for-select-p" :class="checkFloor == index ?'for-select-p-check':''"
+                 @click="clickFloor(item,index)"
+                 v-for="(item,index) in floorOptions" :key="index">
+                {{index+1}}
+              </p>
+            </div>
           </div>
         </div>
         <!--智能监测/危险源-->
         <div class="content-monitor-danger-box">
           <!--智能监测-->
           <div class="content-monitor-box">
-
+            <div class="big-title-box">
+              <img src="@/assets/ZDimages/emergencyManagement/icon_yygb_tb.png">
+              <p>智能物联</p>
+            </div>
+            <div class="content-monitor-for-box" :class="!monitorList[0]?'content-monitor-null-box':''">
+              <div class="null-box">
+                <img class="null-img" src="@/assets/ZDimages/emergencyManagement/newImg/img_zhpt_znjcsj.png">
+                <p class="null-p">暂无数据</p>
+              </div>
+            </div>
           </div>
           <!--危险源-->
           <div class="content-danger-box">
-
+            <div class="big-title-box">
+              <img src="@/assets/ZDimages/emergencyManagement/icon_yygb_tb.png">
+              <p>危险源</p>
+            </div>
+            <div class="content-danger-for-box" :class="!dangerList[0]?'content-danger-null-box':''">
+              <div class="null-box">
+                <img class="null-img" src="@/assets/ZDimages/emergencyManagement/newImg/img_zhpt_zwzzsj.png">
+                <p class="null-p">暂无数据</p>
+              </div>
+            </div>
           </div>
         </div>
       </div>
       <!--摄像头-->
       <div class="content-right-max-big-box">
-
+        <div class="big-title-box">
+          <img src="@/assets/ZDimages/emergencyManagement/icon_yygb_tb.png">
+          <p>视频监控</p>
+        </div>
+        <div class="content-video-for-box" :class="!videoList[0]?'content-video-null-box':''">
+          <div class="null-box">
+            <img class="null-img" src="@/assets/ZDimages/emergencyManagement/newImg/img_zhpt_zwsj.png">
+            <p class="null-p">暂无数据</p>
+          </div>
+        </div>
       </div>
     </div>
   </div>
@@ -75,6 +187,24 @@
         //楼层数据
         floorId:null,
         floorOptions:[],
+        //楼层人数
+        floorUserNum:0,
+        //选中楼层
+        checkFloor:0,
+        //智能物联
+        monitorList:[],
+        //危险源
+        dangerList:[],
+        //视频数据
+        videoList:[],
+        //地图数据
+        mapList:[],
+        zoomData:null,
+        mapData:{},
+        planMapList:[],
+        mapType:false,
+        //实验室选中/报警数据
+        checkSubId:null,
       }
     },
     created () {
@@ -89,6 +219,12 @@
       this.getBuild();
     },
     methods: {
+      //切换楼层
+      clickFloor(item,index){
+        this.$set(this,'checkFloor',index);
+        this.$set(this,'floorId',item.id);
+        this.laboratoryBigViewGetFloorByBigView();
+      },
       //楼栋数据选择
       buildingChange(){
         //获取楼层数据
@@ -100,10 +236,12 @@
           this.$router.push({
             path: "/emergencyManagement/performEvacuation"
           })
+          this.exitfull();
         }else{
           this.$router.push({
             path: "/performEvacuationBig"
           })
+          this.fullScreen();
         }
       },
       //获取楼栋数据
@@ -122,15 +260,178 @@
         laboratoryBigViewGetBuildByBigView({id:this.buildingId,type:3}).then(response => {
           this.$set(this,'floorOptions',response.data);
           this.$set(this,'floorId',response.data[0].id);
+          this.$set(this,'checkFloor',0);
+          //获取楼层数据
           this.laboratoryBigViewGetFloorByBigView();
+          //获取楼层-总人数;
+          //获取楼层-智能物联设备列表;
+          //获取楼层-摄像头列表;
+          //获取楼层-危险源统计;
+          //获取楼层-内实验室内人数;
         })
       },
       //获取楼层布局数据
       laboratoryBigViewGetFloorByBigView(){
         laboratoryBigViewGetFloorByBigView({id:this.floorId}).then(response => {
-
+          if(response.data[0]){
+            if(response.data[0].buildLayoutVoList && response.data[0].labExitLineVo){
+              let list = JSON.parse(response.data[0].labExitLineVo.layoutJoinData)
+              for(let i=0;i<list.length;i++){
+                if(list[i].type == '2'){
+                  //楼道
+                  for(let o=0;o<list[i].lightList.length;o++){
+                    list[i].lightList[o].openType = false;
+                  }
+                }else if(list[i].type == '1'){
+                  const hex2Rgba = (bgColor) => {
+                    let color = bgColor.slice(1); // 去掉'#'号
+                    let rgba = [
+                      parseInt("0x" + color.slice(0, 2)),
+                      parseInt("0x" + color.slice(2, 4)),
+                      parseInt("0x" + color.slice(4, 6)),
+                      0.6
+                    ];
+                    return "rgba(" + rgba.toString() + ")";
+                  };
+                  for(let o=0;o<response.data[0].buildLayoutVoList.length;o++){
+                    if(list[i].key == response.data[0].buildLayoutVoList[o].pointName){
+                      console.log('response.data[0].buildLayoutVoList[o]',response.data[0].buildLayoutVoList[o])
+                      list[i].id = response.data[0].buildLayoutVoList[o].id;
+                      list[i].buildId = response.data[0].buildLayoutVoList[o].buildId;
+                      list[i].floorId = response.data[0].buildLayoutVoList[o].floorId;
+                      list[i].roomType = response.data[0].buildLayoutVoList[o].roomType;
+                      list[i].roomName = response.data[0].buildLayoutVoList[o].roomName;
+                      list[i].roomNum = response.data[0].buildLayoutVoList[o].roomNum;
+                      list[i].subName = response.data[0].buildLayoutVoList[o].subName;
+                      list[i].subId = response.data[0].buildLayoutVoList[o].subId;
+                      list[i].online = response.data[0].buildLayoutVoList[o].online;
+                      list[i].loginAdmin = response.data[0].buildLayoutVoList[o].loginAdmin;
+                      list[i].levelColor = response.data[0].buildLayoutVoList[o].levelColor?hex2Rgba(response.data[0].buildLayoutVoList[o].levelColor):'';
+                      list[i].planType = false;
+                    }
+                  }
+                }else if(list[i].type == 3){
+                  list[i].roomCheckType = false;
+                }
+              }
+              let obj = this.calculateMapMax(list)
+              this.$set(this.mapData,'width',obj.maxWidth);
+              this.$set(this.mapData,'height',obj.maxHeight);
+              this.$set(this.mapData,'zoomData',obj.zoomData);
+              this.$set(this,'mapList',JSON.parse(JSON.stringify(list)));
+              this.$set(this,'mapType',true);
+              //处理实验室弹窗数据
+              let roomList = [];
+              for(let i=0;i<list.length;i++){
+                if(list[i].type == 1 && list[i].subId){
+                  let roomObj = {
+                    subId:list[i].subId
+                  };
+                  if(list[i].doorList[0].toward == 'top'){
+                    roomObj.width = 266;
+                    roomObj.height = 142;
+                    roomObj.left = (list[i].w/2) + (list[i].x) - 133;
+                    roomObj.top = list[i].y - 111;
+                    roomObj.planType = false;
+                  }else if(list[i].doorList[0].toward == 'bottom'){
+                    roomObj.width = 266;
+                    roomObj.height = 142;
+                    roomObj.left = (list[i].w/2) + (list[i].x) - 133;
+                    roomObj.top = list[i].y + list[i].h;
+                    roomObj.planType = false;
+                  }else if(list[i].doorList[0].toward == 'left'){
+                    roomObj.width = 266;
+                    roomObj.height = 142;
+                    roomObj.left = list[i].x - 133;
+                    roomObj.top = (list[i].h/2) + (list[i].y) - 56;
+                    roomObj.planType = false;
+                  }else if(list[i].doorList[0].toward == 'fight'){
+                    roomObj.width = 266;
+                    roomObj.height = 142;
+                    roomObj.left = list[i].x + list[i].w + 133;
+                    roomObj.top = (list[i].h/2) + (list[i].y) - 56;
+                    roomObj.planType = false;
+                  }
+                  roomList.push(roomObj);
+                }
+              }
+              this.$set(this,'planMapList',roomList);
+            }else{
+              this.$set(this,'mapData',{});
+              this.$set(this,'mapList',[]);
+              this.$set(this,'mapType',false);
+            }
+          }
         })
       },
+      //计算布局最大尺寸
+      calculateMapMax(list) {
+        //基础参数
+        let height = 500;
+        let width = 1000;
+        let maxWidth = 0
+        let maxHeight = 0
+        let zoomData = 1;
+        //参数处理
+        for (let i = 0; i < list.length; i++) {
+          if ((list[i].x + list[i].w) > maxWidth) {
+            maxWidth = list[i].x + list[i].w
+          }
+          if ((list[i].y + list[i].h) > maxHeight) {
+            maxHeight = list[i].y + list[i].h
+          }
+        }
+        //处理等值数据
+        if(maxHeight == height){
+          maxHeight++
+        }
+        if(maxWidth == width){
+          maxWidth++
+        }
+        //缩放判断
+        let zoomNumOne = height / maxHeight;
+        if(parseInt(this.accMul(zoomNumOne,maxHeight)) <= height && parseInt(this.accMul(zoomNumOne,maxWidth)) <= width){
+          zoomData = zoomNumOne;
+          this.$set(this,'zoomData',zoomNumOne);
+        }
+        let zoomNumTwo = width / maxWidth;
+        if(parseInt(this.accMul(zoomNumTwo,maxHeight)) <= height && parseInt(this.accMul(zoomNumTwo,maxWidth)) <= width){
+          zoomData = zoomNumTwo;
+          this.$set(this,'zoomData',zoomNumTwo);
+        }
+        return { maxWidth: maxWidth, maxHeight: maxHeight,zoomData:zoomData }
+      },
+      accMul(arg1,arg2){
+        var m=0,s1=arg1.toString(),s2=arg2.toString();
+        try{m+=s1.split(".")[1].length}catch(e){}
+        try{m+=s2.split(".")[1].length}catch(e){}
+        return Number(s1.replace(".",""))*Number(s2.replace(".",""))/Math.pow(10,m)
+      },
+      //退出全屏
+      exitfull() {
+        if (document.exitFullscreen) {
+          document.exitFullscreen();
+        } else if (document.mozCancelFullScreen) {
+          document.mozCancelFullScreen();
+        } else if (document.webkitExitFullscreen) {
+          document.webkitExitFullscreen();
+        } else if (document.msExitFullscreen) {
+          document.msExitFullscreen();
+        }
+      },
+      //进入全屏
+      fullScreen() {
+        let element = document.documentElement;
+        if (element.requestFullscreen) {
+          element.requestFullscreen();
+        } else if (element.msRequestFullscreen) {
+          element.msRequestFullscreen();
+        } else if (element.mozRequestFullScreen) {
+          element.mozRequestFullScreen();
+        } else if (element.webkitRequestFullscreen) {
+          element.webkitRequestFullscreen();
+        }
+      },
     },
   }
 </script>
@@ -194,9 +495,10 @@
         overflow: hidden;
         .content-floor-num-box{
           height:87px;
+          display: flex;
           .content-floor-box{
             ::v-deep .building-select-box{
-              margin:12px 0 0 30px;
+              margin:12px 0 0 33px;
               .el-input__inner{
                 background:rgba(0,0,0,0);
                 border:1px solid #24D1F9;
@@ -209,6 +511,7 @@
               }
             }
             ::v-deep .el-select-dropdown{
+              width:240px;
               background:#01294d;
               border:1px solid #24D1F9;
               .el-select-dropdown__item{
@@ -221,7 +524,27 @@
             }
           }
           .content-num-box{
-
+            margin-left:92px;
+            display: flex;
+            img{
+              margin:20px 13px 0 0;
+              display: block;
+              width:26px;
+              height:23px;
+            }
+            p{
+              margin-top: 12px;
+              line-height:40px;
+              color:#24D1F9;
+            }
+            p:nth-child(2){
+              margin-right:22px;
+              font-size:16px;
+            }
+            p:nth-child(3){
+              font-size:30px;
+              font-weight:700;
+            }
           }
         }
         .content-map-select-box{
@@ -300,54 +623,54 @@
                       overflow: hidden;
                     }
                     .center-move-door-p-t {
-                      /*background: url("../../../../assets/ZDimages/emergencyManagement/icon_pmbjt_m.png") !important;*/
+                      background: url("../../../assets/ZDimages/emergencyManagement/icon_pmbjt_m.png") !important;
                       background-size: 100% !important;
                       transform: rotate(180deg);
                     }
                     .center-move-door-p-b {
-                      /*background: url("../../../../assets/ZDimages/emergencyManagement/icon_pmbjt_m.png") !important;*/
+                      background: url("../../../assets/ZDimages/emergencyManagement/icon_pmbjt_m.png") !important;
                       background-size: 100% !important;
                     }
                     .center-move-door-p-l {
-                      /*background: url("../../../../assets/ZDimages/emergencyManagement/icon_pmbjt_m.png") !important;*/
+                      background: url("../../../assets/ZDimages/emergencyManagement/icon_pmbjt_m.png") !important;
                       background-size: 100% !important;
                       transform: rotate(90deg);
                     }
                     .center-move-door-p-r {
-                      /*background: url("../../../../assets/ZDimages/emergencyManagement/icon_pmbjt_m.png") !important;*/
+                      background: url("../../../assets/ZDimages/emergencyManagement/icon_pmbjt_m.png") !important;
                       background-size: 100% !important;
                       transform: rotateZ(270deg);
                     }
                     .lightTopOn {
-                      /*background: url("../../../../assets/ZDimages/emergencyManagement/icon_sjt.png");*/
+                      background: url("../../../assets/ZDimages/emergencyManagement/icon_sjt.png");
                       background-size: 100%;
                     }
                     .lightTopOff {
-                      /*background: url("../../../../assets/ZDimages/emergencyManagement/icon_shang_hs.png");*/
+                      background: url("../../../assets/ZDimages/emergencyManagement/icon_shang_hs.png");
                       background-size: 100%;
                     }
                     .lightBottomOn {
-                      /*background: url("../../../../assets/ZDimages/emergencyManagement/icon_xjt.png");*/
+                      background: url("../../../assets/ZDimages/emergencyManagement/icon_xjt.png");
                       background-size: 100%;
                     }
                     .lightBottomOff {
-                      /*background: url("../../../../assets/ZDimages/emergencyManagement/icon_xia_hs.png");*/
+                      background: url("../../../assets/ZDimages/emergencyManagement/icon_xia_hs.png");
                       background-size: 100%;
                     }
                     .lightLeftOn {
-                      /*background: url("../../../../assets/ZDimages/emergencyManagement/icon_zuo.png");*/
+                      background: url("../../../assets/ZDimages/emergencyManagement/icon_zuo.png");
                       background-size: 100%;
                     }
                     .lightLeftOff {
-                      /*background: url("../../../../assets/ZDimages/emergencyManagement/icon_zou_hs.png");*/
+                      background: url("../../../assets/ZDimages/emergencyManagement/icon_zou_hs.png");
                       background-size: 100%;
                     }
                     .lightRightOn {
-                      /*background: url("../../../../assets/ZDimages/emergencyManagement/icon_yuo.png");*/
+                      background: url("../../../assets/ZDimages/emergencyManagement/icon_yuo.png");
                       background-size: 100%;
                     }
                     .lightRightOff {
-                      /*background: url("../../../../assets/ZDimages/emergencyManagement/icon_you_hs.png");*/
+                      background: url("../../../assets/ZDimages/emergencyManagement/icon_you_hs.png");
                       background-size: 100%;
                     }
                   }
@@ -359,11 +682,11 @@
                   background: rgba(1,16,32,0.5);
                 }
                 .for-map-box-two{
-                  /*background: url("../../../../assets/ZDimages/emergencyManagement/icon_jjck.png") center center no-repeat rgba(5,45,43,0.5);*/
+                  background: url("../../../assets/ZDimages/emergencyManagement/icon_jjck.png") center center no-repeat rgba(5,45,43,0.5);
                   background-size: 80px 80px;
                 }
                 .for-map-box-two-check{
-                  /*background: url("../../../../assets/ZDimages/emergencyManagement/icon_jjck.png") center center no-repeat rgba(50,205,50,1);*/
+                  background: url("../../../assets/ZDimages/emergencyManagement/icon_jjck.png") center center no-repeat rgba(50,205,50,1);
                   background-size: 80px 80px;
                 }
                 .room-type-one{
@@ -392,7 +715,7 @@
                   font-weight:500;
                   position:absolute;
                   z-index:100;
-                  /*background: url("../../../../assets/ZDimages/emergencyManagement/img_bg_yatk.png");*/
+                  background: url("../../../assets/ZDimages/emergencyManagement/img_bg_yatk.png");
                   .plan-top-button-box{
                     display: flex;
                     p:nth-child(1){
@@ -516,20 +839,164 @@
           }
           .content-select-box{
             width:158px;
+            position: relative;
+            .for-select-box{
+              position: absolute;
+              bottom:31px;
+              left:59px;
+              display: flex;
+              flex-direction: column-reverse;
+              .for-select-p:nth-child(1){
+                border-bottom:1px solid #19667e;
+                border-bottom-left-radius:4px;
+                border-bottom-right-radius:4px;
+              }
+              .for-select-p:last-child{
+                border-top-left-radius:4px;
+                border-top-right-radius:4px;
+              }
+              .for-select-p{
+                cursor: pointer;
+                width:40px;
+                line-height:40px;
+                text-align: center;
+                color:#19667e;
+                border-top:1px solid #19667e;
+                border-left:1px solid #19667e;
+                border-right:1px solid #19667e;
+              }
+              .for-select-p-check{
+                /*border:1px solid #20d0fa !important;*/
+                color:#fff;
+                box-shadow: inset 0 0 4px 1px rgba(32,208,250,1);
+              }
+            }
           }
         }
         .content-monitor-danger-box{
           height:367px;
+          display: flex;
           .content-monitor-box{
-
+            width:954px;
+            .big-title-box{
+              margin-left:33px;
+            }
+            .content-monitor-for-box{
+              margin-left:33px;
+              margin-top:20px;
+              width:820px;
+              height:260px;
+              position: relative;
+              .null-box{
+                position: absolute;
+                left:50%;
+                top:50%;
+                margin-left:-88px;
+                margin-top:-91px;
+                width:176px;
+                height:183px;
+                .null-img{
+                  width:176px;
+                  height:143px;
+                }
+                .null-p{
+                  margin-top:20px;
+                  line-height:20px;
+                  text-align: center;
+                  font-size:16px;
+                  color:#CCD6D6;
+                }
+              }
+            }
+            .content-monitor-null-box{
+              background-color: #021e30;
+            }
           }
           .content-danger-box{
-
+            width:539px;
+            .content-danger-for-box{
+              margin-top:20px;
+              width:480px;
+              height:260px;
+              position: relative;
+              .null-box{
+                position: absolute;
+                left:50%;
+                top:50%;
+                margin-left:-91px;
+                margin-top:-98px;
+                width:183px;
+                height:196px;
+                .null-img{
+                  width:183px;
+                  height:156px;
+                }
+                .null-p{
+                  margin-top:20px;
+                  line-height:20px;
+                  text-align: center;
+                  font-size:16px;
+                  color:#CCD6D6;
+                }
+              }
+            }
+            .content-danger-null-box{
+              background-color: #021e30;
+            }
           }
         }
       }
       .content-right-max-big-box{
         width:427px;
+        .big-title-box{
+          margin-top:12px;
+        }
+        .content-video-for-box{
+          margin:20px 30px 30px 0;
+          height:870px;
+          position: relative;
+          .null-box{
+            position: absolute;
+            left:50%;
+            top:50%;
+            margin-left:-82px;
+            margin-top:-75px;
+            width:165px;
+            height:150px;
+            .null-img{
+              width:165px;
+              height:110px;
+            }
+            .null-p{
+              margin-top:20px;
+              line-height:20px;
+              text-align: center;
+              font-size:16px;
+              color:#CCD6D6;
+            }
+          }
+        }
+        .content-video-null-box{
+          background-color: #021e30;
+        }
+      }
+      .big-title-box{
+        width:181px;
+        height:59px;
+        background: url("../../../assets/ZDimages/emergencyManagement/img_zjdp_bg.png");
+        background-size: 100%;
+        display: flex;
+        img{
+          width:18px;
+          height:18px;
+          margin:27px 16px 0 20px;
+        }
+        p{
+          margin-top:16px;
+          line-height:40px;
+          color:#fff;
+          font-size:16px;
+        }
       }
     }
   }

src/views/gasManage3_0/manage/infoRecord/detailsPage.vue

@@ -105,7 +105,7 @@
           'https://img2.baidu.com/it/u=3596352791,3086982929&fm=253&fmt=auto&app=120&f=JPEG?w=1280&h=800',
           'https://img2.baidu.com/it/u=3596352791,3086982929&fm=253&fmt=auto&app=120&f=JPEG?w=1280&h=800',
         ],
-        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://'+localStorage.getItem('fileBrowseEnvironment')+ localStorage.getItem('videoCover'),
         topButtonIndex:0,
         topButton:[
           {id:'1',name:'走廊摄像头1'},{id:'2',name:'走廊摄像头2'},{id:'3',name:'走廊摄像头3'},

src/views/hierarchicalControl/hierarchicalControl/gradeManage/addPage.vue

@@ -141,7 +141,7 @@
                   </el-radio-group>
                 </el-form-item>
                 <el-tooltip placement="top" v-if="minItem.isUpload == 1" style="margin-left:10px;">
-                  <div slot="content">文档格式包含： pdf / doc / docx
+                  <div slot="content">文档格式包含： pdf / docx
                     <br/>视频格式包含： mp4
                     <br/>图片格式包含： png / jpeg / gif
                   </div>

src/views/hierarchicalControl/hierarchicalControl/gradeManageWork/addPage.vue

@@ -94,7 +94,7 @@
               </el-upload>
             </div>
             <div class="right-upload-box">
-              <p v-if="documentType">文件请上传 pdf / doc / docx 格式</p>
+              <p v-if="documentType">文件请上传 pdf / docx 格式</p>
               <p v-if="videoType">视频请上传 mp4</p>
               <p v-if="pictureType">图片请上传 png / jpeg / gif 格式</p>
             </div>
@@ -181,7 +181,6 @@
         if(list[i] == '1'){
           self.documentType = true;
           self.indexOfList.push('application/pdf');
-          self.indexOfList.push('application/msword');
           self.indexOfList.push('application/vnd.openxmlformats-officedocument.wordprocessingml.document');
         }else if(list[i] == '2'){
           self.videoType = true;

src/views/safetyEducationExam/safeLearning/el_course/coursePreview.vue

@@ -32,7 +32,7 @@
       <!--word-->
       <iframe
         class="iframe"
-        v-if="exerciseData.postfix == 'pdf' || exerciseData.postfix == 'doc' || exerciseData.postfix == 'docx'"
+        v-if="exerciseData.postfix == 'pdf' || exerciseData.postfix == 'docx'"
         :src="exerciseData.iframeSrc" scrolling="auto" frameborder="0">
       </iframe>
       <!--富文本-->
@@ -53,7 +53,7 @@
     },
     data() {
       return {
-        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://'+localStorage.getItem('fileBrowseEnvironment')+ localStorage.getItem('videoCover'),
         loading:false,
         playerOptions: {
           playbackRates: [0.5, 1.0, 1.5, 2.0], // 可选的播放速度
@@ -90,7 +90,7 @@
         if(this.exerciseData.postfix == "mp4"){
           // this.getVideo();
           this.loading = true;
-        }else if(this.exerciseData.postfix == "pdf" || this.exerciseData.postfix == "doc" || this.exerciseData.postfix == "docx"){
+        }else if(this.exerciseData.postfix == "pdf" || this.exerciseData.postfix == "docx"){
           this.getWord();
         }else if(this.exerciseData.type == 5){
           this.getRichText();

src/views/safetyEducationExam/safeLearning/el_course/index.vue

@@ -116,77 +116,6 @@
     <edit-page v-if="pageType == 2" :infoId="infoId"></edit-page>
     <!--查看记录-->
     <detail-page v-if="pageType == 3" :infoId="infoId"></detail-page>
-    <!-- 添加或修改学习资源对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="分类ID" prop="cateId">
-          <el-input v-model="form.cateId" placeholder="请输入分类ID" />
-        </el-form-item>
-        <el-form-item label="标题" prop="title">
-          <el-input v-model="form.title" placeholder="请输入标题" />
-        </el-form-item>
-        <el-form-item label="是否公开" prop="private">
-          <el-input v-model="form.private" placeholder="请输入是否公开" />
-        </el-form-item>
-        <el-form-item label="等级" prop="level">
-          <el-input v-model="form.level" placeholder="请输入等级" />
-        </el-form-item>
-        <el-form-item label="是否限制顺序" prop="orderRest">
-          <el-input v-model="form.orderRest" placeholder="请输入是否限制顺序" />
-        </el-form-item>
-        <el-form-item label="课程时长" prop="duration">
-          <el-input v-model="form.duration" placeholder="请输入课程时长" />
-        </el-form-item>
-        <el-form-item label="课程标签" prop="label">
-          <el-input v-model="form.label" placeholder="请输入课程标签" />
-        </el-form-item>
-        <el-form-item label="PDF翻页有效时间" prop="effectiveTime">
-          <el-input v-model="form.effectiveTime" placeholder="请输入PDF翻页有效时间" />
-        </el-form-item>
-        <el-form-item label="课程有效时间类型" prop="ceType">
-          <el-select v-model="form.ceType" placeholder="请选择课程有效时间类型">
-            <el-option label="请选择字典生成" value="" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="课程有效时间" prop="ceTime">
-          <el-input v-model="form.ceTime" placeholder="请输入课程有效时间" />
-        </el-form-item>
-        <el-form-item label="课程关键字" prop="keywords">
-          <el-input v-model="form.keywords" placeholder="请输入课程关键字" />
-        </el-form-item>
-        <el-form-item label="封面图片" prop="img">
-          <el-input v-model="form.img" placeholder="请输入封面图片" />
-        </el-form-item>
-        <el-form-item label="课程状态 1 下架，2 上架">
-          <el-radio-group v-model="form.status">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="是否显示课程拖拽进度" prop="videoDraggable">
-          <el-input v-model="form.videoDraggable" placeholder="请输入是否显示课程拖拽进度" />
-        </el-form-item>
-        <el-form-item label="积分值" prop="points">
-          <el-input v-model="form.points" placeholder="请输入积分值" />
-        </el-form-item>
-        <el-form-item label="设置选项" prop="settings">
-          <el-input v-model="form.settings" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="课程类型" prop="type">
-          <el-select v-model="form.type" placeholder="请选择课程类型">
-            <el-option label="请选择字典生成" value="" />
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer dialog-footer-box">
-        <p class="dialog-footer-button-null"></p >
-        <p class="dialog-footer-button-info" @click="cancel">取消</p >
-        <p class="dialog-footer-button-primary" @click="submitForm">提交</p >
-        <p class="dialog-footer-button-null"></p >
-      </div>
-    </el-dialog>
     <!--课程详情-->
     <course-details v-if="pageType == 4" :infoId="infoId"></course-details>
     <!--管理分类-->
@@ -490,22 +419,6 @@ export default {
       this.$refs.tree.setCurrentKey();
       this.handleQuery();
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加学习资源";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      examElCourse(id).then( response => {
-        this.form =  response.data;
-        this.open = true;
-        this.title = "修改学习资源";
-      });
-    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {

src/views/safetyEducationExam/safeLearning/el_resources/index.vue

@@ -163,7 +163,7 @@
             <p>支持上传视频、图片、文件类型的课件</p>
             <p>图片请上传 png / jpeg / gif 格式</p>
             <p>视频请上传 mp4</p>
-            <p>文件请上传 pdf / doc / docx 格式</p>
+            <p>文件请上传 pdf / docx 格式</p>
           </div>
         </el-form>
       </el-dialog>
@@ -227,7 +227,7 @@
               <p>支持上传视频、图片、文件类型的课件</p>
               <p>图片请上传 png / jpeg / gif 格式</p>
               <p>视频请上传 mp4 / WebM格式 </p>
-              <p>文件请上传 pdf / doc / docx 格式</p>
+              <p>文件请上传 pdf / docx 格式</p>
             </div>
           </div>
         </el-form>
@@ -462,7 +462,7 @@ export default {
         },
       },
       attrs: {
-        accept: ["image/png","image/jpeg","image/gif","application/pdf","video/mp4","application/msword","application/vnd.openxmlformats-officedocument.wordprocessingml.document"]
+        accept: ["image/png","image/jpeg","image/gif","application/pdf","video/mp4","application/vnd.openxmlformats-officedocument.wordprocessingml.document"]
       },
       statusText: {
         success: "上传成功",
@@ -882,7 +882,7 @@ export default {
         if(["image/png","image/jpeg","image/gif",
           "application/pdf",
           "video/mp4",
-          "application/msword","application/vnd.openxmlformats-officedocument.wordprocessingml.document"].indexOf(item.fileType) === -1){
+          "application/vnd.openxmlformats-officedocument.wordprocessingml.document"].indexOf(item.fileType) === -1){
           this.$message.error("文件格式不支持,请上传正确的文件.");
           file.ignored = true;
         }else{

src/views/safetyEducationExam/safeLearning/safeLearning/learning.vue

@@ -1,12 +1,11 @@
 <template>
   <div class="startLearning" v-loading="studyLoading">
     <div class="learn-top-user-info-box">
-      <!--<img class="logo-img" src="@/assets/ZDimages/logo.jpg">-->
       <img class="logo-img" :src="circularLogo">
       <p class="title-p">实验室安全学习与考试系统</p>
       <p class="time-p">{{timeText}}</p>
       <div class="user-box">
-        <img v-if="avatar" :src="userInfo.avatar">
+        <img v-if="userInfo.avatar" :src="userInfo.avatar">
         <img v-else src="@/assets/ZDimages/basicsModules/tx_cion.png">
         <p>{{userInfo.userName}}</p>
       </div>
@@ -38,7 +37,7 @@
           <source :src="learningData.chapterData" type="video/mp4">
         </video>
         <vue-office-docx
-          v-if="learningData.postfix == 'doc' || learningData.postfix == 'docx'"
+          v-if="learningData.postfix == 'docx'"
           :src="learningData.iframeSrc"
           @rendered="renderedHandler"
           @error="errorHandler"
@@ -49,15 +48,9 @@
           @rendered="renderedHandler"
           @error="errorHandler"
         />
-        <!--<iframe-->
-          <!--class="iframe"-->
-          <!--v-if="learningData.postfix == 'pdf' || learningData.postfix == 'doc' || learningData.postfix == 'docx'"-->
-          <!--:src="learningData.iframeSrc" scrolling="auto" frameborder="0">-->
-        <!--</iframe>-->
         <!--富文本-->
         <div v-if="learningData.type == 5" v-html="learningData.chapterData" style="width:896px;margin:0 auto;"></div>
       </div>
-      <!--<div class="button-bottom-max-box" :class="timeType?'button-color-a':'button-color-b'" @click="shadeTypeClick(1)">完成学习</div>-->
     </div>
     <div class="shade-max-box" v-if="shadeType">
       <div class="shade-big-box">
@@ -95,7 +88,7 @@
     },
     data() {
       return {
-        videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/admin/" + localStorage.getItem('videoCover'),
+        videoCover:window.location.href.split('://')[0]+'://'+localStorage.getItem('fileBrowseEnvironment')+ localStorage.getItem('videoCover'),
         circularLogo:localStorage.getItem('circularLogo'),
         studyLoading:false,
         //时间
@@ -176,30 +169,6 @@
       },
       //下一节方法
       nextSection(){
-        // let endObj = {
-        //   courseId:this.newList[this.chapterIndex].courseId,
-        //   chapterId:this.newList[this.chapterIndex].children[this.festivalIndex].id,
-        // };
-        // learnFinish(endObj).then( res => {
-        //   if(this.newList[this.chapterIndex].children.length > this.festivalIndex+1){
-        //     //该章未学完
-        //     this.festivalIndex++;
-        //     this.learnFinish();
-        //   }else{
-        //     //该章已学完
-        //     if(this.newList.length > this.chapterIndex+1){
-        //       this.chapterIndex++;
-        //       this.festivalIndex = 0;
-        //       this.learnFinish();
-        //     }else{
-        //       //所有章节已学习学习完毕
-        //       this.msgSuccess('所有章节已学习完毕')
-        //       this.$router.push({
-        //         path: `/user/safeLearning`
-        //       })
-        //     }
-        //   }
-        // });
         if(this.newList[this.chapterIndex].children.length > this.festivalIndex+1){
           //该章未学完
           this.festivalIndex++;
@@ -247,9 +216,7 @@
           this.learningData.secondTwo = 0;
           if(this.learningData.postfix == "mp4"){
             this.learningData.chapterData = window.location.href.split('://')[0]+'://'+localStorage.getItem('fileBrowseEnvironment')+this.learningData.chapterData
-            // this.getVideo();
-            // this.getVideoTwo();
-          }else if(this.learningData.postfix == "pdf" || this.learningData.postfix == "doc" || this.learningData.postfix == "docx"){
+          }else if(this.learningData.postfix == "pdf" || this.learningData.postfix == "docx"){
             this.getWord();
           }else if(this.learningData.type == 5){
             this.getRichText();
@@ -286,16 +253,6 @@
       getRichText(){
         this.learningData.chapterData = unescape(this.learningData.chapterData)
       },
-      //视频处理
-      getVideo(){
-        let list = [];
-        let obj = {
-          type:'video/'+this.learningData.postfix,
-          src:window.location.href.split('://')[0]+'://'+localStorage.getItem('fileBrowseEnvironment')+this.learningData.chapterData,
-        };
-        list.push(obj);
-        this.playerOptions.sources = list;
-      },
       //word处理
       async getWord(){
         this.learningData.iframeSrc = window.location.href.split('://')[0]+'://'+localStorage.getItem('fileBrowseEnvironment')+this.learningData.chapterData

src/views/secureAccess/approval/infoPage.vue

@@ -150,9 +150,9 @@ export default {
     fullScreenFileLookClick(item){
       //判断类型
       let type = '';
-      if(item.name.split('.')[1] == 'doc' || item.name.split('.')[1] == 'docx'){
+      if(item.name.split('.')[1] == 'docx'){
         type = 'docx'
-      }else if(item.name.split('.')[1] == 'xls' || item.name.split('.')[1] == 'xlsx'){
+      }else if(item.name.split('.')[1] == 'xlsx'){
         type = 'excel'
       }else if(item.name.split('.')[1] == 'pdf'){
         type = 'pdf'

src/views/secureAccess/handle/addPage.vue

@@ -149,7 +149,7 @@
                     class="avatar-uploader"
                     :action="uploadImgUrl"
                     :show-file-list="false"
-                    accept=".jpeg,.gif,.png,.pdf,.doc,.docx"
+                    accept=".jpeg,.gif,.png,.pdf,.docx"
                     :on-success="(res)=>handleAvatarSuccess(res,item)"
                     :headers="headers"
                     :before-upload="(file)=>beforeAvatarUpload(file,item)">
@@ -319,9 +319,9 @@
       fullScreenFileLookClick(item){
         //判断类型
         let type = '';
-        if(item.name.split('.')[1] == 'doc' || item.name.split('.')[1] == 'docx'){
+        if(item.name.split('.')[1] == 'docx'){
           type = 'docx'
-        }else if(item.name.split('.')[1] == 'xls' || item.name.split('.')[1] == 'xlsx'){
+        }else if(item.name.split('.')[1] == 'xlsx'){
           type = 'excel'
         }else if(item.name.split('.')[1] == 'pdf'){
           type = 'pdf'
@@ -472,7 +472,7 @@
           if (item == '1') {
             strArr.push('pdf')
           } else if (item == '2') {
-            strArr.push('doc', 'docx')
+            strArr.push('docx')
           } else if (item == '3') {
             strArr.push('png', 'jpg', 'gif')
           }
@@ -492,11 +492,11 @@
           type = false
         }
         //学生名称+文件名称
-        if (file.type == 'image/png' || file.type == 'image/jpeg' || file.type == 'image/gif' || file.type == 'application/pdf' || file.type == 'application/msword' || file.type == 'application/vnd.openxmlformats-officedocument.wordprocessingml.document') {
+        if (file.type == 'image/png' || file.type == 'image/jpeg' || file.type == 'image/gif' || file.type == 'application/pdf' || file.type == 'application/vnd.openxmlformats-officedocument.wordprocessingml.document') {
           this.upDataName = file.name
           // type = true
         } else {
-          this.$message.error('只能上传png/jpeg/gif/doc/docx格式')
+          this.$message.error('只能上传png/jpeg/gif/docx格式')
           type = false
         }
         return type

src/views/secureAccess/handle/infoPage.vue

@@ -117,9 +117,9 @@ export default {
     fullScreenFileLookClick(item){
       //判断类型
       let type = '';
-      if(item.name.split('.')[1] == 'doc' || item.name.split('.')[1] == 'docx'){
+      if(item.name.split('.')[1] == 'docx'){
         type = 'docx'
-      }else if(item.name.split('.')[1] == 'xls' || item.name.split('.')[1] == 'xlsx'){
+      }else if(item.name.split('.')[1] == 'xlsx'){
         type = 'excel'
       }else if(item.name.split('.')[1] == 'pdf'){
         type = 'pdf'

src/views/systemManagement/filePreview/index.vue

@@ -160,9 +160,9 @@
         //判断类型
         if(item.fileName&&item.fileUrl){
           let type = '';
-          if(item.fileName.split('.')[1] == 'doc' || item.fileName.split('.')[1] == 'docx'){
+          if(item.fileName.split('.')[1] == 'docx'){
             type = 'docx'
-          }else if(item.fileName.split('.')[1] == 'xls' || item.fileName.split('.')[1] == 'xlsx'){
+          }else if(item.fileName.split('.')[1] == 'xlsx'){
             type = 'excel'
           }else if(item.fileName.split('.')[1] == 'pdf'){
             type = 'pdf'