代码修复

main.js

@@ -14,7 +14,6 @@ import api from './util/api.js'
  
  
  
- 
 
 // 引入colorui组件
 import cuCustom from 'colorui/components/cu-custom.vue'

manifest.json

@@ -143,5 +143,6 @@
                 }
             }
         }
-    }
+    },
+    "vueVersion" : "2"
 }

pages/add/add.vue

@@ -6,27 +6,27 @@
 					<text class="necessary">*</text>
 					用户名称:
 				</view>
-				<input name="userName" v-model="formMess.userName"></input>
+				<input name="userName" v-model="formMess.userName"/>
 			</view>
 			<view class="form-item">
 				<view class="title">地址:</view>
-				<input name="input" v-model="formMess.place"></input>
+				<input name="input" v-model="formMess.place"/>
 			</view>
 			<view class="form-item">
 				<view class="title">经度:</view>
-				<input name="input" v-model="formMess.longitude"></input>
+				<input name="input" v-model="formMess.longitude"/>
 			</view>
 			<view class="form-item">
 				<view class="title">维度:</view>
-				<input name="input" v-model="formMess.dimension"></input>
+				<input name="input" v-model="formMess.dimension"/>
 			</view>
 			<view class="form-item">
 				<view class="title">联系人:</view>
-				<input name="input" v-model="formMess.contactor"></input>
+				<input name="input" v-model="formMess.contactor"/>
 			</view>
 			<view class="form-item">
 				<view class="title">手机号码:</view>
-				<input name="input" v-model="formMess.mobile"></input>
+				<input name="input" v-model="formMess.mobile"/>
 			</view>
 
 
@@ -40,15 +40,15 @@
 					<text class="necessary">*</text>
 					设备编号:
 				</view>
-				<input name="input" v-model="formMess.deviceNo"></input>
+				<input name="input" v-model="formMess.deviceNo"/>
 			</view>
 			<view class="form-item">
 				<view class="title">设备名称:</view>
-				<input name="input" v-model="formMess.deviceName"></input>
+				<input name="input" v-model="formMess.deviceName"/>
 			</view>
 			<view class="form-item">
 				<view class="title">安装位置:</view>
-				<input name="input" v-model="formMess.place"></input>
+				<input name="input" v-model="formMess.place"/>
 			</view>
 			<view class="form-item">
 				<view class="title">所属楼层:</view>
@@ -85,7 +85,7 @@
 					<text class="necessary">*</text>
 					角色名称
 				</view>
-				<input name="userName" v-model="formMess.userName"></input>
+				<input name="userName" v-model="formMess.userName"/>
 			</view>
 			<view class="form-item">
 				<view class="title " style="vertical-align:top">
@@ -93,7 +93,7 @@
 					站点:
 				</view>
 				<view style="position:relative" class="innerZd">
-					<input name="siteName" v-model="formMess.siteName" @click="test" @focus="focusfns"  @input="handleInput()" placeholder="请选择"></input>
+					<input name="siteName" v-model="formMess.siteName" @click="test" @focus="focusfns"  @input="handleInput()" placeholder="请选择"/>
 					
 					<view class="siteItems" v-if="isShow">
 						<view class=" site-item" v-if="!siteItemData.length">暂无结果</view>
@@ -101,7 +101,7 @@
 						<view class="site-item" v-for="(item,index) in siteItemData" @click="add(item,index)" :key="index">{{item}}</view>
 					</view>
 					<view style="width:500rpx" class="selectedBox">
-						<button class="cu-btn  sm margin-xs" v-for="(item,index) in selectedData" @click="deleteItem(item,index)">
+						<button class="cu-btn  sm margin-xs" v-for="(item,index) in selectedData" :key="index" @click="deleteItem(item,index)">
 						{{item}}
 						<text class="lg text-gray cuIcon-close"></text>
 						</button>

pages/authAdd/authAdd.vue

@@ -10,7 +10,7 @@
 
 				<select name="" id="" v-model="formMess.mobile" filterable clearable>
 					<option value="0">请选择</option>
-					<option :value=item.phone v-for="item in phoneData">{{ item.phone}}</option>
+					<option :value=item.phone v-for="(item,index) in phoneData" :key="index">{{ item.phone}}</option>
 				</select>
 
 			</view>
@@ -22,7 +22,7 @@
 				</view>
 				<view style="position:relative" class="innerZd">
 					<input name="siteName" v-model="formMess.siteName" @click="test" @focus="focusfns" @input="handleInput()"
-					 placeholder="请输入或选择"></input>
+					 placeholder="请输入或选择" />
 
 					<view class="siteItems" v-if="isShow" style="max-height:60vh;overflow:auto">
 						<view class=" site-item" v-if="!siteItemData.length">暂无结果</view>
@@ -30,7 +30,7 @@
 						<view class="site-item" v-for="(item,index) in siteItemData" @click="add(item,index)" :key="index">{{item.siteName}}</view>
 					</view>
 					<view style="width:500rpx;max-height:30vh;overflow:scroll" class="selectedBox">
-						<button class="cu-btn  sm margin-xs" v-for="(item,index) in selectedData" @click="deleteItem(item,index)">
+						<button class="cu-btn  sm margin-xs" v-for="(item,index) in selectedData" :key="index" @click="deleteItem(item,index)">
 							{{item.siteName}}
 							<text class="lg text-gray cuIcon-close"></text>
 						</button>
@@ -73,7 +73,7 @@
 				</view>
 		
 				<select name="" id="" v-model="authorityData.phone" filterable clearable disabled="disabled"> 
-					<option :value=item.phone v-for="item in phoneData">{{ item.phone}}</option>
+					<option :value=item.phone v-for="(item,index) in phoneData" :key="index">{{ item.phone}}</option>
 				</select>
 		
 			</view>
@@ -85,7 +85,7 @@
 				</view>
 				<view style="position:relative" class="innerZd">
 					<input name="siteName" v-model="authorityData.siteName" @click="test" @focus="focusfns" @input="handleInputEdit()"
-					 placeholder="请输入或选择"></input>
+					 placeholder="请输入或选择" />
 		
 					<view class="siteItems" v-if="isShow" style="max-height:60vh;overflow:auto">
 						<view class=" site-item" v-if="!siteItemData.length">暂无结果</view>
@@ -93,7 +93,7 @@
 						<view class="site-item" v-for="(item,index) in siteItemData" @click="add(item,index)" :key="index">{{item.siteName}}</view>
 					</view>
 					<view style="width:500rpx;max-height:30vh;overflow:scroll" class="selectedBox">
-						<button class="cu-btn  margin-xs" v-for="(item,index) in selectedData" @click="deleteItem(item,index)">
+						<button class="cu-btn  margin-xs" v-for="(item,index) in selectedData" :key="index" @click="deleteItem(item,index)">
 							{{item.siteName}}
 							<text class="lg text-gray cuIcon-close"></text>
 						</button>

pages/authManage/authManage.vue

@@ -9,7 +9,7 @@
 				<view class="search-form round bg-white">
 					<text class="cuIcon-search"></text>
 					<input class="" @focus="InputFocus" @blur="InputBlur" :adjust-position="false" type="text"
-					 v-model="phoneNumber"></input>
+					 v-model="phoneNumber"/>
 				</view>
 				<view class="action">
 					<button class="cu-btn bg-blue round" @click="searchAuthList">查询</button>

pages/device-Manage/device-Manage.vue

@@ -1,27 +1,28 @@
 <template>
 
 	<view class="">
-		<view class="cu-list menu-avatar">
-			<view class="cu-item deviceTypeItem" :class="modalName=='move-box-'+ index?'move-cur':''" v-for="(item,index) in deviceData"
-			 :key="index" :data-target="'move-box-' + index" @tap="goDeviceDetail(item)">
+		<view class="cu-list menu-avatar" :style="this.num!=1 ? 'padding-bottom: 86px;' : ''">
+			<view class="cu-item deviceTypeItem" :class="modalName=='move-box-'+ index?'move-cur':''"
+				v-for="(item,index) in deviceData" :key="index" :data-target="'move-box-' + index"
+				@tap="goDeviceDetail(item)">
 				<view class="cu-avatar round lg" style="background-image:url(../../static/jx.png)"></view>
 				<view class="content" style="width:440rpx">
 					<view class="inOneLine cut" style="display:block">{{item.deviceName}}</view>
 				</view>
 				<view class="nav-right num">
 					<view class="text-grey">
-						{{item.trueStatus=="0"?'在线':'离线'}}
+						{{item.trueStatus=="1"?'离线':'在线'}}
 						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
 					</view>
 				</view>
 			</view>
 		</view>
-		
+
 		<view class="btn-area submitBottomBtn padding-lr-sm" v-if="this.num!=1">
 			<button class="bg-blue round  margin-top" @click="goDetail"> 配电系统模拟图 </button>
 		</view>
-		
-		
+
+
 	</view>
 </template>
 
