heyang 2 gadi atpakaļ
vecāks
revīzija
1a6a14ff08
32 mainītis faili ar 80 papildinājumiem un 997 dzēšanām
  1. 3 11
      App.vue
  2. 2 2
      api/request/config.js
  3. 1 7
      api/request/request.js
  4. 13 14
      component/cropper.js
  5. 3 5
      component/tabBar.vue
  6. 0 6
      component/topWarn.vue
  7. 0 563
      pages/alarmInfo/alarmInfo.vue
  8. 0 174
      pages/alarmInfo/alarmInfoMonitor.vue
  9. 1 5
      pages/avatar.vue
  10. 0 3
      pages/casuallyPat.vue
  11. 0 4
      pages/fingerprint.vue
  12. 0 1
      pages/home.vue
  13. 0 5
      pages/information/information.vue
  14. 24 56
      pages/information/notPassInfo.vue
  15. 0 4
      pages/login.vue
  16. 0 26
      pages/manageWorkbench.vue
  17. 0 4
      pages/mine.vue
  18. 0 1
      pages/studentWorkbench.vue
  19. 0 6
      pages_manage/emergencyEvacuationBigFullScreen.vue
  20. 0 5
      pages_manage/examination/examinationSelect.vue
  21. 1 1
      pages_manage/gasList/gasListBinding.vue
  22. 0 25
      pages_manage/workbench/accessQualification/accessQualificationInfo.vue
  23. 0 3
      pages_manage/workbench/laboratory/word.vue
  24. 0 1
      pages_manage/workbench/problemRectification/rectifyDetails.vue
  25. 0 1
      pages_manage/workbench/receiveCasuallyPat/receiveCasuallyPat.vue
  26. 0 1
      pages_manage/workbench/securityCheck/inspectionRecords.vue
  27. 16 17
      pages_manage/workbench/securityCheck/safetyInspect.vue
  28. 9 35
      pages_manage/workbench/signature/signatureImg.vue
  29. 1 2
      pages_student/workbench/safeAccess/safeAccess.vue
  30. 5 6
      pages_supplier/register/register.vue
  31. 1 2
      uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue
  32. 0 1
      uni_modules/uni-popup/components/uni-popup/uni-popup.vue

+ 3 - 11
App.vue

@@ -3,7 +3,6 @@
     import { config } from '@/api/request/config.js'
 	export default {
 		onLaunch: function() {
-			console.log('App Launch')
 			//获取openid
 			uni.login({
 				success(loginRes) {
@@ -43,12 +42,8 @@
 			 }
 		},
 		onShow: function() {
-			// this.onMQTT();
-			console.log('App Show')
 		},
 		onHide: function() {
-            // this.offMQTT();
-			console.log('App Hide')
 		},
         data(){
 		    return{
@@ -191,21 +186,21 @@
 							        console.log("火灾传感器状态-订阅成功",self.mqttIdList[i].type+self.mqttIdList[i].fireCode)
 							    }
 							});
-							
+
 						}else if(self.mqttIdList[i].type == 'lab/fireDevice/isOnline/'){
 							self.client.subscribe(self.mqttIdList[i].type+self.mqttIdList[i].fireCode, (err) => {
 							    if (!err) {
 							        console.log("火灾设备是否在线-订阅成功",self.mqttIdList[i].type+self.mqttIdList[i].fireCode)
 							    }
 							});
-							
+
 						}else if(self.mqttIdList[i].type == 'lab/fireDevice/executing/'){
 							self.client.subscribe(self.mqttIdList[i].type+self.mqttIdList[i].fireCode, (err) => {
 							    if (!err) {
 							        console.log("火灾是否正在执行灭火操作-订阅成功:",self.mqttIdList[i].type+self.mqttIdList[i].fireCode)
 							    }
 							});
-							
+
 						}
 					}
                 });
@@ -243,16 +238,13 @@
 							 console.log("一键灭火-是否正在执行灭火",data);
 							this.globalData.mqttPerformData = data;
 						}else if(topic == 'lab/bigview'){
-							// console.log("报警",data);
 							if(data.data == 'SUB_RISKPLAN_GROUP'){
 								this.globalData.mqttAlarmData = data.data;
 							}
 						}else {
 							if(data.data.subId){
-								// console.log('传感器',data);
 							    this.globalData.mqttSensorData = data.data;
 							}else{
-								// console.log("设备开关",data);
 								this.globalData.mqttDeviceData = data.data;
 							}
 						}

+ 2 - 2
api/request/config.js

@@ -9,9 +9,9 @@ const config = {
 	// base_url: 'https://demo.sxitdlc.com/xzgd/',
 
 	// base_url: 'https://lab.sxitdlc.com/labNhSystem/',//43服务器高升测试
-	// base_url: 'https://lab.sxitdlc.com/labAppTest/',//43服务器线上
+	base_url: 'https://lab.sxitdlc.com/labAppTest/',//43服务器线上
     // base_url: 'https://lab.sxitdlc.com/appTest/',//88服务器线上
-	 base_url: 'https://lab.sxitdlc.com/labSystem/', //矿大地址
+	 //base_url: 'https://lab.sxitdlc.com/labSystem/', //矿大地址
 	// base_url: 'https://lab.sxitdlc.com/jdlabSystem/', //交大地址
     // base_url: 'https://lab.sxitdlc.com/jndxlabSystem/', //暨大地址
     //  base_url: 'https://lab.sxitdlc.com/kdwclabSystem/', //矿大文昌地址

+ 1 - 7
api/request/request.js

@@ -68,7 +68,6 @@ export const apiResquest = (prams) => {
 					title: '出错啦~请联系管理员!',
 					duration: 2000
 				});
-				console.log("失败",err)
 			},
 			complete: () => {
 				// 完成
@@ -141,7 +140,6 @@ export const apiResquestForm = (prams) => {
                     title: '出错啦~请联系管理员!',
                     duration: 2000
                 });
-                console.log("失败",err)
             },
             complete: () => {
                 // 完成
@@ -162,7 +160,6 @@ export const apiResquestJsonList = (prams) => {
             url = url.slice(0, -1);
             prams.data = {};
         }
-        console.log("prams",prams)
         return uni.request({
             url: url,
             data: prams.data,
@@ -213,7 +210,6 @@ export const apiResquestJsonList = (prams) => {
                     title: '出错啦~请联系管理员!',
                     duration: 2000
                 });
-                console.log("失败",err)
             },
             complete: () => {
                 // 完成
@@ -286,7 +282,6 @@ export const apiResquestFormVideo = (prams) => {
                     title: '出错啦~请联系管理员!',
                     duration: 2000
                 });
-                console.log("失败",err)
             },
             complete: () => {
                 // 完成
@@ -357,11 +352,10 @@ export const apiResquestTimer = (prams) => {
 					title: '出错啦~请联系管理员!',
 					duration: 2000
 				});
-				console.log("失败",err)
 			},
 			complete: () => {
 				// 完成
 			}
 		});
 	})
-}
+}

+ 13 - 14
component/cropper.js

@@ -1,5 +1,5 @@
 const ABS = Math.abs
