Ming 4 éve
szülő
commit
b7dc84a7c0

+ 8 - 8
data/json.js

@@ -249,56 +249,56 @@ let deviceType = [{
 //设备管理
 let deviceManage = [{
 		"id": "1",
-		"title": "测试用传装置",
+		"title": "测试用传装置1",
 		"des": "三楼茶水间",
 		"time": "2021-01-20 15:23:43",
 		"status": 0
 	},
 	{
 		"id": "2",
-		"title": "测试用传装置",
+		"title": "测试用传装置2",
 		"des": "三楼茶水间",
 		"time": "2021-01-20 15:23:43",
 		"status": 0
 	},
 	{
 		"id": "3",
-		"title": "测试用传装置",
+		"title": "测试用传装置3",
 		"des": "三楼茶水间",
 		"time": "2021-01-20 15:23:43",
 		"status": 0
 	},
 	{
 		"id": "4",
-		"title": "测试用传装置",
+		"title": "测试用传装置4",
 		"des": "三楼茶水间",
 		"time": "2021-01-20 15:23:43",
 		"status": 0
 	},
 	{
 		"id": "5",
-		"title": "测试用传装置",
+		"title": "测试用传装置5",
 		"des": "三楼茶水间",
 		"time": "2021-01-20 15:23:43",
 		"status": 0
 	},
 	{
 		"id": "6",
-		"title": "测试用传装置",
+		"title": "测试用传装置6",
 		"des": "三楼茶水间",
 		"time": "2021-01-20 15:23:43",
 		"status": 0
 	},
 	{
 		"id": "7",
-		"title": "测试用传装置",
+		"title": "测试用传装置7",
 		"des": "三楼茶水间",
 		"time": "2021-01-20 15:23:43",
 		"status": 1
 	},
 	{
 		"id": "8",
-		"title": "测试用传装置",
+		"title": "测试用传装置8",
 		"des": "三楼茶水间",
 		"time": "2021-01-20 15:23:43",
 		"status": 2

+ 7 - 95
pages.json

@@ -155,15 +155,7 @@
 
 
 
-		{
-			"path": "pages/siteList/siteList",
-			"style": {
-				"navigationBarTitleText": "运行监测",
-				"enablePullDownRefresh": true
-			}
-		},
-
-
+	
 		
 		
 
@@ -213,13 +205,6 @@
 				"enablePullDownRefresh": false
 			}
 
-		}, {
-			"path": "pages/siteList/siteList",
-			"style": {
-				"navigationBarTitleText": "站点列表",
-				"enablePullDownRefresh": false
-			}
-
 		}, {
 			"path": "pages/alarmingList/alarmingList",
 			"style": {
@@ -241,21 +226,8 @@
 				"enablePullDownRefresh": false
 			}
 
-		}, {
-			"path": "pages/unprocessDetail/unprocessDetail",
-			"style": {
-				"navigationBarTitleText": "未处理",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/unprocessDetail/unprocessDetail",
-			"style": {
-				"navigationBarTitleText": "未处理",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
+		},
+		{
 			"path": "pages/processedDetail/processedDetail",
 			"style": {
 				"navigationBarTitleText": "已处理",
@@ -269,28 +241,6 @@
 				"enablePullDownRefresh": false
 			}
 
-		}, {
-			"path": "pages/unprocessDetail/opeDataDetail/opeDataDetail",
-			"style": {
-				"navigationBarTitleText": "运行数据",
-				"enablePullDownRefresh": false
-			}
-
-		},
-		{
-			"path": "pages/unprocessDetail/videoDetail/videoDetail",
-			"style": {
-				"navigationBarTitleText": "视频监测",
-				"enablePullDownRefresh": false
-			}
-
-		},  {
-			"path": "pages/siteManage/siteManage",
-			"style": {
-				"navigationBarTitleText": "站点管理",
-				"enablePullDownRefresh": false
-			}
-
 		}, {
 			"path": "pages/videoList/videoList",
 			"style": {
@@ -306,31 +256,15 @@
 			}
 
 		},
-		{
-			"path": "pages/add/add",
-			"style": {
-				"navigationBarTitleText": "设备新增",
-				"enablePullDownRefresh": false
-				
-			}
-
-		}, {
+		 {
 			"path": "pages/index/components/chart4/chart4",
 			"style": {
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false
 			}
 
-		}
-
-		, {
-			"path": "pages/siteDetail/siteDetail",
-			"style": {
-				"navigationBarTitleText": "站点详情",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
+		}, 
+		{
 			"path": "pages/authority/authority",
 			"style": {
 				"navigationBarTitleText": "授权",
@@ -339,30 +273,8 @@
 
 		}
 
+	
 		, {
-			"path": "pages/siteListAlarming/siteListAlarming",
-			"style": {
-				"navigationBarTitleText": "站点列表",
-				"enablePullDownRefresh": true
-			}
-
-		}
-
-		, {
-			"path": "pages/authManage/authManage",
-			"style": {
-				"navigationBarTitleText": "权限管理",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/siteAdd/siteAdd",
-			"style": {
-				"navigationBarTitleText": "站点新增",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
 			"path": "pages/deviceManage/deviceManage",
 			"style": {
 				"navigationBarTitleText": "设备管理",

+ 0 - 501
pages/add/add.vue

@@ -1,501 +0,0 @@
-<template>
-	<view class="appWrapper">
-		<form action="" v-if="type==1" @submit="formSubmit">
-			<view class="form-item margin-top">
-				<view class="title">
-					<text class="necessary">*</text>
-					用户名称:
-				</view>
-				<input name="userName" v-model="formMess.userName"></input>
-			</view>
-			<view class="form-item">
-				<view class="title">地址:</view>
-				<input name="input" v-model="formMess.place"></input>
-			</view>
-			<view class="form-item">
-				<view class="title">经度:</view>
-				<input name="input" v-model="formMess.longitude"></input>
-			</view>
-			<view class="form-item">
-				<view class="title">维度:</view>
-				<input name="input" v-model="formMess.dimension"></input>
-			</view>
-			<view class="form-item">
-				<view class="title">联系人:</view>
-				<input name="input" v-model="formMess.contactor"></input>
-			</view>
-			<view class="form-item">
-				<view class="title">手机号码:</view>
-				<input name="input" v-model="formMess.mobile"></input>
-			</view>
-
-
-			<view class="btn-area submitBottomBtn padding-lr-sm">
-				<button class="bg-blue round  margin-top" form-type="submit">提 交 </button>
-			</view>
-		</form>
-		<form action="" v-else-if="type==2">
-			<view class="form-item margin-top">
-				<view class="title">
-					<text class="necessary">*</text>
-					设备编号:
-				</view>
-				<input name="input" v-model="formMess.deviceNo"></input>
-			</view>
-			<view class="form-item">
-				<view class="title">设备名称:</view>
-				<input name="input" v-model="formMess.deviceName"></input>
-			</view>
-			<view class="form-item">
-				<view class="title">安装位置:</view>
-				<input name="input" v-model="formMess.place"></input>
-			</view>
-			<view class="form-item">
-				<view class="title">所属楼层:</view>
-				<select name="" id="">
-					<option value="">楼层一</option>
-					<option value="">楼层一</option>
-					<option value="">楼层一</option>
-				</select>
-			</view>
-			<view class="form-item">
-				<view class="title">站点:</view>
-				<select name="" id="">
-					<option value="">站点一</option>
-					<option value="">站点一</option>
-					<option value="">站点一</option>
-				</select>
-			</view>
-			<view class="form-item">
-				<view class="title">设备类型:</view>
-				<select name="" id="">
-					<option value="">智慧用电</option>
-					<option value="">视频监控</option>
-				</select>
-			</view>
-
-			<view class="btn-area submitBottomBtn padding-lr-sm">
-				<button class="bg-blue round  margin-top">提 交 </button>
-			</view>
-		</form>
-		<!-- 权限管理 start -->
-		<form action="" v-else>
-			<view class="form-item margin-top">
-				<view class="title">
-					<text class="necessary">*</text>
-					角色名称
-				</view>
-				<input name="userName" v-model="formMess.userName"></input>
-			</view>
-			<view class="form-item">
-				<view class="title " style="vertical-align:top">
-					<text class="necessary">*</text>
-					站点:
-				</view>
-				<view style="position:relative" class="innerZd">
-					<input name="siteName" v-model="formMess.siteName" @click="test" @focus="focusfns"  @input="handleInput()" placeholder="请选择"></input>
-					
-					<view class="siteItems" v-if="isShow">
-						<view class=" site-item" v-if="!siteItemData.length">暂无结果</view>
-						
-						<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)">
-						{{item}}
-						<text class="lg text-gray cuIcon-close"></text>
-						</button>
-
-					</view>
-				</view>
-
-
-			</view>
-
-			<view class="form-item margin-top">
-				<view class="title">
-					<text class="necessary">*</text>
-					告警类型
-				</view>
-				<radio-group name="gender">
-					<label class="margin-right">
-						<radio value="全部告警" checked /><text>全部告警</text>
-					</label>
-					<label>
-						<radio value="维保告警" /><text>维保告警</text>
-					</label>
-				</radio-group>
-			</view>
-
-
-			<view class="btn-area submitBottomBtn padding-lr-sm">
-				<button class="bg-blue round  margin-top" form-type="submit">提 交 </button>
-			</view>
-		</form>
-		<!-- 权限管理 end -->
-	</view>
-</template>
-
-<script>
-	// var graceChecker = require("../../common/graceChecker.js");
-	// import add from '../../common/select.js';
-	export default {
-
-		data() {
-			return {
-				index: -1,
-				picker: ['楼层一', '楼层二', '楼层三'],
-				type: '0',
-
-				isShow: false,
-				formMess: {
-					"userName": "sss",
-					"siteName": "",
-					"place": "",
-					"longitude": "",
-					"dimension": "",
-					"contactor": "",
-					"mobile": "",
-				},
-
-				// 站点多选下拉
-				siteItemDataOrigin: ["站点一", "站点二", "站点三", "站点四", "站点五", "站点六"],
-				// newDataList: [],
-
-				selectedData: [],
-				siteItemData: ["站点一", "站点二", "站点三", "站点四", "站点五", "站点六"],
-				
-			}
-		},
-		onLoad: function(option) {
-			console.log(option.type); //打印出上个页面传递的参数。
-			this.type = option.type;
-			if (option.type == 1) {
-				uni.setNavigationBarTitle({
-					title: '站点新增'
-				});
-			} else if (option.type == 2) {
-				uni.setNavigationBarTitle({
-					title: '设备新增'
-				});
-			} else {
-				uni.setNavigationBarTitle({
-					title: '权限新增'
-				});
-			}
-		},
-		
-		mounted() {
-			document.addEventListener('click', (e) => {
-				if (e.target.className != 'uni-input-input') {
-					this.isShow = false;
-				}
-			});
-		},
-		methods: {
-			add: function(item, index) {
-				this.selectedData.push(item);
-				this.isShow = false;
-				this.formMess.siteName=''
-				this.siteItemData.splice(index, 1);
-				
-			},
-			deleteItem: function(item, index) {
-				// this.selectedData.remove(item);
-				
-				
-				this.selectedData.splice(index, 1);
-				this.siteItemDataOrigin.push(item);
-				
-				
-				
-				//将元素根据搜索内容过滤出来  这里改变了siteItemData
-				
-				this.siteItemData = this.getNotSelectItem();
-				
-				
-				this.siteItemData = this.siteItemData.filter(item => item.indexOf(this.formMess.siteName) > -1);
-				// console.log('这是过滤来的');
-				// console.log(this.siteItemData);
-				
-				// this.selectedData = newlist;
-				// console.log(this.selectedData)
-				
-			
-			},
-
-			// 站点多选下拉
-			test: function() {
-				this.isShow = !this.isShow;
-			},
-			test2: function() {
-				this.isShow = false;
-			},
-			handleInput() {
-				// this.getNotSelectItem();
-				
-				//将元素根据搜索内容过滤出来  这里改变了siteItemData
-				
-				this.siteItemData = this.getNotSelectItem();
-				this.siteItemData = this.siteItemData.filter(item => item.indexOf(this.formMess.siteName) > -1);
-				
-				// this.selectedData = newlist;
-				// console.log(this.selectedData)
-				
-			},
-			// 站点多选下拉 end
-			
-			
-			
-			getNotSelectItem(){
-				
-				let ok1 = this.siteItemDataOrigin;
-				let ok2 = this.selectedData;
-				// console.log('选中值',ok2);
-				// console.log('全部值',ok1);
-				
-				
-				if(ok2.length){
-					for(let i = 0; i < ok2.length; i++){
-						for(let j = 0; j < ok1.length; j++){
-							        if(ok1[j] === ok2[i]){//值已经被选中
-							            ok1.splice(j, 1);
-							        }
-							}
-						}
-						
-				}
-				
-				 
-				 return ok1;
-				
-			
-			},
-
-			formSubmit: function(e) {
-				console.log('form发生了submit事件,携带数据为:' + JSON.stringify(e.detail.value))
-				//定义表单规则
-				var rule = [{
-						name: "userName",
-						checkType: "string",
-						checkRule: "1,3",
-						errorMsg: "姓名应为1-3个字符..."
-					},
-					// {name:"gender", checkType : "in", checkRule:"男,女",  errorMsg:"请选择性别"},
-					// {name:"loves", checkType : "notnull", checkRule:"",  errorMsg:"请选择爱好"}
-				];
-				//进行表单检查
-				var formData = e.detail.value;
-				var checkRes = graceChecker.check(formData, rule);
-				if (checkRes) {
-					uni.showToast({
-						title: "验证通过!",
-						icon: "none"
-					});
-				} else {
-					uni.showToast({
-						title: graceChecker.error,
-						icon: "none"
-					});
-				}
-			},
-			formReset: function(e) {
-				console.log('清空数据')
-			},
-			focusfns:function(e){
-					// this.getNotSelectItem();
-					
-					//将元素根据搜索内容过滤出来  这里改变了siteItemData
-					
-					this.siteItemData = this.getNotSelectItem();
-					
-					
-					this.siteItemData = this.siteItemData.filter(item => item.indexOf(this.formMess.siteName) > -1);
-			},
-
-
-
-
-
-		}
-	}
-</script>
-
-
-
-
-<style lang="scss">
-	.cu-form-group {
-		border-top: 0;
-
-	}
-
-	input,
-	select,
-	option {
-		line-height: 70rpx;
-		padding: 0 20rpx;
-		height: 70rpx;
-		border: 1px solid #EDEDED;
-		// width:500rpx!important;
-		background-color: #fff;
-		box-sizing: border-box;
-		appearance: none;
-		-moz-appearance: none;
-		-webkit-appearance: none;
-		color: #999;
-
-
-	}
-
-	select:focus,
-	select:active,
-	select:hover {
-		outline: none;
-	}
-
-	select {
-		background: url(../../static/arrow.png) no-repeat scroll 98% center;
-		background-size: 6%;
-	}
-
-	.form-item label text {
-		position: relative;
-		top: 2rpx
-	}
-
-	.form-item {
-		padding: 0 40rpx;
-		display: flex;
-		align-items: top;
-		margin-bottom: 20rpx;
-
-
-		.title {
-			width: 170rpx;
-			position: relative;
-
-			.necessary {
-				color: red;
-				display: inline-block;
-				position: absolute;
-				top: -2rpx;
-				left: -20rpx;
-				font-size: 40rpx;
-
-			}
-		}
-
-		input,
-		select {
-			width: 500rpx;
-			font-size: 28rpx;
-		}
-
-
-	}
-
-
-
-
-
-	/* 站点多选下拉样式 start */
-
-	.layui-btn {
-		background-color: #5fb878;
-	}
-
-	a {
-		text-decoration: none;
-	}
-
-	.label {
-		padding: 2px 0px;
-		background: #aaa;
-		border-radius: 2px;
-		color: #fff;
-		display: block;
-		line-height: 20px;
-		height: 20px;
-		margin: 2px 5px 2px 0;
-		float: left;
-	}
-
-	.label span {
-		padding: 0 5px;
-		color: #fff;
-	}
-
-	.close {
-		padding: 1px 5px !important;
-	}
-
-	.close:hover {
-		/* background-color: #009E94;
-	    border-radius: 2px;
-	    color: tomato; */
-	}
-
-	.selectId input {
-		width: 100% !important;
-	}
-
-	.selectId input {
-		height: 25px;
-		padding: 1px 5px;
-		border-radius: 3px;
-		width: calc(100% - 12px);
-		outline-color: #5fb878;
-		border: 1px solid #5fb878;
-	}
-
-	.selectId {
-		position: relative;
-	}
-
-	.selectId dl {
-		border: 1px solid #eee;
-		border-radius: 3px;
-		margin: 2px 0px;
-		max-height: 300px;
-		overflow-x: hidden;
-		white-space: nowrap;
-		position: absolute;
-		width: 100%;
-		top: 40px;
-		background: #fff;
-		z-index: 1000
-	}
-
-	.selectId dl dd {
-		margin: 0;
-		padding: 5px 10px;
-	}
-
-	.selectId dl dd:hover {
-		background-color: #5FB878;
-		color: white;
-	}
-
-	.AD {
-		/* width: 210px;
-	        margin-left: 40px; */
-		overflow-y: auto;
-		max-height: 200px;
-		/* border: 2px solid #5fb878;
-	        border-radius: 6px;
-	        padding: 1px 2px; */
-	}
-
-	form .AD span {
-		width: auto;
-	}
-
-	.siteSelect {
-		width: 71%;
-		display: inline-block;
-	}
-
-
-	/* 站点多选下拉样式end */
-</style>

+ 1 - 1
pages/analyse/buildingCheck/buildingCheck.vue

@@ -5,7 +5,7 @@
 		<view class="ding">
 			<view class="cu-bar search bg-gray filter-section" style="with:50%;">
 				<view class="search-form round bg-white" >
-					<select name="" id="" placeholder="" style="width:98%;background-size: 4%;">
+					<select name="" id="" placeholder="" style="width:98%;background-size: 4%;font-size:28rpx">
 						<option value="">请选择建筑</option>
 						<option value="">建筑1</option>
 						<option value="">建筑2</option>

+ 7 - 7
pages/analyse/buildingCheck/components/chart/chart.vue

@@ -10,12 +10,12 @@
 
 	 let title = '安全评分';
 	export default {
-		props:{
-			bindData:{
-				type:Object,
-				default: ''
-			}
-		},
+		// props:{
+		// 	bindData:{
+		// 		type:Object,
+		// 		default: ''	
+		// 	}
+		// },
 		data() {
 			return {
 				option: {
@@ -155,7 +155,7 @@
 				// 动态引入较大类库避免影响页面展示
 				const script = document.createElement('script')
 				// view 层的页面运行在 www 根目录,其相对路径相对于 www 计算
-				script.src = '/static/echarts.min.js'
+				script.src = 'static/echarts.min.js'
 				script.onload = this.initEcharts.bind(this)
 				document.head.appendChild(script)
 			}

+ 1 - 1
pages/analyse/monthDetail/components/chart.vue

@@ -166,7 +166,7 @@
 				// 动态引入较大类库避免影响页面展示
 				const script = document.createElement('script')
 				// view 层的页面运行在 www 根目录,其相对路径相对于 www 计算
-				script.src = '/static/echarts.js'
+				script.src = 'static/echarts.js'
 				script.onload = this.initEcharts.bind(this)
 				document.head.appendChild(script)
 			}

+ 1 - 1
pages/analyse/monthDetail/components/chart2.vue

@@ -163,7 +163,7 @@
 				// 动态引入较大类库避免影响页面展示
 				const script = document.createElement('script')
 				// view 层的页面运行在 www 根目录,其相对路径相对于 www 计算
-				script.src = '/static/echarts.js'
+				script.src = 'static/echarts.js'
 				script.onload = this.initEcharts.bind(this)
 				document.head.appendChild(script)
 			}

+ 1 - 1
pages/analyse/monthDetail/components/chart3.vue

@@ -163,7 +163,7 @@
 				// 动态引入较大类库避免影响页面展示
 				const script = document.createElement('script')
 				// view 层的页面运行在 www 根目录,其相对路径相对于 www 计算
-				script.src = '/static/echarts.js'
+				script.src = 'static/echarts.js'
 				script.onload = this.initEcharts.bind(this)
 				document.head.appendChild(script)
 			}

+ 1 - 1
pages/analyse/monthDetail/components/chart4.vue

@@ -163,7 +163,7 @@
 				// 动态引入较大类库避免影响页面展示
 				const script = document.createElement('script')
 				// view 层的页面运行在 www 根目录,其相对路径相对于 www 计算
-				script.src = '/static/echarts.js'
+				script.src = 'static/echarts.js'
 				script.onload = this.initEcharts.bind(this)
 				document.head.appendChild(script)
 			}

+ 0 - 179
pages/authManage/authManage.vue

@@ -1,179 +0,0 @@
-<template>
-	<view class="site-wrapper">
-
-
-		<!-- 筛选框start -->
-		<view class="ding">
-			<view class="cu-bar search bg-gray filter-section">
-				<view class="search-form round bg-white">
-					<text class="cuIcon-search"></text>
-					<input class="" @focus="InputFocus" @blur="InputBlur" :adjust-position="false" type="text" confirm-type="search"
-					 v-model="phoneNumber"></input>
-				</view>
-				<view class="action">
-					<button class="cu-btn bg-blue round" @click="searchAuthList">查询</button>
-				</view>
-			</view>
-		</view>
-		<!-- 筛选框end -->
-
-		<!-- 权限管理start -->
-		<view class="site-items">
-			<view class="cu-list menu-avatar">
-
-				<view class="cu-item" :class="modalName=='move-box-'+ index?'move-cur':''" v-for="(item,index) in authList" :key="index"
-				 @touchstart="ListTouchStart" @touchmove="ListTouchMove" @touchend="ListTouchEnd" :data-target="'move-box-' + index">
-					<view class="cu-avatar round lg" style="background-image: url(../../static/auth-icon.jpg);"></view>
-					<view class="content">
-						<view class="text-grey site-tit">{{item.phone}}</view>
-					</view>
-					<view class="move">
-						<view class="bg-grey" @click.stop="EditItem(item)">编辑</view>
-						<view class="bg-red" @click.stop="deleteItem(item)">删除</view>
-					</view>
-				</view>
-			</view>
-			<view v-if="!authList.length&&authListRes==1" class="text-center margin-top"> 暂无数据</view>
-		</view>
-
-		<!-- 权限管理end-->
-
-
-		<!-- 新增按钮start -->
-		<view class="plus">
-			<image src="../../static/plus.png" style="width:125rpx;height:125rpx" @tap="goAddPage(type)"></image>
-		</view>
-		<!-- 新增按钮end -->
-	</view>
-
-</template>
-
-<script>
-	import json from '../../data/json.js';
-
-	export default {
-		data() {
-			return {
-				phoneNumber: '',
-				authListRes: 0,
-				authList: [],
-				type: '0',
-				siteListData: json.siteListData,
-				modalName: null,
-				listTouchStart: 0,
-				listTouchDirection: null,
-				CustomBar: this.CustomBar,
-				csListArrl: [],
-				//左滑默认宽度
-				delBtnWidth: 160,
-				flag: false
-
-
-			};
-		},
-
-		onLoad: function(option) {
-			this.getAuthData()
-		},
-		methods: {
-			
-			EditItem(item){
-				uni.navigateTo({
-					url: '/pages/authAdd/authAdd?phone='+item.phone+'',
-				
-				});
-			},
-			  deleteItem(item) {
-				 let deleteT=0;
-				 uni.showModal({	
-				     title: '确认删除吗?',
-				     content: '',
-				     success: function (result) {
-				         if (result.confirm) {
-							  this.deleteAuth({
-							 	"phone": item.phone
-							 });
-				         } else if (result.cancel) {
-				             console.log('用户点击取消');
-				         }
-				     }.bind(this)
-				 }); 
-			},
-
-
-			// 删除请求接口
-			async deleteAuth(ming = {}) {
-				let res = await  this.$myRequest({
-					url: 'AuthorityManagement/setDelAuthority',
-					data: ming
-				})
-				if (!res.data.flag) {
-					alert('删除失败');
-					return;
-				}
-				this.getAuthData()
-				
-				return res;
-			},
-
-
-			async getAuthData(ming = {}) {
-				const res = await this.$myRequest({
-					url: 'AuthorityManagement/getAuthorityList',
-					showLoading: true,
-					data: ming
-				})
-				this.authListRes = 1;
-				this.authList = res.data.data
-				console.log(res.data.data);
-			},
-
-			searchAuthList() {
-				this.getAuthData({
-					"phone": this.phoneNumber
-				})
-			},
-
-
-
-			// 页面跳转
-			goAddPage(type) {
-				uni.navigateTo({
-					url: '/pages/authAdd/authAdd',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-
-
-			InputFocus(e) {
-				this.InputBottom = e.detail.height
-			},
-			InputBlur(e) {
-				this.InputBottom = 0
-			},
-
-			// ListTouch触摸开始
-			ListTouchStart(e) {
-				this.listTouchStart = e.touches[0].pageX
-			},
-
-			// ListTouch计算方向
-			ListTouchMove(e) {
-				this.listTouchDirection = e.touches[0].pageX - this.listTouchStart < -80 ? 'left' : 'right'
-			},
-
-			// ListTouch计算滚动
-			ListTouchEnd(e) {
-				if (this.listTouchDirection == 'left') {
-					this.modalName = e.currentTarget.dataset.target
-				} else {
-					this.modalName = null
-				}
-				this.listTouchDirection = null
-			}
-		}
-
-	}
-</script>

+ 1 - 1
pages/deviceDetail/components/chart.vue

@@ -181,7 +181,7 @@
 				// 动态引入较大类库避免影响页面展示
 				const script = document.createElement('script')
 				// view 层的页面运行在 www 根目录,其相对路径相对于 www 计算
-				script.src = '/static/echarts.min.js'
+				script.src = 'static/echarts.min.js'
 				script.onload = this.initEcharts.bind(this)
 				document.head.appendChild(script)
 			}

+ 1 - 1
pages/deviceDetail/components/chart2.vue

@@ -301,7 +301,7 @@
 				// 动态引入较大类库避免影响页面展示
 				const script = document.createElement('script')
 				// view 层的页面运行在 www 根目录,其相对路径相对于 www 计算
-				script.src = '/static/echarts.min.js'
+				script.src = 'static/echarts.min.js'
 				script.onload = this.initEcharts.bind(this)
 				document.head.appendChild(script)
 			}

+ 14 - 4
pages/deviceManage/deviceManage.vue

@@ -57,7 +57,7 @@
 			</view>
 			<view class="share-item  text-center">
 				<view><text class="icon iconfont margin-xs" style="color:#FF0303">&#xe66c;</text></view>
-				<view @tap="deleteItem" data-target="DialogModal2">删除</view>
+				<view @tap="deleteItem;pindex=index" data-target="DialogModal2">删除</view>
 			</view>
 			<view class="share-item  text-center">
 				<view><text class="icon iconfont margin-xs" style="color:#FF642E">&#xe66e;</text></view>
@@ -213,7 +213,6 @@
 					alert('请选择至少一条需要导出的数据')
 				}else{
 					this.modalName = e.currentTarget.dataset.target
-					
 				}
 			},
 			
@@ -230,12 +229,23 @@
 				}
 			},
 			deleteItem2(e) {
-				this.deletedId=e.target.dataset.id;
+				this.deleteId=e.target.dataset.id;
+				console.log('e.target.dataset');
+				console.log(e.target.dataset);
 				console.log(e.target.dataset.id);
 				this.modalName = e.currentTarget.dataset.target;
+				// this.todos.splice(index, 1);
 			},
 			confirmDelete(){
-				alert(this.deletedId)
+				// alert(this.deleteId)
+				
+				// alert(this.pindex)
+				// this.deviceManage.splice(this.deleteId,1);
+				var arr=["1"]
+				
+// this.deviceManage = this.deviceManage.filter((item) => !arr.includes(item.id));
+this.deviceManage.filter((item) => !arr.includes(item.id));
+console.log(this.deviceManage)
 				
 			},
 			//再次确认弹框

+ 3 - 7
pages/index/components/chart/chart.vue

@@ -32,12 +32,7 @@
 
 	export default {
 		name: 'chart',
-		props: {
-			bindData: {
-				type: Object,
-				default: ''
-			}
-		},
+	
 		data() {
 			return {
 
@@ -164,7 +159,7 @@
 				// 动态引入较大类库避免影响页面展示
 				const script = document.createElement('script')
 				// view 层的页面运行在 www 根目录,其相对路径相对于 www 计算
-				script.src = '/static/echarts.min.js'
+				script.src = 'static/echarts.min.js'
 				script.onload = this.initEcharts.bind(this)
 				document.head.appendChild(script)
 			}
@@ -203,5 +198,6 @@
 		width: 100%;
 		height: 500rpx;
 		margin-top: 70rpx;
+		/* background:pink */
 	}
 </style>

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

@@ -181,7 +181,7 @@
 				// 动态引入较大类库避免影响页面展示
 				const script = document.createElement('script')
 				// view 层的页面运行在 www 根目录,其相对路径相对于 www 计算
-				script.src = '/static/echarts.min.js'
+				script.src = 'static/echarts.min.js'
 				script.onload = this.initEcharts.bind(this)
 				document.head.appendChild(script)
 			}

+ 1 - 1
pages/index/components/chart3/chart3.vue

@@ -194,7 +194,7 @@
 				// 动态引入较大类库避免影响页面展示
 				const script = document.createElement('script')
 				// view 层的页面运行在 www 根目录,其相对路径相对于 www 计算
-				script.src = '/static/echarts.min.js'
+				script.src = 'static/echarts.min.js'
 				script.onload = this.initEcharts.bind(this)
 				document.head.appendChild(script)
 			}

+ 1 - 3
pages/index/index.vue

@@ -32,7 +32,6 @@
 					<chart :bindData="staticData" v-if="hackReset"></chart>
 				</view>
 				<view v-if="Inv == 1">
-
 					<chart2 :bindData="staticData"></chart2>
 				</view>
 				<view v-if="Inv == 2" class="chart3-box" >
@@ -125,8 +124,7 @@
 
 			// 图表切换渲染
 			this.hackReset = true;
-		
-
+	
 			// 数据渲染
 			this.getSearchList();
 		},

+ 2 - 2
pages/inspectList/processList/processList.vue

@@ -19,7 +19,7 @@
 					<view class="cu-list menu-avatar">
 						
 						<view class="cu-item" v-for="(item,index) in unporcessList" :key="index">
-							<view class="cu-avatar lg" style="background-image:url(../../static/process-icon.png);"></view>
+							<view class="cu-avatar lg" style="background-image:url(../../../static/process-icon.png);"></view>
 							<view class="content">
 								<view class="pro-title">
 									<view class="cut">{{item.title}}</view>
@@ -44,7 +44,7 @@
 			<view class="processList">
 					<view class="cu-list menu-avatar "  >
 						<view class="cu-item" v-for="(item,index) in porcessedList" :key="index">
-							<view class="cu-avatar lg" style="background-image:url(../../static/processed-icon.png);"></view>
+							<view class="cu-avatar lg" style="background-image:url(../../../static/processed-icon.png);"></view>
 							<view class="content">
 								<view class="pro-title">
 									<view class="cut">{{item.title}}</view>

+ 0 - 476
pages/siteAdd/siteAdd.vue

@@ -1,476 +0,0 @@
-<template>
-	<view class="appWrapper">
-		
-		<!-- 站点新增start -->
-		<form action="" @submit="formSubmit" v-if="!id">
-			<view class="form-item margin-top">
-				<view class="title">
-					<text class="necessary">*</text>
-					站点名称:
-				</view>
-				<input name="userName" v-model="formMess.siteName"></input>
-			</view>
-			<view class="form-item">
-				<view class="title"><text class="necessary">*</text>地址:</view>
-				<input name="input" v-model="formMess.address"></input>
-			</view>
-			<view class="form-item">
-				<view class="title"><text class="necessary">*</text>经度:</view>
-				<input name="input" v-model="formMess.longitude"></input>
-			</view>
-			<view class="form-item">
-				<view class="title"><text class="necessary">*</text>维度:</view>
-				<input name="input" v-model="formMess.latitude"></input>
-			</view>
-			<view class="form-item">
-				<view class="title"><text class="necessary">*</text>联系人:</view>
-				<input name="input" v-model="formMess.userName"></input>
-			</view>
-			<view class="form-item">
-				<view class="title"><text class="necessary">*</text>手机号码:</view>
-				<input name="input" v-model="formMess.phone"></input>
-			</view>
-
-
-			<view class="btn-area submitBottomBtn padding-lr-sm">
-				<button class="bg-blue round  margin-top" @click="addSubmit">提 交 </button>
-			</view>
-		</form>
-		<!-- 站点新增end -->
-		
-		<!-- 站点修改start -->
-		<form action="" @submit="formSubmit" v-else>
-			<view class="form-item margin-top">
-				<view class="title">
-					<text class="necessary">*</text>
-					站点名称:
-				</view>
-				<input name="userName" v-model="siteMessage.siteName"></input>
-			</view>
-			<view class="form-item">
-				<view class="title">地址:</view>
-				<input name="input" v-model="siteMessage.address"></input>
-			</view>
-			<view class="form-item">
-				<view class="title">经度:</view>
-				<input name="input" v-model="siteMessage.longitude"></input>
-			</view>
-			<view class="form-item">
-				<view class="title">维度:</view>
-				<input name="input" v-model="siteMessage.latitude"></input>
-			</view>
-			<view class="form-item">
-				<view class="title">联系人:</view>
-				<input name="input" v-model="siteMessage.userName"></input>
-			</view>
-			<view class="form-item">
-				<view class="title">手机号码:</view>
-				<input name="input" v-model="siteMessage.phone"></input>
-			</view>
-		
-		
-			<view class="btn-area submitBottomBtn padding-lr-sm">
-				<button class="bg-blue round  margin-top" @click="editSubmit">提 交 </button>
-			</view>
-		</form>
-		<!-- 站点修改end -->
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-				id: 0,
-				formMess: {
-					"siteName": "",
-					"userName": "",
-					"phone": "",
-					"address": "",
-					"longitude": "",
-					"latitude": "",
-				},
-				siteMessage:{}
-			}
-		},
-		
-		onLoad: function(option) {
-			this.id=option.id
-			if (option.id) {
-				uni.setNavigationBarTitle({
-					title: '站点修改'
-				});
-				this.getSiteList({"id":option.id})
-			} else {
-				uni.setNavigationBarTitle({
-					title: '站点新增'
-				});
-			}
-		},
-
-		methods: {
-
-			//新增验证并提交
-			addSubmit() {
-				if (!this.formMess.siteName) {
-					uni.showToast({
-						title: "请输入站点名称...",
-						icon: "none"
-					});
-					return
-				}
-				if (!this.formMess.address) {
-					uni.showToast({
-						title: "请输入地址...",
-						icon: "none"
-					});
-					return
-				}
-				if (!this.formMess.longitude) {
-					uni.showToast({
-						title: "请输入经度...",
-						icon: "none"
-					});
-					return
-				}
-				if (!this.formMess.latitude) {
-					uni.showToast({
-						title: "请输入纬度...",
-						icon: "none"
-					});
-					return
-				}
-				if (!this.formMess.userName) {
-					uni.showToast({
-						title: "请输入联系人...",
-						icon: "none"
-					});
-					return
-				}
-				if (!this.formMess.phone) {
-					uni.showToast({
-						title: "请输入手机号码...",
-						icon: "none"
-					});
-					return
-				}
-				if (!/^1[345678]\d{9}$/.test(this.formMess.phone)){
-					uni.showToast({
-						title: "请输入正确的手机号码...",
-						icon:"none"
-					});
-					return
-				 }
-				this.getAddSite({
-					"siteName": this.formMess.siteName,
-					"userName": this.formMess.userName,
-					"phone": this.formMess.phone,
-					"address": this.formMess.address,
-					"longitude": this.formMess.longitude,
-					"latitude": this.formMess.latitude
-				})
-			},
-			
-			//编辑验证并提交
-			editSubmit() {
-				if (!this.siteMessage.siteName) {
-					uni.showToast({
-						title: "请填写站点名称...",
-						icon: "none"
-					});
-					return
-				}
-				if (!this.siteMessage.address) {
-					uni.showToast({
-						title: "请输入地址...",
-						icon: "none"
-					});
-					return
-				}
-				if (!this.siteMessage.longitude) {
-					uni.showToast({
-						title: "请输入经度...",
-						icon: "none"
-					});
-					return
-				}
-				if (!this.siteMessage.latitude) {
-					uni.showToast({
-						title: "请输入纬度...",
-						icon: "none"
-					});
-					return
-				}
-				if (!this.siteMessage.userName) {
-					uni.showToast({
-						title: "请输入联系人...",
-						icon: "none"
-					});
-					return
-				}
-				if (!this.siteMessage.phone) {
-					uni.showToast({
-						title: "请输入手机号码...",
-						icon: "none"
-					});
-					return
-				}
-				if (!/^1[345678]\d{9}$/.test(this.siteMessage.phone)){
-					uni.showToast({
-						title: "请输入正确的手机号码...",
-						icon:"none"
-					});
-					return
-				 }
-				this.setEditSite({
-					"id":this.id,
-					"siteName": this.siteMessage.siteName,
-					"userName": this.siteMessage.userName,
-					"phone": this.siteMessage.phone,
-					"address": this.siteMessage.address,
-					"longitude": this.siteMessage.longitude,
-					"latitude": this.siteMessage.latitude
-				})
-			},
-			
-			// 新增请求
-			async getAddSite(ming = {}) {
-				const res = await this.$myRequest({
-					url: 'SiteManagement/setAddSite',
-					data: ming
-				})
-				if (!res.data.flag) {
-					uni.showToast({
-						title: "添加失败",
-						icon: "none"
-					});
-				} else {
-					uni.showToast({
-						title: "添加成功",
-					});
-				}
-				setTimeout(() => {
-					uni.navigateTo({
-						url: '/pages/siteManage/siteManage',
-					});
-				}, 1000);
-
-			},
-			
-			// 修改回显请求
-			async getSiteList(ming = {}) {
-				const res = await this.$myRequest({
-					url: 'SiteManagement/getSiteList',
-					showLoading: true,
-					data: ming
-				})
-				this.siteMessage=res.data.data[0];
-			},
-			
-			
-			// 编辑请求
-			async setEditSite(ming = {}) {
-				const res = await this.$myRequest({
-					url: 'SiteManagement/setEditSite',
-					data: ming
-				})
-				if (!res.data.flag) {
-					uni.showToast({
-						title: "编辑失败",
-						icon: "none"
-					});
-				} else {
-					uni.showToast({
-						title: "编辑成功",
-					});
-				}
-				setTimeout(() => {
-					uni.navigateTo({
-						url: '/pages/siteManage/siteManage',
-					});
-				}, 1000);
-			},
-
-		}
-	}
-</script>
-
-
-
-
-<style lang="scss">
-	.cu-form-group {
-		border-top: 0;
-
-	}
-
-	input,
-	select,
-	option {
-		line-height: 70rpx;
-		padding: 0 20rpx;
-		height: 70rpx;
-		border: 1px solid #EDEDED;
-		// width:500rpx!important;
-		background-color: #fff;
-		box-sizing: border-box;
-		appearance: none;
-		-moz-appearance: none;
-		-webkit-appearance: none;
-		color: #999;
-
-
-	}
-
-	select:focus,
-	select:active,
-	select:hover {
-		outline: none;
-	}
-
-	select {
-		background: url(../../static/arrow.png) no-repeat scroll 98% center;
-		background-size: 6%;
-	}
-
-	.form-item label text {
-		position: relative;
-		top: 2rpx
-	}
-
-	.form-item {
-		padding: 0 40rpx;
-		display: flex;
-		align-items: top;
-		margin-bottom: 20rpx;
-
-
-		.title {
-			width: 170rpx;
-			position: relative;
-
-			.necessary {
-				color: red;
-				display: inline-block;
-				position: absolute;
-				top: -2rpx;
-				left: -20rpx;
-				font-size: 40rpx;
-
-			}
-		}
-
-		input,
-		select {
-			width: 500rpx;
-			font-size: 28rpx;
-		}
-
-
-	}
-
-
-
-
-
-	/* 站点多选下拉样式 start */
-
-	.layui-btn {
-		background-color: #5fb878;
-	}
-
-	a {
-		text-decoration: none;
-	}
-
-	.label {
-		padding: 2px 0px;
-		background: #aaa;
-		border-radius: 2px;
-		color: #fff;
-		display: block;
-		line-height: 20px;
-		height: 20px;
-		margin: 2px 5px 2px 0;
-		float: left;
-	}
-
-	.label span {
-		padding: 0 5px;
-		color: #fff;
-	}
-
-	.close {
-		padding: 1px 5px !important;
-	}
-
-	.close:hover {
-		/* background-color: #009E94;
-	    border-radius: 2px;
-	    color: tomato; */
-	}
-
-	.selectId input {
-		width: 100% !important;
-	}
-
-	.selectId input {
-		height: 25px;
-		padding: 1px 5px;
-		border-radius: 3px;
-		width: calc(100% - 12px);
-		outline-color: #5fb878;
-		border: 1px solid #5fb878;
-	}
-
-	.selectId {
-		position: relative;
-	}
-
-	.selectId dl {
-		border: 1px solid #eee;
-		border-radius: 3px;
-		margin: 2px 0px;
-		max-height: 300px;
-		overflow-x: hidden;
-		white-space: nowrap;
-		position: absolute;
-		width: 100%;
-		top: 40px;
-		background: #fff;
-		z-index: 1000
-	}
-
-	.selectId dl dd {
-		margin: 0;
-		padding: 5px 10px;
-	}
-
-	.selectId dl dd:hover {
-		background-color: #5FB878;
-		color: white;
-	}
-
-	.AD {
-		/* width: 210px;
-	        margin-left: 40px; */
-		overflow-y: auto;
-		max-height: 200px;
-		/* border: 2px solid #5fb878;
-	        border-radius: 6px;
-	        padding: 1px 2px; */
-	}
-
-	form .AD span {
-		width: auto;
-	}
-
-	.siteSelect {
-		width: 71%;
-		display: inline-block;
-	}
-
-
-	/* 站点多选下拉样式end */
-</style>

+ 0 - 131
pages/siteDetail/siteDetail.vue

@@ -1,131 +0,0 @@
-<template>
-	<view>
-
-
-		<view >
-			<!-- 基本信息start -->
-			<view class="basic-info">
-				<view class="info-tit margin-left-xs">
-					<text class="cuIcon-titles margin-right-xs"></text>
-					详细信息
-				</view>
-				<view class="info-content">
-					<view class="info-one-info ">
-						<text>站点名称:</text>
-						<text>{{data.siteName}}</text>
-					</view>
-					
-					<view>
-						<text>地址:</text>
-						<text>{{data.address}}</text>
-					</view>
-					<view>
-						<text>定位:</text>
-						<text>{{data.longitude}} , {{data.latitude}}</text>
-					</view>
-					<view>
-						<text>联系人:</text>
-						<text>{{data.userName}}</text>
-					</view>
-					<view>
-						<text>联系电话:</text>
-						<text>{{data.phone}}</text>
-					</view>
-				</view>
-			</view>
-			<!-- 基本信息end -->
-			
-		</view>
-		
-
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				radio: 'A',
-				radio: 'B',
-				modalName: null,
-				data:{}
-		
-			}
-		},
-		onLoad(option) {
-		
-			console.log(option.id)
-			this.getData({"id":option.id})
-		
-		},
-		
-		methods: {
-			
-			async getData(ming) {
-				const res= await this.$myRequest({
-					url:'SiteManagement/getSiteList',
-					data:ming
-				})
-				console.log(res.data.data[0])
-				this.data=res.data.data[0]
-				// this.cuIconList=res.data.data   videoMonitoringCount
-				
-				
-			},
-			
-			submit() {
-				uni.makePhoneCall({
-					phoneNumber: '15122423833' //仅为示例
-				});
-			},
-			mapLocation(){
-				uni.openLocation({
-					latitude: 31.469465,
-					longitude: 121.327514,
-					success: function() {
-						console.log('success');
-					}
-				});
-			},
-			
-			RadioChange(e) {
-				this.radio = e.detail.value
-			},
-			textareaAInput(e) {
-				this.textareaAValue = e.detail.value
-			},
-
-		}
-	}
-</script>
-
-<style lang="scss">
-	.timeBox {
-		height: 88rpx;
-		background: #EFF4FF;
-		line-height: 88rpx;
-
-		.time {
-			color: #333
-		}
-	}
-
-	.info-tit {
-		color: #4074E7;
-		line-height: 90rpx;
-		height: 90rpx;
-	}
-
-	// 基本信息
-	.info-content>view {
-		margin-left: 24rpx;
-		border-bottom: 1px solid #EDEDED;
-		line-height: 92rpx;
-		color: #666;
-	}
-
-	.info-content view text:first-child {
-		width: 160rpx;
-		display: inline-block
-	}
-</style>