@@ -29,20 +30,23 @@
 	export default {
 		data() {
 			return {
-				deviceData:[],
-				
+				deviceData: [],
+
 				modalName: null,
-				companyCode:"",
-				deviceType:"",
-				num:''
+				companyCode: "",
+				deviceType: "",
+				num: ''
 			};
 		},
-		
-		onLoad:function(option){
-			this.companyCode=option.companyCode
-			this.deviceType=option.deviceType
-			this.getDeviceManage({"companyCode":option.companyCode,"deviceType":option.deviceType})
-			this.num=option.num;
+
+		onLoad: function(option) {
+			this.companyCode = option.companyCode
+			this.deviceType = option.deviceType
+			this.getDeviceManage({
+				"companyCode": option.companyCode,
+				"deviceType": option.deviceType
+			})
+			this.num = option.num;
 			console.log('this.num')
 			console.log(this.num)
 		},
@@ -53,47 +57,49 @@
 		// 	});
 		// },
 		methods: {
-			async getDeviceManage(ming={}) {
-				const res= await this.$myRequest({
-					url:'OperationMonitoring/getDeviceList',
-					data:ming,
-					showLoading:true
+			async getDeviceManage(ming = {}) {
+				const res = await this.$myRequest({
+					url: 'OperationMonitoring/getDeviceList',
+					data: ming,
+					showLoading: true
 				})
 				console.log(res.data.data)
-				this.deviceData=res.data.data
+				this.deviceData = res.data.data
 				// this.powerDeviceCount= res.data.data[0].powerDeviceCount
 				// this.videoDeviceCount= res.data.data[0].videoDeviceCount
-				
+
 			},
-			
-			goDetail(){
+
+			goDetail() {
 				uni.navigateTo({
-					url: './electricalSystem/index?deviceType='+this.deviceType+'&companyCode='+this.companyCode
+					url: './electricalSystem/index?deviceType=' + this.deviceType + '&companyCode=' + this
+						.companyCode
 				});
 			},
-			
+
 			// 页面跳转
 			goDeviceDetail(item) {
-				
+
 				// uni.navigateTo({
 				// 	url: '/pages/device-Manage/deviceDetail/deviceDetail?deviceType=1&companyCode='+this.companyCode+'&deviceCode='+item.deviceCode+'',
 				// 	success: res => {},
 				// 	fail: () => {},
 				// 	complete: () => {}
 				// });
-				if(this.num==1){
+				if (this.num == 1) {
 					uni.navigateTo({
-						url: '/pages/device-Manage/deviceDetail/deviceDetail?deviceType=1&companyCode='+this.companyCode+'&deviceCode='+item.deviceCode+'',
+						url: '/pages/device-Manage/deviceDetail/deviceDetail?deviceType=1&companyCode=' + this
+							.companyCode + '&deviceCode=' + item.deviceCode + '',
 						success: res => {},
 						fail: () => {},
 						complete: () => {}
 					});
-				}else{
-					
+				} else {
+
 				}
-				
+
 			},
-			
+
 
 
 

pages/device-Manage/electricalSystem/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="">
-		<web-view :src="'https://pcdev.ewoogi.com/appfiv/#/?siteId='+siteId" allow></web-view>
+		<web-view :src="'https://wx.ewoogi.com/appfiv/#/?siteId='+siteId" allow></web-view>
 	</view>
 </template>
 

pages/deviceAdd/deviceAdd.vue

@@ -8,15 +8,15 @@
 					<text class="necessary">*</text>
 					设备编号:
 				</view>
-				<input name="deviceCode" v-model="formMess.deviceCode"></input>
+				<input name="deviceCode" v-model="formMess.deviceCode"/>
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>设备名称:</view>
-				<input name="input" v-model="formMess.deviceName"></input>
+				<input name="input" v-model="formMess.deviceName"/>
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>安装位置:</view>
-				<input name="input" v-model="formMess.deviceInstallationPosition"></input>
+				<input name="input" v-model="formMess.deviceInstallationPosition"/>
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>所属楼层:</view>
@@ -36,7 +36,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,index) in 60" :key="index">楼层{{item}}</option>
 				</select>
 			</view>
 			<view class="form-item">
@@ -59,7 +59,7 @@
 				<view class="title"><text class="necessary">*</text>站点:</view>
 				<select name="" id="" v-model="formMess.siteId" filterable clearable>
 					<option value="">请选择</option>
-					<option :value=item.id v-for="item in siteList">{{ item.siteName}}</option>
+					<option :value=item.id v-for="(item,index) in siteList" :key="index">{{ item.siteName}}</option>
 				</select>
 			</view>
 
@@ -76,15 +76,15 @@
 					<text class="necessary">*</text>
 					设备编号:
 				</view>
-				<input name="deviceCode" v-model="deviceMessage.deviceCode" disabled="disabled"></input>
+				<input name="deviceCode" v-model="deviceMessage.deviceCode" disabled="disabled"/>
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>设备名称:</view>
-				<input name="input" v-model="deviceMessage.deviceName" ></input>
+				<input name="input" v-model="deviceMessage.deviceName" />
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>安装位置:</view>
-				<input name="input" v-model="deviceMessage.deviceInstallationPosition"></input>
+				<input name="input" v-model="deviceMessage.deviceInstallationPosition"/>
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>所属楼层:</view>
@@ -100,7 +100,7 @@
 					<option value="-3">楼层B3</option>
 					<option value="-2">楼层B2</option>
 					<option value="-1">楼层B1</option>
-					<option :value=index+1 v-for="(item,index) in 60">楼层{{item}}</option>
+					<option :value=index+1 v-for="(item,index) in 60" :key="index">楼层{{item}}</option>
 				</select>
 			</view>
 			<view class="form-item">
@@ -120,7 +120,7 @@
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>站点:</view>
 				<select name="" id="" v-model="deviceMessage.siteId" filterable clearable>
-					<option :value=item.id v-for="item in siteList">{{ item.siteName}}</option>
+					<option :value=item.id v-for="(item,index) in siteList" :key="index">{{ item.siteName}}</option>
 				</select>
 			</view>
 

pages/deviceManage/deviceManage.vue

@@ -7,7 +7,7 @@
 				<view class="search-form round bg-white">
 					<text class="cuIcon-search"></text>
 					<input class=""  type="text" placeholder="请输入设备名称"
-					 v-model="deviceName"></input>
+					 v-model="deviceName"/>
 				</view>
 				<view class="action">
 					<button class="cu-btn bg-blue round" @click="searchSiteList">查询</button>

pages/eleControl/controlReport/controlReport.vue

@@ -1,140 +1,131 @@
 <template>
-	<view class="site-wrapper">
-		
-		<view style="height: calc(100vh - 200rpx)">
-			<view class="cu-list menu-avatar">
-				<view class="cu-item"  :class="modalName=='move-box-'+ index?'move-cur':''" v-for="(item,index) in controlReport"
-				 :key="index" :data-target="'move-box-' + index"  @tap="goDetail(item.id)" >
-					<view class="cu-avatar round lg" style="background-image:url(../../../static/controlReportIcon.png)"></view>
-					<view class="content">
-						<view class="pro-title">
-							<view class="cut inOneLine">{{item.supervision_title}}</view>
-						</view>
-						<view class="pro-date inOneLine">{{item.site_name}}</view>
-						<view class="pro-date inOneLine">{{item.create_time}}</view>
-						
-						
-					</view>
-					<view class="nav-right num">
-						<view class="text-grey">
-							<text class="icon iconfont margin-right-sm margin-left-lg">&#xe629;</text>
-						</view>
-					</view>
-				</view>
-			</view>
-			
-			<view v-if="!controlReport.length&&siteListRes==1" class="text-center margin-top"> 暂无数据</view>
-			<view v-show="isLoadMore&&this.currentPage>1" style="padding-bottom:60px">
-				<uni-load-more :status="loadStatus"></uni-load-more>
-			</view>
-			
-			
-		</view>
-		
-		<!-- 新增按钮start -->
-		<view <view style="width: 100%;
-    position: fixed;
-    bottom: 0px;
-    right: 0px;
-    height: 64px;
-    background: #fff">
-	<view class="plus">
-		<image src="../../../static/plus.png" style="width:100rpx;height:100rpx" @tap="goAddPage()"></image>
-	</view></view>
-		
-		<!-- 新增按钮end -->
-	</view>
+  <view class="site-wrapper">
+    <view style="height: calc(100vh - 200rpx)">
+      <view class="cu-list menu-avatar">
+        <view
+          class="cu-item"
+          :class="modalName == 'move-box-' + index ? 'move-cur' : ''"
+          v-for="(item, index) in controlReport"
+          :key="index"
+          :data-target="'move-box-' + index"
+          @tap="goDetail(item.id)"
+        >
+          <view class="cu-avatar round lg" style="background-image: url(../../../static/controlReportIcon.png)"></view>
+          <view class="content">
+            <view class="pro-title">
+              <view class="cut inOneLine">{{ item.supervision_title }}</view>
+            </view>
+            <view class="pro-date inOneLine">{{ item.site_name }}</view>
+            <view class="pro-date inOneLine">{{ item.create_time }}</view>
+          </view>
+          <view class="nav-right num">
+            <view class="text-grey">
+              <text class="icon iconfont margin-right-sm margin-left-lg">&#xe629;</text>
+            </view>
+          </view>
+        </view>
+      </view>
 
-	
+      <view v-if="!controlReport.length && siteListRes == 1" class="text-center margin-top"> 暂无数据</view>
+      <view v-show="isLoadMore && this.currentPage > 1" style="padding-bottom: 60px">
+        <uni-load-more :status="loadStatus"></uni-load-more>
+      </view>
+    </view>
+
+    <!-- 新增按钮start -->
+    <view style="width: 100%; position: fixed; bottom: 0px; right: 0px; height: 64px; background: #fff">
+      <view class="plus">
+        <image src="../../../static/plus.png" style="width: 100rpx; height: 100rpx" @tap="goAddPage()"></image>
+      </view>
+    </view>
+
+    <!-- 新增按钮end -->
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				controlReport: [],
-				modalName: null,
-				siteListRes: 0,
-				
-				currentPage: 1,
-				size: 11,
-				loadStatus: 'loading', //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
-				isLoadMore: false, //是否加载中
-			};
-		},
-		
-		onReachBottom() { //上拉触底函数
-		
-			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
-				this.isLoadMore = true
-				this.currentPage += 1;
-				this.loadData()
-			}
-		},
-		
-		onLoad:function(option){
-			this.loadData()
-			
-		},
-	
-		methods: {
-		
-			// 页面跳转
-			goAddPage(item) {
-				uni.redirectTo({
-					url: '/pages/eleControl/controlReport/controlReportAdd/controlReportAdd',
-				});
-			},
-			
-			goDetail(id) {
-				uni.navigateTo({
-					url: '/pages/eleControl/controlReport/controlReportDetail/controlReportDetail?id='+id,
-				});
-			},
-			
-			loadData(){
-				this.getDataList({
-					currentPage: this.currentPage,
-					size: this.size,
-				})
-				
-			},
-			
-			//数据请求
-			async getDataList(params = {}) {
-				const res = await this.$myRequest({
-					url: 'MonitoringReporting/getMonitoringReportingList',
-					showLoading: true,
-					data: params
-				})
-				this.siteListRes = 1;
-				
-				if (res.data.total) {
-					
-					// this.controlReport = res.data.data
-					this.controlReport = this.controlReport.concat(res.data.data)
-					if (res.data.data.length < this.size) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
-						this.isLoadMore = true
-						this.loadStatus = 'nomore'
-					} else {
-						this.isLoadMore = false
-					}
-					console.log('this.controlReport')
-					console.log(this.controlReport)
-				} else {
-					
-					this.isLoadMore = true
-					this.loadStatus = 'nomore'
-				}
-				
-			}
-		}
+export default {
+  data() {
+    return {
+      controlReport: [],
+      modalName: null,
+      siteListRes: 0,
+
+      currentPage: 1,
+      size: 11,
+      loadStatus: "loading", //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
+      isLoadMore: false, //是否加载中
+    };
+  },
+
+  onReachBottom() {
+    //上拉触底函数
+
+    if (!this.isLoadMore) {
+      //此处判断，上锁，防止重复请求
+      this.isLoadMore = true;
+      this.currentPage += 1;
+      this.loadData();
+    }
+  },
+
+  onLoad: function (option) {
+    this.loadData();
+  },
+
+  methods: {
+    // 页面跳转
+    goAddPage(item) {
+      uni.redirectTo({
+        url: "/pages/eleControl/controlReport/controlReportAdd/controlReportAdd",
+      });
+    },
+
+    goDetail(id) {
+      uni.navigateTo({
+        url: "/pages/eleControl/controlReport/controlReportDetail/controlReportDetail?id=" + id,
+      });
+    },
+
+    loadData() {
+      this.getDataList({
+        currentPage: this.currentPage,
+        size: this.size,
+      });
+    },
+
+    //数据请求
+    async getDataList(params = {}) {
+      const res = await this.$myRequest({
+        url: "MonitoringReporting/getMonitoringReportingList",
+        showLoading: true,
+        data: params,
+      });
+      this.siteListRes = 1;
 
-	}
+      if (res.data.total) {
+        // this.controlReport = res.data.data
+        this.controlReport = this.controlReport.concat(res.data.data);
+        if (res.data.data.length < this.size) {
+          //判断接口返回数据量小于请求数据量，则表示此为最后一页
+          this.isLoadMore = true;
+          this.loadStatus = "nomore";
+        } else {
+          this.isLoadMore = false;
+        }
+        console.log("this.controlReport");
+        console.log(this.controlReport);
+      } else {
+        this.isLoadMore = true;
+        this.loadStatus = "nomore";
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss">
-	.cu-item{
-		height:160rpx!important
-	}
+.cu-item {
+  height: 160rpx !important;
+}
 </style>

pages/eleControl/controlReport/controlReportAdd/controlReportAdd.vue

@@ -19,7 +19,7 @@
 				<view class="title"><text class="necessary">*</text>所属站点:</view>
 				<select name="" id="" filterable clearable v-model="site_id">
 					<option value="">请选择</option>
-					<option :value=item.id v-for="item in siteListData">{{ item.site_name}}</option>
+					<option :value=item.id v-for="(item,index) in siteListData" :key="index">{{ item.site_name}}</option>
 				</select>
 			</view>
 

pages/eleControl/controlReport/controlReportDetail/controlReportDetail.vue

@@ -15,7 +15,7 @@
 				<view class="title"><text class="necessary">*</text>所属站点:</view>
 				<select name="" id="" filterable clearable v-model="controlReportDetail.site_id" disabled>
 					<option value="">请选择</option>
-					<option :value=item.id v-for="item in siteListData">{{ item.site_name}}</option>
+					<option :value=item.id v-for="(item,index) in siteListData" :key="index">{{ item.site_name}}</option>
 				</select>
 			</view>
 

pages/eleControl/powerCut/powerCut.vue

@@ -17,7 +17,7 @@
 			<view class="cu-bar search bg-gray filter-section">
 				<view class="search-form round bg-white">
 					<text class="cuIcon-search"></text>
-					<input class="" type="text" placeholder="请输入站点名称" v-model="site_name"></input>
+					<input class="" type="text" placeholder="请输入站点名称" v-model="site_name"/>
 				</view>
 				<view class="action">
 					<button class="cu-btn bg-blue round" @click="searchSiteList">查询</button>
@@ -35,10 +35,10 @@
 					<view class="cu-item" :class="modalName=='move-box-'+ index?'move-cur':''"
 						@touchstart="ListTouchStart" @touchmove="ListTouchMove" @touchend="ListTouchEnd"
 						:data-target="'move-box-' + index" v-for="(item,index) in planListData" :key="index"
-						 @tap="goDetail(item.id)">
+						@tap="goDetail(item.id)">
 						<view class="cu-avatar lg" style="background-image:url(../../../static/unprocessIcon.png);">
 						</view>
-						<view class="content"  style="width:460rpx">
+						<view class="content" style="width:460rpx">
 							<view class="pro-title">
 								<view class="cut inOneLine">{{item.site_name}}</view>
 							</view>
@@ -66,7 +66,7 @@
 					<view class="cu-item " :class="modalName=='move-box-'+ index?'move-cur':''"
 						@touchstart="ListTouchStart" @touchmove="ListTouchMove" @touchend="ListTouchEnd"
 						:data-target="'move-box-' + index" v-for="(item,index) in planListData" :key="index"
-						 @tap="goDetail(item.id)">
+						@tap="goDetail(item.id)">
 						<view class="cu-avatar lg" style="background-image:url(../../../static/processingIcon.png);">
 						</view>
 						<view class="content" style="width:460rpx">
@@ -78,8 +78,8 @@
 						<view class="action" style="z-index:99">
 							<view class="processing" @tap="goProcessedDetail(item.id)">执行中</view>
 						</view>
-						<view class="move"  style="width: 66px;"  >
-							<view class="bg-grey"@click.stop="editItem(item)">编辑</view>
+						<view class="move" style="width: 66px;">
+							<view class="bg-grey" @click.stop="editItem(item)">编辑</view>
 							<!-- <view class="bg-red" @click.stop="deleteItem(item)">删除</view> -->
 						</view>
 					</view>
@@ -97,7 +97,7 @@
 					<view class="cu-item" v-for="(item,index) in planListData" :key="index" @tap="goDetail(item.id)">
 						<view class="cu-avatar lg" style="background-image:url(../../../static/processedIcon.png);">
 						</view>
-						<view class="content"  style="width:460rpx">
+						<view class="content" style="width:460rpx">
 							<view class="pro-title">
 								<view class="cut inOneLine">{{item.site_name}}</view>
 							</view>
@@ -139,64 +139,65 @@
 				CustomBar: this.CustomBar,
 				TabCur: 0,
 				tabNav: ['未执行', '执行中', '已执行', ],
-				
-				planListData:[],
-				site_name:'',
-				status_value:1,
-				
+
+				planListData: [],
+				site_name: '',
+				status_value: 1,
+
 				currentPage: 1,
 				size: 10,
 				loadStatus: 'loading', //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
 				isLoadMore: false, //是否加载中
-				
-				deleteStatus:false
+
+				deleteStatus: false
 			};
 		},
 		onReachBottom() { //上拉触底函数
 			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
 				this.isLoadMore = true
 				this.currentPage += 1;
-				
+
 				this.loadData()
-		
+
 			}
 		},
-	
+
 		onLoad: function(option) {
 			// this.getDataList({"status_value":1})
 			this.loadData()
 		},
-		
+
 		methods: {
-			
+
 			//编辑
 			editItem(item) {
 				uni.redirectTo({
-					url: '/pages/eleControl/powerCut/powerCutAdd/powerCutAdd?id=' + item.id + '&status_value=' + this.status_value + '',
+					url: '/pages/eleControl/powerCut/powerCutAdd/powerCutAdd?id=' + item.id + '&status_value=' +
+						this.status_value + '',
 				});
 			},
-			
-			
+
+
 			//筛选
 			searchSiteList() {
-				this.currentPage=1,
-				this.planListData=[]
+				this.currentPage = 1,
+					this.planListData = []
 				this.loadData()
-				
+
 			},
-			loadData(){
+			loadData() {
 				this.getDataList({
 					"site_name": this.site_name,
-					"status_value":this.status_value,
+					"status_value": this.status_value,
 					"currentPage": this.currentPage,
 					"size": this.size,
 				})
-				
+
 			},
-			
+
 			//删除
 			deleteItem(item) {
-				this.deleteStatus=true
+				this.deleteStatus = true
 				uni.showModal({
 					title: '确认删除吗？',
 					content: '',
@@ -205,7 +206,7 @@
 							this.setDelSite({
 								"id": item.id
 							})
-							
+
 						} else if (result.cancel) {
 							// console.log('用户点击取消');
 						}
@@ -222,7 +223,7 @@
 						title: "删除失败",
 						icon: "none"
 					});
-				}else{
+				} else {
 					uni.showToast({
 						title: "删除成功",
 					});
@@ -230,11 +231,11 @@
 						this.loadData()
 					}, 1000);
 				}
-				
+
 			},
-			
-			
-			
+
+
+
 			//数据请求
 			async getDataList(params = {}) {
 				const res = await this.$myRequest({
@@ -245,40 +246,40 @@
 				// console.log('res.data.data')
 				// console.log(res.data.data)
 				// this.planListData = res.data.data
-				if(this.deleteStatus){
-					this.planListData=[];
-					this.deleteStatus=false;
+				if (this.deleteStatus) {
+					this.planListData = [];
+					this.deleteStatus = false;
 				}
 				if (res.data.data.length) {
 
 					this.planListData = this.planListData.concat(res.data.data)
-									
+
 					if (res.data.data.length < this.size) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
 						this.isLoadMore = true
 						this.loadStatus = 'nomore'
-		
+
 					} else {
-					
-						this.loadStatus='loading'
+
+						this.loadStatus = 'loading'
 						this.isLoadMore = false
 					}
 				} else {
-					
+
 					this.isLoadMore = true
 					this.loadStatus = 'nomore'
 				}
 			},
-			
-			
+
+
 			tabSelect(e) {
 				console.log(e.currentTarget);
-				this.currentPage=1,
-				this.planListData=[],
-				this.site_name='',
-				this.TabCur = e.currentTarget.dataset.id;
+				this.currentPage = 1,
+					this.planListData = [],
+					this.site_name = '',
+					this.TabCur = e.currentTarget.dataset.id;
 				// this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60;
-				this.status_value=e.currentTarget.dataset.status;
-				this.modalName=null;
+				this.status_value = e.currentTarget.dataset.status;
+				this.modalName = null;
 				this.loadData()
 			},
 			goAddPage(id) {
@@ -288,7 +289,8 @@
 			},
 			goDetail(id) {
 				uni.navigateTo({
-					url: '/pages/eleControl/powerCut/powerCutDetail/powerCutDetail?id='+id+'&&status_value='+this.status_value,
+					url: '/pages/eleControl/powerCut/powerCutDetail/powerCutDetail?id=' + id + '&&status_value=' +
+						this.status_value,
 				});
 			},
 
@@ -340,7 +342,7 @@
 			color: #4274E7
 		}
 	}
-	
+
 	.cu-list.eleDoing>.cu-item.move-cur {
 		-webkit-transform: translateX(-66px);
 	}

pages/eleControl/powerCut/powerCutAdd/powerCutAdd.vue

@@ -1,4 +1,5 @@
 <template>
+
 	<view class="appWrapper">
 		<form action="" v-if="!id">
 			<view style="height:30rpx"></view>
@@ -20,19 +21,19 @@
 					<uni-datetime-picker v-model="end_time" :start="start_time" />
 				</view>
 			</view>
-			
+
 			<!-- <calendar   @func='getMsgFromxSon' @func2='getMsgFromxSon2' :bindStartTime="formMess.start_time" :bindEndTime="formMess.end_time"></calendar> -->
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>所属站点:</view>
 				<select name="" id="" filterable clearable v-model="formMess.site_id">
 					<option value="0">请选择</option>
-					<option :value=item.id v-for="item in siteListData">{{ item.site_name}}</option>
+					<option :value=item.id v-for="(item,index) in siteListData" :key="index">{{ item.site_name}}</option>
 				</select>
 			</view>
-			
+
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>计划类型:</view>
-				
+
 				<select name="" id="" filterable clearable v-model="formMess.plan_type">
 					<option value="0">请选择</option>
 					<option value="1">计划检修停电</option>
@@ -44,7 +45,7 @@
 				<button class="bg-blue round  margin-top" @click="$noMultipleClicks(addSubmit)">提 交 </button>
 			</view>
 		</form>
-		
+
 		<!-- 修改start -->
 		<form action="" v-else>
 			<view style="height:30rpx"></view>
@@ -54,10 +55,10 @@
 					开始时间:
 				</view>
 				<view class="example-body" v-if="this.status_value==1">
-					<uni-datetime-picker  v-model="planDetailData.start_time" />
+					<uni-datetime-picker v-model="planDetailData.start_time" />
 				</view>
 				<view class="example-body" v-else>
-					<uni-datetime-picker  v-model="planDetailData.start_time" disabled/>
+					<uni-datetime-picker v-model="planDetailData.start_time" disabled />
 				</view>
 			</view>
 			<view class="form-item">
@@ -65,22 +66,22 @@
 					<text class="necessary">*</text>
 					结束时间:
 				</view>
-				<view class="example-body" >
-					<uni-datetime-picker v-model="planDetailData.end_time"  :start="planDetailData.start_time" />
+				<view class="example-body">
+					<uni-datetime-picker v-model="planDetailData.end_time" :start="planDetailData.start_time" />
 				</view>
 			</view>
-			
-		
-			
+
+
+
 			<!-- <calendar   @func='getMsgFromxSon' @func2='getMsgFromxSon2' :bindStartTime="planDetailData.start_time" :bindEndTime="planDetailData.end_time" v-if="this.planDetailData.end_time" ></calendar> -->
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>所属站点:</view>
 				<select name="" id="" filterable clearable v-model="planDetailData.site_id" disabled="disabled">
 					<option value="0">请选择</option>
-					<option :value=item.id v-for="item in siteListData">{{ item.site_name}}</option>
+					<option :value=item.id v-for="(item,index) in siteListData" :key="index">{{ item.site_name}}</option>
 				</select>
 			</view>
-			
+
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>计划类型:</view>
 				<select name="" id="" filterable clearable v-model="planDetailData.plan_type" disabled="disabled">
@@ -95,14 +96,14 @@
 					<text class="necessary">*</text>
 					报备人:
 				</view>
-				<input name="deviceCode" v-model="planDetailData.creator" disabled="disabled"></input>
+				<input name="deviceCode" v-model="planDetailData.creator" disabled="disabled"/>
 			</view>
 			<view class="form-item margin-top">
 				<view class="title">
 					<text class="necessary">*</text>
 					手机号:
 				</view>
-				<input name="deviceCode" v-model="planDetailData.phone" disabled="disabled"></input>
+				<input name="deviceCode" v-model="planDetailData.phone" disabled="disabled"/>
 			</view>
 			<view class="btn-area submitBottomBtn padding-lr-sm">
 				<button class="bg-blue round  margin-top" @click="$noMultipleClicks(editSubmit)">提 交 </button>
@@ -116,17 +117,18 @@
 
 <script>
 	// import calendar from '../calendar/calendar.vue';
+
 	export default {
 		components: {
-		        // calendar 
-				},
+			// calendar 
+		},
 
 		data() {
 			return {
-				
-				noClick:true,
-				
-				id:'',
+				single: "2021-04-3",
+				noClick: true,
+
+				id: '',
 				isShow: false,
 				formMess: {
 					"site_id": 0,
@@ -134,18 +136,18 @@
 					"start_time": "",
 					"end_time": "",
 				},
-				siteListData:[],
-				planTypeData:[],
-				planDetailData:{},
-				
+				siteListData: [],
+				planTypeData: [],
+				planDetailData: {},
+
 				start_time: '',
 				end_time: '',
 			}
 		},
 		onLoad: function(option) {
 			this.getSiteList();
-			this.id=option.id;
-			this.status_value=option.status_value
+			this.id = option.id;
+			this.status_value = option.status_value
 			if (option.id) {
 				uni.setNavigationBarTitle({
 					title: '计划停电修改'
@@ -159,9 +161,13 @@
 					title: '计划停电新增'
 				});
 			}
-			
+
 		},
 		methods: {
+			change(e) {
+				this.single = e;
+				console.log("-change事件:", e);
+			},
 			//新增验证并提交
 			addSubmit() {
 				// alert( this.formMess.start_time)
@@ -179,14 +185,14 @@
 					});
 					return
 				}