-const calcLen = (v) => { // distance between two coordinate 
+const calcLen = (v) => { // distance between two coordinate
   return Math.sqrt(v.x * v.x + v.y * v.y)
 }
 const calcAngle = (a, b) => { // angle of the two vectors
@@ -55,10 +55,10 @@ export default {
       type: Boolean,
       default: true
     },
-    src: String, 
+    src: String,
     disableScale: Boolean, // disable to zoom
-    disableRotate: Boolean, 
-    disableTranslate: Boolean, 
+    disableRotate: Boolean,
+    disableTranslate: Boolean,
     disableCtrl: Boolean, // disable to resize the cutter
     boundDetect: Boolean, // open boundary detection
     freeBoundDetect: Boolean, // open boundary detection while doing rotation
@@ -71,7 +71,7 @@ export default {
       default: true
     },
     imageCenter: Boolean, // auto center/middle for image
-    maxZoom: { // maximum scaling factor 
+    maxZoom: { // maximum scaling factor
       type: Number,
       default: 10 // can not be Infinity in baidu-MiniProgram
     },
@@ -199,7 +199,7 @@ export default {
 			// #ifndef MP-ALIPAY
 			const context = uni.createSelectorQuery().in(this)
 			// #endif
-      
+
       // get contianer size
       context.select('.nice-cropper').boundingClientRect()
       context.exec(res => {
@@ -225,12 +225,12 @@ export default {
         bottom: this.containerHeight - this.ctrlHeight - cornerStartY
       }
     },
-    initCut() { 
+    initCut() {
       this.resetCutReact()
       this.initImage()
     },
     async initImage() {
-		
+
       if (!this.src) return
 
       const [err, res] = await uni.getImageInfo({
@@ -241,8 +241,7 @@ export default {
         this.$emit("error", err)
       } else {
         this.$emit('load', res)
-      }   
-console.log(res.path)
+      }
       // init image size
       this.image.originWidth = err ? this.ctrlWidth : res.width
       this.image.originHeight = err ? this.ctrlHeight : res.height
@@ -257,7 +256,7 @@ console.log(res.path)
       }
       offset[0] += this.offset[0] || 0
       offset[1] += this.offset[1] || 0
-      
+
       this.setTranslate(offset)
       this.setZoom(this.zoom)
       this.transform.angle = this.freeBoundDetect || !this.disableRotate ? this.angle : 0
@@ -287,7 +286,7 @@ console.log(res.path)
       }
     },
     start(e) {
-      if(!this.src) e.preventDefault() 
+      if(!this.src) e.preventDefault()
       const point = e.touches ? e.touches[0] : e
       const touch = this.touch
       const now = Date.now()
@@ -315,7 +314,7 @@ console.log(res.path)
       }
     },
     move(e) {
-      if(!this.src) return 
+      if(!this.src) return
       const point = e.touches ? e.touches[0] : e
       if (e.touches.length > 1) { // multi touch
         const point2 = e.touches[1]
@@ -400,7 +399,7 @@ console.log(res.path)
       this.setRotate(angle)
     },
     setCutMode(type) {
-      if(!this.src) return 
+      if(!this.src) return
       this.cutMode = true
       this.cutDirection = type
     },

+ 3 - 5
component/tabBar.vue

@@ -52,12 +52,12 @@
 			    }
 			});
 		},
-		
+
 		onShow(){
 			this.getTotalList();
 		},
 		mounted(){
-			
+
 			this.getTotalList();
 			this.totalCount=uni.getStorageSync('totalCount')
             // 获取当前路由
@@ -70,13 +70,11 @@
 		methods: {
 			//获取消息总数接口
 			async getTotalList(){
-			console.log('消息')
 				const {data} = await infoTotalCount();
 				if(data.code==200){
-					console.log(data)
 					this.totalCount=data.data.totalCount
 				}
-				
+
 			},
             tabBarGoPage(type){
                 if(type === 1){

+ 0 - 6
component/topWarn.vue

@@ -38,7 +38,6 @@
 		methods: {
 			//应急变更
 			lineDataFunction(val){
-				console.log("预警",val);
 				this.getWarn();
 			},
 			buttonClick(){
@@ -52,8 +51,6 @@
 				uni.showActionSheet({
 					itemList: list,
 					success: function (res) {
-						console.log('res.tapIndex',res.tapIndex);
-						console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
 						if(res.tapIndex == 0){
 							self.goPage();
 						}else if(res.tapIndex == 1){
@@ -75,9 +72,7 @@
 					success: function (res) {
 						if (res.confirm) {
 							self.closeRiskPlan();
-							console.log('用户点击确定');
 						} else if (res.cancel) {
-							console.log('用户点击取消');
 						}
 					}
 				});
@@ -110,7 +105,6 @@
 			async getWarn(){
 				let self = this;
 				const {data} = await selectTriggerInfo();
-				console.log('data',data);
 					if(data.data[0]){
 					  this.$set(this,'text',data.data.length>1?'有多个实验室发生预案':'有实验室发生预案');
 					  this.$set(this,'buildId',data.data[0].buildId);

+ 0 - 563
pages/alarmInfo/alarmInfo.vue

@@ -1,563 +0,0 @@
-<!-- 停用 -->
-<template>
-    <view class="alarm">
-		<view class="alarm_t">
-			<view class="alarm_t_t">
-        <img src="@/images/icon_003.png"/>
-				<text>2022-01-01  14:00:23</text>
-				<text>待处理</text>
-			</view>
-			<view class="alarm_t_b">化学品名称-未领用带离实验室房间,请尽快确认。</view>
-		</view>
-		<view class="alarm_c">
-			<view class="alarm_c_li">
-				<text>位置:</text>
-				<text>实验室名称-楼栋楼层房间号</text>
-			</view>
-			<view class="alarm_c_li">
-				<text>气瓶规格:</text>
-				<text>10L</text>
-			</view>
-			<view class="alarm_c_li">
-				<text>气体余量:</text>
-				<text>10Mpa</text>
-			</view>
-			<view class="alarm_c_li">
-				<text>当前使用人:</text>
-				<text>成双-13666554455</text>
-			</view>
-			<view class="alarm_c_li">
-				<text>气瓶所有人:</text>
-				<text>李妮妮-13256564545</text>
-			</view>
-			<view class="alarm_c_img">
-				<view>报警抓拍:</view>
-				<view>
-          <img src="@/images/icon_01.png"/>
-          <img src="@/images/icon_01.png"/>
-					<img src="@/images/icon_01.png"/>
-					<img src="@/images/icon_01.png"/>
-					<img src="@/images/icon_01.png"/>
-					<img src="@/images/icon_01.png"/>
-				</view>
-			</view>
-		</view>
-		<view class="alarm_b">
-			<view class="alarm_b_l" @click="MonitorBtn()">查看监控</view>
-			<view class="alarm_b_r" @click="voiceBtn()">语音广播</view>
-		</view>
-		<view class="shade-max-big-box" v-if="broadcastType">
-			<view class="null-box" @click="voiceBtn()"></view>
-			<!-- 语音广播-执行疏散 -->
-			<view class="broadcast">
-				<view class="broadcast_t">语音广播<label>选择喇叭位置</label></view>
-				<!-- 按钮部分 -->
-				<view class="trumpet-max-box">
-					<view @click="trumpetClick(index)"
-						class="trumpet-for-box" :class="item.type?'trumpet-color-a':'trumpet-color-b'"
-						v-for="(item,index) in trumpetList" :key="index">
-						<img src="@/images/icon_sskz_zc.png" v-if="!item.type"/>
-						<img src="@/images/icon_sskz_xz.png" v-if="item.type"/>
-						{{item.name}}
-					</view>
-				</view>
-				<view class="broadcast_m">
-					<view class="broadcast_m_t" :class="liveType?'broadcast_m_t_back_a':'broadcast_m_t_back_b'" @longpress.stop="recordButton" @touchmove.stop="cancelButton"  @touchend.stop="sendButton">
-
-						{{liveType?'松开发送':'按住说话'}}
-					</view>
-					<view class="broadcast_m_b" v-if="!liveType">按住说话,录入广播内容</view>
-					<view class="broadcast_m_b" v-if="liveType">松开发送,向上滑动取消发送</view>
-				</view>
-			</view>
-		</view>
-
-	</view>
-
-</template>
-
-<script>
-	import { config,} from '@/api/request/config.js'
-    import {getDeviceList,textParseUrlIps} from '@/api/index.js'
-    export default {
-        data() {
-            return {
-				form:{
-
-				},
-				broadcastType:false,
-				//喇叭数据
-				trumpetList:[],
-				//广播相关
-				liveType:false,
-				sendLock: true, //发送锁,当为true时上锁,false时解锁发送
-				recorderManager : wx.getRecorderManager(),
-				//滑动记录
-				startPoint:{},
-            }
-        },
-        onLoad(option) {
-			this.getDeviceList()
-        },
-        onShow(){
-
-        },
-		methods:{
-			MonitorBtn(){
-				// uni.navigateTo({
-				//   url:'/pages/alarmInfo/alarmInfoMonitor'
-				// })
-			},
-			voiceBtn(){
-				this.broadcastType = !this.broadcastType
-			},
-			//获取喇叭
-			async getDeviceList(){
-				let obj ={
-					floorId:5,
-					page:1,
-					pageSize:100,
-				};
-				const {data} = await getDeviceList(obj)
-				if(data.code == 200){
-					for(let i=0;i<data.data.length;i++){
-						data.data[i].type = false;
-					}
-					this.$set(this,'trumpetList',data.data)
-				}
-			},
-			//点击选择喇叭
-			trumpetClick(index){
-				this.trumpetList[index].type = !this.trumpetList[index].type
-        // let _this=this;
-        // if(_this.trumpetList[index].type==true){
-        //   _this.trumpetList.forEach(function(item2) {
-        //     if(item2.deviceSn==_this.trumpetList[index].deviceSn){
-        //       item2.type=true
-        //     }else{
-        //       item2.type=false
-        //     }
-        //   })
-        // }
-			},
-			//录制
-			recordButton(e){
-				console.log("按下")
-				let self = this;
-				let num = 0;
-				for(let i=0;i<self.trumpetList.length;i++){
-					if(self.trumpetList[i].type){
-						num++
-					}
-				}
-				if(num == 0){
-					uni.showToast({
-						title: '请选择喇叭',
-						icon:"none",
-						mask:true,
-						duration: 2000
-					});
-					return
-				}
-				this.liveType=true;
-				console.log('录制',e)
-				this.startPoint = e.touches[0];//记录长按时开始点信息,后面用于计算上划取消时手指滑动的距离。
-				const options = {
-					duration: 10000,
-					sampleRate: 16000,
-					numberOfChannels: 1,
-					encodeBitRate: 48000,
-					format: 'mp3',
-					frameSize: 50
-				}
-				this.recorderManager.start(options);//开始录音
-				this.recorderManager.onStart(() => {
-					console.log('recorder start')
-				})
-				this.recorderManager.onError((res) => {
-					console.log(res);
-				})
-				wx.showToast({
-					title: "正在录音,上划取消发送",
-					icon: "none",
-					duration: 60000//先定义个60秒,后面可以手动调用wx.hideToast()隐藏
-				});
-				this.sendLock = false;//长按时是不上锁的。
-			},
-			//取消
-			cancelButton(e){
-				console.log("移动")
-				let self = this;
-				let num = 0;
-				for(let i=0;i<self.trumpetList.length;i++){
-					if(self.trumpetList[i].type){
-						num++
-					}
-				}
-				if(num == 0){
-					return
-				}
-				this.liveType=false;
-				console.log('取消',e)
-				let moveLenght = e.touches[e.touches.length - 1].clientY - this.startPoint.clientY; //移动距离
-				/* if (Math.abs(moveLenght) > 50) {
-					wx.showToast({
-						title: "松开手指,取消发送",
-						icon: "none",
-						duration: 60000
-					});
-					this.sendLock = true;//触发了上滑取消发送,上锁
-				} else {
-					wx.showToast({
-						title: "正在录音,上划取消发送",
-						icon: "none",
-						duration: 60000
-					});
-					this.sendLock = false;//上划距离不足,依然可以发送,不上锁
-				} */
-			},
-			//发送
-			sendButton(e){
-				console.log("松开")
-				let self = this;
-				let num = 0;
-				for(let i=0;i<self.trumpetList.length;i++){
-					if(self.trumpetList[i].type){
-
-						num++
-					}
-				}
-				if(num == 0){
-					return
-				}
-				this.liveType=false;
-				console.log('发送',e)
-				wx.hideToast();//结束录音、隐藏Toast提示框
-				this.recorderManager.stop();//结束录音
-				this.recorderManager.onStop((res) => {
-					if(!this.sendLock){
-						console.log('1', this.recorderManager)
-						this.uploadImg(res.tempFilePath);
-					}
-					console.log('停止录音', res.tempFilePath)
-					console.log("sendLock",this.sendLock);
-				})
-			},
-			//发送语音
-			async textParseUrlIps(text){
-				let self = this;
-				let newList = [];
-				for(let i=0;i<self.trumpetList.length;i++){
-				  if(self.trumpetList[i].type){
-					let obj = {
-					  sn:self.trumpetList[i].deviceSn,
-					  port:self.trumpetList[i].port,
-					  deviceIp:self.trumpetList[i].deviceIp,
-					  type:"",
-					  name:"",
-					  speed:"",
-					  params:{
-						tid:"",
-						vol:"",
-						urls:[]
-					  }
-					};
-					newList.push(obj);
-				  }
-				}
-				const {data} = await textParseUrlIps(newList,text)
-				if(data.code == 200){
-					uni.showToast({
-						title: '发送成功',
-						icon:"none",
-						mask:true,
-						duration: 2000
-					});
-				}
-			},
-
-		}
-
-	}
-</script>
-
-<style lang="stylus" scoped>
-    .alarm{
-        height:100%;
-        width:100%;
-		display:flex;
-		flex-direction:column;
-		overflow-y:scroll;
-		.alarm_t{
-			padding: 0 20rpx;
-			box-sizing: border-box;
-			background: #fff;
-			.alarm_t_t{
-				display: flex;
-				justify-content: flex-start;
-				align-items: center;
-				height: 80rpx;
-				border-bottom: 1px solid #e0e0e0;
-				>img{
-					width: 30rpx;
-					height: 30rpx;
-					margin-right: 22rpx;
-				}
-				>text:nth-of-type(1){
-					width: 586rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					line-height: 28rpx;
-				}
-				>text:nth-of-type(2){
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #FF9C00;
-					line-height: 28rpx;
-				}
-			}
-			.alarm_t_b{
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #666666;
-				line-height: 120rpx;
-			}
-		}
-		.alarm_c{
-			margin: 20rpx;
-			padding:0 16rpx;
-			box-sizing: border-box;
-			background: #FFFFFF;
-			border-radius: 20rpx;
-			.alarm_c_li{
-				height: 80rpx;
-				display: flex;
-				justify-content: space-between;
-				border-bottom: 1px solid #e0e0e0;
-				>text{
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					line-height: 80rpx;
-				}
-				>text:nth-of-type(1){}
-				>text:nth-of-type(2){
-					color: #666666;
-				}
-			}
-			.alarm_c_img{
-				display: flex;
-				justify-content: flex-start;
-				margin-top: 30rpx;
-				>view:nth-of-type(1){
-					width: 184rpx;
-					display: inline-block;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					line-height: 28rpx;
-				}
-				>view:nth-of-type(2){
-					flex: 1;
-					display: flex;
-					justify-content: flex-start;
-					flex-wrap: wrap;
-					>img{
-						width: 150rpx;
-						height: 150rpx;
-						background: #FFFFFF;
-						border-radius: 4rpx;
-						margin-right: 14rpx;
-						margin-bottom: 20rpx;
-					}
-				}
-			}
-
-		}
-		.alarm_b{
-			width: 650rpx;
-			margin-left: 50rpx;
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #FFFFFF;
-			line-height: 100rpx;
-			text-align: center;
-			position: fixed;
-			bottom: 20rpx;
-			display: flex;
-			justify-content: flex-start;
-			.alarm_b_l{
-				width: 325rpx;
-				height: 100rpx;
-				background: linear-gradient(-45deg, #FA9901, #F28E26);
-				border-radius: 50rpx 0px 0px 50rpx;
-
-			}
-			.alarm_b_r{
-				width: 325rpx;
-				height: 100rpx;
-				background: linear-gradient(-35deg, #309CFF, #0183FA);
-				border-radius: 0px 50rpx 50rpx 0px;
-
-			}
-		}
-		.shade-max-big-box{
-				height:100%;
-				width:100%;
-				position fixed
-				display flex;
-				flex-direction column
-				z-index:10;
-				background :rgba(0,0,0,0.2);
-				.null-box{
-					flex:1;
-				}
-				/* 语音广播-执行疏散 */
-				.broadcast{
-					width: 100%;
-					// height: 532rpx;
-					background: #FFFFFF;
-					border-top-left-radius :20rpx;
-					border-top-right-radius :20rpx
-					padding :22rpx 30rpx 30rpx;
-					box-sizing :border-box;
-					margin-top:20rpx;
-					.broadcast_t{
-						font-size: 30rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #333333;
-						line-height: 30rpx;
-						>label{
-							font-size: 24rpx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #999999;
-							line-height: 30rpx;
-							margin-left :16rpx;
-						}
-					}
-					.trumpet-max-box{
-						display :flex;
-						justify-content :flex-start;
-						margin-top :22rpx;
-						flex-wrap: wrap;
-						.trumpet-for-box{
-							display:inline-block;
-							width:200rpx;
-							height:60rpx;
-							line-height:60rpx;
-							font-size:24rpx;
-							text-align center;
-							cursor: pointer;
-							overflow: hidden;
-							border: 1rpx solid #E0E0E0;
-							border-radius:10rpx;
-							color: #E0E0E0;
-							display :flex;
-							justify-content :center;
-							margin-right :20rpx;
-							margin-bottom: 10rpx;
-							>img{
-								width:36rpx;
-								height:34rpx;
-								margin :12rpx 20rpx 0 25rpx;
-							}
-						}
-
-						.trumpet-color-a{
-							border:1px solid #0183FA;
-							color:#0183FA;
-						}
-						.trumpet-color-b{
-							border:1px solid #CCCCCC;
-							color:#999;
-						}
-					}
-					.broadcast_m{
-						width :100%;
-						.broadcast_m_t{
-							width: 142rpx;
-							height: 142rpx;
-							margin :30rpx 0 0 258rpx;
-							position :relative;
-							font-size: 24rpx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							line-height: 170rpx;
-							text-align center
-							>img{
-								width: 142rpx;
-								height: 142rpx;
-								position :absolute;
-
-							}
-							>label{
-								width :100%;
-								font-size: 24rpx;
-								font-family: PingFang SC;
-								font-weight: 500;
-								color: #0183FA;
-								line-height: 24rpx;
-								display :inline-block;
-								text-align :center;
-								position :absolute;
-								top:76rpx;
-							}
-							/* 按下 */
-							.press_color{
-								color: #FFFFFF;
-							}
-							/* 松开 */
-							.slip_color{
-								color: #0183FA;
-							}
-						}
-						.broadcast_m_t_back_a{
-							background:url(@/images/icon_sskz_skfs.png);
-							background-size 100%
-							color: #FFFFFF;
-						}
-						.broadcast_m_t_back_b{
-							background:url(@/images/icon_sskz_azsh.png);
-							background-size 100%
-							color: #0183FA;
-						}
-						.broadcast_m_b{
-							font-size: 24rpx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #999999;
-							line-height: 24rpx;
-							text-align center;
-							margin-top :14rpx;
-						}
-					}
-					/* 疏散按钮 */
-					.evacuation-button-box{
-						width:650rpx;
-						height:100rpx;
-						background #0183FA
-						color:#fff;
-						text-align center;
-						line-height:100rpx;
-						font-size:28rpx;
-						margin:88rpx auto 0;
-						border-radius:20rpx;
-					}
-				}
-			}
-
-	}
-
-	/deep/.input-value-border{
-		display :none !important;
-	}
-</style>

+ 0 - 174
pages/alarmInfo/alarmInfoMonitor.vue

@@ -1,174 +0,0 @@
-<!-- 停用 -->
-<template>
-    <view class="monitor">
-		<view class="monitor_n">
-			<scroll-view class="scroll1" scroll-x="true">
-					<view :class="currentTab==index ? 'select' : 'select1'" v-for="(item,index) in barNameList" :key="index" :data-current="index" @click="ontabtap(item,$event)">
-						{{item.name}}
-					</view>
-			</scroll-view>
-
-			<view class="monitor_n_b">
-				<video
-				    v-for="(item,index) in urlList" :key="index" :id="urlList.id" :src="item.url"
-				    :poster="videoCover"
-				    :custom-cache='false' :autoplay="true" :controls="true"
-				    :enable-danmu="false" :muted="true" :show-fullscreen-btn="true"
-				    :show-center-play-btn="false" :show-play-btn="false"
-				    @error="videoErrorCallback" >
-				</video>
-			</view>
-		</view>
-	</view>
-
-</template>
-
-<script>
-	import { config,} from '@/api/request/config.js'
-    import {GetStartList} from '@/api/index.js'
-    export default {
-        data() {
-            return {
-				videoCover:uni.getStorageSync('videoCover'),
-				currentTab: 0,
-				form:{
-
-				},
-				urlList:[],
-				barNameList:[
-					{
-						name:'楼道监控1',
-					},
-					{
-						name:'实验室监控1',
-					},
-					{
-						name:'实验室监控1',
-					},
-					{
-						name:'实验室监控1',
-					},
-					{
-						name:'实验室监控1',
-					},
-					{
-						name:'实验室监控1',
-					},
-				],
-
-            }
-        },
-        onLoad(option) {
-			this.GetStartList();
-        },
-        onShow(){
-
-        },
-		methods:{
-			//点击tab切换
-			ontabtap:function(item,e) {
-				var _this = this;
-				if (this.currentTab === e.target.dataset.current) {
-					return false;
-				} else {
-					this.currentTab = e.target.dataset.current
-				}
-				// this.hardware.forEach(function(item,index){
-				// 	if(data.id==item.id){
-				// 	  _this.jinanGetStartList(_this.hardwareNUM[index])
-				// 	}
-				// })
-
-			},
-			//查询摄像头地址(交大)
-			async GetStartList(deviceIds){
-			  let obj = {
-				page:'1',
-				count:'1',
-				//deviceIds:deviceIds
-				deviceIds:'4401020049200000000100209'
-			  };
-			  const {data} = await GetStartList(obj);
-        if(data.code == 200){
-          let list = [];
-          for(let i=0;i<data.data.length;i++){
-            let text = uni.getStorageSync('cameraUrl');
-            let url = data.data[i].hls;
-            url = url.split("rtp/");
-            let newUrl = text+'rtp/'+url[1];
-            let obj = {
-              id:data.data[i].deviceID,
-              url:newUrl,
-            }
-            list.push(obj)
-            console.log("obj",obj)
-          }
-          this.urlList = list;
-        }
-			},
-		},
-
-	}
-</script>
-
-<style lang="stylus" scoped>
-    .monitor{
-        height:100%;
-        width:100%;
-		display:flex;
-		flex-direction:column;
-		.monitor_n{
-			width:710rpx;
-			margin: 20rpx;
-			background: #FFFFFF;
-			border-radius: 20rpx;
-			padding: 20rpx 22rpx 40rpx;
-			box-sizing: border-box;
-			.scroll1 {
-					width: 100%;
-					white-space: nowrap;
-					border-bottom: 1px solid #e0e0e0;
-
-					& view {
-						white-space: normal;
-						display: inline-block;
-						height: 60rpx;
-						font-size: 28rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #333333;
-						line-height: 60rpx;
-						margin-right: 34rpx;
-					}
-					& view:first-child:before {
-						display: none;
-					}
-
-					.select {
-						font-size: 28rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #0183FA;
-						line-height: 60rpx;
-					}
-
-					.select1 {
-						color: #333333;
-					}
-				}
-			.monitor_n_b{
-				width: 666rpx;
-				height: 347rpx;
-				margin-top: 16rpx;
-				overflow-y scroll;
-				video{
-				  width:666rpx;
-				  height:347rpx;
-				}
-			}
-		}
-	}
-	/deep/.input-value-border{
-		display :none !important;
-	}
-</style>

+ 1 - 5
pages/avatar.vue

@@ -55,11 +55,9 @@
 				transform.zoom = 2
 			},
 			afterDraw(ctx, info) {
-				ctx.fillText('我是一行文字水印', 20, 20)
-				console.log(`当前画布大小:${info.width}*${info.height}`)
+				ctx.fillText('', 20, 20)
 			},
 			cropped(imagePath, imageInfo) {
-				console.log("imagePath",imagePath)
 				this.srcData = imagePath;
 			},
 
@@ -73,9 +71,7 @@
 				    success: function (res) {
 				        if (res.confirm) {
 				            self.uploadImg(self.srcData);
-				            console.log('用户点击确定');
 				        } else if (res.cancel) {
-				            console.log('用户点击取消');
 				        }
 				    }
 				});

+ 0 - 3
pages/casuallyPat.vue

@@ -119,9 +119,7 @@
                     success: function (res) {
                         if (res.confirm) {
                             self.addPhotoNote();
-                            console.log('用户点击确定');
                         } else if (res.cancel) {
-                            console.log('用户点击取消');
                         }
                     }
                 });
@@ -192,7 +190,6 @@
                     sizeType: ["original", "compressed"],
                     sourceType: ["album", "camera"],
                     success: function(res) {
-						console.log(res)
                         let tempFilePaths = res.tempFilePaths[0];
                         self.uploadImg(tempFilePaths,index);
                     }

+ 0 - 4
pages/fingerprint.vue

@@ -133,9 +133,6 @@
 			      }
 			    })
 			  }
-
-
-			   console.log(this.yesUseList)
 		   },
 		   //查询用户指纹录取数据
 		   async fingerprintClick(){
@@ -196,7 +193,6 @@
 			    const {data} = await fingerprintQeryMySubList(_this.dialogForm)
 				if(data.code == 200){
 					_this.yesUseList=data.data;
-					console.log(_this.yesUseList)
 					_this.yesUseList.forEach(function(item){
 						item.isCheck=false;
 					})

+ 0 - 1
pages/home.vue

@@ -38,7 +38,6 @@ export default {
         url: '/pages/login',
       });
     }
-    console.log("onShow")
   },
   methods: {
 

+ 0 - 5
pages/information/information.vue

@@ -10,13 +10,8 @@
 					<view class="top-box">
 						<view>{{item.isApply==1?'准入驳回':(item.isApply==2?item.remark:
 						(item.isApply==3||item.isApply==-1?item.sendName:(item.isApply==4||item.isApply==5?item.remark:'')))}}</view>
-<!-- 						<view v-if='item.isApply==2'>{{item.remark}}</view>
-						<view v-if='item.isApply==3 || item.isApply==-1'>{{item.sendName}}</view> -->
 						<view>{{item.isApply==1?item.subName:(item.isApply==2?'':
 						(item.isApply==3||item.isApply==-1?item.deptName:(item.isApply==4||item.isApply==5?'':'')))}}</view>
-						<!-- <view v-if='item.isApply==1'>{{item.subName}}</view>
-						<view v-if='item.isApply==2'></view>
-						<view v-if='item.isApply==3 && item.isApply==-1'>{{item.deptName}}</view> -->
 						<view>{{item.newMessageDate}}</view>
 					</view>
 					<view class="bottom">{{item.newMessage}}</view>

+ 24 - 56
pages/information/notPassInfo.vue

@@ -14,22 +14,6 @@
 				<view>申请备注:</view>
 				<view>{{subjectData.labSecurityApply.applyCause}}</view>
 			</view>
-			<!-- <view class="user-info-box-min">
-				<view>申请时间:</view>
-				<view>{{subjectData.labSecurityApply.creatTime}}</view>
-			</view>
-			<view class="user-info-box-min" v-if="subjectData.labSecurityApply.auditStatus == 2">
-				<view>通过时间:</view>
-				<view>{{subjectData.labSecurityApply.auditTime}}</view>
-			</view>
-			<view class="user-info-box-min" v-if="subjectData.labSecurityApply.auditStatus == 1">
-				<view>驳回时间:</view>
-				<view>{{subjectData.labSecurityApply.rejectTime}}</view>
-			</view>
-			<view class="user-info-box-min" v-if="subjectData.labSecurityApply.auditStatus == 1">
-				<view>驳回原因:</view>
-				<view style="line-height:40rpx;padding:14rpx 0;">{{subjectData.labSecurityApply.rejectCause}}</view>
-			</view> -->
 		</view>
 		<view class="user-info-box">
 			<view class="user-info-box_title"><view style="color: red;">*</view>身份信息:(关联学生信息材料)</view>
@@ -37,7 +21,7 @@
 				<view>申请人:</view>
 				<view>{{subjectData.sysUser.nickName}}</view>
 			</view>
-			<view class="user-info-box-min">	
+			<view class="user-info-box-min">
 				<view>联系电话:</view>
 				<view>{{subjectData.sysUser.phonenumber}}</view>
 			</view>
@@ -57,16 +41,9 @@
 				<view>导师:</view>
 				<view>{{subjectData.sysUser.tutorUserName}}</view>
 			</view>
-		
+
 		</view>
 		<view v-for="(item,index) in subjectData.listTemp" :key="index" style="overflow: hidden;">
-			<!-- <view class="user-card-box" v-if="item.materialType==2&&item.relationType==1">
-				<view class="user-card-title">{{subjectData.labSecurityApply.userType == '11'?'教师信息(关联教师信息材料):':(subjectData.labSecurityApply.userType == '22'?'学生信息(关联学生信息材料):':'')}}</view>
-				<view class="user-card-text">姓名:{{subjectData.labSecurityApply.userName}}</view>
-				<view class="user-card-text">{{subjectData.labSecurityApply.userType == '11'?'工号:':(subjectData.labSecurityApply.userType == '22'?'学号:':'')}}{{subjectData.labSecurityApply.userNumber}}</view>
-				<view class="user-card-text">院校:{{subjectData.labSecurityApply.deptName}}</view>
-				<view class="user-card-text" v-if="subjectData.labSecurityApply.userType == '22'">专业:{{subjectData.labSecurityApply.userMajor}}</view>
-			</view> -->
 			<view class="img-box" v-if="item.materialType==2&&item.relationType==2">
 				<view class="img-title">安全考试证书</view>
 				<img v-if="subjectData.listcert[0]" class="item-img-box" :src="subjectData.listcert[0].cert_url">
@@ -101,21 +78,19 @@
             }
         },
         onLoad(option) {
-			
+
             this.infoData = JSON.parse(decodeURIComponent(option.item));
-			console.log(this.infoData)
             //修改页面title
             uni.setNavigationBarTitle({
                 title:this.infoData.auditStatus==0?'待审核':(this.infoData.auditStatus==1?'未通过':(this.infoData.auditStatus==2?'已通过':''))
             });
         },
         onShow(){
-           
+
             this.getRead();
         },
         methods: {
 			lookItem(minItem){
-				console.log("minItem",minItem)
 				if(minItem.type == 'png' || minItem.type == 'jpg' || minItem.type == 'jpeg' || minItem.type == 'gif'){
 					//查看图片
 					wx.previewImage({
@@ -136,7 +111,6 @@
 							Authorization: uni.getStorageSync('token')
 						},
 						success: function (res) {
-							console.log("resresresresresres",res)
 							const fileManager = wx.getFileSystemManager()
 							const filePath = wx.env.USER_DATA_PATH + '/' + minItem.name + '.docx'
 							fileManager.saveFile({
@@ -183,7 +157,6 @@
 			        let self = this;
 			        const {data} = await groupListRead({messageId:this.infoData.messageId})
 			        if(data.code==200){
-						console.log(data.data.applyId)
 						let id=data.data.applyId
 						this.getDetails(id)
 			        }
@@ -191,34 +164,29 @@
             //获取安全准入审批记录详细信息(用户端)
             async getDetails(id) {
                 let self = this;
-				
+
                 const {data} = await getDetails({id:id})
                 if(data.code==200){
 				  for(let i=0;i<data.data.listTemp.length;i++){
-					  console.log(data.data.listTemp.length)
-					if(data.data.listTemp[i].materialType == 1){
-					  let maxList = [];
-					  for(let o=0;o<data.data.listTemp[i].listMr.length;o++){
-						   console.log(data.data.listTemp[i].listMr.length)
-						let bigList = data.data.listTemp[i].listMr[o].dataUrl.split(',');
-						for(let x=0;x<bigList.length;x++){
-							console.log(bigList.length)
-						  if(bigList[x]){
-							let minList = bigList[x].split(';');
-							let minListTwo = minList[0].split('.')
-							let obj = {
-							  name:minList[0],
-							  url:minList[1],
-							  type:minListTwo[1]
-							};
-							maxList.push(obj);
-						  }
-						}
-					  }
-					  data.data.listTemp[i].upList = maxList;
-					  console.log('maxList[0].url',maxList);
-					  // self.iframeSrc = window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_FILE_API + '/onlinePreview?url='+encodeURIComponent(btoa(unescape(encodeURIComponent(maxList[0].url))));
-					}
+					if(data.data.listTemp[i].materialType == 1) {
+            let maxList = [];
+            for (let o = 0; o < data.data.listTemp[i].listMr.length; o++) {
+              let bigList = data.data.listTemp[i].listMr[o].dataUrl.split(',');
+              for (let x = 0; x < bigList.length; x++) {
+                if (bigList[x]) {
+                  let minList = bigList[x].split(';');
+                  let minListTwo = minList[0].split('.')
+                  let obj = {
+                    name: minList[0],
+                    url: minList[1],
+                    type: minListTwo[1]
+                  };
+                  maxList.push(obj);
+                }
+              }
+            }
+            data.data.listTemp[i].upList = maxList;
+           }
 				  }
 				  this.$set(this,"subjectData",data.data);
 				  this.pageType = true;

+ 0 - 4
pages/login.vue

@@ -76,7 +76,6 @@ export default {
       if(data.code==200){
 
       }else if(data.code==500){
-        console.log(data.msg)
       }
     },
     switchClick(){
@@ -132,7 +131,6 @@ export default {
           content: '请您联系学校相关管理人员申请重置密码',
           success: function (res) {
             if (res.confirm) {
-              console.log('用户点击确定');
             }
           }
         });
@@ -215,7 +213,6 @@ export default {
 
         },
         fail: function(res) {
-          console.log(res)
         }
       })
     },
@@ -236,7 +233,6 @@ export default {
 
         },
         fail: function(res) {
-          console.log(res)
         }
       })
     }

+ 0 - 26
pages/manageWorkbench.vue

@@ -1,7 +1,6 @@
 <!-- 管理端工作台 -->
 <template>
   <view class="manage-workbench">
-    <!-- <img class="top-big-img" src="@/images/Version2.2/ing_bg_banner.png"> -->
     <img class="top-big-img" :src="homepageBanner">
     <top-warn></top-warn>
     <view class="min-icon-button-box" style="margin-bottom: 0;">
@@ -161,26 +160,8 @@ export default {
     this.getGrading();
     //监听报警信息
     getApp().watch(this.getSafeWarnList,'mqttAlarmData');
-		// mqtt订阅因为返回数据频率问题 暂时取消列表的MQTT刷新
-    //监听传感器信息
-    // getApp().watch(this.getMqttSensorData,'mqttSensorData');
   },
   methods: {
-    //跳转选择器
-    buttonChange(e){
-
-      /* if(this.buttonArray[e.detail.value].id == 1){
-        //检查记录
-        uni.navigateTo({
-          url: '/pages_manage/workbench/securityCheck/inspectionRecords'
-        });
-      }else if(this.buttonArray[e.detail.value].id == 2){
-        //问题整改
-        uni.navigateTo({
-            url: '/pages_manage/workbench/problemRectification/rectifyList'
-        });
-      } */
-    },
     //暂无提示
     goCheckPage(){
       if(this.userInfo.isadmin){
@@ -202,9 +183,7 @@ export default {
     },
     //监听传感器信息
     getMqttSensorData(val){
-		console.log("val",val);
       let self = this;
-      // console.log('页面获取的-传感器信息',val)
       if(val.subId){
         for(let i=0;i<self.dataList.length;i++){
           if(self.dataList[i].id == val.subId){
@@ -253,7 +232,6 @@ export default {
     async laboratoryInfo(item){
       const {data} = await laboratoryInfo(item.subDiyVo.id);
       if(data.code == 200){
-		console.log("data",data)
         let obj = data.data[0];
         obj.subClassVO = item.subDiyVo.subClassVO;
         obj.name = item.subDiyVo.name;
@@ -349,9 +327,6 @@ export default {
 				obj.idList.push(self.dataList[i].id)
 			}
 		}
-		// mqtt订阅因为返回数据频率问题 暂时取消列表的MQTT刷新
-		// list.push(obj);
-		// list.push({type:"lab/bigview",});
 		list.push({type:"lab/riskPlan/trigger/notice",});
 		getApp().appMqttOn(1,list);
       }
@@ -484,7 +459,6 @@ export default {
     getApp().deleteAlarmWatch();
     //删除传感器监听
     getApp().deleteSensorWatch();
-	console.log("beforeDestroy");
   }
 }
 </script>

+ 0 - 4
pages/mine.vue

@@ -238,7 +238,6 @@ export default {
 
         _this.isUpload=data.data.isUpload;
         _this.signatureUrl=data.data.signature;
-        console.log(_this.certification.isUpload)
       }
     },
     //获取个人奖励分/信用分
@@ -288,9 +287,7 @@ export default {
         success: function (res) {
           if (res.confirm) {
             self.logout();
-            console.log('用户点击确定');
           } else if (res.cancel) {
-            console.log('用户点击取消');
           }
         }
       });
@@ -352,7 +349,6 @@ export default {
         sizeType: ["original", "compressed"],
         sourceType: ["album", "camera"],
         success: function(res) {
-          console.log("res1",res)
           let tempFilePaths = res.tempFilePaths[0];
           self.uploadImg(tempFilePaths);
         }

+ 0 - 1
pages/studentWorkbench.vue

@@ -89,7 +89,6 @@ export default {
 
   },
   mounted(){
-    console.log("user-workbench")
     this.myViolationCount();
     this.getGrading();
 

+ 0 - 6
pages_manage/emergencyEvacuationBigFullScreen.vue

@@ -102,7 +102,6 @@
 		},
 		methods: {
 			mqttPageFunction(type){
-				// console.log('页面方法被上级路由页面调用-type=',type);
 				let self = this;
 				if (type == 'FLOOR_EXITLINE') {
 					this.getRedisEvacuation();
@@ -119,7 +118,6 @@
 				}
 			},
 			checkRoom(item){
-				console.log('item',item)
 				if(this.buttonType){
 					item.roomCheckType = !item.roomCheckType;
 					this.$forceUpdate();
@@ -156,7 +154,6 @@
 				doorPointNames:doorPointNames,
 				}
 				const {	data } = await executeEvacuation(obj)
-				console.log('data', data)
 				if (data.code == 200) {
 					uni.showToast({
 						title: '执行成功',
@@ -179,7 +176,6 @@
 				const {
 					data
 				} = await getFloorData(this.floorId)
-				console.log('data', data)
 				if (data.code == 200) {
 					if (data.data.buildFloorLayoutVoList[0]) {
 						let list = JSON.parse(data.data.labExitLineVertex.layoutJoinData)
@@ -273,9 +269,7 @@
 							} else {
 								self.openLight(item);
 							}
-							console.log('用户点击确定');
 						} else if (res.cancel) {
-							console.log('用户点击取消');
 						}
 					}
 				});

+ 0 - 5
pages_manage/examination/examinationSelect.vue

@@ -8,11 +8,6 @@
 					<img  class="icon_img" src="@/pages_manage/images/icon_aqjc_ss.png"/>
 				</view>
 			</view>
-			<!-- <view class="search_b">
-				<text>气体名称</text>
-				<text>气体级别</text>
-				<text>气体规格</text>
-			</view> -->
 		</view>
 		<scroll-view scroll-y @scrolltolower="scrollGet" class="scroll-box">
 		    <view class="list">

+ 1 - 1
pages_manage/gasList/gasListBinding.vue

@@ -72,7 +72,7 @@
 							content: '该RFID已被绑定,请重新选择 RFID标签',
 							success: function (res) {
 								if (res.confirm) {
-									console.log('用户点击确定');
+
 								}
 							}
 						});

+ 0 - 25
pages_manage/workbench/accessQualification/accessQualificationInfo.vue

@@ -18,14 +18,6 @@
 				<view>申请备注:</view>
 				<view>{{subjectData.labSecurityApply.applyCause==null?'':subjectData.labSecurityApply.applyCause}}</view>
 			</view>
-			<!-- <view class="user-info-box-min">
-				<view>身份:</view>
-				<view>{{subjectData.labSecurityApply.userType == '11'?'教职工':(subjectData.labSecurityApply.userType == '22'?'学生':'')}}</view>
-			</view>
-			<view class="user-info-box-min">
-				<view>申请时间:</view>
-				<view>{{subjectData.labSecurityApply.creatTime}}</view>
-			</view> -->
 		</view>
 		<view class="user-info-box">
 			<view class="user-info-box_title"><view style="color: red;">*</view>身份信息:(关联学生信息材料)</view>
@@ -55,13 +47,6 @@
 			</view>
 		</view>
 		<view v-for="(item,index) in subjectData.listTemp" :key="index" style="overflow: hidden;">
-			<!-- <view class="user-card-box" v-if="item.materialType==2&&item.relationType==1">
-				<view class="user-card-title">{{subjectData.labSecurityApply.userType == '11'?'教师信息(关联教师信息材料):':(subjectData.labSecurityApply.userType == '22'?'学生信息(关联学生信息材料):':'')}}</view>
-				<view class="user-card-text">姓名:{{subjectData.labSecurityApply.userName}}</view>
-				<view class="user-card-text">{{subjectData.labSecurityApply.userType == '11'?'工号:':(subjectData.labSecurityApply.userType == '22'?'学号:':'')}}{{subjectData.labSecurityApply.userNumber}}</view>
-				<view class="user-card-text">院校:{{subjectData.labSecurityApply.deptName}}</view>
-				<view class="user-card-text" v-if="subjectData.labSecurityApply.userType == '22'">专业:{{subjectData.labSecurityApply.userMajor}}</view>
-			</view> -->
 			<view class="img-box" v-if="item.materialType==2&&item.relationType==2">
 				<view class="img-title">安全考试证书</view>
 				<img v-if="subjectData.listcert[0]" class="item-img-box" :src="subjectData.listcert[0].cert_url">
@@ -145,9 +130,7 @@
 				    success: function (res) {
 				        if (res.confirm) {
 				            self.laboratoryApply();
-				            console.log('用户点击确定');
 				        } else if (res.cancel) {
-				            console.log('用户点击取消');
 				        }
 				    }
 				});
@@ -174,7 +157,6 @@
 			},
 			lookItem(minItem){
 				let self = this;
-				console.log("minItem",minItem)
 				if(minItem.type == 'png' || minItem.type == 'jpg' || minItem.type == 'jpeg' || minItem.type == 'gif'){
 					//查看图片
 					wx.previewImage({
@@ -195,7 +177,6 @@
 							Authorization: uni.getStorageSync('token')
 						},
 						success: function (res) {
-							console.log("resresresresresres",res)
 							const fileManager = wx.getFileSystemManager()
 							const filePath = wx.env.USER_DATA_PATH + '/' + minItem.name + '.docx'
 							fileManager.saveFile({
@@ -256,8 +237,6 @@
 						}
 					  }
 					  data.data.listTemp[i].upList = maxList;
-					  console.log('maxList[0].url',maxList);
-					  // self.iframeSrc = window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_FILE_API + '/onlinePreview?url='+encodeURIComponent(btoa(unescape(encodeURIComponent(maxList[0].url))));
 					}
 				  }
 				  this.$set(this,"subjectData",data.data);
@@ -275,7 +254,6 @@
 			},
 			//查看图片
 			lockImg(list){
-				console.log("list",list);
 				if(!list[0]){
 					return
 				}
@@ -297,9 +275,7 @@
                     success: function (res) {
                         if (res.confirm) {
                             self.appOperation();
-                            console.log('用户点击确定');
                         } else if (res.cancel) {
-                            console.log('用户点击取消');
                         }
                     }
                 });
@@ -324,7 +300,6 @@
                 }
             },
             async approvalDetailManage(){
-                console.log("123")
                 let obj = {
                     ids:this.itemData.id
                 }

+ 0 - 3
pages_manage/workbench/laboratory/word.vue

@@ -40,7 +40,6 @@
         },
         methods: {
 			radioChange(e){
-				console.log("e",e)
 				this.type = e.detail.value;
 			},
             voiceButton(){
@@ -71,9 +70,7 @@
                     success: function (res) {
                         if (res.confirm) {
                             self.voice();
-                            console.log('用户点击确定');
                         } else if (res.cancel) {
-                            console.log('用户点击取消');
                         }
                     }
                 });

+ 0 - 1
pages_manage/workbench/problemRectification/rectifyDetails.vue

@@ -692,7 +692,6 @@
 					id:this.id
 				};
 			    const {data} = await RecordDettailsListNew(obj);
-				console.log(22222)
 				if(data.code==200){
 					console.log(data.data)
 					let obj = JSON.parse(JSON.stringify(data.data));

+ 0 - 1
pages_manage/workbench/receiveCasuallyPat/receiveCasuallyPat.vue

@@ -69,7 +69,6 @@
             },
             //滚动事件
             scrollGet(){
-                console.log("股东了");
                 if(this.getData.getType){
                     this.getData.page += 1;
                     this.getList();

+ 0 - 1
pages_manage/workbench/securityCheck/inspectionRecords.vue

@@ -84,7 +84,6 @@
 				console.log(1111)
 				this.getList();
 			}else{//第一次进入
-			    console.log(2222)
 			  uni.setStorageSync('First', 'true')//设置关键字和其值
 			}
 

+ 16 - 17
pages_manage/workbench/securityCheck/safetyInspect.vue

@@ -5,7 +5,7 @@
 			<view class="tabTitle_li" @tap="tabClick(index)"  :key="index" v-for="(item,index) in tabText">
 				<view :class="{on:curTab==index}" class="tabTitle_text">{{item}}</view>
 			    <view :class="{on:curTab==index}" class="tabTitle_across"></view>
-			</view>	
+			</view>
 		</view>
 		<inspection-records ref="child" v-if="pageType==0" style="display: flex;flex: 1;overflow-y: auto;"></inspection-records>
 		<rectify-list ref="child" v-if="pageType==1" style="display: flex;flex: 1;overflow-y: auto;"></rectify-list>
@@ -27,37 +27,36 @@
 				pageType:0,
 				curTab:0,
 				tabText:['检查记录','问题整改',],
-            
+
             }
         },
         onLoad() {
-			
+
 			//判断如果是学生端进入只显示问题整改
 			if(this.userType==2){
 				this.pageType=1
 			}
         },
         onShow() {
-			
+
 			this.dataList=[];
-			 console.log(3333)
 		    uni.removeStorageSync('First')
 			this.$refs.child.getList()
-			
+
         },
 		mounted(){
-		  
-			
+
+
 		},
         methods: {
 			//顶部tab点击
 			tabClick(index) {
 				this.curTab = index;
-				
+
 				this.pageType=index;
-			
+
 			},
-            
+
         }
     }
 </script>
@@ -76,7 +75,7 @@
 			height: 100rpx;
 			background: #fff;
 			margin-bottom 16rpx;
-		
+
 			.tabTitle_li{
 				width:146rpx;
 				text-align center;
@@ -88,7 +87,7 @@
 					color: #333333;
 					line-height: 70rpx;
 					&.on{
-						color:#0183FA;  
+						color:#0183FA;
 					}
 				}
 				.tabTitle_across{
@@ -102,11 +101,11 @@
 						display block;
 					}
 				}
-				
+
 			}