+ 0 - 195
pages/siteList/siteList.vue

@@ -1,195 +0,0 @@
-<template>
-	<view class="site-wrapper" ref="contentWrapper">
-
-		<!-- 筛选框start -->
-		<view class="ding">
-			<view class="cu-bar search bg-gray filter-section">
-				<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="请输入站点名称" confirm-type="search"></input>
-				</view>
-				<view class="action">
-					<button class="cu-btn bg-blue round" @click=searchData()>查询</button>
-				</view>
-			</view>
-		</view>
-		<!-- 筛选框end -->
-
-
-		<!-- 站点列表start -->
-		<view class="site-items">
-			<view class="cu-list menu-avatar longPressUl">
-				<view class="cu-item" :class="modalName=='move-box-'+ index?'move-cur':''" v-for="(item,index) in newSiteListData"
-				 :key="index" :data-target="'move-box-' + index">
-					<view class="cu-avatar round lg" style="background-image: url(../../static/site-icon-alarm.png);"></view>
-					<view class="content" @tap="goDeviceType(item)" @longpress="showDetail(item)">
-						<view class="text-grey site-tit">
-							<text style="width:260rpx;" class="inOneLine">{{item.siteName}}</text>
-							<text style="font-size:28rpx;text-align:right">
-								( 共{{item.count}}个未处理告警 )
-							</text>
-						</view>
-						<view class="showDetail" v-if="item.isShow" @tap.stop="goSiteDetail(item)">查看详情</view>
-					</view>
-					<view class="nav-right num">
-						<view class="text-grey">
-							<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
-						</view>
-					</view>
-				</view>
-			</view>
-
-			<view v-if="!siteListData.length&&siteListRes==1" class="text-center margin-top"> 暂无数据</view>
-		</view>
-		<!-- 站点列表end -->
-
-
-	</view>
-
-</template>
-
-<script>
-	import json from '../../data/json.js';
-
-	export default {
-		data() {
-			return {
-				siteListRes: 0,
-				siteName: '',
-				type: '0',
-				siteListData: [],
-				modalName: null,
-				listTouchStart: 0,
-				listTouchDirection: null,
-				CustomBar: this.CustomBar,
-			};
-		},
-
-
-		onPullDownRefresh() {
-			console.log('refresh');
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		computed: {
-			newSiteListData() {
-				return this.siteListData.map(item => {
-					this.$set(item, "isShow", false)
-					return item
-				})
-			}
-
-		},
-
-
-		mounted() {
-			document.addEventListener('click', (e) => {
-				if (e.target.className != 'showDetail') {
-					this.siteListData.forEach(item => {
-						item.isShow = false
-					})
-				}
-			})
-		},
-		onLoad() {
-			this.getSiteList()
-		},
-
-		methods: {
-			searchData() {
-				this.getSiteList({
-					"siteName": this.siteName
-				})
-			},
-
-
-			async getSiteList(ming) {
-				const res = await this.$myRequest({
-					url: 'OperationMonitoring/getSiteList',
-					showLoading: true,
-					data: ming
-				})
-				this.siteListRes = 1;
-				console.log(res.data.data)
-				this.siteListData = res.data.data
-			},
-
-
-			// 隐藏显示
-			showDetail(e) {
-				// 存储点击那一项的状态
-				const nowStatu = e.isShow;
-				// 将每一项列表的isShow设置为false,让所有的列表都隐藏
-				this.siteListData.forEach(item => {
-					item.isShow = false
-				})
-				// 用于再次点击该项的取反
-				e.isShow = !nowStatu
-			},
-			InputFocus(e) {
-				this.InputBottom = e.detail.height
-			},
-			InputBlur(e) {
-				this.InputBottom = 0
-			},
-
-
-			goDeviceType(item) {
-				if (item.count) {
-					uni.navigateTo({
-						url: '/pages/deviceType/deviceType?companyCode=' + item.companyCode,
-						success: res => {},
-						fail: () => {},
-						complete: () => {}
-					});
-				}
-
-			},
-			goSiteDetail(item) {
-				uni.navigateTo({
-					url: '/pages/siteDetail/siteDetail?id=' + item.id + '',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-		}
-
-	}
-</script>
-
-<style>
-	.showDetail {
-		position: absolute;
-		background: #fff;
-		box-shadow: 0 1px 6px 0 rgb(32 33 36 / 28%);
-		padding: 0rpx 32rpx;
-		border-radius: 10rpx;
-		top: 42rpx;
-		right: 45%;
-		z-index: 3000000;
-		font-size: 28rpx;
-
-	}
-
-	/* *:not(input) { */
-
-	* {
-		-webkit-touch-callout: none;
-		-webkit-user-select: none;
-		-khtml-user-select: none;
-		-moz-user-select: none;
-		-ms-user-select: none;
-		user-select: none;
-	}
-	input {
-		user-select: initial !important;
-	}
-
-
-	/* uni-page-head .uni-page-head-bd{
-		 user-select: none!important;
-	} */
-</style>

+ 0 - 62
pages/siteListAlarming/siteListAlarming.vue

@@ -1,62 +0,0 @@
-<template>
-	<list-test :bindData="siteListData" :bindUrl="linkUrl" :bindIcon="linkIcon" :bindNum="num" :bindType="type" :bindSiteName="siteName"
-	 :bindDetailUrl="detailUrl">
-	</list-test>
-
-</template>
-
-<script>
-	import json from '../../data/json.js';
-
-	export default {
-
-		data() {
-			return {
-				type: 1,
-				linkUrl: '/pages/alarmingList/alarmingList',
-				linkIcon: '../../static/site-icon-alarm.png',
-				siteListData: [],
-				num: ' 共3个未处理告警',
-				detailUrl: '/pages/siteDetail/siteDetail',
-				siteName:''
-			};
-		},
-
-
-		onPullDownRefresh() {
-			console.log('refresh');
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		computed: {
-
-		},
-
-		mounted() {
-		
-		},
-
-		onLoad() {
-			this.getDataList({})
-		},
-
-		methods: {
-			async getDataList(params={}) {
-				const res= await this.$myRequest({
-					url:'IntegratedAlarm/getSiteList',
-					showLoading:true,
-					data:params
-					
-				})
-				console.log(res.data.data)
-				this.siteListData=res.data.data
-			}
-		}
-
-	}
-</script>
-
-<style>
-
-</style>

+ 0 - 195
pages/siteManage/siteManage.vue

@@ -1,195 +0,0 @@
-<template>
-	<view class="site-wrapper">
-		<!-- 筛选框start -->
-		<view class="ding">
-			<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="请输入站点名称"
-					 confirm-type="search" v-model="siteName"></input>
-				</view>
-				<view class="action">
-					<button class="cu-btn bg-blue round" @click="searchSiteList">查询</button>
-				</view>
-			</view>
-		</view>
-		<!-- 筛选框end -->
-
-		<!-- 站点列表start -->
-		<view class="site-items">
-			<view class="cu-list menu-avatar">
-				<view class="cu-item" :class="modalName=='move-box-'+ index?'move-cur':''" v-for="(item,index) in siteList" :key="index"
-				 @touchstart="ListTouchStart" @touchmove="ListTouchMove" @touchend="ListTouchEnd" :data-target="'move-box-' + index">
-					<view class="cu-avatar round lg" style="background-image: url(../../static/site-icon.png);"></view>
-
-					<view class="content" @tap="goDeviceManage(item)">
-						<view class="text-grey site-tit">{{item.siteName}}</view>
-					</view>
-
-					<view class="nav-right num">
-						<view class="text-grey text-xs">
-							<image @click="mapLocation(item)" src="../../static/nav-icon.png" style="width:25rpx;height:25rpx;margin-right:26rpx"></image>
-						</view>
-					</view>
-					<view class="move">
-						<view class="bg-grey" @click.stop="editItem(item)">编辑</view>
-						<view class="bg-red" @click.stop="deleteItem(item)">删除</view>
-					</view>
-				</view>
-			</view>
-			<view v-if="!siteList.length&&siteListRes==1" class="text-center margin-top"> 暂无数据</view>
-		</view>
-		<!-- 站点列表end -->
-
-		<!-- 新增按钮start -->
-		<view class="plus">
-			<image src="../../static/plus.png" style="width:125rpx;height:125rpx" @tap="goAddPage()"></image>
-		</view>
-		<!-- 新增按钮end -->
-	</view>
-
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				modalName: null,
-				listTouchStart: 0,
-				listTouchDirection: null,
-
-				siteName: '',
-				siteList: [],
-				siteListRes: 0,
-			};
-		},
-
-		onLoad: function(option) {
-			
-			//站点列表渲染
-			this.getSiteList()
-			
-		},
-		
-		methods: {
-			//筛选
-			searchSiteList() {
-				this.getSiteList({
-					"siteName": this.siteName
-				})
-			},
-			
-			//编辑
-			editItem(item) {
-				uni.navigateTo({
-					url: '/pages/siteAdd/siteAdd?id=' + item.id + '',
-				});
-			},
-
-			//删除
-			deleteItem(item) {
-				uni.showModal({
-					title: '确认删除吗?',
-					content: '',
-					success: function(result) {
-						if (result.confirm) {
-							this.setDelSite({
-								"id": item.id
-							})
-						} else if (result.cancel) {
-							// console.log('用户点击取消');
-						}
-					}.bind(this)
-				});
-			},
-			
-			// 打开导航
-			mapLocation(item) {
-				uni.openLocation({
-					latitude: parseInt(item.latitude),
-					longitude: parseInt(item.longitude),
-					success: function() {
-						// console.log('success');
-					}
-				});
-			},
-
-			async setDelSite(ming = {}) {
-				const res = await this.$myRequest({
-					url: 'SiteManagement/setDelSite',
-					data: ming
-				})
-				if (!res.data.flag) {
-					uni.showToast({
-						title: "删除失败",
-						icon: "none"
-					});
-				}else{
-					uni.showToast({
-						title: "删除成功",
-					});
-					setTimeout(() => {
-						this.getSiteList()
-					}, 1000);
-				}
-				
-			},
-
-			async getSiteList(ming = {}) {
-				const res = await this.$myRequest({
-					url: 'SiteManagement/getSiteList',
-					showLoading: true,
-					data: ming
-				})
-				this.siteListRes = 1;
-				this.siteList = res.data.data
-				console.log(res.data.data);
-			},
-			
-			// 新增跳转
-			goAddPage() {
-				uni.navigateTo({
-					url: '/pages/siteAdd/siteAdd',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			
-			//跳转到设备管理页面
-			goDeviceManage(item) {
-				uni.navigateTo({
-					url: '/pages/deviceManage/deviceManage?siteId='+item.id+'',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-
-			// ListTouch触摸开始
-			ListTouchStart(e) {
-				this.listTouchStart = e.touches[0].pageX
-			},
-
-			// ListTouch计算方向
-			ListTouchMove(e) {
-				this.listTouchDirection = e.touches[0].pageX - this.listTouchStart < -80 ? 'left' : 'right'
-			},
-
-			// ListTouch计算滚动
-			ListTouchEnd(e) {
-				if (this.listTouchDirection == 'left') {
-					this.modalName = e.currentTarget.dataset.target
-				} else {
-					this.modalName = null
-				}
-				this.listTouchDirection = null
-			}
-		}
-
-	}
-</script>
-
-<style>
-
-</style>

+ 0 - 74
pages/unprocessDetail/opeDataDetail/opeDataDetail.vue

@@ -1,74 +0,0 @@
-<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>
-		<view class="basic-info">
-			<view class="info-tit margin-left-xs">
-				<text class="cuIcon-titles margin-right-xs"></text>
-				数据状态
-			</view>
-			<view class="info-content">
-				<view class="info-one-info ">
-					<text>Uab:</text>
-					<text>{{opeData.Uab}}V</text>
-				</view>
-				<view>
-					<text>Ubc:</text>
-					<text>{{opeData.Ubc}}V</text>
-				</view>
-				<view>
-					<text>Uca:</text>
-					<text>{{opeData.Uca}}V</text>
-				</view>
-				<view>
-					<text>la:</text>
-					<text>{{opeData.Ia}}A</text>
-				</view>
-				<view>
-					<text>lb:</text>
-					<text>{{opeData.Ib}}A</text>
-				</view>
-				<view>
-					<text>lc:</text>
-					<text>{{opeData.Ic}}A</text>
-				</view>
-				
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				opeData:{}
-				
-			}
-		},
-		onLoad(option) {
-			
-		this.getOpeData({"companyCode":option.companyCode,"deviceCode":option.deviceCode,"deviceType":option.deviceType})
-		
-		},
-		methods: {
-			async getOpeData(ming={}) {
-				const res= await this.$myRequest({
-					url:'OperationMonitoring/getMonitoringScreen',
-					data:ming
-				})
-				  console.log(res.data.data[0]);
-				  this.opeData=res.data.data[0]
-			},
-		}
-	}
-</script>
-
-<style>
-	.info-content uni-view uni-text:first-child{
-		width:90rpx;
-	}
-
-</style>

+ 0 - 22
pages/unprocessDetail/videoDetail/videoDetail.vue

@@ -1,22 +0,0 @@
-<template>
-	<view>
-		<video src="" style="width:750rpx" ></video>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>

+ 1 - 1
pages/weiBao/plan/components/chart.vue

@@ -92,7 +92,7 @@
 				// 动态引入较大类库避免影响页面展示
 				const script = document.createElement('script')
 				// view 层的页面运行在 www 根目录,其相对路径相对于 www 计算
-				script.src = '/static/echarts.min.js'
+				script.src = 'static/echarts.min.js'
 				script.onload = this.initEcharts.bind(this)
 				document.head.appendChild(script)
 			}

+ 1 - 1
pages/weiBao/plan/components/chart2.vue

@@ -123,7 +123,7 @@
 				// 动态引入较大类库避免影响页面展示
 				const script = document.createElement('script')
 				// view 层的页面运行在 www 根目录,其相对路径相对于 www 计算
-				script.src = '/static/echarts.min.js'
+				script.src = 'static/echarts.min.js'
 				script.onload = this.initEcharts.bind(this)
 				document.head.appendChild(script)
 			}