-				if (this.end_time<this.start_time) {
+				if (this.end_time < this.start_time) {
 					uni.showToast({
 						title: "结束时间不能小于开始时间，请重新选择",
 						icon: "none"
 					});
 					return
 				}
-				
+
 				if (!this.formMess.site_id) {
 					uni.showToast({
 						title: "请选择所属站点",
@@ -201,7 +207,7 @@
 					});
 					return
 				}
-				
+
 				this.setAddDevice({
 					"site_id": this.formMess.site_id,
 					"plan_type": this.formMess.plan_type,
@@ -231,7 +237,7 @@
 					});
 				}, 1000);
 			},
-			
+
 			// 修改回显请求
 			async getDataList(params = {}) {
 				const res = await this.$myRequest({
@@ -242,14 +248,14 @@
 				console.log('res.data.data')
 				console.log(res.data.data)
 				this.planDetailData = res.data.data[0],
-				this.start_time=this.planDetailData.start_time
+					this.start_time = this.planDetailData.start_time
 				console.log(this.planDetailData.start_time)
 			},
-			
+
 			//编辑验证并提交
-			
+
 			editSubmit() {
-				if (this.planDetailData.end_time<this.planDetailData.start_time) {
+				if (this.planDetailData.end_time < this.planDetailData.start_time) {
 					uni.showToast({
 						title: "结束时间不能小于开始时间，请重新选择",
 						icon: "none"
@@ -263,7 +269,7 @@
 					"end_time": this.planDetailData.end_time,
 					"creator": this.planDetailData.creator,
 					"phone": this.planDetailData.phone,
-					"id":this.planDetailData.id,
+					"id": this.planDetailData.id,
 				})
 			},
 			// 编辑请求
@@ -288,7 +294,7 @@
 					});
 				}, 1000);
 			},