-			
-			
+
+
 		}
-     
+
 	}
 </style>

+ 9 - 35
pages_manage/workbench/signature/signatureImg.vue

@@ -36,27 +36,22 @@
 		},
 		onLoad(option){
 			this.src = option.src;
-			//this.src = 'https://www.baidu.com/img/flexible/logo/pc/result@2.png';
-			console.log(this.src)
 		},
 		onShow(){
 
 		},
 		methods:{
 			/************************************************修改头像************************************************/
-			
+
 			beforeDraw(context, transform) {
 				context.setFillStyle('yellow')
 				transform.zoom = 2
 			},
 			afterDraw(ctx, info) {
 				ctx.fillText('', 20, 20)
-				console.log(`当前画布大小:${info.width}*${info.height}`)
 			},
 			async cropped(imagePath, imageInfo) {
-				console.log("imagePath",imagePath)
 				this.srcData = imagePath;
-				console.log(imagePath)
 				//小程序电子签名抠图生成图片
 				uni.uploadFile({
 				    url: config.base_url+'/app/sysuser/api/genSign', //仅为示例,非真实的接口地址
@@ -67,12 +62,11 @@
 				        'user': 'test'
 				    },
 				    success: (response) => {
-						console.log(typeof(response.data))
 						let data=JSON.parse(response.data)
 						if(data.code == 200){
 							let text = data.data.replace(/[\r\n]/g,"");
 							this.signatureData = 'data:image/png;base64,'+ text;
-							
+
 						} else {
 							uni.showToast({
 								title: response.msg,
@@ -81,51 +75,31 @@
 								duration: 2000
 							});
 						}
-				       
+
 				    },
 				    fail: err => {},
 				    complete: () => {
 				        uni.hideLoading()
 				    }
 				});
-				
+
 			},
