Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

.hbuilderx/debug.config.json

@@ -0,0 +1,4 @@
+{
+    "rootPathIndex": 1,
+    "webRoot": "${projectDir}"
+}

config/index.js

@@ -1,7 +1,7 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
-	baseUrlNew: 'http://192.168.1.107:8090/',
-	// baseUrlNew: 'http://api1.eliangeyun.com/',
+	// baseUrlNew: 'http://192.168.1.107:8090/',
+	baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "1.1.15",
-    "versionCode" : 1114,
+    "versionName" : "1.1.18",
+    "versionCode" : 1118,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},
@@ -186,7 +186,9 @@
         "modules" : {
             "SQLite" : {},
             "Push" : {},
-            "Maps" : {}
+            "Maps" : {},
+            "LivePusher" : {},
+            "VideoPlayer" : {}
         },
         "splashscreen" : {
             "waiting" : false

pages.json

@@ -311,12 +311,18 @@
 				"navigationStyle": "custom"
 			}
 		},
-		// {
-		// 	"path": "pages/user/report",
-		// 	"style": {
-		// 		"navigationBarTitleText": "数据报表"
-		// 	}
-		// },
+		{
+			"path": "pages/user/report",
+			"style": {
+				"navigationBarTitleText": "数据报表"
+			}
+		},
+		{
+			"path": "pages/user/mintor",
+			"style": {
+				"navigationBarTitleText": "库点监控"
+			}
+		},
 		{
 			"path": "pages/buy/transaction",
 			"style": {
@@ -1080,6 +1086,15 @@
             
         }
         
+        ,{
+            "path" : "pages/user/depotMonitoring",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "库点监控",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"subpackages": [{
 			"root": "pageA",

pages/erp/improvedWrehousing/improvedWrehousingDetail.vue

@@ -22,45 +22,45 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">毛重（吨）</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
+				<input type="number" @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
 					placeholder="输入毛重"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">皮重（吨）</view>
-				<input @input='calculate' v-model='detailData.tare' class="right-bottom" placeholder="输入皮重"></input>
+				<input type="number" @input='calculate' v-model='detailData.tare' class="right-bottom" placeholder="输入皮重"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">扣重（吨）</view>
-				<input @input='calculate' v-model='detailData.deductionWeight' class="right-bottom"
+				<input type="number" @input='calculate' v-model='detailData.deductionWeight' class="right-bottom"
 					placeholder="输入扣重"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">净重（吨）</view>
-				<input @input='' v-model='netWeight' class="right-bottom" placeholder="不可编辑,自动计算"
+				<input type="number" @input='' v-model='netWeight' class="right-bottom" placeholder="不可编辑,自动计算"
 					:disabled="true"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">扣款（元/吨）</view>
-				<input @input='' v-model='detailData.deductionAmount' class="right-bottom" placeholder="输入扣款"></input>
+				<input type="number" @input='' v-model='detailData.deductionAmount' class="right-bottom" placeholder="输入扣款"></input>
 			</view>
 			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">扣重比</view>
-				<input @input='' v-model='detailData.buckleWeightRatio' class="right-bottom" placeholder="输入扣重比"
+				<input type="number" @input='' v-model='detailData.buckleWeightRatio' class="right-bottom" placeholder="输入扣重比"
 					@input="pureWeightCount"></input>
 			</view>
 			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">干粮水分（%）</view>
-				<input @input='' v-model='detailData.solidGrainWater' class="right-bottom" placeholder="输入干粮水分占比"
+				<input type="number" @input='' v-model='detailData.solidGrainWater' class="right-bottom" placeholder="输入干粮水分占比"
 					@input="pureWeightCount"></input>
 			</view>
 			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">潮粮水分（%）</view>
-				<input @input='' v-model='detailData.tidalGrainWater' class="right-bottom" placeholder="输入潮粮水分占比"
+				<input type="number" @input='' v-model='detailData.tidalGrainWater' class="right-bottom" placeholder="输入潮粮水分占比"
 					@input="pureWeightCount"></input>
 			</view>
 			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">纯重（吨）</view>
-				<input @input='calculate' v-model='detailData.pureWeight' class="right-bottom" placeholder="不可编辑,自动计算"
+				<input type="number" @input='calculate' v-model='detailData.pureWeight' class="right-bottom" placeholder="不可编辑,自动计算"
 					:disabled="true"></input>
 			</view>
 			<view class="row">
@@ -98,13 +98,13 @@
 			</view>
 			<view class="row row-bottom has-btn">
 				<view class="left">成本（元/吨）</view>
-				<input v-if="detailData.inOutType=='采购入库'" v-model='detailData.cost' class="right-bottom"
+				<input type="number" v-if="detailData.inOutType=='采购入库'" v-model='detailData.cost' class="right-bottom"
 					placeholder="自动获取" :disabled="isEditCB"></input>
 				<u-button class="edit-btn" hover-class="none" @click="editCB">编辑</u-button>
 			</view>
 			<view class="row row-bottom has-btn">
 				<view class="left">运费（元/吨）</view>
-				<input @input='' v-model='detailData.freight' :disabled="isEditYF" class="right-bottom"
+				<input type="number" @input='' v-model='detailData.freight' :disabled="isEditYF" class="right-bottom"
 					placeholder="自动获取"></input>
 				<u-button class="edit-btn" hover-class="none" @click="editYF">编辑</u-button>
 			</view>
@@ -126,32 +126,32 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">水分（%）</view>
-				<input @input='' v-model='detailData.warehouseInOutDetail.waterContent' class="right-bottom"
+				<input type="number" @input='' v-model='detailData.warehouseInOutDetail.waterContent' class="right-bottom"
 					placeholder="输入水分占比"></input>
 			</view>
 			<view class="row row-bottom" >
 				<view class="left">容重（克/升）</view>
-				<input v-model='detailData.warehouseInOutDetail.bulkDensity' class="right-bottom"
+				<input type="number" v-model='detailData.warehouseInOutDetail.bulkDensity' class="right-bottom"
 					placeholder="输入容重"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">热损伤（%）</view>
-				<input @input='' v-model='detailData.warehouseInOutDetail.jiaorenli' class="right-bottom"
+				<input type="number" @input='' v-model='detailData.warehouseInOutDetail.jiaorenli' class="right-bottom"
 					placeholder="输入热损伤占比"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">杂质（%）</view>
-				<input @input='' v-model='detailData.warehouseInOutDetail.impurity' class="right-bottom"
+				<input type="number" @input='' v-model='detailData.warehouseInOutDetail.impurity' class="right-bottom"
 					placeholder="输入杂质占比"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">霉变粒（%）</view>
-				<input @input='' v-model='detailData.warehouseInOutDetail.mildewGrain' class="right-bottom"
+				<input type="number" @input='' v-model='detailData.warehouseInOutDetail.mildewGrain' class="right-bottom"
 					placeholder="输入霉变粒占比"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">不完善粒（%）</view>
-				<input @input='' v-model='detailData.warehouseInOutDetail.imperfectGrain' class="right-bottom"
+				<input type="number" @input='' v-model='detailData.warehouseInOutDetail.imperfectGrain' class="right-bottom"
 					placeholder="输入不完善粒占比"></input>
 			</view>
 		</view>

pages/erp/warehousing/warehousing.vue

@@ -22,45 +22,45 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">毛重（吨）</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
+				<input type="number" @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
 					placeholder="输入毛重"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">皮重（吨）</view>
-				<input @input='calculate' v-model='detailData.tare' class="right-bottom" placeholder="输入皮重"></input>
+				<input type="number" @input='calculate' v-model='detailData.tare' class="right-bottom" placeholder="输入皮重"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">扣重（吨）</view>
-				<input @input='calculate' v-model='detailData.deductionWeight' class="right-bottom"
+				<input type="number" @input='calculate' v-model='detailData.deductionWeight' class="right-bottom"
 					placeholder="输入扣重"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">净重（吨）</view>
-				<input @input='' v-model='netWeight' class="right-bottom" placeholder="不可编辑,自动计算"
+				<input type="number" @input='' v-model='netWeight' class="right-bottom" placeholder="不可编辑,自动计算"
 					:disabled="true"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">扣款（元/吨）</view>
-				<input @input='' v-model='detailData.deductionAmount' class="right-bottom" placeholder="输入扣款"></input>
+				<input type="number" @input='' v-model='detailData.deductionAmount' class="right-bottom" placeholder="输入扣款"></input>
 			</view>
 			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">扣重比</view>
-				<input @input='' v-model='detailData.buckleWeightRatio' class="right-bottom" placeholder="输入扣重比"
+				<input type="number" @input='' v-model='detailData.buckleWeightRatio' class="right-bottom" placeholder="输入扣重比"
 					@input="pureWeightCount"></input>
 			</view>
 			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">干粮水分（%）</view>
-				<input @input='' v-model='detailData.solidGrainWater' class="right-bottom" placeholder="输入干粮水分占比"
+				<input type="number" @input='' v-model='detailData.solidGrainWater' class="right-bottom" placeholder="输入干粮水分占比"
 					@input="pureWeightCount"></input>
 			</view>
 			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">潮粮水分（%）</view>
-				<input @input='' v-model='detailData.tidalGrainWater' class="right-bottom" placeholder="输入潮粮水分占比"
+				<input type="number" @input='' v-model='detailData.tidalGrainWater' class="right-bottom" placeholder="输入潮粮水分占比"
 					@input="pureWeightCount"></input>
 			</view>
 			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">纯重（吨）</view>
-				<input @input='calculate' v-model='detailData.pureWeight' class="right-bottom" placeholder="不可编辑,自动计算"
+				<input type="number" @input='calculate' v-model='detailData.pureWeight' class="right-bottom" placeholder="不可编辑,自动计算"
 					:disabled="true"></input>
 			</view>
 			<view class="row">
@@ -97,15 +97,15 @@
 			</view>
 			<view class="row row-bottom has-btn">
 				<view class="left">成本（元/吨）</view>
-				<input v-model='detailData.cost' class="right-bottom"
+				<input type="number" v-model='detailData.cost' class="right-bottom"
 					placeholder="自动获取" :disabled="isEditCB"></input>
-				<!-- <input v-if="detailData.inOutType!='采购入库'" v-model='detailData.cost' class="right-bottom"
+				<!-- <input type="number" v-if="detailData.inOutType!='采购入库'" v-model='detailData.cost' class="right-bottom"
 					placeholder="自动获取" :disabled="isEditCB"></input> -->
 				<u-button class="edit-btn" hover-class="none" @click="editCB">编辑</u-button>
 			</view>
 			<view class="row row-bottom has-btn">
 				<view class="left">运费（元/吨）</view>
-				<input @input='' v-model='detailData.freight' :disabled="isEditYF" class="right-bottom"
+				<input type="number" @input='' v-model='detailData.freight' :disabled="isEditYF" class="right-bottom"
 					placeholder="自动获取"></input>
 				<u-button class="edit-btn" hover-class="none" @click="editYF">编辑</u-button>
 			</view>
@@ -127,27 +127,27 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">水分（%）</view>
-				<input @input='' v-model='detailData.warehouseInOutDetail.waterContent' class="right-bottom"
+				<input type="number" @input='' v-model='detailData.warehouseInOutDetail.waterContent' class="right-bottom"
 					placeholder="输入水分占比"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">容重（克/升）</view>
-				<input v-model='detailData.warehouseInOutDetail.bulkDensity' class="right-bottom"
+				<input type="number" v-model='detailData.warehouseInOutDetail.bulkDensity' class="right-bottom"
 					placeholder="输入容重"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">热损伤（%）</view>
-				<input @input='' v-model='detailData.warehouseInOutDetail.jiaorenli' class="right-bottom"
+				<input type="number" @input='' v-model='detailData.warehouseInOutDetail.jiaorenli' class="right-bottom"
 					placeholder="输入热损伤占比"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">杂质（%）</view>
-				<input @input='' v-model='detailData.warehouseInOutDetail.impurity' class="right-bottom"
+				<input type="number" @input='' v-model='detailData.warehouseInOutDetail.impurity' class="right-bottom"
 					placeholder="输入杂质占比"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">霉变粒（%）</view>
-				<input @input='' v-model='detailData.warehouseInOutDetail.mildewGrain' class="right-bottom"
+				<input type="number" @input='' v-model='detailData.warehouseInOutDetail.mildewGrain' class="right-bottom"
 					placeholder="输入霉变粒占比"></input>
 			</view>
 			<view class="row row-bottom">
@@ -232,10 +232,10 @@
 					grade: "一等品",
 					agent: '请选择经办人',
 					inOutType: '请选择入库类型',
-					deductionWeight: 0,
-					grossWeight: 0,
-					tare: 0,
-					deductionAmount: 0,
+					deductionWeight: '',
+					grossWeight: '',
+					tare: '',
+					deductionAmount: '',
 					netWeight: 0,
 					cost:0,
 					warehouseInOutDetail: {}

pages/erpbusiness/index.vue

@@ -79,15 +79,15 @@
 						show: true
 					},
 
-					{
-						num: 2,
-						name: '收购检斤',
-						// icon: 'cuIcon-copy',
-						src:'../../static/img/erp/shougoujianjin@3x.png',
-						tips: 0,
-						url: '/pages/erpbusiness/acquisitionInspection/acquisitionInspection',
-						show: false
-					}
+					// {
+					// 	num: 2,
+					// 	name: '收购检斤',
+					// 	// icon: 'cuIcon-copy',
+					// 	src:'../../static/img/erp/shougoujianjin@3x.png',
+					// 	tips: 0,
+					// 	url: '/pages/erpbusiness/acquisitionInspection/acquisitionInspection',
+					// 	show: false
+					// }
 
 					// {
 					// 	num: 5,

pages/public/login_account_number.vue

@@ -117,7 +117,6 @@
 							console.log("loginQuickly",res)
 							if(res1.data.code==200){
 								uni.setStorageSync('pcUserInfo', res1.data.data)
-								// debugger
 								helper.getListByUserId()
 							}
 							else{

pages/user/depotMonitoring.vue

@@ -0,0 +1,269 @@
+<template>
+	<view class="wrap">
+		<view class='title'>库点监控管理</view>
+		<view class="dropdown">
+			<view class="left">仓库名称</view>
+			<view class="right" @click='show1=true'>
+				<view>{{warehouseName}}</view>
+				<u-icon name="arrow-right" color=""></u-icon>
+				<u-picker @confirm="warehousechange" range-key='warehouseName' mode="selector" v-model="show1"
+					:range="warehouseList"></u-picker>
+			</view>
+		</view>
+		<view class="content no-content" v-if="warehouseName!='山东诸城迈饶库'">暂无视频</view>
+		<view class="content" v-if="warehouseName=='山东诸城迈饶库'">
+			<view class='title'>监控视频</view>
+			<view class="video-list">
+				<view class=" cu-list grid col-4 no-border">
+					<view class="cu-item" style='text-align:center;' v-for="(item,index) in videoList"
+						@click="gridClick(item)">
+						<view v-if="item.Status == 'ON'">
+							<image v-if="item.SnapURL" :src="'https://live.eliangeyun.com'+item.SnapURL" class="sign1">
+							</image>
+							<view v-else style="background-color: #008000;" class="sign1">
+								<image src="../../static/img/play-btn.png"
+									style="width: 80rpx;height: 80rpx;margin-top: 40rpx;"></image>
+							</view>
+						</view>
+					</view>
+				</view>
+				<!-- <iframe class='video-iframe' v-show="item.isPlay"  :src="item.src" width="" height="" allowfullscreen="true"
+						webkitallowfullscreen="true" mozallowfullscreen="true"
+						allow="autoplay; fullscreen; microphone;"></iframe> -->
+			</view>
+		</view>
+	</view>
+	</view>
+</template>
+<script>
+	import {
+		mapState
+	} from 'vuex';
+
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				show1: false,
+				warehouseName: '',
+				warehouseList: [],
+				monitorUrl2: '',
+				videoList: []
+			}
+		},
+
+		onLoad() {
+
+		},
+		// #ifndef MP
+		onNavigationBarButtonTap(e) {
+			const index = e.index;
+			if (index === 0) {
+				this.navTo('/pages/set/set');
+			} else if (index === 1) {
+				// #ifdef APP-PLUS
+				const pages = getCurrentPages();
+				const page = pages[pages.length - 1];
+				const currentWebview = page.$getAppWebview();
+				currentWebview.hideTitleNViewButtonRedDot({
+					index
+				});
+				// #endif
+				uni.navigateTo({
+					url: '/pages/notice/notice'
+				})
+			}
+		},
+		// #endif
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
+		onShow() {
+			debugger
+			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
+				console.log("checkSession", res)
+				if (res.data.data == "INVALID") {
+					uni.showModal({
+						title: '登录提示',
+						content: '当前登入信息验证失败，是否重新登录？',
+						showCancel: true,
+						confirmText: '登录',
+						success: (e) => {
+							if (e.confirm) {
+								uni.navigateTo({
+									url: '/pages/public/login'
+								})
+							}
+						},
+						fail: () => {},
+						complete: () => {}
+					})
+				}
+			})
+			var that = this
+			uni.request({
+				url: 'https://live.eliangeyun.com/api/v1/device/channellist',
+				method: 'GET',
+				success: (res) => {
+					if (res.statusCode === 200) {
+						that.videoList = res.data.ChannelList
+					}
+				},
+				fail: (res) => {
+					console.log("fail::", res)
+				}
+			})
+			this.$api.doRequest('get', '/openServiceInfo/selectCommonCompany', {
+				phone: this.userInfo.phone
+			}).then(res => {
+				if (res.data.code == 200) {
+					this.init(res.data.data[0].compId)
+				}
+			})
+			console.log("hasLogin", this.hasLogin)
+		},
+		methods: {
+			/**
+			 * 统一跳转接口,拦截未登录路由
+			 * navigator标签现在默认没有转场动画，所以用view
+			 */
+			navTo(url) {
+				if (!this.hasLogin) {
+					url = '/pages/public/login';
+				}
+				uni.navigateTo({
+					url
+				})
+			},
+			init(compId) {
+				console.log(this.userInfo)
+				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelf', {
+					compId: compId,
+				}).then(res => {
+					if (res.data.data.length != 0) {
+						console.log('res', res.data.data)
+						this.warehouseName = res.data.data[0].warehouseName
+						let _showData = uni.getStorageSync("depotMonitoring")
+						this.warehouseList = res.data.data;
+						if (_showData) {
+							this.warehouseName = _showData.warehouseName
+						} else {
+							this.warehouseName = res.data.data[0].warehouseName
+						}
+
+					} else {
+						this.warehouseList = []
+						this.warehouseName = '暂无仓库'
+					}
+				})
+
+			},
+			warehousechange(e) {
+				this.warehouseName = this.warehouseList[e[0]].warehouseName
+				console.log(this.warehouseName)
+				uni.setStorageSync("depotMonitoring", this.warehouseList[e[0]])
+			},
+			gridClick(item) {
+				var param = "https://live.eliangeyun.com/play.html?serial=" + item.DeviceID + "&code=" + item.ID +
+					"&aspect=fullscreen"
+				uni.setStorageSync("mintor", param)
+				uni.navigateTo({
+					url: '/pages/user/mintor'
+				})
+				console.log("param", param)
+			}
+		}
+	}
+</script>
+<style lang='scss' scoped>
+	page {
+		background: #F5F6FA;
+	}
+
+	.cu-list>.cu-item:after {
+		border: none;
+	}
+
+	.sign {
+		width: 35px;
+		height: 35px;
+		top: 4px;
+	}
+
+	.sign1 {
+		width: 76px;
+		height: 76px;
+		top: 4px;
+	}
+
+	.wrap {
+		background: #fff;
+		margin: 10px;
+		border-radius: 10px;
+		padding: 10px;
+
+		.title {
+			font-size: 16px;
+			font-weight: 700;
+		}
+
+		.dropdown {
+			display: flex;
+			margin: 20rpx 0;
+			justify-content: space-between;
+			/* border-bottom: 1px solid #EEEEEE; */
+			padding-bottom: 20rpx;
+
+			.left,
+			.right {
+				display: flex;
+				align-items: center;
+			}
+		}
+	}
+
+	.video-list {
+		position: relative;
+
+		.video-list-item {
+			position: relative;
+			height: 400rpx;
+			margin: 20rpx 0;
+
+			.img-content {
+				position: relative;
+				width: 100%;
+				height: 400rpx;
+				background: green;
+
+				.play {
+					position: absolute;
+					width: 100rpx;
+					height: 100rpx;
+					top: 0;
+					bottom: 0;
+					left: 0;
+					right: 0;
+					margin: auto;
+					z-index: 3;
+				}
+			}
+
+			.img {}
+
+			.video-iframe {
+				position: absolute;
+				width: 100%;
+				height: 100%;
+				z-index: 1;
+				border: 0;
+			}
+		}
+	}
+
+	.no-content {
+		text-align: center;
+	}
+</style>

