任家庄内网版本适配

App.vue

@@ -23,7 +23,8 @@
 			// 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');
+			uni.setStorageSync('mine_code', 'renjiazhuang_neiwang');
 			
 			// console.log(set_base_url(uni.getStorageSync('mine_code')))
 			

common/production-http/interface.js

@@ -33,9 +33,9 @@ http.delete('user/1').then((res)=>{
 
 export default {
 	config: {
-		baseUrl: "http://nmjt.nxjiewei.com:8011/api",
+		// baseUrl: "http://nmjt.nxjiewei.com:8011/api",
 		// 内网
-		// baseUrl: "http://n.nmjt.nxjiewei.com:8011/api",
+		baseUrl: "http://n.nmjt.nxjiewei.com:8011/api",
 		header: {
 			"Content-Type": "multipart/form-data",
 			'Content-Type': 'application/json;charset=UTF-8',

common/set_base_url.js

@@ -47,6 +47,9 @@ export const set_base_url = (mine_code) => {
 		case 'renjiazhuang':
 			return "http://renjiazhuang.nxjiewei.com:8011/api"
 			break;
+		case 'renjiazhuang_neiwang':
+			return "http://n.renjiazhuang.nxjiewei.com:8011/api"
+			break;
 		default:
 			return ""
 	}

common/vmeitime-http/interface.js

@@ -48,7 +48,9 @@ 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: "http://n.renjiazhuang.nxjiewei.com:8011/api",
 		
 		// baseUrl: uni.getStorageSync('base_url'),
 		header: {

components/t-i-navbar-2/t-i-navbar-2.vue

@@ -27,7 +27,7 @@
 						<image v-if="mine_code == 'shicaocun'" src="@/static/switch-kuang/shicaocun.png" mode="">
 						</image>
 						<image v-if="mine_code == 'lingxin'" src="@/static/switch-kuang/lingxin.png" mode=""></image>
-						<image v-if="mine_code == 'renjiazhuang'" src="@/static/switch-kuang/renjiazhuang.png" mode=""></image>
+						<image v-if="mine_code == 'renjiazhuang' || mine_code == 'renjiazhuang_neiwang'" src="@/static/switch-kuang/renjiazhuang.png" mode=""></image>
 						<uni-icons type="arrowdown" color="#fff"></uni-icons>
 					</view>
 				</view>
@@ -50,7 +50,7 @@
 						<image v-if="mine_code == 'shicaocun'" src="@/static/switch-kuang/shicaocun.png" mode="">
 						</image>
 						<image v-if="mine_code == 'lingxin'" src="@/static/switch-kuang/lingxin.png" mode=""></image>
-						<image v-if="mine_code == 'renjiazhuang'" src="@/static/switch-kuang/renjiazhuang.png" mode=""></image>
+						<image v-if="mine_code == 'renjiazhuang' || mine_code == 'renjiazhuang_neiwang'" src="@/static/switch-kuang/renjiazhuang.png" mode=""></image>
 					</view>
 				</view>
 				<view class="search" v-if="mine_code != 'qingshuiying' && mine_code != 'wuyegongsi'">

components/t-i-navbar/t-i-navbar.vue

@@ -27,7 +27,7 @@
 						<image v-if="mine_code == 'shicaocun'" src="@/static/switch-kuang/shicaocun.png" mode="">
 						</image>
 						<image v-if="mine_code == 'lingxin'" src="@/static/switch-kuang/lingxin.png" mode=""></image>
-						<image v-if="mine_code == 'renjiazhuang'" src="@/static/switch-kuang/renjiazhuang.png" mode=""></image>
+						<image v-if="mine_code == 'renjiazhuang' || mine_code == 'renjiazhuang_neiwang'" src="@/static/switch-kuang/renjiazhuang.png" mode=""></image>
 						<uni-icons type="arrowdown" color="#fff"></uni-icons>
 					</view>
 				</view>
@@ -49,7 +49,7 @@
 							src="@/static/switch-kuang/jinjiaqu.png" mode=""></image>
 						<image v-if="mine_code == 'shicaocun'" src="@/static/switch-kuang/shicaocun.png" mode=""></image>
 						<image v-if="mine_code == 'lingxin'" src="@/static/switch-kuang/lingxin.png" mode=""></image>
-						<image v-if="mine_code == 'renjiazhuang'" src="@/static/switch-kuang/renjiazhuang.png" mode=""></image>
+						<image v-if="mine_code == 'renjiazhuang' || mine_code == 'renjiazhuang_neiwang'" src="@/static/switch-kuang/renjiazhuang.png" mode=""></image>
 					</view>
 				</view>
 				<view class="search" v-if="mine_code != 'qingshuiying' && mine_code != 'wuyegongsi'">

components/t-o-origanization/t-o-origanization.vue

@@ -16,7 +16,7 @@
 				<view class="text" v-if="mine_code == 'shicaocun'">国家能源集团石槽村煤矿</view>
 				<view class="text" v-if="mine_code == 'jinfeng' || mine_code == 'jinfeng_neiwang'">国家能源集团金凤煤矿</view>
 				<view class="text" v-if="mine_code == 'lingxin'">国家能源集团灵新煤矿</view>
-				<view class="text" v-if="mine_code == 'renjiazhuang'">国家能源集团任家庄煤矿</view>
+				<view class="text" v-if="mine_code == 'renjiazhuang' || mine_code == 'renjiazhuang_neiwang'">国家能源集团任家庄煤矿</view>
 				
 			</view>
 			<view class="box">

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

@@ -18,7 +18,7 @@
 				<!-- <view class="tip">6268监测点</view> -->
 			</view>
 		</view>
-		<view class="item_box" style="background-color: #FBB47B;" @click="go_video_monitor()">
+		<!-- <view class="item_box" style="background-color: #FBB47B;" @click="go_video_monitor()">
 			<view class="img">
 				<image src="../t-p-icon/icon_6.png" mode=""></image>
 			</view>
@@ -26,8 +26,8 @@
 				<view class="name">视频监控</view>
 				<view class="tip">工业视频</view>
 			</view>
-		</view>
-		<!-- <view class="item_box" style="background-color: #FBB47B;" @click="go_video_monitor_h5()">
+		</view> -->
+		<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>
@@ -154,7 +154,7 @@
 			},
 			go_video_monitor_h5(){
 				uni.navigateTo({
-					url:"../../production/video_monitor/video_monitor?mine_code=jinjiaquhaikang"
+					url:"../../production/video_monitor/video_monitor?mine_code=jinjiaqu_jituan"
 				})
 			},
 			

manifest.json

@@ -1,8 +1,8 @@
 {
-    "name" : "智慧任家庄",
-    "appid" : "__UNI__17021E8",
+    "name" : "智慧任家庄(内网)",
+    "appid" : "__UNI__7CD7C0B",
     "description" : "",
-    "versionName" : "1.0.6",
+    "versionName" : "1.0.0",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */

pages.json

@@ -1043,6 +1043,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/workbench/free_car/free_car",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "navigationStyle":"custom",

pages/my/login/login.vue

@@ -16,7 +16,7 @@
 			<text v-if="mine_code == 'shicaocun'">石槽村煤矿</text>
 			<text v-if="mine_code == 'jinfeng' || mine_code == 'jinfeng_neiwang'">金凤煤矿</text>
 			<text v-if="mine_code == 'lingxin'">灵新煤矿</text>
-			<text v-if="mine_code == 'renjiazhuang'">任家庄煤矿</text>
+			<text v-if="mine_code == 'renjiazhuang' || mine_code == 'renjiazhuang_neiwang'">任家庄煤矿</text>
 		</view>
 		<view class="login_box">
 			<view class="item">

pages/origanization/communication/origanization/origanization.vue

@@ -15,7 +15,7 @@
 					<image src="./icon/title_icon.png" mode=""></image>
 				</view>
 				<view class="text" v-if="mine_code == 'lingxin'">国家能源集团灵新煤矿</view>
-				<view class="text" v-if="mine_code == 'renjiazhuang'">国家能源集团任家庄煤矿</view>
+				<view class="text" v-if="mine_code == 'renjiazhuang' || mine_code == 'renjiazhuang_neiwang'">国家能源集团任家庄煤矿</view>
 				<view class="text" v-if="mine_code == 'zaoquan'">国家能源集团枣泉煤矿</view>
 				<view class="text" v-if="mine_code == 'ningmeijituan'">国家能源集团宁夏煤业公司</view>
 

pages/production/video_monitor/video_monitor.vue

@@ -12,7 +12,8 @@
 			};
 		},
 		onLoad(option) {
-			this.href = "http://webdevelop.nxjiewei.com/assets/html/video/?mine_code=" + option.mine_code
+			// this.href = "http://webdevelop.nxjiewei.com/assets/html/video/?mine_code=" + option.mine_code
+			this.href = "http://static.nxjiewei.com:8011/assets/html/zhks-quankuang/ningmeijituan/video_ws/?mine_code=" + option.mine_code
 			
 			// this.get_product_data_query_power()
 		},

pages/tabbar/production/production.vue

@@ -35,7 +35,7 @@
 			<t-p-lingxin></t-p-lingxin>
 		</view>
 		<!-- 任家庄 -->
-		<view v-if="mine_code == 'renjiazhuang'">
+		<view v-if="mine_code == 'renjiazhuang' || mine_code == 'renjiazhuang_neiwang'">
 			<t-p-renjiazhuang></t-p-renjiazhuang>
 		</view>
 	</view>

pages/workbench/free_car/free_car.vue

@@ -0,0 +1,196 @@
+<template>
+	<view>
+		<view class="list">
+			<view class="btn_box">
+				<view class="btn" @click="go_oa_url()">
+					<view class="text">我的申请</view>
+					<view class="icon">
+						<uni-icons type="right" color="#fff" size="16"></uni-icons>
+					</view>
+				</view>
+			</view>
+			<view class="item" v-for="(item,index) in list" :key="index">
+				<div class="line">
+					<view class="title">{{item.car_type}}</view>
+					<view class="btn" @click="go_oa_url_2(item)">
+						<view class="icon">
+							<uni-icons type="list" color="#fff" size="16"></uni-icons>
+						</view>
+						<view class="text">申请</view>
+					</view>
+				</div>
+				<div class="label_box">
+					<view class="label" v-for="(item_2,index_2) in item.con" :key="index_2" v-if="item_2.is_show == 1">
+						<view class="name">{{item_2.title}}</view>
+						<view class="num">{{item_2.con}}</view>
+					</view>
+				</div>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				mine_code:"",
+				base_url:"http://oa_system.nxjiewei.com:8011",
+				list: []
+			};
+		},
+		onLoad(option) {
+			console.log(uni.getStorageSync('mine_code'))
+			if(uni.getStorageSync('mine_code').indexOf("_neiwang") != -1){
+				console.log("内网")
+				this.base_url = "http://n.oa_system.nxjiewei.com:8011"
+			}else{
+				console.log("公网")
+			}
+			
+			console.log(option)
+
+			uni.setNavigationBarTitle({
+				title: option.title
+			})
+		},
+		mounted() {
+			this.get_list()
+		},
+		methods: {
+			go_oa_url() {
+				uni.navigateTo({
+					url: "../../origanization/OA/h5/h5",
+					success: (res) => {
+						// 通过eventChannel向被打开页面传送数据
+						res.eventChannel.emit('acceptDataFromOpenerPage', {
+							url: this.base_url + "/?m=ying&d=we&mnum=rjz_car_apply&show=we&hideheader=true",
+							title: "用车申请"
+						})
+					}
+				})
+			},
+			go_oa_url_2(item) {
+				console.log(item)
+				uni.navigateTo({
+					url: "../../origanization/OA/h5/h5",
+					success: (res) => {
+						// 通过eventChannel向被打开页面传送数据
+						res.eventChannel.emit('acceptDataFromOpenerPage', {
+							url: this.base_url + "/index.php?a=lum&m=input&d=flow&num=rjz_car_apply&hideheader=true&show=we&car_type="+item.car_type+"&free_con="+item.con[1].con,
+							title: "用车申请"
+						})
+					}
+				})
+			},
+			get_list() {
+				uni.request({
+					method: "GET",
+					url: this.base_url + "/api.php?m=rjzcarlist&a=getFreeCarCon&ischeck=0",
+					success: (res) => {
+						console.log(res.data);
+
+						this.list = res.data.data
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.list {
+		box-sizing: border-box;
+		padding: 25rpx;
+
+		.btn_box {
+			display: flex;
+			justify-content: flex-end;
+			margin-bottom: 30rpx;
+
+			.btn {
+				width: 230rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				background: #00A0E8;
+				border-radius: 32rpx;
+
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+				.text {
+					font-size: 30rpx;
+					color: #fff;
+					font-weight: 700;
+					margin-right: 10rpx;
+				}
+
+				.icon {
+					font-weight: 700;
+				}
+			}
+		}
+
+		.item {
+			margin-bottom: 30rpx;
+			box-shadow: 1rpx 10rpx 16rpx 0rpx rgba(0, 0, 0, 0.13);
+			border-radius: 20rpx;
+
+			box-sizing: border-box;
+			padding: 30rpx;
+
+			.line {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+
+				.title {
+					font-size: 32rpx;
+					font-weight: 700;
+					border-bottom: 6rpx solid #009fe8;
+				}
+
+				.btn {
+					width: 140rpx;
+					height: 46rpx;
+					background: #00A0E8;
+					border-radius: 28rpx;
+
+					display: flex;
+					align-items: center;
+					justify-content: center;
+
+					.text {
+						font-size: 26rpx;
+						color: #fff;
+						margin-left: 10rpx;
+					}
+				}
+
+
+			}
+
+			.label_box {
+				margin-top: 30rpx;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+
+				.label {
+					text-align: center;
+
+					.name {
+						color: #6F6F6F;
+						font-size: 24rpx;
+					}
+
+					.num {
+						font-size: 26rpx;
+						font-weight: 700;
+					}
+				}
+			}
+		}
+	}
+</style>

read.md

@@ -60,4 +60,18 @@
 ## 页面及组件创建命名规范
 	
 	> 页面命名规范：在相应层级目录下创建页面文件，遵循语义化标准创建目录（非特定名称外不要使用拼音！）；命名遵循下划线连字符命名法，使用‘_’连接（如：personnel-orientation;人员定位）。
-	> 组件命名规范：层级目录首字母-页面全名-组件名称。（如：t-p-ningdongyunying;p-personnel-orientation-navbar）
+	> 组件命名规范：层级目录首字母-页面全名-组件名称。（如：t-p-ningdongyunying;p-personnel-orientation-navbar）
+
+
+
+## 关于打包内网应用
+
+	1.修改APP.vue文件中的mine_code
+	2.修改vmeitime-htpp/interface.js中的基础路径
+	3.修改production-http/production-api中的基础路径
+	4.修改set_base_url中mine_code对应的基础路径
+	5.修改组件 t-o-origanization.vue 新增_neiwang的标题显示条件
+	6.修改 tabbar/production/production.vue 新增_neiwang的标题显示条件
+	7.修改 origanization/communication/origanization/origanization.vue 中的标题显示条件
+	8.修改 my/login.vue 中的标题显示条件
+	9.修改 组件t-i-navbar、t-i-navbar-2中的图标显示条件