flx:提交桥机监测模块

components/u-calendar/u-calendar.vue

@@ -476,7 +476,21 @@
 						// switch: show //是否是切换年月操作
 					});
 				} else {
-					if (!this.startDate || !this.endDate) return;
+					if (!this.startDate || !this.endDate) {
+						this.$emit('change', {
+							startYear: this.startYear,
+							startMonth: this.startMonth,
+							startDay: this.startDay,
+							startDate: null,
+							startWeek: null,
+							endYear: this.endYear,
+							endMonth: this.endMonth,
+							endDay: this.endDay,
+							endDate: null,
+							endWeek: null
+						});
+						return
+					};
 					let startMonth = this.formatNum(this.startMonth);
 					let startDay = this.formatNum(this.startDay);
 					let startDate = `${this.startYear}-${startMonth}-${startDay}`;

js_sdk/u-charts/config-ucharts.js

@@ -81,6 +81,9 @@ module.exports = {
             // }
             // return month + "月";
         },
+        "defaultTooltip": function(val, rowName) {
+            return `${rowName}：${val.data}`;
+        },
     },
     //这里演示了自定义您的图表类型的option，可以随意命名，之后在组件上 type="demotype" 后，组件会调用这个花括号里的option，如果组件上还存在opts参数，会将demotype与opts中option合并后渲染图表。
     "demotype": {

main.js

@@ -1,6 +1,8 @@
 import Vue from 'vue'
 import App from './App'
-import { _chooseImage } from "@/common/permissionTips.js";
+import {
+	_chooseImage
+} from "@/common/permissionTips.js";
 // import VueResource from "vue-resource";
 // main.js
 import uView from "uview-ui";
@@ -23,25 +25,25 @@ Vue.use(uView);
 // // const vConsole = new VConsole()//h5控制台
 // // Vue.use(vConsole)//h5控制台
 Vue.config.productionTip = false
-    // Vue.use(VueResource)
+// Vue.use(VueResource)
 App.mpType = 'app'
-    // import UniIcons from './uni_modules/uni-icons/components/uni-icons/uni-icons.vue'
-    // Vue.use('UniIcons')
-    // 由于引入的icons的命名会跟项目文件里的冲突，所以随便往命名加了个2，区分开来
+// import UniIcons from './uni_modules/uni-icons/components/uni-icons/uni-icons.vue'
+// Vue.use('UniIcons')
+// 由于引入的icons的命名会跟项目文件里的冲突，所以随便往命名加了个2，区分开来
 import uniIcons2 from './uni_modules/uni-icons/components/uni-icons/uni-icons.vue'
 Vue.component('uni-icons2', uniIcons2)
-    //全局变量
-    // Vue.prototype.mobileTopHeight = uni.getMenuButtonBoundingClientRect()?uni.getMenuButtonBoundingClientRect().top:0;
-    // Vue.prototype.url_config = ''
-    // Vue.prototype.COMPANY = "longguang"
-    // Vue.prototype.COMPANY = "nanchang"
-    // Vue.prototype.COMPANY = "sanjiang" //（部署三江h5需要打开/pages/projectManage/projectManage，页面onload内容）
-    // Vue.prototype.COMPANY = "zjwj"
-    // Vue.prototype.COMPANY = "sccr"
-    // Vue.prototype.COMPANY = "agjt" // 鞍钢集团环境
-    // Vue.prototype.COMPANY = "cpgs" // 成平高速环境
+//全局变量
+// Vue.prototype.mobileTopHeight = uni.getMenuButtonBoundingClientRect()?uni.getMenuButtonBoundingClientRect().top:0;
+// Vue.prototype.url_config = ''
+// Vue.prototype.COMPANY = "longguang"
+// Vue.prototype.COMPANY = "nanchang"
+// Vue.prototype.COMPANY = "sanjiang" //（部署三江h5需要打开/pages/projectManage/projectManage，页面onload内容）
+// Vue.prototype.COMPANY = "zjwj"
+// Vue.prototype.COMPANY = "sccr"
+// Vue.prototype.COMPANY = "agjt" // 鞍钢集团环境
+// Vue.prototype.COMPANY = "cpgs" // 成平高速环境
 Vue.prototype.COMPANY = "xjw" // 新金湾 || 潮州环境
-    // Vue.prototype.COMPANY = "" // 标准版
+// Vue.prototype.COMPANY = "" // 标准版
 if (process.env.NODE_ENV === 'development') {
 	// 开发环境
 	console.log('开发环境')
@@ -102,9 +104,11 @@ if (process.env.NODE_ENV === 'development') {
 	// Vue.prototype.url_config = 'http://huli.zjzhiliao.com/jxjgdapi'//金林湾测试
 	// Vue.prototype.url_config = 'http://8.136.222.164:8808/'//中科安信
 	// Vue.prototype.url_config = 'http://101.43.164.214:11111/'// 百色三标段
-        Vue.prototype.url_config = 'http://jxj.zhgdyun.com:9500/'//  测试环境h5
+	// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:9500/'//  测试环境h5
+	// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:1667/' //  测试环境h5
 	// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:21000/' //  潮州项目h5
 
+
 } else {
 	// 生产环境
 	console.log('生产环境')
@@ -127,6 +131,9 @@ if (process.env.NODE_ENV === 'development') {
 	// Vue.prototype.work_url = 'http://101.43.164.214:11137'//  新金湾地址 通用
 
 	Vue.prototype.url_config = 'http://jxj.zhgdyun.com:9500/' //  测试环境h5
+	// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:1667/' //  测试环境h5
+	// Vue.prototype.url_config = 'http://10.36.27.195:9809/' //  敦煌环境h5
+
 	// Vue.prototype.url_config = 'https://192.168.1.2/'//  青海中水北方
 	// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:21000/' //  潮州项目h5
 
@@ -357,8 +364,8 @@ Vue.prototype.sendRequest = function(param) {
 			return;
 		}
 	});
-    }
-    // 判断按钮权限的函数
+}
+// 判断按钮权限的函数
 Vue.prototype.checkBtnPermission = function(permission) {
 	var permissions = JSON.parse(uni.getStorageSync("userInfo")).menuAuthority.menuList;
 	// var permissions = store.state.userInfo.menuAuthority.menuList;

pages.json

@@ -3253,6 +3253,13 @@
 			{
 				"navigationBarTitleText" : ""
 			}
+		},
+		{
+			"path" : "pages/projectEnd/bridgeCraneMonitor/index",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
 		}
 	],
 	// "subPackages":[{