-		
+
 			/************************************************************************************************/
 			upImg(){
 				let self = this;
-				console.log(this.signatureData)
 			    uni.setStorageSync('signatureData',this.signatureData)
 				setTimeout(function(){
 				    uni.navigateBack();
 				},200);
-				/* uni.showModal({
-				    content: '确认提交吗?',
-				    cancelColor:"#999",
-				    confirmColor:"#0183FA",
-				    success: function (res) {
-				        if (res.confirm) {
-				            self.uploadImg(self.srcData);
-				            console.log('用户点击确定');
-				        } else if (res.cancel) {
-				            console.log('用户点击取消');
-				        }
-				    }
-				}); */
-				 
+
+
 			},
 			backButton(){
 				uni.navigateBack();
 			},
-			
-			/* //小程序电子签名抠图生成图片
-			async querygenSign(formData){
-				const {data} = await querygenSign(formData);
-				if(data.code == 200){
-					console.log('程序电子签名抠图生成图片')
-				}
-			}, */
-			
+
+
 		}
 	}
 </script>

+ 1 - 2
pages_student/workbench/safeAccess/safeAccess.vue

@@ -67,7 +67,6 @@
             },
             //滚动事件
             scrollGet(){
-                console.log("gunla")
                 if(this.getData.getType){
                     this.getData.page += 1;
                     this.getList();
@@ -172,7 +171,7 @@
 						border-radius:6rpx;
 						color:#30A23D;
 						background rgba(48,162,61,0.2)
-						
+
 					}
 					.typeColor4{
 						border-radius:6rpx;

+ 5 - 6
pages_supplier/register/register.vue

@@ -87,7 +87,7 @@
 
 				}
 			},
