Ming 4 년 전
부모
커밋
7063743628

+ 3 - 3
App.vue

@@ -1,13 +1,13 @@
 <script>
 	export default {
 		onLaunch: function() {
-			console.log('App Launch')
+			// console.log('App Launch')
 		},
 		onShow: function() {
-			console.log('App Show')
+			// console.log('App Show')
 		},
 		onHide: function() {
-			console.log('App Hide')
+			// console.log('App Hide')
 		}
 	}
 	

+ 12 - 12
manifest.json

@@ -124,17 +124,17 @@
         },
         "devServer" : {
             "https" : false,
-			"proxy": {  
-					"/web": {  
-						"target": "https://wx.ewoogi.com/wx",
-						"changeOrigin": true,   
-						"secure": false,
-						"pathRewrite": {
-							"^/web": "/"  
-						}  
-					}  
-				}  
-		
-        }
+            "proxy" : {
+                "/web" : {
+                    "target" : "https://wx.ewoogi.com/wx",
+                    "changeOrigin" : true,
+                    "secure" : false,
+                    "pathRewrite" : {
+                        "^/web" : "/"
+                    }
+                }
+            }
+        },
+        "domain" : "https://s.yxin.tech/"
     }
 }

+ 15 - 16
pages/accountManage/perAdd/perAdd.vue

@@ -8,7 +8,7 @@
 					<text class="necessary">*</text>
 					联系方式:
 				</view>
-				<select name="" id="" v-model="formMess.phone">
+				<select name="" id="" v-model="phone">
 					<option value="0">请选择</option>
 					<option :value="item.phone" v-for="(item,index) in phoneListData" :key="index">{{item.phone}}
 					</option>
@@ -16,7 +16,7 @@
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>姓名:</view>
-				<input name="input" v-model="formMess.name"></input>
+				<input name="input" v-model="name"></input>
 			</view>
 
 			<view class="form-item">
@@ -24,7 +24,7 @@
 					<text class="necessary">*</text>
 					所在单位:
 				</view>
-				<select name="" id="" v-model="formMess.company_code">
+				<select name="" id="" v-model="company_code">
 					<option value="0">请选择</option>
 					<option :value="item.owner_code" v-for="(item,index) in companyListData" :key="index"
 						style="width:80%">{{item.owner_name}}</option>
@@ -59,12 +59,11 @@
 				noClick:true,
 				companyListData: [],
 				phoneListData: [],
-				formMess: {
-					"phone": 0,
-					"company_code": 0,
-					"radioOne": "1",
-					"power": "",
-				},
+				"phone": 0,
+				"company_code": 0,
+				"radioOne": "1",
+				"power": "",
+				"name":""
 
 
 			}