pages/projectEnd/projectIndex/projectIndex.vue

@@ -745,6 +745,11 @@
 							url: '../betonManage/index'
 						})
 						break
+					case 'bridgeCraneMonitor':
+						uni.navigateTo({
+							url: '../bridgeCraneMonitor/index'
+						})
+						break
 					case 'progressManage':
 						uni.navigateTo({
 							url: '../progressManagement/index'

pages/projectEnd/workTicketManage/addWorkTicket.vue

@@ -538,7 +538,7 @@
 							if (res.result) {
 								const resultInfo = JSON.parse(res.result);
 								that.policeCameraItemInfo = that.policeCameraItemList.find(item => item
-									.devSn == resultInfo);
+									.devSn == resultInfo.devSn);
 								that.submitShow = true;
 							}
 						}

pages/projectEnd/workTicketManage/index.vue

@@ -165,6 +165,7 @@
 			this.getWorkTicketTypeListFn();
 		},
 		onShow() {
+			this.checkedIds = [];
 			this.getWorkTicketCountWorkTicketFn();
 			this.getWorkTicketListFn();
 		},

pages/projectEnd/workTicketManage/workTicketDetail.vue

@@ -9,14 +9,17 @@
 		</view>
 		<view class="content" :style="{paddingTop: mobileTopHeight + 44 + 'px'}">
 			<view class="content_header" v-if="workTicketInfo.status == 2">
-				<u-dropdown>
+				<u-dropdown ref="uDropdown" @open="onOpen" @close="onClose">
 					<u-dropdown-item @change="onVideoItemChange" :title="itemListUp" v-model="itemId"
 						:options="workTicketInfo.itemList"></u-dropdown-item>
 				</u-dropdown>
 				<!-- 'https://gcalic.v.myalicdn.com/gc/wgw05_1/index.m3u8' -->
+				<template v-if="dropdownFlag">
 					<my-player-m3u8 v-if="videoItemInfo.url" :src="videoItemInfo.url" :showMask="stateShow"
 						:autoplay="true" />
 					<video class="player-m3u8" v-else :src="videoItemInfo.url"></video>
+				</template>
+				<view v-else class="player-m3u8 "></view>
 			</view>
 
 			<u-tabs :bar-height="4" :font-size="28" active-color="#498CEC" inactive-color="#B3B3B3" :bar-width="375"
@@ -250,6 +253,7 @@
 				},
 				lineHeightFlag1: false,
 				lineHeightFlag2: false,
+				dropdownFlag: true
 			}
 		},
 		onLoad(opts) {
@@ -274,6 +278,14 @@
 			}, 500)
 		},
 		methods: {
+			onOpen(index) {
+				this.$refs.uDropdown.highlight();
+				this.dropdownFlag = false;
+			},
+			onClose(index) {
+				this.$refs.uDropdown.highlight(index);
+				this.dropdownFlag = true;
+			},
 			getLineCount() {
 				const that = this;
 				uni.createSelectorQuery().in(this).select('#box-content_detail1').boundingClientRect(rect => {
@@ -529,6 +541,10 @@
 </script>
 
 <style scoped lang="scss">
+	.player-m3u8-bg {
+		background: #000;
+	}
+
 	.new-nodata {
 		position: absolute;
 		top: 50%;
@@ -702,6 +718,7 @@
 				position: relative;
 				height: 800rpx;
 			}
+
 			.header-title {
 				padding: 12rpx 16rpx;
 				border-bottom: 2rpx solid #EFF3F7;