3/17

App.vue

@@ -21,9 +21,6 @@
 		height: 88rpx;
 		width: 100%;
 	}
-<<<<<<< HEAD
-
-=======
 	.status_bar {
 	  height: 88rpx;
 	  width: 100%;
@@ -32,7 +29,6 @@
 	  top: 0;
 	  z-index: 99999;
 	 }
->>>>>>> 1c31f0ba3e58f06f275858f2857f9f7f3e3fafc8
 	@font-face {
 		font-family: "iconfont";
 		src: url('~@/static/font/iconfont.eot?t=1614322974882');

pages.json

@@ -935,17 +935,10 @@
             
         }
         ,{
-<<<<<<< HEAD
-            "path" : "pages/cb/cbd/equip-set/test/test",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-=======
             "path" : "pages/distribution/index",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "设备分布",
->>>>>>> 1c31f0ba3e58f06f275858f2857f9f7f3e3fafc8
                 "enablePullDownRefresh": false
             }
             

pages/cb/cbd/equip-set/historyfile.vue

@@ -175,22 +175,12 @@
 					arr3.push(res[i].addtime * 1000 + 8 * 3600000, Number(res[i].others))
 					this.options.series[2].data.push(arr3)
 				}
-<<<<<<< HEAD
-				console.log(this.options.series)
-			 },
-			 //forecast.worm_lamp.device_history_data历史数据列表
-			 async historylist() { //获取图片列表
-			 	const res = await this.$myRequest({
-			 		url: '/api/api_gateway?method=forecast.worm_lamp.device_history_data',
-			 		data: {
-=======
 			},
 			//forecast.worm_lamp.device_history_data历史数据列表
 			async historylist() { //获取图片列表
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=forecast.worm_lamp.device_history_data',
 					data: {
->>>>>>> 1c31f0ba3e58f06f275858f2857f9f7f3e3fafc8
 						device_type_id: 3,
 						device_id: this.device_id,
 						start_time: parseInt(this.start_time / 1000),

pages/equipMange/index/index.vue

@@ -1,14 +1,7 @@
 <template>
 	<view class="">
-<<<<<<< HEAD
-		<view class="">
-			<view class="status_bar">
-				
-			</view>
-=======
 		<view class="status_bar"></view>
 		<view class="" style="position: relative;top: 44px;">
->>>>>>> 1c31f0ba3e58f06f275858f2857f9f7f3e3fafc8
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar left-icon="back" left-text="返回" right-icon="plus" title="用户管理" @clickRight="clickRight" @clickLeft="clickLeft"></uni-nav-bar>
 			</view>

pages/fourBase/index.vue

@@ -11,21 +11,6 @@
 					<u-icon name="search" class="search" @click="search"></u-icon>
 					<input type="text" v-model="data.search" placeholder="请输入基地名称" @input="searchinput" />
 				</view>
-<<<<<<< HEAD
-				<view class="bases_list_text">
-					<p><span style="margin-right: 30rpx;">{{items.base_name}}</span><span>{{items.base_area}}㎡</span></p>
-					<p style="font-size: 24rpx;">联系人：{{items.base_charge}}</p>
-					<p style="font-size: 24rpx;">联系电话：{{items.base_phone}}</p>
-					<p style="font-size: 24rpx;">地址：{{items.base_name}}</p>
-				</view>
-				<u-icon name="more-dot-fill" class="bases_list_xiangqing" @click.native.stop="XQclick(items)"></u-icon>
-				<view class="photoshow">
-					<image src="../../static/image/fourMoodBase/cbd.png" mode=""></image>
-					<image src="../../static/image/fourMoodBase/scd.png" mode=""></image>
-					<image src="../../static/image/fourMoodBase/qxz.png" mode=""></image>
-					<view class="photoshow_num">
-						6+
-=======
 			</view>
 			<view class="bases">
 				<view class="bases_list" v-for="(items,index) in baselist" :key="index" @click="details(items.id)">
@@ -43,13 +28,12 @@
 					</view>
 					<u-icon name="more-dot-fill" class="bases_list_xiangqing" @click.native.stop="XQclick(items)"></u-icon>
 					<view class="photoshow">
-						<image src="../../static/image/fourMoodBase/测报灯.png" mode=""></image>
-						<image src="../../static/image/fourMoodBase/杀虫灯.png" mode=""></image>
-						<image src="../../static/image/fourMoodBase/环境监测.png" mode=""></image>
+						<image src="../../static/image/fourMoodBase/cbd.png" mode=""></image>
+						<image src="../../static/image/fourMoodBase/scd.png" mode=""></image>
+						<image src="../../static/image/fourMoodBase/qxz.png" mode=""></image>
 						<view class="photoshow_num">
 							{{items.num}}+
 						</view>
->>>>>>> 1c31f0ba3e58f06f275858f2857f9f7f3e3fafc8
 					</view>
 				</view>
 				<u-action-sheet :list="actionSheetList" v-model="post_show" @click="message"></u-action-sheet>