-			
+
 			//站带下拉数据请求
 			async getSiteList(params = {}) {
 				const res = await this.$myRequest({
@@ -303,15 +309,18 @@
 </script>
 
 <style lang="scss">
-	/deep/ .uni-calendar--fixed{
-		z-index:1111!important
+	/deep/ .uni-calendar--fixed {
+		z-index: 1111 !important
 	}
-	.example-body{
+
+	.example-body {
 		width: 276px;
-		    font-size: 15px;
-			/deep/ uni-input, select, option{
-				border:none
-			}
-	}
+		font-size: 15px;
 
+		/deep/ uni-input,
+		select,
+		option {
+			border: none
+		}
+	}
 </style>

pages/eleControl/powerCut/powerCutDetail/powerCutDetail.vue

@@ -21,12 +21,12 @@
 			
 			<view class="form-item">
 				<view class="title">所属站点:</view>
-				<input name="input" disabled ="true" v-model="detailData.site_name"></input>
+				<input name="input" disabled ="true" v-model="detailData.site_name"/>
 			</view>
 			
 			<view class="form-item">
 				<view class="title">计划类型:</view>
-				<input name="input" disabled ="true" v-model="detailData.plan_type==1?'计划检修停电':detailData.plan_type==2?'计划施工停电':'客户申请停电'"></input>
+				<input name="input" disabled ="true" v-model="detailData.plan_type==1?'计划检修停电':detailData.plan_type==2?'计划施工停电':'客户申请停电'"/>
 			</view>
 			
 			<view class="form-item">
@@ -34,7 +34,7 @@
 					<text class="necessary">*</text>
 					报备人:
 				</view>
-				<input name="input" v-model="detailData.contacts"></input>
+				<input name="input" v-model="detailData.contacts"/>
 			</view>
 			
 			<view class="form-item">
@@ -42,7 +42,7 @@
 					<text class="necessary">*</text>
 					手机号:
 				</view>
-				<input name="input" v-model="detailData.phone" ></input>
+				<input name="input" v-model="detailData.phone" />
 			</view>
 
 		</form>

pages/index/index.vue

@@ -4,7 +4,7 @@
 			<view class="cu-bar search bg-white">
 				<view class="search-form round">
 					<input @focus="InputFocus" @blur="InputBlur" @input="handleInput()" v-model="searchInput"
-						:adjust-position="false" type="text" placeholder=""></input>
+						:adjust-position="false" type="text" placeholder="" />
 					<text class="cuIcon-search "></text>
 				</view>
 			</view>
@@ -61,11 +61,13 @@
 			<view class="cu-list grid col-3 no-border">
 				<view class="cu-item justify-center align-center" @tap=navItemClick(index)
 					v-for="(item,index) in cuIconList" :key="index">
-					<image :src="item.imgUrl" style="width:100rpx;height:100rpx"></image>
-					<view class="cu-tag badge" v-if="item.badge!=0">
-						<block v-if="item.badge!=0">{{item.badge>99?'99+':item.badge}}</block>
-					</view>
-					<text>{{item.name}}</text>
+					<div v-if="item.onShow">
+						<image :src="item.imgUrl" style="width:100rpx;height:100rpx"></image>
+						<view class="cu-tag badge" v-if="item.badge!=0">
+							<block v-if="item.badge!=0">{{item.badge>99?'99+':item.badge}}</block>
+						</view>
+						<text>{{item.name}}</text>
+					</div>
 				</view>
 			</view>
 		</view>
@@ -73,83 +75,94 @@
 </template>
 
 <script>
-	import chart from './components/chart/chart.vue';
-	import chart2 from './components/chart2/chart2.vue';
-	import chart3 from './components/chart3/chart3.vue';
-	import chart4 from './components/chart4/chart4.vue';
-	import json from '../../data/json.js';
-
+	import chart from "./components/chart/chart.vue";
+	import chart2 from "./components/chart2/chart2.vue";
+	import chart3 from "./components/chart3/chart3.vue";
+	import chart4 from "./components/chart4/chart4.vue";
+	import json from "../../data/json.js";
 
 	export default {
 		components: {
 			chart,
 			chart2,
 			chart3,
-			chart4
-
+			chart4,
 		},
 		data() {
 			return {
 				componentKey: 0,
 				arr: [],
-				searchInput: '',
-				alarmCount: '',
+				searchInput: "",
+				alarmCount: "",
 				flag: false,
 
 				// 宫格列表数据
 				cuIconList: [{
-					imgUrl: '../../static/square1.png',
-					badge: 0,
-					name: '综合报警',
-					redirectUrl: '/pages/siteList/siteList?type=1'
-				}, {
-					imgUrl: '../../static/square2.png',
-					badge: 0,
-					name: '运行监测',
-					redirectUrl: '/pages/siteList/siteList?type=2'
-				}, {
-					imgUrl: '../../static/square-wb.png',
-					badge: 0,
-					name: '维保',
-					redirectUrl: ''
-				}, {
-					imgUrl: '../../static/square-bx.png',
-					badge: 0,
-					name: '报修',
-					redirectUrl: ''
-				}, {
-					imgUrl: '../../static/square-rl.png',
-					badge: 0,
-					name: '人脸识别',
-					redirectUrl: ''
-				}, {
-					imgUrl: '../../static/square-xj.png',
-					badge: 0,
-					badge: 0,
-					name: '巡检',
-					redirectUrl: ''
-				}, {
-					imgUrl: '../../static/square-bz.png',
-					badge: 0,
-					badge: 0,
-					name: '风险保障',
-					redirectUrl: ''
-				}, {
-					imgUrl: '../../static/square-dljc.png',
-					badge: 0,
-					badge: 0,
-					name: '电力监察',
-					redirectUrl: ''
-				}],
+						imgUrl: "../../static/square1.png",
+						badge: 0,
+						name: "综合报警",
+						redirectUrl: "/pages/siteList/siteList?type=1",
+						onShow: true,
+					},
+					{
+						imgUrl: "../../static/square2.png",
+						badge: 0,
+						name: "运行监测",
+						redirectUrl: "/pages/siteList/siteList?type=2",
+						onShow: true,
+					},
+					{
+						imgUrl: "../../static/square-wb.png",
+						badge: 0,
+						name: "维保",
+						redirectUrl: "",
+						onShow: true,
+					},
+					{
+						imgUrl: "../../static/square-bx.png",
+						badge: 0,
+						name: "报修",
+						redirectUrl: "",
+						onShow: true,
+					},
+					{
+						imgUrl: "../../static/square-rl.png",
+						badge: 0,
+						name: "人脸识别",
+						redirectUrl: "",
+						onShow: true,
+					},
+					{
+						imgUrl: "../../static/square-xj.png",
+						badge: 0,
+						name: "巡检",
+						redirectUrl: "",
+						onShow: true,
+					},
+					{
+						imgUrl: "../../static/square-bz.png",
+						badge: 0,
+						name: "风险保障",
+						redirectUrl: "",
+						onShow: true,
+					},
+					{
+						imgUrl: "../../static/square-dljc.png",
+						badge: 0,
+						name: "电力监察",
+						redirectUrl: "",
+						onShow: true,
+					},
+				],
 				Inv: 0,
 				searchList: [],
 				searchList2: [],
-				staticData: {}
+				staticData: {},
 			};
 		},
 		onNavigationBarButtonTap(e) {
-			if (e.float == 'right') {
-				console.log("你点击了扫一扫")
+			if (e.float == "right") {
+				console.log("你点击了扫一扫");
 				uni.scanCode({
 					// success: function(res) {
 					// 	console.log('条码类型：' + res.scanType);
@@ -157,113 +170,118 @@
 					// }
 					success: function(res) {
 						let result = res.result;
-						if (result.indexOf('http://') == 0 || result.indexOf('https://') == 0) {
-							//是网址，直接跳转  
-							plus.runtime.openURL(result); //调用手机浏览器  
-							//怎么在APP内跳转网址？  
+						if (
+							result.indexOf("http://") == 0 ||
+							result.indexOf("https://") == 0
+						) {
+							//是网址，直接跳转
+							plus.runtime.openURL(result); //调用手机浏览器
+							//怎么在APP内跳转网址？
 						} else {
-							//不是网址，打印出结果  
+							//不是网址，打印出结果
 							uni.showToast({
-								title: res.result
-							})
+								title: res.result,
+							});
 						}
 					},
 					fail: function(err) {
-						console.log('扫码失败', err)
-					}
+						console.log("扫码失败", err);
+					},
 				});
 			} else {
-				this.showTag()
+				this.showTag();
 			}
 		},
 
-
-
-		created: function() {
-
-		},
+		created: function() {},
 
 		mounted() {
-			document.querySelector('.uni-page-head-hd').style.display = 'none'
+			document.querySelector(".uni-page-head-hd").style.display = "none";
 		},
 
 		beforeCreate: function() {},
 
-
 		onLoad: function(option) {
-
-		
 			if (option.op) {
 				this.getData();
-			
 			} else {
-				this.init()
+				if (window.location.host.indexOf("localhost") == -1) {
+					this.init();
+				} else {
+					this.getData();
+				}
 			}
-			
-			
-			// this.getData();
 
 			this.hackReset = false;
 			this.$nextTick(() => {
 				this.hackReset = true;
-			})
+			});
 		},
 
 		methods: {
-
-
 			async init() {
-				window.location.href = this.$BASE_URL + "Com/getPageAuthorization1"
+				window.location.href = this.$BASE_URL + "Com/getPageAuthorization1";
 			},
 			// end
 
-
-
 			async getData() {
 				const res = await this.$myRequest({
-					url: 'Index/getDataStatistics',
-					showLoading: true
-				})
-				this.staticData = res.data.data[0]
-				this.alarmCount = this.staticData.alarmCount
-				this.cuIconList[0].badge = this.staticData.unprocessedCount
-			},
-
+					url: "Index/getDataStatistics",
+					showLoading: true,
+				});
+				this.staticData = res.data.data[0];
+				this.alarmCount = this.staticData.alarmCount;
+				this.cuIconList[0].badge = this.staticData.unprocessedCount;
+
+				const resOne = await this.$myRequest({
+					url: "Com/getAuthorization",
+					showLoading: true,
+					data: undefined,
+				});
 
+				var permissionLabel = resOne.data.permissionLabel;
 
+				this.cuIconList.forEach((el) => {
+					if (el.name === "电力监察" && permissionLabel == 4) {
+						el.onShow = false;
+					}
+				});
+			},
 
 			handleInput() {
-				var newlist = this.searchList2.filter(item => item.indexOf(this.searchInput) > -1)
-				this.searchList = newlist
+				var newlist = this.searchList2.filter(
+					(item) => item.indexOf(this.searchInput) > -1
+				);
+				this.searchList = newlist;
 			},
 
 			navItemClick(index) {
 				let url = "";
 				switch (index) {
 					case 0:
-						url = "/pages/siteListAlarming/siteListAlarming"
+						url = "/pages/siteListAlarming/siteListAlarming";
 						break;
 					case 1:
-						url = "/pages/siteList/siteList"
+						url = "/pages/siteList/siteList";
 						break;
 					case 7:
-						url = "/pages/eleControl/eleControl"
+						url = "/pages/eleControl/eleControl";
 						break;
 					default:
 						break;
 				}
 				if (url) {
 					uni.navigateTo({
-						url: url
-					})
+						url: url,
+					});
 				} else {
 					uni.showModal({
-						title: 'Tips',
-						content: '此模块开发中~',
+						title: "Tips",
+						content: "此模块开发中~",
 						showCancel: false,
 						success: function(res) {
 							if (res.confirm) {} else if (res.cancel) {}
-						}
+						},
 					});
 				}
 			},
@@ -273,24 +291,21 @@
 			},
 
 			InputFocus(e) {
-				this.InputBottom = e.detail.height
+				this.InputBottom = e.detail.height;
 			},
 			InputBlur(e) {
-				this.InputBottom = 0
+				this.InputBottom = 0;
 			},
 
 			changeTab(Inv) {
 				that.navIdx = Inv;
-
 			},
-
-		}
-	}
-
+		},
+	};
 
 	//解决IOS返回页面不刷新的问题
 	history.pushState(null, null, document.URL); //禁止网页返回上一页
