任家庄：视频监控改为原生

App.vue

@@ -15,7 +15,7 @@
 			// uni.setStorageSync('mine_code', 'shicaocun');
 			// uni.setStorageSync('mine_code', 'meihuajing');
 			// uni.setStorageSync('mine_code', 'zaoquan');
-			uni.setStorageSync('mine_code', 'qingshuiying');
+			// uni.setStorageSync('mine_code', 'qingshuiying');
 			// uni.setStorageSync('mine_code', 'wuyegongsi');
 			// uni.setStorageSync('mine_code', 'jinjiaqu');
 			// uni.setStorageSync('mine_code', 'jinjiaqu_neiwang');
@@ -23,7 +23,7 @@
 			// uni.setStorageSync('mine_code', 'jinfeng');
 			// uni.setStorageSync('mine_code', 'jinfeng_neiwang');
 			// uni.setStorageSync('mine_code', 'lingxin');
-			// uni.setStorageSync('mine_code', 'renjiazhuang');
+			uni.setStorageSync('mine_code', 'renjiazhuang');
 			
 			// console.log(set_base_url(uni.getStorageSync('mine_code')))
 			

common/common.js

@@ -219,7 +219,7 @@ export const goToLink = (item, mine_code) => {
 		if (link.indexOf("/workBench/evaluate") != -1) {
 			console.log("干部评测")
 			uni.navigateTo({
-				url: "../../workbench/h5/h5?mine_code=" + mine_code + "&workBench=pingce"
+				url: "../../workbench/h5/h5?workBench=pingce"
 			})
 		}
 		if (link.indexOf("/productionData/persnoalLocation") != -1) {
@@ -246,4 +246,4 @@ export const goToLink = (item, mine_code) => {
 			
 		}
 	}
-}
+}

common/vmeitime-http/interface.js