pages/user/mintor.vue

@@ -0,0 +1,22 @@
+<template>
+    <web-view  :src="url"></web-view>
+</template>
+
+<script>
+	export default {
+        data() {
+            return {
+                url:"",
+            }
+        },
+        onShow(){
+			this.url = uni.getStorageSync("mintor")
+        }
+    }
+</script>
+    
+
+
+<style>
+
+</style>

pages/user/report.vue

@@ -1,16 +1,25 @@
 <template>
-    <web-view :src="url"></web-view>
+    <web-view  :src="url"></web-view>
+    <!-- <web-view v-if="flag" :src="url"></web-view> -->
+	<!-- <iframe v-else :src="url" width="340" height="360" allowfullscreen allow="autoplay; fullscreen; microphone;"></iframe> -->
 </template>
 
 <script>
 	export default {
         data() {
             return {
-                url:"https://datav.aliyuncs.com/share/235518097ffd673bc1eb05011b9a02b6"
+                url:"https://datav.aliyuncs.com/share/235518097ffd673bc1eb05011b9a02b6",
+				flag:true
             }
         },
         onLoad: function(option) {
-            // this.url = option.url;
+			if(option.url){
+				this.url = option.url;
+				uni.setNavigationBarTitle({
+					title:"库点监控"
+				})
+				this.flag = false
+			}
         },
         methods: {
         }

pages/user/user.vue

@@ -31,7 +31,7 @@
 				<view style='font-size:16px;padding-left:14px;'>我的功能</view>
 				<view class="cu-list grid" :class="['col-' + gridCol,gridBorder?'':'no-border']">
 					<view class="cu-item" style='text-align:center;' v-for="(item,index) in gridList1" :key="index"
-						@click="gridClick(item, index)" v-if="index<gridCol*2">
+						@click="gridClick(item, index)" v-if="index<gridCol*2" v-show="item.show">
 						<view :class="['cuIcon-' + item.cuIcon,'text-' + item.color]">
 							<text v-if='item.num==4&&taskTip' class='badge_user'>{{taskTip}}</text>
 							<image :src="item.src" class="sign1"></image>
@@ -204,10 +204,19 @@
 						num: 6,
 						name: '数据报表',
 						// icon: 'cuIcon-edit',
-						src: '../../static/img/sign/myContract@2x.png',
+						src: '../../static/img/sign/shujubaobiao@2x.png',
 						tips: 0,
 						url: `/pages/user/report`,
 						show: true
+					},
+					{
+						num: 6,
+						name: '库点监控',
+						// icon: 'cuIcon-edit',
+						src: '../../static/img/sign/kudianjiankong@2x.png',
+						tips: 0,
+						url: `/pages/user/depotMonitoring`,
+						show: true
 					}
 				],
 				showTran: true,
@@ -249,7 +258,7 @@
 			this.scrollTop = e.scrollTop;
 		},
 		onShow() {
-
+			this.isShow();
 			uni.hideKeyboard()
 			uni.showTabBar()
 			this.loadData()
@@ -299,6 +308,24 @@
 			console.log("this.userInfo", this.userInfo)
 		},
 		methods: {
+			getRoles: function(role) {
+				let _roles = uni.getStorageSync('rolesList')
+				for (let i = 0; i < _roles.length; i++) {
+					if (_roles[i] == role) {
+						 return true
+					} 
+				}
+				return false
+			},
+			isShow(){
+				for(let k = 0;k<this.gridList1.length;k++){
+					if(k==6){
+						this.gridList1[k].show = this.getRoles('reportData.view')
+					}else if (k==7){
+						this.gridList1[k].show = this.getRoles('monitoring.view')
+					}
+				}
+			},
 			smBtnClick() {
 				console.log(2)
 				if (!this.hasLogin) {