-	window.addEventListener('popstate', function() {
+	window.addEventListener("popstate", function() {
 		// alert('点击返回按钮了！')
 	});
 </script>
@@ -302,22 +317,22 @@
 
 	.select-items {
 		overflow: auto;
-		height: 80vh
+		height: 80vh;
 	}
 
 	.static-tabs {
 		border-radius: 50rpx;
-		border: 1rpx solid #4074E7;
+		border: 1rpx solid #4074e7;
 	}
 
 	.static-tabs>view {
-		color: #4074E7;
+		color: #4074e7;
 		font-size: 30rpx;
 	}
 
 	.static-tabs>view.active {
 		color: #fff;
-		background: #4074E7
+		background: #4074e7;
 	}
 
 	.static-tabs>view:first-child {
@@ -326,8 +341,8 @@
 	}
 
 	.static-tabs>view:nth-child(2) {
-		border-left: 1px solid #4074E7;
-		border-right: 1px solid #4074E7
+		border-left: 1px solid #4074e7;
+		border-right: 1px solid #4074e7;
 	}
 
 	.static-tabs>view:last-child {
@@ -335,37 +350,35 @@
 		border-bottom-right-radius: 50rpx;
 	}
 
-
 	/* 检测时间 */
 	.time {
 		border-radius: 50rpx;
-		background: #FAFCFF;
-		border: 1px solid #E8F1FF;
+		background: #fafcff;
+		border: 1px solid #e8f1ff;
 		padding: 20rpx;
 		color: #666666;
 		font-size: 28rpx;
-
 	}
 
 	.chart3-box {
-		position: relative
+		position: relative;
 	}
 
 	.chart3-icon {
 		position: absolute;
 		top: 60rpx;
-		left: 30rpx
+		left: 30rpx;
 	}
 
 	.chart3-icon li {
-		padding-top: 25rpx
+		padding-top: 25rpx;
 	}
 
 	ul,
 	li {
 		padding: 0;
 		margin: 0;
-		list-style: none
+		list-style: none;
 	}
 </style>
 

pages/messagePush/messagePush.vue

@@ -5,7 +5,7 @@
 			<form action="">
 				<checkbox-group class="block" @change="CheckboxChange" >
 					<view class="margin-top  ">
-						<view class="flex align-left checkItems" v-for="(item,index) in checkbox">
+						<view class="flex align-left checkItems" v-for="(item,index) in checkbox" :key="index">
 							<checkbox class="blue" :class="item.checked==1?'checked':''"
 								:checked="item.checked==1?true:false" :value="item.value"></checkbox>
 							<view class="title">{{item.title}}</view>

pages/processList/processList.vue

@@ -32,8 +32,8 @@
 							<view class="pro-date ">{{item.soeTime}}</view>
 						</view>
 						<view class="action" style="z-index:99;width:170rpx;text-align:right">
-							<view class="unProcess" @tap="type==1?goUnprocessDetail(item):goVideoUnprocessDetail(item)">未处理<text
-									class="icon iconfont margin-left-xs margin-right-xs">&#xe629;</text></view>
+							<view class="unProcess" @tap="type==1?goUnprocessDetail(item):goVideoUnprocessDetail(item)">
+								未处理<text class="icon iconfont margin-left-xs margin-right-xs">&#xe629;</text></view>
 						</view>
 					</view>
 					<view class=" text-center margin-top" v-if="alarmUntreatedCount == 0">暂无数据...</view>
@@ -43,13 +43,14 @@
 				</view>
 			</view>
 		</block>
-		
+
 		<!-- 已处理start -->
 		<block v-if="TabCur==1">
 			<view class="processList">
-				
+
 				<!-- 电力监测筛选 start -->
-				<view  v-if="this.type==1 " class=" padding-bottom-xs" style="border-bottom:1rpx solid  rgba(221,221,221,.3)">
+				<view v-if="this.type==1 " class=" padding-bottom-xs"
+					style="border-bottom:1rpx solid  rgba(221,221,221,.3)">
 					<view class="cu-bar search filter-section">
 						<view class="search-form border-gray round bg-white">
 							<select name="" id="" v-model="handleStatus">
@@ -88,7 +89,8 @@
 
 							<view class="cu-avatar lg" :style="{'left':handleStatus==2 ? '60rpx':'0'}"
 								style="background-image:url(../../static/processed-icon.png);"></view>
-							<view class="content" style="width:400rpx" :style="{'left':handleStatus==2 ? '180rpx':'120rpx'}">
+							<view class="content" style="width:400rpx"
+								:style="{'left':handleStatus==2 ? '180rpx':'120rpx'}">
 								<view class="pro-title">
 									<view class="cut inOneLine">{{item.measName}}</view>
 								</view>
@@ -99,7 +101,7 @@
 								</view>
 								<view class="pro-date ">{{item.soeTime}}</view>
 							</view>
-							
+
 							<view class="action" style="z-index:99;width:180rpx;text-align:right">
 								<view class="processed" v-if="item.handling_status==1"
 									@tap="type==1?goProcessedDetail(item):goVideoProcessedDetail(item)">
@@ -122,14 +124,16 @@
 							</view>
 						</view>
 						<view class="text-center margin-top" v-if="alarmUntreatedCount1 == 0">暂无数据...</view>
-						<view v-show="isLoadMore&&alarmUntreatedCount1 != 0&&this.currentPage>1"  :style="{'padding-top':this.handleStatus==2 ? '50rpx':'','padding-bottom':this.handleStatus==2 ? '180rpx':''}" >
+						<view v-show="isLoadMore&&alarmUntreatedCount1 != 0&&this.currentPage>1"
+							:style="{'padding-top':this.handleStatus==2 ? '50rpx':'','padding-bottom':this.handleStatus==2 ? '180rpx':''}">
 							<uni-load-more :status="loadStatus"></uni-load-more>
 						</view>
-						
+
 					</view>
 
 					<view v-if="this.handleStatus==2" class="btn-area submitBottomBtn padding-lr-sm">
-						<button class="bg-blue round  margin-top" @click="$noMultipleClicks(quickConfirm)">快速确认 </button>
+						<button class="bg-blue round  margin-top" @click="$noMultipleClicks(quickConfirm)">快速确认
+						</button>
 					</view>
 
 				</checkbox-group>
@@ -146,7 +150,7 @@
 	export default {
 		data() {
 			return {
-				noClick:true,
+				noClick: true,
 				allChecked: false,
 
 				checkbox: [{
@@ -175,7 +179,7 @@
 				alarmUntreatedCount: '',
 				alarmUntreatedCount1: '',
 				processingStatus: 0,
-				
+
 				currentPage: 1,
 				size: 10,
 				loadStatus: 'loading', //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
@@ -185,13 +189,13 @@
 		watch: {
 			handleStatus(val) {
 				console.log('下拉框切换')
-				this.currentPage=1;
-				this.porcessedList=[]
+				this.currentPage = 1;
+				this.porcessedList = []
 				// this.porcessedList={};
-				if(val==0){
-					val='1,2,3,4'
+				if (val == 0) {
+					val = '1,2,3,4'
 				}
-				this.processingStatus=val
+				this.processingStatus = val
 				console.log(this.processingStatus)
 				this.getProcessData({
 					"companyCode": this.companyCode,
@@ -199,32 +203,31 @@
 					"processingStatus": val,
 					"currentPage": this.currentPage,
 					"size": this.size,
-					
+
 				}, this.TabCur);
 
 			}
 		},
-		computed: {
-		},
+		computed: {},
 		onReachBottom() { //上拉触底函数
 			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
 				this.isLoadMore = true
 				this.currentPage += 1;
-				
+
 				this.getProcessData({
 					"companyCode": this.companyCode,
 					"type": this.type,
 					"processingStatus": this.processingStatus,
 					"currentPage": this.currentPage,
 					"size": this.size,
-				},  this.TabCur);
+				}, this.TabCur);
 
 			}
 		},
 
 		onLoad: function(option) {
-			this.type=option.type;
-			this.companyCode=option.companyCode;
+			this.type = option.type;
+			this.companyCode = option.companyCode;
 
 			console.log(option.type);
 			console.log(option.companyCode);
@@ -237,16 +240,16 @@
 					title: '视频告警'
 				});
 			}
-			
+
 			this.loadData()
-		
 
-			
-		
+
+
+
 		},
 		methods: {
-			loadData(){
-				
+			loadData() {
+
 				this.getProcessData({
 					"companyCode": this.companyCode,
 					"type": this.type,
@@ -255,8 +258,8 @@
 					"size": this.size,
 				}, this.TabCur);
 			},
-			
-			quickConfirm(){
+
+			quickConfirm() {
 				if (!this.checkedArr.length) {
 					uni.showToast({
 						title: "请至少选择一条需要确认的数据",
@@ -264,18 +267,18 @@
 					});
 					return
 				}
-				
+
 				console.log(this.checkedArr)
-				
+
 				this.quickConfirmRes({
 					"id": this.checkedArr.toString(),
 					"companyCode": this.companyCode,
-					
+
 				})
-				
-				
+
+
 			},
-			
+
 			// 请求
 			async quickConfirmRes(ming = {}) {
 				const res = await this.$myRequest({
@@ -327,7 +330,7 @@
 					this.allChecked = false;
 				}
 			},
-		
+
 			async getProcessData(ming = {}, whichTab) {
 				console.log('请求接口')
 				const res = await this.$myRequest({
@@ -355,41 +358,41 @@
 						this.porcessedList = this.porcessedList.concat(res.data.data);
 						this.alarmUntreatedCount1 = parseInt(res.data.alarmUntreatedCount)
 						console.log(this.alarmUntreatedCount1)
-					}			
+					}
 					if (res.data.data.length < this.size) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
-			
+
 						this.isLoadMore = true
 						this.loadStatus = 'nomore'
 					} else {
-					
+
 						this.isLoadMore = false
-					
+
 					}
 				} else {
-					
+
 					this.isLoadMore = true
 					this.loadStatus = 'nomore'
 				}
-				
-				
-			
-					
-				
+
+
+
+
+
 			},
 
-			tabSelect(e) {   //已处理未处理切换
+			tabSelect(e) { //已处理未处理切换
 				console.log('已处理未处理切换')
-				this.currentPage=1;
-				this.porcessedList=[];
-				this.unporcessList=[];
-				
+				this.currentPage = 1;
+				this.porcessedList = [];
+				this.unporcessList = [];
+
 				console.log(e.currentTarget);
 				this.TabCur = e.currentTarget.dataset.id;
 				this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60;
 				// this.handleStatus=0;
-				
-				this.processingStatus=!e.currentTarget.dataset.id ? e.currentTarget.dataset.id : '1,2,3,4',
-				console.log(this.processingStatus)
+
+				this.processingStatus = !e.currentTarget.dataset.id ? e.currentTarget.dataset.id : '1,2,3,4',
+					console.log(this.processingStatus)
 				this.loadData()
 			},
 
@@ -407,15 +410,15 @@
 						'&id=' + item.id + '&type=1',
 				});
 			},
-			
-						goVideoUnprocessDetail(item) {
+
+			goVideoUnprocessDetail(item) {
 				uni.navigateTo({
 					url: '/pages/processDetailVideo/processDetailVideo?companyCode=' + this.companyCode +
 						'&id=' + item.id +
 						'&type=2',
 				});
 			},
-			
+
 
 			goVideoProcessedDetail(item) {
 				uni.navigateTo({

pages/processedDetail1/processedDetail1.vue

@@ -131,9 +131,6 @@
 			<!-- 处理状态end -->
 		</view>
 	</view>
-
-
-	</view>
 </template>
 
 <script>

pages/setting/setting.vue

@@ -1,175 +1,190 @@
 <template>
-	<view class="setting-wrapper">
-		<view class="top-banner justify-center align-center text-center">
-			<view>
-				<image width="130" src="../../static/personal-head.png"></image>
-				<view class="userName">admin</view>
-				<view>伍继智慧用电</view>
-			</view>
-		</view>
-		<view class="cu-list menu-avatar">
-			<view class="cu-item" @tap="goMessagePush()">
-				<view class="cu-avatar " style="background-image:url(../../static/setting-icon1.png)"></view>
-				<view class="content">
-					<view class="">消息推送设置</view>
-				</view>
-				<view class="nav-right">
-					<view class="text-grey">
-						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
-					</view>
-				</view>
-			</view>
-			
-			<view class="cu-item" @tap="goSiteArchive()">
-				<view class="cu-avatar " style="background-image:url(../../static/settingIconDa.png)"></view>
-				<view class="content">
-					<view class="">现场档案</view>
-				</view>
-				<view class="nav-right">
-					<view class="text-grey">
-						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
-					</view>
-				</view>
-			</view>
-			
-			<view class="cu-item" @tap="goSiteManage" v-if="permissionLabel==1">
-				<view class="cu-avatar " style="background-image:url(../../static/setting-icon2.png)"></view>
-				<view class="content">
-					<view class="">站点管理</view>
-				</view>
-				<view class="nav-right">
-					<view class="text-grey">
-						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
-					</view>
-				</view>
-			</view>
-			<view class="cu-item" @tap="goAuthManage" v-if="permissionLabel==1">
-				<view class="cu-avatar " style="background-image:url(../../static/setting-icon4.png)"></view>
-				<view class="content">
-					<view class="">权限管理</view>
-				</view>
-				<view class="nav-right">
-					<view class="text-grey">
-						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
-					</view>
-				</view>
-			</view>
-		</view>
-		
-	</view>
+  <view class="setting-wrapper">
+    <view class="top-banner justify-center align-center text-center">
+      <view>
+        <image width="130" src="../../static/personal-head.png"></image>
+        <view class="userName">admin</view>
+        <view>伍继智慧用电</view>
+      </view>
+    </view>
+    <view class="cu-list menu-avatar">
+      <view class="cu-item" @tap="goMessagePush()">
+        <view
+          class="cu-avatar"
+          style="background-image: url(../../static/setting-icon1.png)"
+        ></view>
+        <view class="content">
+          <view class="">消息推送设置</view>
+        </view>
+        <view class="nav-right">
+          <view class="text-grey">
+            <text class="icon iconfont margin-right-xs margin-left-lg"
+              >&#xe629;</text
+            >
+          </view>
+        </view>
+      </view>
+
+      <view class="cu-item" @tap="goSiteArchive()" v-if="permissionLabel != 4">
+        <view
+          class="cu-avatar"
+          style="background-image: url(../../static/settingIconDa.png)"
+        ></view>
+        <view class="content">
+          <view class="">现场档案</view>
+        </view>
+        <view class="nav-right">
+          <view class="text-grey">
+            <text class="icon iconfont margin-right-xs margin-left-lg"
+              >&#xe629;</text
+            >
+          </view>
+        </view>
+      </view>
+
+      <view class="cu-item" @tap="goSiteManage" v-if="permissionLabel == 1">
+        <view
+          class="cu-avatar"
+          style="background-image: url(../../static/setting-icon2.png)"
+        ></view>
+        <view class="content">
+          <view class="">站点管理</view>
+        </view>
+        <view class="nav-right">
+          <view class="text-grey">
+            <text class="icon iconfont margin-right-xs margin-left-lg"
+              >&#xe629;</text
+            >
+          </view>
+        </view>
+      </view>
+      <view class="cu-item" @tap="goAuthManage" v-if="permissionLabel == 1">
+        <view
+          class="cu-avatar"
+          style="background-image: url(../../static/setting-icon4.png)"
+        ></view>
+        <view class="content">
+          <view class="">权限管理</view>
+        </view>
+        <view class="nav-right">
+          <view class="text-grey">
+            <text class="icon iconfont margin-right-xs margin-left-lg"
+              >&#xe629;</text
+            >
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				permissionLabel:0
-			}
-		},
-		onLoad() {
-			this.getAuthorization()
-		},
-		methods: {
-			
-			async getAuthorization(params) {
-				const res = await this.$myRequest({
-					url: 'Com/getAuthorization',
-					showLoading: true,
-					data: params
-				})
-			
-				console.log(res.data.permissionLabel)
-				 this.permissionLabel = res.data.permissionLabel
-			},
-			
-			goSiteArchive() {
-				uni.navigateTo({
-					url: '/pages/siteArchive/siteArchive',
-			
-				});
-			},
-			
-			
-			goSiteManage() {
-				uni.navigateTo({
-					url: '/pages/siteManage/siteManage?type=1',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			goDeviceManage() {
-				uni.navigateTo({
-					url: '/pages/siteManage/siteManage?type=2',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			goAuthManage() {
-				uni.navigateTo({
-					url: '/pages/authManage/authManage',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			goMessagePush() {
-				// uni.showModal({
-				// 	title: 'Tips',
-				// 	content: '此模块开发中~',
-				// 	showCancel: false,
-				// 	success: function(res) {
-				// 		if (res.confirm) {
-				// 		} else if (res.cancel) {
-				// 		}
-				// 	}
-				// });
-				uni.navigateTo({
-					url: '/pages/messagePush/messagePush',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
+export default {
+  data() {
+    return {
+      permissionLabel: 0,
+    };
+  },
+  onLoad() {
+    this.getAuthorization();
+  },
+  methods: {
+    async getAuthorization(params) {
+      const res = await this.$myRequest({
+        url: "Com/getAuthorization",
+        showLoading: true,
+        data: params,
+      });
+
+      console.log(res.data.permissionLabel);
+      this.permissionLabel = res.data.permissionLabel;
+    },
 
-		}
-	}
+    goSiteArchive() {
+      uni.navigateTo({
+        url: "/pages/siteArchive/siteArchive",
+      });
+    },
+
+    goSiteManage() {
+      uni.navigateTo({
+        url: "/pages/siteManage/siteManage?type=1",
+        success: (res) => {},
+        fail: () => {},
+        complete: () => {},
+      });
+    },
+    goDeviceManage() {
+      uni.navigateTo({
+        url: "/pages/siteManage/siteManage?type=2",
+        success: (res) => {},
+        fail: () => {},
+        complete: () => {},
+      });
+    },
+    goAuthManage() {
+      uni.navigateTo({
+        url: "/pages/authManage/authManage",
+        success: (res) => {},
+        fail: () => {},
+        complete: () => {},
+      });
+    },
+    goMessagePush() {
+      // uni.showModal({
+      // 	title: 'Tips',
+      // 	content: '此模块开发中~',
+      // 	showCancel: false,
+      // 	success: function(res) {
+      // 		if (res.confirm) {
+      // 		} else if (res.cancel) {
+      // 		}
+      // 	}
+      // });
+      uni.navigateTo({
+        url: "/pages/messagePush/messagePush",
+        success: (res) => {},
+        fail: () => {},
+        complete: () => {},
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss">
-	.setting-wrapper {
-		.top-banner {
-			width: 100%;
-			height: 380rpx;
-			background: url(../../static/setting-bg.png) no-repeat;
-			background-size:cover;
-			color: #fff;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			image {
-				width: 130rpx;
-				height: 130rpx;
-			}
-			.userName {
-				margin-top: 30rpx;
-				margin-bottom: 10rpx;
-			}
-		}
-		.cu-avatar {
-			width:40rpx;height:40rpx;
-			background-color:#fff;
-		}
-		.cu-list.menu-avatar>.cu-item {
-			height:120rpx;
-			.content{
-				left:70rpx;
-			}
-			.nav-right{
-				margin-right:10rpx;
-			}
-		}
-
-	}
+.setting-wrapper {
+  .top-banner {
+    width: 100%;
+    height: 380rpx;
+    background: url(../../static/setting-bg.png) no-repeat;
+    background-size: cover;
+    color: #fff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    image {
+      width: 130rpx;
+      height: 130rpx;
+    }
+    .userName {
+      margin-top: 30rpx;
+      margin-bottom: 10rpx;
+    }
+  }
+  .cu-avatar {
+    width: 40rpx;
+    height: 40rpx;
+    background-color: #fff;
+  }
+  .cu-list.menu-avatar > .cu-item {
+    height: 120rpx;
+    .content {
+      left: 70rpx;
+    }
+    .nav-right {
+      margin-right: 10rpx;
+    }
+  }
+}
 </style>

pages/siteAdd/siteAdd.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="appWrapper">
-		
+
 		<!-- 站点新增start -->
 		<form action="" @submit="formSubmit" v-if="!id">
 			<view class="form-item margin-top">
@@ -8,51 +8,51 @@
 					<text class="necessary">*</text>
 					站点名称:
 				</view>
-				<input name="userName" v-model="siteName" maxlength="15" ></input>
+				<input name="userName" v-model="siteName" maxlength="15"/>
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>地址:</view>
-				<input name="input" v-model="address"></input>
+				<input name="input" v-model="address"/>
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>经度:</view>
-				<input name="input" v-model="longitude"></input>
+				<input name="input" v-model="longitude"/>
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>纬度:</view>
-				<input name="input" v-model="latitude"></input>
+				<input name="input" v-model="latitude"/>
 			</view>
 			<view class="form-item">
 				<view class="title"></view>
-				<button class=" cu-btn " style="padding:10rpx 20rpx"  @click="getLocation()">
+				<button class=" cu-btn " style="padding:10rpx 20rpx" @click="getLocation()">
 					<image src="../../static/nav-icon.png" style="width:25rpx;height:25rpx;margin-right:26rpx"></image>
 					获取当前经纬度
 				</button>
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>联系人:</view>
-				<input name="input" v-model="userName"></input>
+				<input name="input" v-model="userName"/>
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>手机号码:</view>
-				<input name="input" v-model="phone"></input>
+				<input name="input" v-model="phone"/>
 			</view>
-			
+
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>联系人2:</view>
-				<input name="input" v-model="spare_user_name"></input>
+				<input name="input" v-model="spare_user_name"/>
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>手机号码2:</view>
-				<input name="input" v-model="spare_phone"></input>
+				<input name="input" v-model="spare_phone"/>
 			</view>
-			
-			
+
+
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>所属新线:</view>
 				<select name="" id="" filterable clearable v-model="router_id">
 					<option value="0">请选择</option>
-					<option :value=item.id v-for="item in routeListData">{{ item.route_name}}</option>
+					<option :value=item.id v-for="(item,index) in routeListData" :key="index">{{ item.route_name}}</option>
 				</select>
 			</view>
 			<view class="form-item">
@@ -63,23 +63,23 @@
 					<option value="2">嘉定</option>
 				</select>
 			</view>
-			
-			<view class="form-item">
+
+			<!-- <view class="form-item">
 				<view class="title"><text class="necessary">*</text>装机容量:</view>
-				<input name="input" v-model="installed_capacity"></input>
+				<input name="input" v-model="installed_capacity"/>
 			</view>
 			<view class="form-item" style="padding-bottom:200rpx">
 				<view class="title"><text class="necessary">*</text>流变变化:</view>
-				<input name="input" v-model="rheological_change"></input>
-			</view>
-			
+				<input name="input" v-model="rheological_change"/>
+			</view> -->
+
 
 			<view class="btn-area submitBottomBtn padding-lr-sm">
 				<button class="bg-blue round  margin-top" @click="$noMultipleClicks(addSubmit)">提 交 </button>
 			</view>
 		</form>
 		<!-- 站点新增end -->
-		
+
 		<!-- 站点修改start -->
 		<form action="" @submit="formSubmit" v-else>
 			<view class="form-item margin-top">
@@ -87,42 +87,42 @@
 					<text class="necessary">*</text>
 					站点名称:
 				</view>
-				<input name="userName" v-model="siteMessage.siteName"></input>
+				<input name="userName" v-model="siteMessage.siteName"/>
 			</view>
 			<view class="form-item">
 				<view class="title">地址:</view>
-				<input name="input" v-model="siteMessage.address"></input>
+				<input name="input" v-model="siteMessage.address"/>
 			</view>
 			<view class="form-item">
 				<view class="title">经度:</view>
-				<input name="input" v-model="siteMessage.longitude"></input>
+				<input name="input" v-model="siteMessage.longitude"/>
 			</view>
 			<view class="form-item">
 				<view class="title">纬度:</view>
-				<input name="input" v-model="siteMessage.latitude"></input>
+				<input name="input" v-model="siteMessage.latitude"/>
 			</view>
 			<view class="form-item">
 				<view class="title"></view>
-				<button class=" cu-btn " style="padding:10rpx 20rpx"  @click="getLocation2()">
+				<button class=" cu-btn " style="padding:10rpx 20rpx" @click="getLocation2()">
 					<image src="../../static/nav-icon.png" style="width:25rpx;height:25rpx;margin-right:26rpx"></image>
 					获取当前经纬度
 				</button>
 			</view>
 			<view class="form-item">
 				<view class="title">联系人:</view>
-				<input name="input" v-model="siteMessage.userName"></input>
+				<input name="input" v-model="siteMessage.userName"/>
 			</view>
 			<view class="form-item">
 				<view class="title">手机号码:</view>
-				<input name="input" v-model="siteMessage.phone"></input>
+				<input name="input" v-model="siteMessage.phone"/>
 			</view>
 			<view class="form-item">
 				<view class="title">联系人2:</view>
-				<input name="input" v-model="siteMessage.spare_user_name"></input>
+				<input name="input" v-model="siteMessage.spare_user_name"/>
 			</view>
 			<view class="form-item">
 				<view class="title">手机号码2:</view>
-				<input name="input" v-model="siteMessage.spare_phone"></input>
+				<input name="input" v-model="siteMessage.spare_phone"/>
 			</view>
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>所属线区域:</view>
@@ -136,18 +136,18 @@
 				<view class="title"><text class="necessary">*</text>所属新线:</view>
 				<select name="" id=" " v-model="siteMessage.route_id">
 					<option value="0">请选择</option>
-					<option :value=item.id v-for="item in routeListData">{{ item.route_name}}</option>
+					<option :value=item.id v-for="(item,index) in routeListData" :key="index">{{ item.route_name}}</option>
 				</select>
 
 			</view>
-			<view class="form-item">
+			<!-- <view class="form-item">
 				<view class="title"><text class="necessary">*</text>装机容量:</view>
-				<input name="input" v-model="siteMessage.installed_capacity"></input>
+				<input name="input" v-model="siteMessage.installed_capacity"/>
 			</view>
 			<view class="form-item" style="padding-bottom:200rpx">
 				<view class="title"><text class="necessary">*</text>流变变化:</view>
-				<input name="input" v-model="siteMessage.rheological_change"></input>
-			</view>
+				<input name="input" v-model="siteMessage.rheological_change"/>
+			</view> -->
 			<view class="btn-area submitBottomBtn padding-lr-sm">
 				<button class="bg-blue round  margin-top" @click="$noMultipleClicks(editSubmit)">提 交 </button>
 			</view>
@@ -158,351 +158,345 @@
 
 <script>
 	//引入js sdk的封装
-	import * as jwx from '../../util/jssdk.js'
-	
+	import * as jwx from "../../util/jssdk.js";
+
 	export default {
 		data() {
 			return {
-				noClick:true,
-				
+				noClick: true,
+
 				id: 0,
 				latitude: "",
 				siteName: "",
 				userName: "",
 				phone: "",
-				spare_user_name:"",
-				spare_phone:"",
+				spare_user_name: "",
+				spare_phone: "",
 				address: "",
 				longitude: "",
-				siteMessage:{},
-				
-				region:0,
-				router_id:0,
-				routeListData:[],
-				installed_capacity:'',
-				rheological_change:''
-			}
+				siteMessage: {},
+
+				region: 0,
+				router_id: 0,
+				routeListData: [],
+				installed_capacity: "",
+				rheological_change: "",
+			};
 		},
-		
+
 		onLoad: function(option) {
-			this.id=option.id
+			this.id = option.id;
 			if (option.id) {
 				uni.setNavigationBarTitle({
-					title: '站点修改'
+					title: "站点修改",
+				});
+				this.getSiteList({
+					id: option.id
 				});
-				this.getSiteList({"id":option.id})
 			} else {
 				uni.setNavigationBarTitle({
-					title: '站点新增'
+					title: "站点新增",
 				});
 			}
-			
-			this.getRoutrBox()
-			 
+
+			this.getRoutrBox();
 		},
 
 		methods: {
-			
+
 			//新线名称下拉数据请求
 			async getRoutrBox(params = {}) {
 				const res = await this.$myRequest({
-					url: 'Archives/getRoutrBox',
+					url: "Archives/getRoutrBox",
 					showLoading: true,
-					data: params
-				})
+					data: params,
+				});
 				this.routeListData = res.data.data;
-				console.log(this.routeListData)
+				console.log(this.routeListData);
 			},
 			//新增
-			getLocation(){
+			getLocation() {
 				// 将this赋值给that
-				let that = this
+				let that = this;
 				// 微信公众号获取位置
-				jwx.configWeiXin(jweixin => {
+				jwx.configWeiXin((jweixin) => {
 					wx.getLocation({
-					  type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
-					  success: function (res) {
-						that.longitude=res.longitude
-						that.latitude=res.latitude
-					  }
+						type: "gcj02", // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
+						success: function(res) {
+							that.longitude = res.longitude;
+							that.latitude = res.latitude;
+						},
 					});
 				});
 			},
 			//修改
-			getLocation2(){
+			getLocation2() {
 				// 将this赋值给that
-				let that = this
+				let that = this;
 				// 微信公众号获取位置
-				jwx.configWeiXin(jweixin => {
+				jwx.configWeiXin((jweixin) => {
 					wx.getLocation({
-					  type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
-					  success: function (res) {
-						that.siteMessage.longitude=res.longitude
-						that.siteMessage.latitude=res.latitude
-					  }
+						type: "gcj02", // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
+						success: function(res) {
+							that.siteMessage.longitude = res.longitude;
+							that.siteMessage.latitude = res.latitude;
+						},
 					});
 				});
 			},
-			
-			
 
 			//新增验证并提交
 			addSubmit() {
-				if (!this.siteName.replace(/^\s*/g,'')) {
+				if (!this.siteName.replace(/^\s*/g, "")) {
 					uni.showToast({
 						title: "请输入站点名称...",
-						icon: "none"
+						icon: "none",
 					});
-					return
+					return;
 				}
-				if (!this.address.replace(/^\s*/g,'')) {
+				if (!this.address.replace(/^\s*/g, "")) {
 					uni.showToast({
 						title: "请输入地址...",
-						icon: "none"
+						icon: "none",
 					});
-					return
+					return;
 				}
 				if (!this.longitude) {
 					uni.showToast({
 						title: "请输入经度...",
-						icon: "none"
+						icon: "none",
 					});
-					return
+					return;
 				}
 				if (!this.latitude) {
 					uni.showToast({
 						title: "请输入纬度...",
-						icon: "none"
+						icon: "none",
 					});
-					return
+					return;
 				}
-				if (!this.userName.replace(/^\s*/g,'')) {
+				if (!this.userName.replace(/^\s*/g, "")) {
 					uni.showToast({
 						title: "请输入联系人...",
-						icon: "none"
+						icon: "none",
 					});
-					return
+					return;
 				}
-				if (!this.phone.replace(/^\s*/g,'')) {
+				if (!this.phone.replace(/^\s*/g, "")) {
 					uni.showToast({
 						title: "请输入手机号码...",
-						icon: "none"
+						icon: "none",
 					});
-					return
+					return;
 				}
-				
-				if (!/^1[3456789]\d{9}$/.test(this.phone)){
+
+				if (!/^1[3456789]\d{9}$/.test(this.phone)) {
 					uni.showToast({
 						title: "请输入正确的手机号码...",
-						icon:"none"
-					});
-					return
-				 }
-				 
-				 
-				 if (!this.spare_user_name.replace(/^\s*/g,'')) {
-				 	uni.showToast({
-				 		title: "请输入联系人2...",
-				 		icon: "none"
-				 	});
-				 	return
-				 }
-				 if (!this.spare_phone.replace(/^\s*/g,'')) {
-				 	uni.showToast({
-				 		title: "请输入手机号码2...",
-				 		icon: "none"
-				 	});
-				 	return
-				 }
-				 
-				 if (!/^1[3456789]\d{9}$/.test(this.spare_phone)){
-				 	uni.showToast({
-				 		title: "请输入正确的手机号码2...",
-				 		icon:"none"
-				 	});
-				 	return
-				  }
-				  
-				 
-				 
-				 
-				 if (!this.router_id) {
-				 	uni.showToast({
-				 		title: "请选择所属新线...",
-				 		icon: "none"
-				 	});
-				 	return
-				 }
-				 if (!this.region) {
-				 	uni.showToast({
-				 		title: "请选择所属区域...",
-				 		icon: "none"
-				 	});
-				 	return
-				 }
-				 if (!this.installed_capacity.replace(/^\s*/g,'')) {
-				 	uni.showToast({
-				 		title: "请输入装机容量...",
-				 		icon: "none"
-				 	});
-				 	return
-				 }
-				 if (!this.rheological_change.replace(/^\s*/g,'')) {
-				 	uni.showToast({
-				 		title: "请输入流变变化...",
-				 		icon: "none"
-				 	});
-				 	return
-				 }
+						icon: "none",
+					});
+					return;
+				}
+
+				if (!this.spare_user_name.replace(/^\s*/g, "")) {
+					uni.showToast({
+						title: "请输入联系人2...",
+						icon: "none",
+					});
+					return;
+				}
+				if (!this.spare_phone.replace(/^\s*/g, "")) {
+					uni.showToast({
+						title: "请输入手机号码2...",
+						icon: "none",
+					});
+					return;
+				}
+
+				if (!/^1[3456789]\d{9}$/.test(this.spare_phone)) {
+					uni.showToast({
+						title: "请输入正确的手机号码2...",
+						icon: "none",
+					});
+					return;
+				}
+
+				if (!this.router_id) {
+					uni.showToast({
+						title: "请选择所属新线...",
+						icon: "none",
+					});
+					return;
+				}
+				if (!this.region) {
+					uni.showToast({
+						title: "请选择所属区域...",
+						icon: "none",
+					});
+					return;
+				}
+				if (!this.installed_capacity.replace(/^\s*/g, "")) {
+					uni.showToast({
+						title: "请输入装机容量...",
+						icon: "none",
+					});
+					return;
+				}
+				if (!this.rheological_change.replace(/^\s*/g, "")) {
+					uni.showToast({
+						title: "请输入流变变化...",
+						icon: "none",
+					});
+					return;
+				}
 				this.getAddSite({
-					"siteName": this.siteName,
-					"userName": this.userName,
-					"phone": this.phone,
-					
-					"spare_user_name": this.spare_user_name,
-					"spare_phone": this.spare_phone,
-					
-					"address": this.address,
-					"longitude": this.longitude,
-					"latitude": this.latitude,
-					"route_id":this.router_id,
-					"region":this.region,
-					"installed_capacity":this.installed_capacity,
-					"rheological_change":this.rheological_change
-				})
+					siteName: this.siteName,
+					userName: this.userName,
+					phone: this.phone,
+
+					spare_user_name: this.spare_user_name,
+					spare_phone: this.spare_phone,
+
+					address: this.address,
+					longitude: this.longitude,
+					latitude: this.latitude,
+					route_id: this.router_id,
+					region: this.region,
+					installed_capacity: this.installed_capacity,
+					rheological_change: this.rheological_change,
+				});
 			},
-			
+
 			//编辑验证并提交
 			editSubmit() {
-				if (!this.siteMessage.siteName.replace(/^\s*/g,'')) {
+				if (!this.siteMessage.siteName.replace(/^\s*/g, "")) {
 					uni.showToast({
 						title: "请填写站点名称...",
-						icon: "none"
+						icon: "none",
 					});
-					return
+					return;
 				}
-				if (!this.siteMessage.address.replace(/^\s*/g,'')) {
+				if (!this.siteMessage.address.replace(/^\s*/g, "")) {
 					uni.showToast({
 						title: "请输入地址...",
-						icon: "none"
+						icon: "none",
 					});
-					return
+					return;
 				}
 				if (!this.siteMessage.longitude) {
 					uni.showToast({
 						title: "请输入经度...",
-						icon: "none"
+						icon: "none",
 					});
-					return
+					return;
 				}
 				if (!this.siteMessage.latitude) {
 					uni.showToast({
 						title: "请输入纬度...",
-						icon: "none"
+						icon: "none",
 					});
-					return
+					return;
 				}
-				if (!this.siteMessage.userName.replace(/^\s*/g,'')) {
+				if (!this.siteMessage.userName.replace(/^\s*/g, "")) {
 					uni.showToast({
 						title: "请输入联系人...",
-						icon: "none"
+						icon: "none",
 					});
-					return
+					return;
 				}
-				if (!this.siteMessage.phone.replace(/^\s*/g,'')) {
+				if (!this.siteMessage.phone.replace(/^\s*/g, "")) {
 					uni.showToast({
 						title: "请输入手机号码...",
-						icon: "none"
+						icon: "none",
 					});
-					return
+					return;
 				}
-				if (!/^1[3456789]\d{9}$/.test(this.siteMessage.phone)){
+				if (!/^1[3456789]\d{9}$/.test(this.siteMessage.phone)) {
 					uni.showToast({
 						title: "请输入正确的手机号码...",
-						icon:"none"
+						icon: "none",
 					});
-					return
-				 }
+					return;
+				}
 				if (!this.siteMessage.spare_user_name) {
 					uni.showToast({
 						title: "请输入联系人2...",
-						icon: "none"
+						icon: "none",
 					});
-					return
+					return;
 				}
 				if (!this.siteMessage.spare_phone) {
 					uni.showToast({
 						title: "请输入手机号码2...",
-						icon: "none"
+						icon: "none",
 					});
-					return
+					return;
 				}
-				
-				if (!/^1[3456789]\d{9}$/.test(this.siteMessage.spare_phone)){
+
+				if (!/^1[3456789]\d{9}$/.test(this.siteMessage.spare_phone)) {
 					uni.showToast({
 						title: "请输入正确的手机号码2...",
-						icon:"none"
-					});
-					return
-				 }
-				 if (!this.siteMessage.route_id) {
-				 	uni.showToast({
-				 		title: "请选择所属新线...",
-				 		icon: "none"
-				 	});
-				 	return
-				 }
-				 if (!this.siteMessage.region) {
-				 	uni.showToast({
-				 		title: "请选择所属区域...",
-				 		icon: "none"
-				 	});
-				 	return
-				 }
-				 if (!this.siteMessage.installed_capacity) {
-				 	uni.showToast({
-				 		title: "请输入装机容量...",
-				 		icon: "none"
-				 	});
-				 	return
-				 }
-				 if (!this.siteMessage.rheological_change) {
-				 	uni.showToast({
-				 		title: "请输入流变变化...",
-				 		icon: "none"
-				 	});
-				 	return
-				 }
+						icon: "none",
+					});
+					return;
+				}
+				if (!this.siteMessage.route_id) {
+					uni.showToast({
+						title: "请选择所属新线...",
+						icon: "none",
+					});
+					return;
+				}
+				if (!this.siteMessage.region) {
+					uni.showToast({
+						title: "请选择所属区域...",
+						icon: "none",
+					});
+					return;
+				}
+				if (!this.siteMessage.installed_capacity) {
+					uni.showToast({
+						title: "请输入装机容量...",
+						icon: "none",
+					});
+					return;
+				}
+				if (!this.siteMessage.rheological_change) {
+					uni.showToast({
+						title: "请输入流变变化...",
+						icon: "none",
+					});
+					return;
+				}
 				this.setEditSite({
-					"id":this.id,
-					"siteName": this.siteMessage.siteName,
-					"userName": this.siteMessage.userName,
-					"phone": this.siteMessage.phone,
-					
-					"spare_user_name": this.siteMessage.spare_user_name,
-					"spare_phone": this.siteMessage.spare_phone,
-					
-					
-					"address": this.siteMessage.address,
-					"longitude": this.siteMessage.longitude,
-					"latitude": this.siteMessage.latitude,
-					"route_id":this.siteMessage.route_id,
-					"region":this.siteMessage.region,
-					"installed_capacity":this.siteMessage.installed_capacity,
-					"rheological_change":this.siteMessage.rheological_change
-				})
+					id: this.id,
+					siteName: this.siteMessage.siteName,
+					userName: this.siteMessage.userName,
+					phone: this.siteMessage.phone,
+
+					spare_user_name: this.siteMessage.spare_user_name,
+					spare_phone: this.siteMessage.spare_phone,
+
+					address: this.siteMessage.address,
+					longitude: this.siteMessage.longitude,
+					latitude: this.siteMessage.latitude,
+					route_id: this.siteMessage.route_id,
+					region: this.siteMessage.region,
+					installed_capacity: this.siteMessage.installed_capacity,
+					rheological_change: this.siteMessage.rheological_change,
+				});
 			},
-			
+
 			// 新增请求
 			async getAddSite(ming = {}) {
 				const res = await this.$myRequest({
-					url: 'SiteManagement/setAddSite',
-					data: ming
-				})
+					url: "SiteManagement/setAddSite",
+					data: ming,
+				});
 				if (!res.data.flag) {
 					uni.showToast({
 						title: "添加失败",
-						icon: "none"
+						icon: "none",
 					});
 				} else {
 					uni.showToast({
@@ -511,40 +505,37 @@
 				}
 				setTimeout(() => {
 					uni.redirectTo({
-						url: '/pages/siteManage/siteManage',
+						url: "/pages/siteManage/siteManage",
 					});
 				}, 1000);
-
 			},
-			
+
 			// 修改回显请求
 			async getSiteList(ming = {}) {
 				const res = await this.$myRequest({
-					url: 'SiteManagement/getSiteList',
+					url: "SiteManagement/getSiteList",
 					showLoading: true,
-					data: ming
-				})
-				this.siteMessage=res.data.data[0];
-				if(!this.siteMessage.spare_user_name){
-					this.siteMessage.spare_user_name='暂无显示'
+					data: ming,
+				});
+				this.siteMessage = res.data.data[0];
+				if (!this.siteMessage.spare_user_name) {
+					this.siteMessage.spare_user_name = "暂无显示";
 				}
-				if(!this.siteMessage.spare_phone){
-					this.siteMessage.spare_phone='暂无显示'
+				if (!this.siteMessage.spare_phone) {
+					this.siteMessage.spare_phone = "暂无显示";
 				}
-				
 			},
-			
-			
+
 			// 编辑请求
 			async setEditSite(ming = {}) {
 				const res = await this.$myRequest({
-					url: 'SiteManagement/setEditSite',
-					data: ming
-				})
+					url: "SiteManagement/setEditSite",
+					data: ming,
+				});
 				if (!res.data.flag) {
 					uni.showToast({
 						title: "编辑失败",
-						icon: "none"
+						icon: "none",
 					});
 				} else {
 					uni.showToast({
@@ -553,13 +544,12 @@
 				}
 				setTimeout(() => {
 					uni.redirectTo({
-						url: '/pages/siteManage/siteManage',
+						url: "/pages/siteManage/siteManage",
 					});
 				}, 1000);
 			},
-
-		}
-	}
+		},
+	};
 </script>
 
 
@@ -568,7 +558,6 @@
 <style lang="scss">
 	.cu-form-group {
 		border-top: 0;
-
 	}
 
 	input,
@@ -577,7 +566,7 @@
 		line-height: 70rpx;
 		padding: 0 20rpx;
 		height: 70rpx;
-		border: 1px solid #EDEDED;
+		border: 1px solid #ededed;
 		// width:500rpx!important;
 		background-color: #fff;
 		box-sizing: border-box;
@@ -585,8 +574,6 @@
 		-moz-appearance: none;
 		-webkit-appearance: none;
 		color: #999;
-
-
 	}
 
 	select:focus,
@@ -602,7 +589,7 @@
 
 	.form-item label text {
 		position: relative;
-		top: 2rpx
+		top: 2rpx;
 	}
 
 	.form-item {
@@ -611,7 +598,6 @@
 		align-items: top;
 		margin-bottom: 20rpx;
 
-
 		.title {
 			width: 170rpx;
 			position: relative;
@@ -623,7 +609,6 @@
 				top: -2rpx;
 				left: -20rpx;
 				font-size: 40rpx;
-
 			}
 		}
 
@@ -632,14 +617,8 @@
 			width: 500rpx;
 			font-size: 28rpx;
 		}
-
-
 	}
 
-
-
-
-
 	/* 站点多选下拉样式 start */
 
 	.layui-btn {
@@ -705,7 +684,7 @@
 		width: 100%;
 		top: 40px;
 		background: #fff;
-		z-index: 1000
+		z-index: 1000;
 	}
 
 	.selectId dl dd {
@@ -714,7 +693,7 @@
 	}
 
 	.selectId dl dd:hover {
-		background-color: #5FB878;
+		background-color: #5fb878;
 		color: white;
 	}
 
@@ -737,6 +716,5 @@
 		display: inline-block;
 	}
 
-
 	/* 站点多选下拉样式end */
-</style>
+</style>

pages/siteArchive/archiveDetail/archiveDetail.vue

@@ -7,14 +7,14 @@
 				</view>
 				<view class="sub">{{detailInfo.account_number}}</view>
 			</view>
-			<view class="form-item">
+			<!-- <view class="form-item">
 				<view class="title">流变变比:</view>
 				<view class="sub">{{detailInfo.rheological_change}}</view>
 			</view>
 			<view class="form-item">
 				<view class="title" style="width:240rpx">单路电源容量:</view>
 				<view class="sub">{{detailInfo.power_capacity}}</view>
-			</view>
+			</view> -->
 			<view class="form-item">
 				<view class="title">新线:</view>
 				<view class="sub">{{detailInfo.route_name}}</view>
@@ -40,7 +40,7 @@
 				<text class="cuIcon-titles margin-right-xs"></text>
 				现场问题
 			</view>
-			<block v-for="(item,index) in  problem_one">
+			<block v-for="(item,index) in  problem_one" :key="index">
 				<view class="form-item  flex justify-between">
 					<view class="title" style="width:70%">{{item.name}}:</view>
 					<view class="margin-right flex align-center">
@@ -60,7 +60,7 @@
 					其他
 				</view>
 
-				<view class="form-item  flex justify-between" v-for="(item,index) in problem_two">
+				<view class="form-item  flex justify-between" v-for="(item,index) in problem_two" :key="index">
 					<block  v-if="item.name!=='灭火器超期'">
 						<view class="title" style="width:60%">{{item.name}}:</view>
 						<view class="margin-right flex align-center">

pages/siteArchive/siteArchive.vue

@@ -8,7 +8,7 @@
 			<view class="cu-bar search bg-gray filter-section" style="padding-top:10rpx">
 				<view class="search-form round bg-white" style="position:relative;overflow:auto">
 					<input name="siteName" v-model="formMess.siteName" @click="toggleShow" @focus="focusfns"
-						@input="handleInput()" placeholder="请输入或选择所属新线"></input>
+						@input="handleInput()" placeholder="请输入或选择所属新线"/>
 				</view>
 			
 			</view>
@@ -20,7 +20,7 @@
 				<view class="search-form round bg-white">
 					<text class="cuIcon-search"></text>
 					<input class="" @focus="InputFocus" v-model="siteName" @blur="InputBlur" :adjust-position="false"
-						type="text" placeholder="请输入站点"></input>
+						type="text" placeholder="请输入站点"/>
 				</view>
 				<view class="action">
 					<button class="cu-btn bg-blue round" @click="searchData()">查询</button>

pages/siteArchive/siteArchiveAdd/siteArchiveAdd.vue

@@ -7,21 +7,21 @@
 					<text class="necessary">*</text>
 					序号:
 				</view>
-				<input name="input" v-model="formMess.account_number" maxlength="50" :disabled="isdisabledFn"></input>
+				<input name="input" v-model="formMess.account_number" maxlength="50" :disabled="isdisabledFn" />
 			</view>
-			<view class="form-item">
+			<!-- <view class="form-item">
 				<view class="title"><text class="necessary">*</text>流变变比:</view>
 				<input name="input" v-model="formMess.rheological_change" maxlength="20"></input>
 			</view>
 			<view class="form-item">
 				<view class="title" style="width:240rpx"><text class="necessary">*</text>单路电源容量:</view>
 				<input name="input" v-model="formMess.power_capacity" maxlength="10"></input>
-			</view>
+			</view> -->
 			<view class="form-item">
 				<view class="title"><text class="necessary">*</text>新线:</view>
 				<select name="" id="" filterable clearable v-model="formMess.route_id">
 					<option value="0">请选择</option>
-					<option :value=item.id v-for="item in routeListData" :title="item.route_name">{{ item.route_name}}
+					<option :value=item.id v-for="(item,index) in routeListData" :key="index" :title="item.route_name">{{ item.route_name}}
 					</option>
 				</select>
 			</view>
@@ -29,14 +29,14 @@
 				<view class="title"><text class="necessary">*</text>站点名称:</view>
 				<select name="" id="" v-model="formMess.site_id" filterable clearable :disabled="isdisabledFn">
 					<option value="0">请选择</option>
-					<option :value="item.id" v-for="item in siteListData">{{ item.site_name}}</option>
+					<option :value="item.id" v-for="(item,index) in siteListData" :key="index">{{ item.site_name}}</option>
 				</select>
 			</view>
 			<view class="form-item margin-bottom-xs">
 				<view class="title"><text class="necessary">*</text>监察:</view>
 				<select name="" id="" filterable clearable v-model="formMess.supervision_department_id">
 					<option value="0">请选择</option>
-					<option :value=item.id v-for="item in supervisionListData">{{ item.supervision_name}}</option>
+					<option :value=item.id v-for="(item,index) in supervisionListData" :key="index">{{ item.supervision_name}}</option>
 				</select>
 			</view>
 			<view class="info-tit margin-left-xs">
@@ -45,7 +45,7 @@
 			</view>
 			<view class="form-item extraDis">
 				<view class="title"><text class="necessary">*</text>电试报告时间:</view>
-				<input name="input" v-model="formMess.electric_test_overdue" maxlength="20"></input>
+				<input name="input" v-model="formMess.electric_test_overdue" maxlength="20" />
 			</view>
 			<view class="info-tit margin-left-xs">
 				<text class="cuIcon-titles "></text>
@@ -133,7 +133,7 @@
 
 			<view class="form-item extraDis radioSec" style="display:flex">
 				<view class="title"><text class="necessary">*</text>灭火器超期:</view>
-				<input name="input" v-model="formMess.annihilator_overdue" maxlength="20"></input>
+				<input name="input" v-model="formMess.annihilator_overdue" maxlength="20" />
 				<!-- <view class="radioCameraflex">
 					<evan-radio v-model="formMess.annihilator_overdue" label="1" class="margin-right-xl">是</evan-radio>
 					<evan-radio v-model="formMess.annihilator_overdue" label="0" class="margin-right-xl">否</evan-radio>

pages/siteList/siteList.vue

@@ -7,7 +7,7 @@
 			<view class="cu-bar search bg-gray filter-section" style="padding-top:10rpx">
 				<view class="search-form round bg-white" style="position:relative;overflow:auto">
 					<input name="siteName" v-model="formMess.siteName" @click="toggleShow" @focus="focusfns"
-						@input="handleInput()" placeholder="请输入或选择所属新线"></input>
+						@input="handleInput()" placeholder="请输入或选择所属新线"/>
 				</view>
 
 			</view>
@@ -15,7 +15,7 @@
 				<view class="search-form round bg-white">
 					<text class="cuIcon-search"></text>
 					<input class="" @focus="InputFocus" v-model="siteName" @blur="InputBlur" :adjust-position="false"
-						type="text" placeholder="请输入站点名称"></input>
+						type="text" placeholder="请输入站点名称"/>
 				</view>
 				<view class="action">
 					<button class="cu-btn bg-blue round" @click="searchData()">查询</button>

pages/siteListAlarming/siteListAlarming.vue

@@ -12,7 +12,7 @@
 				<view class="search-form round bg-white">
 					<text class="cuIcon-search"></text>
 					<input class="" @focus="InputFocus" @blur="InputBlur" :adjust-position="false" type="text" placeholder="请输入站点名称"
-					  v-model="siteName"></input>
+					  v-model="siteName"/>
 				</view>
 				<view class="action">
 					<button class="cu-btn bg-blue round" @click="searchData">查询</button>

pages/siteManage/siteManage.vue

@@ -6,13 +6,13 @@
 			<view class="cu-bar search bg-gray filter-section" style="padding-top:10rpx">
 				<view class="search-form round bg-white" style="position:relative;overflow:auto">
 					<input name="siteName" v-model="formMess.siteName" @click="toggleShow" @focus="focusfns"
-						@input="handleInput()" placeholder="请输入或选择所属新线"></input>
+						@input="handleInput()" placeholder="请输入或选择所属新线"/>
 				</view>
 			</view>
 			<view class="cu-bar search bg-gray filter-section">
 				<view class="search-form round bg-white">
 					<text class="cuIcon-search"></text>
-					<input class="" type="text" placeholder="请输入站点名称" v-model="siteName"></input>
+					<input class="" type="text" placeholder="请输入站点名称" v-model="siteName"/>
 				</view>
 				<view class="action">
 					<button class="cu-btn bg-blue round" @click="searchSiteList">查询</button>

pages/test/test2.vue

@@ -9,7 +9,7 @@
 				</view>
 				<view style="position:relative" class="innerZd">
 					<input name="siteName" v-model="formMess.siteName" @click="toggleShow" @focus="focusfns" @input="handleInput()"
-					 placeholder="请输入或选择"></input>
+					 placeholder="请输入或选择"/>
 
 					<view class="siteItems" v-if="isShow" style="max-height:60vh;overflow:auto">
 						<view class=" site-item" v-if="!siteItemData.length">暂无结果</view>

pages/unprocessDetail/opeDataDetail/opeDataDetail.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
 		<view class="timeBox flex justify-between align-center padding-lr-sm">
-			<view class="time">进线一</view>
-			<button class="cu-btn bg-green sm">在线</button>
+			<view class="time">{{opeData.device_name}}</view>
+			<button :class="opeData.status === '离线' ? 'cu-btn bg-red sm' : 'cu-btn bg-green sm'">{{opeData.status}}</button>
 		</view>
 		<view class="basic-info">
 			<view class="info-tit margin-left-xs">