@@ -38,7 +38,7 @@ export default {
 		// baseUrl: "http://ningdongyunying.nxjiewei.com:8011/api",
 		// baseUrl: "http://shicaocun.nxjiewei.com:8011/api",
 		// baseUrl: "http://zaoquan.nxjiewei.com:8011/api",
-		baseUrl: "http://qingshuiying.nxjiewei.com:8011/api",
+		// baseUrl: "http://qingshuiying.nxjiewei.com:8011/api",
 		// baseUrl: "http://wuyegongsi.nxjiewei.com:8011/api",
 		// baseUrl: "http://jinjiaqu.nxjiewei.com:8011/api",
 		// 金家渠：内网
@@ -48,7 +48,7 @@ export default {
 		// 金凤:内网
 		// baseUrl: "http://n.jinfeng.nxjiewei.com:8011/api",
 		// baseUrl: "http://lingxin.nxjiewei.com:8011/api",
-		// baseUrl: "http://renjiazhuang.nxjiewei.com:8011/api",
+		baseUrl: "http://renjiazhuang.nxjiewei.com:8011/api",
 		
 		// baseUrl: uni.getStorageSync('base_url'),
 		header: {

components/t-p-jinjiaqu/t-p-jinjiaqu.vue

@@ -27,7 +27,7 @@
 				<view class="tip">工业视频</view>
 			</view>
 		</view>
-		<view class="item_box" style="background-color: #FBB47B;" @click="go_video_monitor_h5()">
+		<!-- <view class="item_box" style="background-color: #FBB47B;" @click="go_video_monitor_h5()">
 			<view class="img">
 				<image src="../t-p-icon/icon_6.png" mode=""></image>
 			</view>
@@ -35,7 +35,7 @@
 				<view class="name">视频监控</view>
 				<view class="tip">海康</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="item_box" style="background-color: #5175E3;" @click="go_shangtang()">
 			<view class="img">
 				<image src="../t-p-icon/icon_4.png" mode=""></image>

components/t-p-renjiazhuang/t-p-renjiazhuang.vue

@@ -162,12 +162,13 @@
 			// 视频监控
 			go_video_monitor(){
 				uni.navigateTo({
-					url:"../../production/video_monitor/video_monitor?mine_code=" + this.mine_code
+					// url:"../../production/video_monitor/video_monitor?mine_code=" + this.mine_code
 				})
 			},
 			go_video_monitor_haikang(){
 				uni.navigateTo({
-					url:"../../production/video_monitor/video_monitor?mine_code=renjiazhuanghaikang"
+					// url:"../../production/video_monitor/video_monitor?mine_code=renjiazhuanghaikang"
+					url:"../../production/video_monitor_app/video_monitor_app?mine_code=renjiazhuanghaikang"
 				})
 			}
 		}

components/tree/tree.vue

@@ -4,7 +4,8 @@
 			<view class="info">
 				<view class="name">
 					<!-- <uni-icons v-if="!item.children" style="margin-right: 30rpx;" type="eye" color="#009FE8"></uni-icons> {{item.name}} <text v-if="item.children" style="margin-left: 10rpx;">（{{item.children.length}})</text> -->
-					<uni-icons v-if="!item.children" style="margin-right: 30rpx;" type="eye" color="#009FE8"></uni-icons> {{item.name}}
+					<uni-icons v-if="!item.children" style="margin-right: 30rpx;" type="eye" color="#009FE8"></uni-icons>
+					{{item.name}}
 				</view>
 				<view v-if="item.children && body_index != index" style="position: absolute;right: 20px;">
 					<uni-icons type="arrowright"></uni-icons>

manifest.json

@@ -1,8 +1,8 @@
 {
-    "name" : "智慧清水营",
-    "appid" : "__UNI__91286B5",
+    "name" : "智慧任家庄",
+    "appid" : "__UNI__17021E8",
     "description" : "",
-    "versionName" : "1.0.5",
+    "versionName" : "1.0.6",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */

pages/index/h5/h5.vue

@@ -33,4 +33,4 @@
 
 <style lang="scss">
 
-</style>
+</style>

pages/my/personal_information/personal_information_peixun.vue

@@ -39,7 +39,7 @@
 				</view>
 				<view class="line">
 					<view class="item">
-						<view class="label">技能等级</view>
+						<view class="label">职称/技能等级</view>
 						<view class="box">{{user_info.jnjdclass}}</view>
 					</view>
 					<view class="item">
@@ -75,7 +75,7 @@
 					<image v-if="index == 5" src="./icon/icon_6.png" mode=""></image>
 					<image v-if="index == 6" src="./icon/icon_7.png" mode=""></image>
 				</view> -->
-				<view class="item" :class="active == index? 'active' : ''" v-for="(item,index) in 6" :key="index"
+				<view class="item" :class="active == index? 'active' : ''" v-for="(item,index) in 5" :key="index"
 					@click="tab(index)">
 					<view class="img">
 						<image v-if="index == 0" src="./icon/icon_1.png" mode=""></image>
@@ -425,7 +425,7 @@
 
 		.tab {
 			margin: 0 auto;
-			width: 700rpx;
+			width: 590rpx;
 			display: flex;
 			justify-content: space-around;
 			// .item{

pages/origanization/communication/origanization/personal_information/personal_information_peixun.vue

@@ -40,7 +40,7 @@
 				</view>
 				<view class="line">
 					<view class="item">
-						<view class="label">技能等级</view>
+						<view class="label">职称/技能等级</view>
 						<view class="box">{{user_info.jnjdclass}}</view>
 					</view>
 					<view class="item">

pages/production/video_monitor_app/video-block/video-block.vue

@@ -11,8 +11,8 @@
 				</view>
 				<view class="name">
 					<view class="text">{{item.camera_name}}</view>
-					<!-- <view class="icon" @click.stop="popup()"> -->
-					<view class="icon" @click.stop="go_playback()">
+					<view class="icon" @click.stop="popup()">
+					<!-- <view class="icon" @click.stop="go_playback()"> -->
 						<image src="./icon/icon.png" mode=""></image>
 					</view>
 				</view>
@@ -74,7 +74,7 @@
 			if (this.mine_code.indexOf('jinjiaqu') != -1) {
 				this.url = "/camera/getrtsp"
 			} else {
-				this.url = "/camera/get_hik_rtsp"
+				this.url = "/camera/geturl"
 			}
 
 			this.mine_id = option.mine_id

pages/production/video_monitor_app/video/video.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 
-		<video style="width: 100%; height: 100vh;" :src="url" codec="software" :play-strategy="0" controls show-fullscreen-btn="true" autoplay></video>
+		<video style="width: 100%; height: 100vh;" :src="url" codec="software"  :play-strategy="0" controls show-fullscreen-btn="true" autoplay></video>
 
 	</view>
 </template>

pages/workbench/h5/h5.vue

@@ -13,8 +13,8 @@
 		},
 		onLoad(option) {
 			console.log(option)
-			if(option.mine_code == 'zaoquan' && option.workBench == 'pingce'){
-				this.href = "http://webdevelop.nxjiewei.com/assets/html/pingce/?mine_code=zaoquan&token=" + uni.getStorageSync('Authorization')
+			if(option.workBench == 'pingce'){
+				this.href = "http://webdevelop.nxjiewei.com/assets/html/pingce/?mine_code="+ uni.getStorageSync('mine_code') +"&token=" + uni.getStorageSync('Authorization')
 			}else{
 				this.href = option.url + "?token="+uni.getStorageSync('Authorization')
 			}