-			
+
 			//获取详情
 			async getInfo(){
 			    let _this = this;
@@ -104,7 +104,6 @@
 			    }
 			},
 			nextStep(){
-				console.log('下一步')
 				let _this = this;
 				if(!this.form.sysUserDto.userName && this.pageStatus==0){
 					uni.showToast({
@@ -138,7 +137,7 @@
 						_this.form.sysUserDto.userName='';
 						return
 					}
-					
+
 				}
 				if(!this.form.sysUserDto.password && this.pageStatus==0){
 					uni.showToast({
@@ -172,7 +171,7 @@
 						this.form.sysUserDto.password='';
 						return
 					}
-					
+
 				}
 				if(!this.form.sysUserDto.repassword && this.pageStatus==0){
 					uni.showToast({
@@ -232,9 +231,9 @@
 						this.form.phone='';
 						return
 					}
-					
+
 				}
-				
+
 				uni.navigateTo({
 				    url: '/pages_supplier/register/registerTow?form='+encodeURIComponent(JSON.stringify(this.form))+'&license='+encodeURIComponent(JSON.stringify(this.license)),//安全检查
 				});

+ 1 - 2
uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue

@@ -160,7 +160,6 @@
 				this.load()
 			},
 			load() {
-				console.log("logh")
 				if (this.readonly) {
 					this._processReadonly(this.localdata, this.dataValue)
 					return
@@ -515,7 +514,7 @@
 	}
 
 	/* #endif */
-	
+
 	/* picker 弹出层通用的指示小三角, todo:扩展至上下左右方向定位 */
 	.uni-popper__arrow,
 	.uni-popper__arrow::after {

+ 0 - 1
uni_modules/uni-popup/components/uni-popup/uni-popup.vue

@@ -208,7 +208,6 @@ export default {
 				direction = this.type
 			}
 			if (!this.config[direction]) {
-				console.error('缺少类型:', direction)
 				return
 			}
 			this[this.config[direction]]()