@@ -77,21 +76,21 @@
 		methods: {
 			async submit() {
 				//提交验证
-				if (!this.formMess.phone) {
+				if (!this.phone) {
 					uni.showToast({
 						title: "请选择联系方式",
 						icon: "none"
 					});
 					return
 				}
-				if (!this.formMess.name.replace(/^\s*/g,'')) {
+				if (!this.name.replace(/^\s*/g,'')) {
 					uni.showToast({
 						title: "请输入姓名",
 						icon: "none"
 					});
 					return
 				}
-				if (!this.formMess.company_code) {
+				if (!this.company_code) {
 					uni.showToast({
 						title: "请选择所在单位",
 						icon: "none"
@@ -99,10 +98,10 @@
 					return
 				}
 				let res = await this.addAuthority({
-					"phone": this.formMess.phone,
-					"name": this.formMess.name,
-					"power": this.formMess.radioOne,
-					"company_code": this.formMess.company_code
+					"phone": this.phone,
+					"name": this.name,
+					"power": this.radioOne,
+					"company_code": this.company_code
 				})
 
 				if (!res.data.flag) {

+ 111 - 115
pages/deviceManage/deviceAdd/deviceAdd.vue

@@ -7,19 +7,19 @@
 					<text class="necessary">*</text>
 					设备编号:
 				</view>
-				<input name="input" v-model="formMess.device_code"></input>
+				<input name="input" v-model="device_code"></input>
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>设备名称:</view>
-				<input name="input" v-model="formMess.device_name"></input>
+				<input name="input" v-model="device_name"></input>
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>单元地址:</view>
-				<input name="input" v-model="formMess.unitinfo"></input>
+				<input name="input" v-model="unitinfo"></input>
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>所属楼层:</view>
-				<select name="" id="" v-model="formMess.louyu" filterable clearable>
+				<select name="" id="" v-model="louyu">
 					<option value="">请选择</option>
 					<option value="-10">楼层B10</option>
 					<option value="-9">楼层B9</option>
@@ -31,24 +31,25 @@
 					<option value="-3">楼层B3</option>
 					<option value="-2">楼层B2</option>
 					<option value="-1">楼层B1</option>
-					<option :value=item v-for="item in 60">楼层{{item}}</option>
+					<!-- <option :value=item v-for="item in 60" >楼层{{item}}</option> -->
+					<option :value=item v-for="item in 60" >楼层{{item}}</option>
 				</select>
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>物联网卡号:</view>
-				<input name="input" v-model="formMess.sim"></input>
+				<input name="input" v-model="sim"></input>
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>所属单位:</view>
-				<select name="" id="" v-model="formMess.company_code">
+				<select name="" id="" v-model="company_code">
 					<option value="0">请选择</option>
-					<option :value="item.owner_code" v-for="(item,index) in companyListData" :key="index"
+					<option :value="item.owner_code" v-for="(item,index) in companyListData" 
 						style="width:80%">{{item.owner_name}}</option>
 				</select>
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>设备类型:</view>
-				<select name="" id="" placeholder="" v-model="formMess.type">
+				<select name="" id="" placeholder="" v-model="type">
 					<option value="0">请选择设备类型</option>
 					<option value="1">用传</option>
 					<option value="2">水表</option>
@@ -63,11 +64,11 @@
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>传输方式:</view>
 
-				<select name="" id="" placeholder="" v-model="formMess.transfer_type">
+				<select name="" id="" placeholder="" v-model="transfer_type">
 					<option value="0">请选择传输方式</option>
-					<option  v-if="this.formMess.type==2||this.formMess.type==5" value="NB">NB</option>
+					<option  v-if="this.type==2||this.type==5" value="NB">NB</option>
 					<option value="4G">4G</option>
-					<option v-if="this.formMess.type==2||this.formMess.type==5" value="Lora">Lora</option>
+					<option v-if="this.type==2||this.type==5" value="Lora">Lora</option>
 				</select>
 			</view>
 			<view class="form-item margin-top">
@@ -87,10 +88,10 @@
 
 
 			<!-- 水表NB必填参数 start -->
-			<block v-if="this.formMess.transfer_type=='NB'&&(this.formMess.type==2||this.formMess.type==5)">
+			<block v-if="this.transfer_type=='NB'&&(this.type==2||this.type==5)">
 				<view class="form-item" >
 					<view class="title"><text class="necessary">*</text>NB类型:</view>
-					<select name="" id=""  v-model="formMess.deviceType">
+					<select name="" id=""  v-model="deviceType">
 <!-- 						<option value="">烟感</option>
  -->						<option value="MultiSensor">水表</option>
 						<option value="WaterMeter">宇洁戎情水表</option>
@@ -99,7 +100,7 @@
 				</view>
 				<view class="form-item" >
 					<view class="title"><text class="necessary">*</text>NB厂商名称:</view>
-					<select name="" id="" v-model="formMess.manufacturerName">
+					<select name="" id="" v-model="manufacturerName">
 						<option value="ST">ST</option>
 						<option value="ZHYQ">ZHYQ</option>
 						<option value="shanghaijunyanTest">shanghaijunyanTest</option>
@@ -108,7 +109,7 @@
 				</view>
 				<view class="form-item" >
 					<view class="title"><text class="necessary">*</text>NB设备型号:</view>
-					<select name="" id="" v-model="formMess.model">
+					<select name="" id="" v-model="model">
 						<!-- <option value="">烟感型号</option> -->
 						<option value="PT124B-2892-010">水表型号</option>
 						<option value="WPTA">宇洁戎情水表型号</option>
@@ -117,7 +118,7 @@
 				</view>
 				<view class="form-item" >
 					<view class="title"><text class="necessary">*</text>NB厂商id:</view>
-					<select name="" id="" v-model="formMess.manufacturerId">
+					<select name="" id="" v-model="manufacturerId">
 						<option value="ST">ST</option>
 						<option value="ZHYQ">ZHYQ</option>
 						<option value="JunyanTest">JunyanTest</option>
@@ -126,48 +127,47 @@
 				</view>
 				<view class="form-item" >
 					<view class="title"><text class="necessary">*</text>NB地址:</view>
-					<input name="input" v-model="formMess.location"></input>
+					<input name="input" v-model="location"></input>
 				</view>
 				<view class="form-item" >
 					<view class="title"><text class="necessary">*</text>NB协议:</view>
-					<input name="input" v-model="formMess.protocolType"></input>
+					<input name="input" v-model="protocolType"></input>
 				</view>
 				
 			</block>
 			<!-- 水表NB必填参数 end -->
 			
 			<!-- 用传4G必填参数 -->
-			<block v-if="this.formMess.type==1&&this.formMess.transfer_type=='4G'">
+			<block v-if="this.type==1&&this.transfer_type=='4G'">
 				<view class="form-item"  >
 					<view class="title"><text class="necessary">*</text>解析方法:</view>
-					<select name="" id="" v-model="formMess.owner_xh_a">
+					<select name="" id="" v-model="owner_xh_a">
 						<option value="z">请选择</option>
-						<option :value=item v-for="item in 7">方法{{item}}</option>
+						<option :value=item v-for="item in 7" >方法{{item}}</option>
 					</select>
 				</view>
 				<view class="form-item">
 					<view class="title"></view>
-					<select name="" id="" v-model="formMess.owner_xh_b">
+					<select name="" id="" v-model="owner_xh_b">
 						<option value="z">请选择</option>
-						<option :value=item v-for="item in 7">方法{{item}}</option>
+						<option :value=item v-for="item in 7" >方法{{item}}</option>
 					</select>
 				</view>
 				<view class="form-item">
 					<view class="title"></view>
-					<select name="" id="" v-model="formMess.owner_xh_c">
+					<select name="" id="" v-model="owner_xh_c">
 						<option value="z">请选择</option>
-						<option :value=item v-for="item in 7">方法{{item}}</option>
+						<option :value=item v-for="item in 7" >方法{{item}}</option>
 					</select>
 				</view>
 				
 			</block>
-			
-			
+\
 			<!-- 电气火灾参数 start -->
-			<block v-if="this.formMess.type==7&&this.formMess.transfer_type=='4G'">
+			<block v-if="this.type==7&&this.transfer_type=='4G'">
 				<view class="form-item">
 					<view class="title"><text class="necessary">*</text>最高层:</view>
-					<select name="" id="" v-model="formMess.max_level" filterable clearable>
+					<select name="" id="" v-model="max_level">
 						<option value="">请选择</option>
 						<option value="-10">楼层B10</option>
 						<option value="-9">楼层B9</option>
@@ -179,12 +179,12 @@
 						<option value="-3">楼层B3</option>
 						<option value="-2">楼层B2</option>
 						<option value="-1">楼层B1</option>
-						<option :value=item v-for="item in 60">楼层{{item}}</option>
+						<option :value=item v-for="item in 60" >楼层{{item}}</option>
 					</select>
 				</view>
 				<view class="form-item">
 					<view class="title"><text class="necessary">*</text>最底层:</view>
-					<select name="" id="" v-model="formMess.min_level" filterable clearable>
+					<select name="" id="" v-model="min_level">
 						<option value="">请选择</option>
 						<option value="-10">楼层B10</option>
 						<option value="-9">楼层B9</option>
@@ -196,7 +196,7 @@
 						<option value="-3">楼层B3</option>
 						<option value="-2">楼层B2</option>
 						<option value="-1">楼层B1</option>
-						<option :value=item v-for="item in 60">楼层{{item}}</option>
+						<option :value=item v-for="item in 60" >楼层{{item}}</option>
 					</select>
 				</view>
 				<view class="form-item ">
@@ -204,7 +204,7 @@
 						<text class="necessary">*</text>
 						倍率:
 					</view>
-					<input name="input" v-model="formMess.owner_bl"></input>
+					<input name="input" v-model="owner_bl"></input>
 				</view>
 			</block>
 			<!-- 电气火灾参数 end -->
@@ -234,38 +234,34 @@
 				
 				
 				
-				formMess: {
-					"device_code":"",
-					"device_name":"",
-					"unitinfo":"",
-					"louyu": "",
-					"sim":"",
-					company_code: 0,
-					
-					"type":0,
-					transfer_type: 0,
-					
-					"owner_bl":"",//倍率
-					"is_top":"0", //是否顶楼
-					
-					"deviceType":"",
-					"manufacturerName":"",
-					"model":"",
-					"location":"",
-					"protocolType":"",
-					"manufacturerId":"",
-					
-					"min_level":"",
-					"max_level":"",
-					
-					"radioOne":0,
-					
-					"owner_xh_a":'z',
-					"owner_xh_b":'z',
-					"owner_xh_c":'z'
-					
-	
-				},
+				"device_code":"",
+				"device_name":"",
+				"unitinfo":"",
+				"louyu": "",
+				"sim":"",
+				company_code: 0,
+				
+				"type":0,
+				transfer_type: 0,
+				
+				"owner_bl":"",//倍率
+				"is_top":"0", //是否顶楼
+				
+				"deviceType":"",
+				"manufacturerName":"",
+				"model":"",
+				"location":"",
+				"protocolType":"",
+				"manufacturerId":"",
+				
+				"min_level":"",
+				"max_level":"",
+				
+				"radioOne":0,
+				
+				"owner_xh_a":'z',
+				"owner_xh_b":'z',
+				"owner_xh_c":'z'
 
 				
 
@@ -286,7 +282,7 @@
 			async submit() {
 				//提交验证
 				
-				if (!this.formMess.device_code) {
+				if (!this.device_code) {
 					uni.showToast({
 						title: "请输入设备编号",
 						icon: "none"
@@ -294,7 +290,7 @@
 					return
 				}else{
 					var reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{2,10}$/;
-					if(!reg.test(this.formMess.device_code)){
+					if(!reg.test(this.device_code)){
 						uni.showToast({
 							title: "请输入字母和数字结合的设备编号",
 							icon: "none"
@@ -309,49 +305,49 @@
 		
 					
 					
-				if (!this.formMess.device_name.replace(/^\s*/g,'')) {
+				if (!this.device_name.replace(/^\s*/g,'')) {
 					uni.showToast({
 						title: "请输入设备名称",
 						icon: "none"
 					});
 					return
 				}
-				if (!this.formMess.unitinfo.replace(/^\s*/g,'')) {
+				if (!this.unitinfo.replace(/^\s*/g,'')) {
 					uni.showToast({
 						title: "请输入单元地址",
 						icon: "none"
 					});
 					return
 				}
-				if (!this.formMess.louyu) {
+				if (!this.louyu) {
 					uni.showToast({
 						title: "请选择所属楼层",
 						icon: "none"
 					});
 					return
 				}
-				if (!this.formMess.sim.replace(/^\s*/g,'')) {
+				if (!this.sim.replace(/^\s*/g,'')) {
 					uni.showToast({
 						title: "请输入物联网卡号",
 						icon: "none"
 					});
 					return
 				}
-				if (!this.formMess.company_code) {
+				if (!this.company_code) {
 					uni.showToast({
 						title: "请选择所在单位",
 						icon: "none"
 					});
 					return
 				}
-				if (!this.formMess.type) {
+				if (!this.type) {
 					uni.showToast({
 						title: "请选择设备类型",
 						icon: "none"
 					});
 					return
 				}
-				if (!this.formMess.transfer_type) {
+				if (!this.transfer_type) {
 					uni.showToast({
 						title: "请选择传输方式",
 						icon: "none"
@@ -359,22 +355,22 @@
 					return
 				}
 				
-				if(this.formMess.type==1&&this.formMess.transfer_type=="4G"){
-					if (this.formMess.owner_xh_a=='z') {
+				if(this.type==1&&this.transfer_type=="4G"){
+					if (this.owner_xh_a=='z') {
 						uni.showToast({
 							title: "请选择第一个解析方法",
 							icon: "none"
 						});
 						return
 					}
-					if (this.formMess.owner_xh_b=='z') {
+					if (this.owner_xh_b=='z') {
 						uni.showToast({
 							title: "请选择第二个解析方法",
 							icon: "none"
 						});
 						return
 					}
-					if (this.formMess.owner_xh_c=='z') {
+					if (this.owner_xh_c=='z') {
 						uni.showToast({
 							title: "请选择第三个解析方法",
 							icon: "none"
@@ -383,43 +379,43 @@
 					}
 				}
 				
-				if(this.formMess.transfer_type=='NB'&&(this.formMess.type==2||this.formMess.type==5)){
-					if (!this.formMess.deviceType) {
+				if(this.transfer_type=='NB'&&(this.type==2||this.type==5)){
+					if (!this.deviceType) {
 						uni.showToast({
 							title: "请选择水表NB设备类型",
 							icon: "none"
 						});
 						return
 					}
-					if (!this.formMess.manufacturerName) {
+					if (!this.manufacturerName) {
 						uni.showToast({
 							title: "请选择水表NB厂商名称",
 							icon: "none"
 						});
 						return
 					}
-					if (!this.formMess.model) {
+					if (!this.model) {
 						uni.showToast({
 							title: "请选择水表NB设备型号",
 							icon: "none"
 						});
 						return
 					}
-					if (!this.formMess.manufacturerId) {
+					if (!this.manufacturerId) {
 						uni.showToast({
 							title: "请选择水表NB厂商ID",
 							icon: "none"
 						});
 						return
 					}
-					if (!this.formMess.location.replace(/^\s*/g,'')) {
+					if (!this.location.replace(/^\s*/g,'')) {
 						uni.showToast({
 							title: "请输入水表NB地址",
 							icon: "none"
 						});
 						return
 					}
-					if (!this.formMess.protocolType.replace(/^\s*/g,'')) {
+					if (!this.protocolType.replace(/^\s*/g,'')) {
 						uni.showToast({
 							title: "请输入水表NB协议",
 							icon: "none"
@@ -429,15 +425,15 @@
 				}
 				
 				
-				if(this.formMess.type==7&&this.formMess.transfer_type=='4G'){
-					if (!this.formMess.max_level) {
+				if(this.type==7&&this.transfer_type=='4G'){
+					if (!this.max_level) {
 						uni.showToast({
 							title: "请选择最高层",
 							icon: "none"
 						});
 						return
 					}
-					if (!this.formMess.min_level) {
+					if (!this.min_level) {
 						uni.showToast({
 							title: "请选择最低层",
 							icon: "none"
@@ -446,7 +442,7 @@
 					}
 					
 				
-					if (!this.formMess.owner_bl.replace(/^\s*/g,'')) {
+					if (!this.owner_bl.replace(/^\s*/g,'')) {
 						uni.showToast({
 							title: "请输入倍率",
 							icon: "none"
@@ -456,41 +452,41 @@
 				}
 	
 				let queryParam = {};
-				queryParam.device_code = this.formMess.device_code;
-				queryParam.device_name = this.formMess.device_name;
-				queryParam.unitinfo = this.formMess.unitinfo;
-				queryParam.louyu = this.formMess.louyu;
-				queryParam.sim = this.formMess.sim;
+				queryParam.device_code = this.device_code;
+				queryParam.device_name = this.device_name;
+				queryParam.unitinfo = this.unitinfo;
+				queryParam.louyu = this.louyu;
+				queryParam.sim = this.sim;
 				
-				queryParam.company_code = this.formMess.company_code;
-				queryParam.type = this.formMess.type;
-				queryParam.transfer_type = this.formMess.transfer_type;
-				queryParam.is_top = this.formMess.radioOne;
+				queryParam.company_code = this.company_code;
+				queryParam.type = this.type;
+				queryParam.transfer_type = this.transfer_type;
+				queryParam.is_top = this.radioOne;
 				
-				if (this.formMess.type==1&&this.formMess.transfer_type=="4G") {
+				if (this.type==1&&this.transfer_type=="4G") {
 					alert(1)
-					queryParam.owner_xh_a = this.formMess.owner_xh_a;
-					queryParam.owner_xh_b = this.formMess.owner_xh_b;
-					queryParam.owner_xh_c = this.formMess.owner_xh_c;
+					queryParam.owner_xh_a = this.owner_xh_a;
+					queryParam.owner_xh_b = this.owner_xh_b;
+					queryParam.owner_xh_c = this.owner_xh_c;
 					this.addDevice(queryParam)
 					return;
 				}
-				if (this.formMess.transfer_type=='NB'&&(this.formMess.type==2||this.formMess.type==5)) {
+				if (this.transfer_type=='NB'&&(this.type==2||this.type==5)) {
 					alert(2)
-					queryParam.deviceType = this.formMess.deviceType;
-					queryParam.manufacturerName = this.formMess.manufacturerName;
-					queryParam.model = this.formMess.model;
-					queryParam.location = this.formMess.location;
-					queryParam.protocolType = this.formMess.protocolType;
-					queryParam.manufacturerId = this.formMess.manufacturerId;
+					queryParam.deviceType = this.deviceType;
+					queryParam.manufacturerName = this.manufacturerName;
+					queryParam.model = this.model;
+					queryParam.location = this.location;
+					queryParam.protocolType = this.protocolType;
+					queryParam.manufacturerId = this.manufacturerId;
 					this.addDevice(queryParam)
 					return;
 				}
-				if (this.formMess.type==7&&this.formMess.transfer_type=='4G') {
+				if (this.type==7&&this.transfer_type=='4G') {
 					alert(3)
-					queryParam.max_level = this.formMess.max_level;
-					queryParam.min_level = this.formMess.min_level;
-					queryParam.owner_bl = this.formMess.owner_bl;
+					queryParam.max_level = this.max_level;
+					queryParam.min_level = this.min_level;
+					queryParam.owner_bl = this.owner_bl;
 					this.addDevice(queryParam)
 					return;
 				}
@@ -519,7 +515,7 @@
 
 			radioChange(e) {
 				console.log('type:' + e.detail.value);
-				this.formMess.radioOne = e.detail.value;
+				this.radioOne = e.detail.value;
 			},
 
 			//单位下拉请求数据

+ 7 - 11
pages/deviceManage/deviceManage.vue

@@ -251,17 +251,13 @@
 		},
 
 		mounted() {
-			document.addEventListener('click', (event) => {
-
-
-				if (event.target.className != 'showDetailEdit') {
-					this.deviceManage.forEach(item => {
-						item.isShow = false;
-					})
-
-
-				}
-			})
+			// document.addEventListener('click', (event) => {
+			// 	if (event.target.className != 'showDetailEdit') {
+			// 		this.deviceManage.forEach(item => {
+			// 			item.isShow = false;
+			// 		})
+			// 	}
+			// })
 		},
 		onLoad: function(option) {
 			this.getDataList({

+ 4 - 13
pages/index/components/chart/chart.vue

@@ -5,8 +5,6 @@
 </template>
 
 <script>
-	
-
 	export default {
 		name: 'chart',
 		props: {
@@ -27,14 +25,6 @@
 
 		},
 		methods: {
-			
-			// changeOption() {
-			// 	const data = this.option.series[0].data
-			// 	// 随机更新示例数据
-			// 	data.forEach((item, index) => {
-			// 		data.splice(index, 1, Math.random() * 40)
-			// 	})
-			// },
 			onViewClick(options) {
 				console.log(options)
 			}
@@ -62,7 +52,10 @@
 				var dataname = ['消防水系统', '报警主机', '电气火灾', '其他', '监控视频']
 				var datavaule = [this.bindData.fire_water_count, this.bindData.alarm_host_count, this.bindData.electrical_fire_count, this.bindData.other_count, this.bindData.video_monitoring_count]
 				var aa = [this.bindData.fire_water_count, this.bindData.alarm_host_count, this.bindData.electrical_fire_count, this.bindData.other_count, this.bindData.video_monitoring_count]
-				aa=aa.sort().pop();
+				aa.sort(function (a, b) {
+				  return a-b;
+				}); 
+				aa=aa.pop();
 				var datamax = [aa, aa, aa, aa, aa];
 				var color = ['#3C8BF0', '#06CDF8', '#0ECB70', '#6744EF', '#FFD803'];
 				
@@ -85,8 +78,6 @@
 					}
 					return false;
 				}
-				
-
 
 				myChart = echarts.init(document.getElementById('echarts'))
 				// 观测更新的数据在 view 层可以直接访问到

+ 1 - 25
pages/index/components/chart2/chart2.vue

@@ -7,25 +7,8 @@
 </template>
 
 <script>
-	// let echartData = [{
-	// 		name: "报警",
-	// 		value: 1000
-	// 	},
-	// 	{
-	// 		name: "事件",
-	// 		value: 2920
-	// 	},
-	// 	{
-	// 		name: "隐患",
-	// 		value: 2200
-	// 	},
-
-	// ];
 	 let title = '总数';
-	// let total = echartData.reduce((a, b) => {
-	// 	return a + b.value * 1
-	// }, 0);
-
+	 
 	export default {
 		props:{
 			bindData:{
@@ -159,13 +142,6 @@
 		onLoad() {
 		},
 		methods: {
-			changeOption() {
-				const data = this.option.series[0].data
-				// 随机更新示例数据
-				data.forEach((item, index) => {
-					data.splice(index, 1, Math.random() * 40)
-				})
-			},
 			onViewClick(options) {
 				console.log(options)
 			}

+ 11 - 13
pages/index/index.vue

@@ -130,11 +130,6 @@
 		},
 
 		onLoad(option) {
-
-			console.log('$websiteUrl')
-			console.log(this.$websiteUrl)
-			console.log(this.$BASE_URL)
-			// console.log(BASE_URL)
 			var res = uni.getStorageSync('selectedCode');
 			var res2 = uni.getStorageSync('selectedName');
 			if (res) {
@@ -164,27 +159,30 @@
 
 			//新增
 			scanQRCode() {
-				// alert(1)
+				alert(1)
 				// 将this赋值给that
 				let that = this;
 				// 微信公众号获取位置
 				jwx.configWeiXin(jweixin => {
+					alert(2)
+
 					wx.scanQRCode({
-						needResult: 0, // 默认为0,扫描结果由微信处理,1则直接返回扫描结果,
+						needResult: 1, // 默认为0,扫描结果由微信处理,1则直接返回扫描结果,
 						scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是一维码,默认二者都有
 						success: function(res) {
-							console.log('res')
-							console.log(res)
-							// that.longitude=res.longitude
-							// var result = res.resultStr; // 当needResult 为 1 时,扫码返回的结果
+							var result = res.resultStr; // 当needResult 为 1 时,扫码返回的结果
+							console.log(result);
 						}
 					});
 
 
+
+
 					// jwx.configWeiXin(jweixin => {
 					// 	wx.getLocation({
 					// 	  type: 'gcj02', // 默认为wgs84的gps坐标,如果要返回直接给openLocation用的火星坐标,可传入'gcj02'
 					// 	  success: function (res) {
+					// 		  alert(3)
 					// 		that.longitude=res.longitude
 					// 		that.latitude=res.latitude
 					// 	  }
@@ -284,8 +282,8 @@
 					this.searchList.push(item)
 					this.searchList2.push(item);
 				});
-				console.log('this.searchList')
-				console.log(this.searchList)
+				// console.log('this.searchList')
+				// console.log(this.searchList)
 
 
 			},

+ 1 - 1
pages/inspectList/unprocessDetail/unprocessDetail.vue

@@ -45,7 +45,7 @@
 							:data-maxnum="reason.length+'/50'"   placeholder="备注信息,最多可输入50个字..."
 							auto-height
 							@input="inputReason"
-							:value="reason"></textarea>
+							:name="reason"></textarea>
 						</view>
 						<view class="btn-area">
 							<button class="bg-blue round  margin-top" @click="$noMultipleClicks(powerSubmit())">提 交 </button>

+ 1 - 1
pages/repair/repairDetail/repairDetail.vue

@@ -17,7 +17,7 @@
 				<view>{{this.getData.type_name}}</view>
 			</view>
 			<view class="form-item margin-top">
-				<view class="title">
+				<view class="title"> 
 					<text class="necessary">*</text>
 					上传图片:
 				</view>

+ 5 - 5
pages/unprocessDetail/unprocessDetail.vue

@@ -46,8 +46,8 @@
 						</radio-group>
 						<view class="cu-form-group">
 							<textarea class="JTxtArea lg" :maxlength="50" :data-maxnum="reason.length+'/50'"
-								placeholder="备注信息,最多可输入50个字..." auto-height v-model="msg" @input="inputReason"
-								:value="reason"></textarea>
+								placeholder="备注信息,最多可输入50个字..." auto-height v-model="textareaMsg" @input="inputReason"
+								:name="reason"></textarea>
 
 						</view>
 						<view class="btn-area">
@@ -74,7 +74,7 @@
 				modalName: null,
 				reason: '',
 				type: 1,
-				msg: '',
+				textareaMsg: '',
 				getData: {},
 				radioOne: 0,
 			}
@@ -159,7 +159,7 @@
 			},
 
 			alarmSubmit(query) {
-				if (!this.msg.replace(/^\s*/g,'')) {
+				if (!this.textareaMsg.replace(/^\s*/g,'')) {
 					uni.showToast({
 						title: "请输入处理内容",
 						icon: "none"
@@ -173,7 +173,7 @@
 					queryParam.if_batch = this.radioOne;
 					queryParam.clwb = query;
 					queryParam.ncmd = this.getData.ncmd;
-					queryParam.clnr = this.msg;
+					queryParam.clnr = this.textareaMsg;
 					
 					if (this.getData.dwtype == 1) {
 						queryParam.data3 = this.getData.data3;

+ 5 - 9
util/jssdk.js

@@ -6,15 +6,11 @@ const jweixin = require('jweixin-module')
 //#endif
 export function configWeiXin(callback) {
 	const url = window.location.href.split('#')[0];
-	// console.log(111)
-	// console.log(BASE_URL.BASE_URL)
+	// const url= "https://s.yxin.tech/hello.html"
 	// start
 	uni.request({
-		url: "/web/sign.php",
-		// url:"http://s.yxin.tech/sign.php",
-
-
-		// url:`${BASE_URL.BASE_URL}sign.php`,		
+		// url: "/web/sign.php",
+		url:"https://s.yxin.tech/sign.php",	
 		header: {
 			'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
 		},
@@ -23,8 +19,8 @@ export function configWeiXin(callback) {
 		},
 		method: 'GET',
 		success: (res) => {
-			// console.log('请求的签名的参数')
-			// console.log(res)
+			console.log('请求的签名的参数')
+			console.log(res)
 
 			let apiList = [ // 可能需要用到的能力 需要啥就写啥。多写也没有坏处
 				'openLocation',