瀏覽代碼

切换域名

tiandewen 1 年之前
父節點
當前提交
19d0c57ec0
共有 34 個文件被更改,包括 1210 次插入81 次删除
  1. 4 4
      App.vue
  2. 2 2
      common/common.js
  3. 2 1
      common/production-http/interface.js
  4. 16 16
      common/set_base_url.js
  5. 4 2
      common/vmeitime-http/interface.js
  6. 1 1
      components/e-link/e-link.vue
  7. 1 1
      components/t-i-icon/t-i-icon - 一行五个.vue
  8. 1 1
      components/t-i-ningdongyunying/t-i-ningdongyunying - 原始适配版本备份.vue
  9. 1 1
      components/t-i-ningdongyunying/t-i-ningdongyunying.vue
  10. 1 1
      components/t-i-ningmeijituan/t-i-ningmeijituan.vue
  11. 2 2
      components/t-p-n-section-1/t-p-n-section-1 - 九宫格版本.vue
  12. 1 1
      components/t-p-zaoquan/t-p-zaoquan - 九宫格版本.vue
  13. 1 1
      components/t-p-zaoquan/t-p-zaoquan - 安宁版本分类.vue
  14. 8 7
      components/t-p-zaoquan/t-p-zaoquan.vue
  15. 1 1
      manifest.json
  16. 1 1
      pages/index/record/detail_list/detail_list.vue
  17. 1 1
      pages/origanization/OA/h5/h5 - 使用的uni版本.vue
  18. 3 3
      pages/origanization/OA/h5/h5-token过期验证.vue
  19. 1 1
      pages/origanization/OA/h5/h5-测试获取位置.vue
  20. 5 5
      pages/origanization/OA/h5/h5.vue
  21. 2 2
      pages/origanization/news/tab_2/all_list/detail/detail.vue
  22. 4 4
      pages/production/shangtang/shangtang - 过期验证.vue
  23. 3 3
      pages/production/video_monitor_app/video-block/video-block.vue
  24. 2 2
      pages/production/video_monitor_app/video_monitor_app.vue
  25. 3 2
      pages/production/zaoquan/control_platform/coal_mining/coal_mining.vue
  26. 6 4
      pages/production/zaoquan/control_platform/drainage/drainage.vue
  27. 1 1
      pages/production/zaoquan/h5/h5.vue
  28. 1 1
      pages/production/zaoquan/power_monitoring/power_monitoring.vue
  29. 1122 0
      pages/tabbar/index/index-安宁.vue
  30. 1 1
      pages/tabbar/my/my.vue
  31. 1 1
      pages/tabbar/workbench/workbench - 副本 (2).vue
  32. 3 3
      pages/tabbar/workbench/workbench-新版样式.vue
  33. 2 2
      pages/tabbar/workbench/workbench.vue
  34. 2 2
      pages/workbench/free_car/free_car.vue

+ 4 - 4
App.vue

@@ -14,12 +14,12 @@
 			// uni.setStorageSync('mine_code', 'ningdongyunying');
 			// uni.setStorageSync('mine_code', 'shicaocun');
 			// uni.setStorageSync('mine_code', 'meihuajing');
-			uni.setStorageSync('mine_code', 'zaoquan');
+			// uni.setStorageSync('mine_code', 'zaoquan');
 			// uni.setStorageSync('mine_code', 'qingshuiying');
 			// uni.setStorageSync('mine_code', 'wuyegongsi');
 			// uni.setStorageSync('mine_code', 'jinjiaqu');
 			// uni.setStorageSync('mine_code', 'jinjiaqu_neiwang');
-			// uni.setStorageSync('mine_code', 'yangchangwan');
+			uni.setStorageSync('mine_code', 'yangchangwan');
 			// uni.setStorageSync('mine_code', 'jinfeng');
 			// uni.setStorageSync('mine_code', 'jinfeng_neiwang');
 			// uni.setStorageSync('mine_code', 'lingxin');
@@ -32,9 +32,9 @@
 			
 			// 设置自动化系统接口内外网域名
 			if(uni.getStorageSync('mine_code').indexOf('_neiwang') == -1){
-				uni.setStorageSync('unified_automation_system_url','http://video.nxjiewei.com:8011/api')
+				uni.setStorageSync('unified_automation_system_url','http://anvideo.nxmy.com:8011/api')
 			}else{
-				uni.setStorageSync('unified_automation_system_url','http://n.video.nxjiewei.com:8011/api')
+				uni.setStorageSync('unified_automation_system_url','http://anvideo.nxmy.com:8011/api')
 			}
 		},
 		onShow: function() {

+ 2 - 2
common/common.js

@@ -3,7 +3,7 @@ export const goToLink = (item, mine_code) => {
 
 	let link = item.link
 	// OA系统
-	if (link.indexOf("oa_system.nxjiewei.com") != -1) {
+	if (link.indexOf("oa_system.nxmy.com") != -1) {
 		uni.navigateTo({
 			url: "../../origanization/OA/h5/h5",
 			success: (res) => {
@@ -19,7 +19,7 @@ export const goToLink = (item, mine_code) => {
 	}
 	
 	// 枣泉OA系统
-	if (link.indexOf("zq.oa.nxjiewei.com") != -1) {
+	if (link.indexOf("zq.oa.nxmy.com") != -1) {
 		uni.navigateTo({
 			url: "../../origanization/OA/h5/h5",
 			success: (res) => {

+ 2 - 1
common/production-http/interface.js

@@ -33,7 +33,8 @@ 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://nmjt.nxmy.com:8011/api",
 		// 内网
 		// baseUrl: "http://n.nmjt.nxjiewei.com:8011/api",
 		header: {

+ 16 - 16
common/set_base_url.js

@@ -3,52 +3,52 @@
 export const set_base_url = (mine_code) => {
 	switch (mine_code) {
 		case 'ningmeijituan':
-			return "http://nmjt.nxjiewei.com:8011/api"
+			return "http://nmjt.nxmy.com:8011/api"
 			break;
 		case 'ningdongyunying':
-			return "http://ningdongyunying.nxjiewei.com:8011/api"
+			return "http://ningdongyunying.nxmy.com:8011/api"
 			break;
 		case 'meihuajing':
-			return "http://meihuajing.nxjiewei.com:8011/api"
+			return "http://meihuajing.nxmy.com:8011/api"
 			break;
 		case 'zaoquan':
-			return "http://zaoquan.nxjiewei.com:8011/api"
+			return "http://zaoquan.nxmy.com:8011/api"
 			break;
 		case 'yangchangwan':
-			return "http://yangchangwan.nxjiewei.com:8011/api"
+			return "http://ycw.nxmy.com:8011/api"
 			break;
 		case 'jinfeng':
-			return "http://jinfeng.nxjiewei.com:8011/api"
+			return "http://jinfeng.nxmy.com:8011/api"
 			break;
 		case 'jinfeng_neiwang':
-			return "http://n.jinfeng.nxjiewei.com:8011/api"
+			return "http://n.jinfeng.nxmy.com:8011/api"
 			break;
 		case 'xixuan':
-			return "http://xixuan.nxjiewei.com:8011/api"
+			return "http://xixuan.nxmy.com:8011/api"
 			break;
 		case 'qingshuiying':
-			return "http://qingshuiying.nxjiewei.com:8011/api"
+			return "http://qingshuiying.nxmy.com:8011/api"
 			break;
 		case 'wuyegongsi':
-			return "http://wuyegongsi.nxjiewei.com:8011/api"
+			return "http://wuyegongsi.nxmy.com:8011/api"
 			break;
 		case 'jinjiaqu':
-			return "http://jinjiaqu.nxjiewei.com:8011/api"
+			return "http://jinjiaqu.nxmy.com:8011/api"
 			break;
 		case 'jinjiaqu_neiwang':
-			return "http://n.jinjiaqu.nxjiewei.com:8011/api"
+			return "http://n.jinjiaqu.nxmy.com:8011/api"
 			break;
 		case 'shicaocun':
-			return "http://shicaocun.nxjiewei.com:8011/api"
+			return "http://shicaocun.nxmy.com:8011/api"
 			break;
 		case 'lingxin':
-			return "http://lingxin.nxjiewei.com:8011/api"
+			return "http://lingxin.nxmy.com:8011/api"
 			break;
 		case 'renjiazhuang':
-			return "http://renjiazhuang.nxjiewei.com:8011/api"
+			return "http://renjiazhuang.nxmy.com:8011/api"
 			break;
 		case 'renjiazhuang_neiwang':
-			return "http://n.renjiazhuang.nxjiewei.com:8011/api"
+			return "http://n.renjiazhuang.nxmy.com:8011/api"
 			break;
 		default:
 			return ""

+ 4 - 2
common/vmeitime-http/interface.js

@@ -33,17 +33,19 @@ http.delete('user/1').then((res)=>{
 
 export default {
 	config: {
-		// baseUrl: "http://nmjt.nxjiewei.com:8011/api",
+		// baseUrl: "http://nmjt.nxmy.com:8011/api",
 		// baseUrl: "http://colliery.nxjiewei.com/api",
 		// baseUrl: "http://ningdongyunying.nxjiewei.com:8011/api",
 		// baseUrl: "http://shicaocun.nxjiewei.com:8011/api",
-		baseUrl: "http://zaoquan.nxjiewei.com:8011/api",
+		// baseUrl: "http://zaoquan.nxjiewei.com:8011/api",
+		baseUrl: "http://zaoquan.nxmy.com:8011/api",
 		// baseUrl: "http://qingshuiying.nxjiewei.com:8011/api",
 		// baseUrl: "http://wuyegongsi.nxjiewei.com:8011/api",
 		// baseUrl: "http://jinjiaqu.nxjiewei.com:8011/api",
 		// 金家渠:内网
 		// baseUrl: "http://n.jinjiaqu.nxjiewei.com:8011/api",
 		// baseUrl: "http://yangchangwan.nxjiewei.com:8011/api",
+		// baseUrl: "http://ycw.nxmy.com:8011/api",
 		// baseUrl: "http://jinfeng.nxjiewei.com:8011/api",
 		// 金凤:内网
 		// baseUrl: "http://n.jinfeng.nxjiewei.com:8011/api",

+ 1 - 1
components/e-link/e-link.vue

@@ -227,7 +227,7 @@
 				// console.log(link)
 				
 				// OA系统
-				if(link.indexOf("oa_system.nxjiewei.com") != -1 ){
+				if(link.indexOf("oa_system.nxmy.com") != -1 ){
 					uni.navigateTo({
 						url:"../../origanization/OA/h5/h5",
 						success: (res) =>{

+ 1 - 1
components/t-i-icon/t-i-icon - 一行五个.vue

@@ -29,7 +29,7 @@
 				console.log(link)
 				
 				// OA系统
-				if(link.indexOf("oa_system.nxjiewei.com") != -1 ){
+				if(link.indexOf("oa_system.nxmy.com") != -1 ){
 					uni.navigateTo({
 						url:"../../origanization/OA/h5/h5",
 						success: (res) =>{

+ 1 - 1
components/t-i-ningdongyunying/t-i-ningdongyunying - 原始适配版本备份.vue

@@ -85,7 +85,7 @@
 				uni.navigateTo({
 					// http://ningdongyunying.nxjiewei.com:8011/assets/html/QRcoddetails/index.html?name=&uuid=&pageId=10ad4420d27b4146bafe43802f03d5c6&departmentID=
 					url: "../../index/h5/h5?url=" +
-						"http://ningdongyunying.nxjiewei.com:8011/web/monitor/dispatch/center"
+						"http://ningdongyunying.nxmy.com:8011/web/monitor/dispatch/center"
 				})
 			}
 		}

+ 1 - 1
components/t-i-ningdongyunying/t-i-ningdongyunying.vue

@@ -64,7 +64,7 @@
 				uni.navigateTo({
 					// http://ningdongyunying.nxjiewei.com:8011/assets/html/QRcoddetails/index.html?name=&uuid=&pageId=10ad4420d27b4146bafe43802f03d5c6&departmentID=
 					url: "../../index/h5/h5?url=" +
-						"http://ningdongyunying.nxjiewei.com:8011/web/monitor/dispatch/center"
+						"http://ningdongyunying.nxmy.com:8011/web/monitor/dispatch/center"
 				})
 			}
 		}

+ 1 - 1
components/t-i-ningmeijituan/t-i-ningmeijituan.vue

@@ -68,7 +68,7 @@
 				uni.navigateTo({
 					// http://ningdongyunying.nxjiewei.com:8011/assets/html/QRcoddetails/index.html?name=&uuid=&pageId=10ad4420d27b4146bafe43802f03d5c6&departmentID=
 					url: "../../index/h5/h5?url=" +
-						"http://ningdongyunying.nxjiewei.com:8011/web/monitor/dispatch/center"
+						"http://ningdongyunying.nxmy.com:8011/web/monitor/dispatch/center"
 				})
 			}
 		}

+ 2 - 2
components/t-p-n-section-1/t-p-n-section-1 - 九宫格版本.vue

@@ -44,7 +44,7 @@
 				<view class="name">通风管理</view>
 			</view>
 		</view>
-		<!-- <view class="item_box" style="background-color: #FBB47B;" @click="go_h5('http://nmjt.nxjiewei.com:8011/web/monitor/video/videoList?mine_code=')"> -->
+		<!-- <view class="item_box" style="background-color: #FBB47B;" @click="go_h5('http://nmjt.nxmy.com:8011/web/monitor/video/videoList?mine_code=')"> -->
 		<view class="item_box" style="background-color: #FBB47B;" @click="go_h5('http://anstatic.nxmy.com:8011/assets/html/video/?mine_code=')">
 			<view class="img">
 				<image src="../t-p-icon/icon_6.png" mode=""></image>
@@ -227,7 +227,7 @@
 				
 				if(uni.getStorageSync('mine_code') != 'ningmeijituan'){
 					uni.navigateTo({
-						url: "../../ningdongyunying/h5/h5?url=" + "http://rongzhi.nxjiewei.com:8011/h5/#/auth"
+						url: "../../ningdongyunying/h5/h5?url=" + "http://rongzhi.nxmy.com:8011/h5/#/auth"
 					})
 				}else{
 					uni.navigateTo({

+ 1 - 1
components/t-p-zaoquan/t-p-zaoquan - 九宫格版本.vue

@@ -182,7 +182,7 @@
 			
 			go_zaoquan_h5(){
 				uni.navigateTo({
-					url:"../../production/zaoquan/h5/h5?url="+"http://zdh.zaoquan.nxjiewei.com:8011/home/dashboard"
+					url:"../../production/zaoquan/h5/h5?url="+"http://zdh.zaoquan.nxmy.com:8011/home/dashboard"
 				})
 			}
 		}

+ 1 - 1
components/t-p-zaoquan/t-p-zaoquan - 安宁版本分类.vue

@@ -176,7 +176,7 @@
 			go_zaoquan_h5() {
 				uni.navigateTo({
 					url: "../../production/zaoquan/h5/h5?url=" +
-						"http://zdh.zaoquan.nxjiewei.com:8011/home/dashboard"
+						"http://zdh.zaoquan.nxmy.com:8011/home/dashboard"
 				})
 			},
 			

+ 8 - 7
components/t-p-zaoquan/t-p-zaoquan.vue

@@ -30,12 +30,13 @@
 
 				nav: [{
 						title: "智能监测",
-						list: [{
-								icon: require("./icon/icon_1.png"),
-								module: "gkpt",
-								name: "管控平台",
-								url: "../../production/zaoquan/h5/h5?url=" + "http://zdh.zaoquan.nxjiewei.com:8011/home/dashboard"
-							},
+						list: [
+							// {
+							// 	icon: require("./icon/icon_1.png"),
+							// 	module: "gkpt",
+							// 	name: "管控平台",
+							// 	url: "../../production/zaoquan/h5/h5?url=" + "http://zdh.zaoquan.nxmy.com:8011/home/dashboard"
+							// },
 							{
 								icon: require("./icon/icon_2.png"),
 								module: "rydw",
@@ -259,7 +260,7 @@
 			go_zaoquan_h5() {
 				uni.navigateTo({
 					url: "../../production/zaoquan/h5/h5?url=" +
-						"http://zdh.zaoquan.nxjiewei.com:8011/home/dashboard"
+						"http://zdh.zaoquan.nxmy.com:8011/home/dashboard"
 				})
 			},
 

+ 1 - 1
manifest.json

@@ -2,7 +2,7 @@
     "name" : "智慧枣泉(新)",
     "appid" : "__UNI__4B520D3",
     "description" : "",
-    "versionName" : "2.1.2",
+    "versionName" : "2.1.4",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */

+ 1 - 1
pages/index/record/detail_list/detail_list.vue

@@ -211,7 +211,7 @@
 					let link = item.data.url
 					
 					// OA系统
-					if(link.indexOf("oa_system.nxjiewei.com") != -1 ){
+					if(link.indexOf("oa_system.nxmy.com") != -1 ){
 						uni.navigateTo({
 							url:"../../../origanization/OA/h5/h5",
 							success: (res) =>{

+ 1 - 1
pages/origanization/OA/h5/h5 - 使用的uni版本.vue

@@ -31,7 +31,7 @@
 					console.log(title)
 					console.log(unescape(title))
 				
-				this.href = "http://oa_system.nxjiewei.com:8011/oa_login?staff_num=" + uni.getStorageSync('user').staff_num + "&url=" + url + "&title=" + title
+				this.href = "http://oa_system.nxmy.com:8011/oa_login?staff_num=" + uni.getStorageSync('user').staff_num + "&url=" + url + "&title=" + title
 	
 			})
 			

+ 3 - 3
pages/origanization/OA/h5/h5-token过期验证.vue

@@ -49,7 +49,7 @@
 
 				uni.setStorageSync("oa_login_time", new Date().format("yyyy-MM-dd"))
 
-				this.href = "http://oa_system.nxjiewei.com:8011/oa_login.html?staff_num=" + uni.getStorageSync('user')
+				this.href = "http://oa_system.nxmy.com:8011/oa_login.html?staff_num=" + uni.getStorageSync('user')
 					.staff_num + "&url=" + this.url + "&oa_login_time=" + oa_login_time
 			} else {
 				// 有登录记录
@@ -61,13 +61,13 @@
 					uni.setStorageSync("oa_login_time", new Date().format("yyyy-MM-dd"))
 					
 					console.log(">5",uni.getStorageSync("oa_login_time"))
-					this.href = "http://oa_system.nxjiewei.com:8011/oa_login.html?staff_num=" + uni.getStorageSync('user')
+					this.href = "http://oa_system.nxmy.com:8011/oa_login.html?staff_num=" + uni.getStorageSync('user')
 						.staff_num + "&url=" + this.url + "&oa_login_time=" + uni.getStorageSync("oa_login_time")
 
 				} else {
 					console.log("<5",oa_login_time)
 					
-					this.href = "http://oa_system.nxjiewei.com:8011/oa_login.html?staff_num=" + uni.getStorageSync('user')
+					this.href = "http://oa_system.nxmy.com:8011/oa_login.html?staff_num=" + uni.getStorageSync('user')
 						.staff_num + "&url=" + this.url + "&oa_login_time=" + oa_login_time
 				}
 

+ 1 - 1
pages/origanization/OA/h5/h5-测试获取位置.vue

@@ -43,7 +43,7 @@
 				});
 				
 
-				// this.href = "http://oa_system.nxjiewei.com:8011/oa_login?staff_num=" + uni.getStorageSync('user')
+				// this.href = "http://oa_system.nxmy.com:8011/oa_login?staff_num=" + uni.getStorageSync('user')
 				// 	.staff_num + "&url=" + url + "&title=" + title
 			})
 

+ 5 - 5
pages/origanization/OA/h5/h5.vue

@@ -47,19 +47,19 @@
 
 				if (mine_code.indexOf('_neiwang') != -1) {
 					// 内网
-					let link_neiwang = data.url.replace('oa_system.nxjiewei.com:8011',
-						'n.oa_system.nxjiewei.com:8011')
+					let link_neiwang = data.url.replace('oa_system.nxmy.com:8011',
+						'oa_system.nxmy.com:8011')
 					let url = escape(link_neiwang)
-					this.href = "http://n.oa_system.nxjiewei.com:8011/oa_login/index_neiwang.html?staff_num=" + uni
+					this.href = "http://oa_system.nxmy.com:8011/oa_login/index_neiwang.html?staff_num=" + uni
 						.getStorageSync('user')
 						.staff_num + "&url=" + url + "&title=" + title
 				} else if (mine_code == "zaoquan") {
 					let url = escape(data.url)
 					
-					this.href = "http://zq.oa.nxjiewei.com:8011/zq_oa_login?staff_num=" + uni.getStorageSync('user').staff_num + "&url=" + url + "&title=" + title
+					this.href = "http://zq.oa.nxmy.com:8011/zq_oa_login?staff_num=" + uni.getStorageSync('user').staff_num + "&url=" + url + "&title=" + title
 				} else {
 					let url = escape(data.url)
-					this.href = "http://oa_system.nxjiewei.com:8011/oa_login?staff_num=" + uni.getStorageSync(
+					this.href = "http://oa_system.nxmy.com:8011/oa_login?staff_num=" + uni.getStorageSync(
 							'user')
 						.staff_num + "&url=" + url + "&title=" + title
 				}

+ 2 - 2
pages/origanization/news/tab_2/all_list/detail/detail.vue

@@ -13,9 +13,9 @@
 		},
 		onLoad(option) {
 			
-			let url = "http://oa_system.nxjiewei.com:8011/task.php?a=x&num="+ option.table +"&mid="+option.id+"&show=we&hideheader=true"
+			let url = "http://oa_system.nxmy.com:8011/task.php?a=x&num="+ option.table +"&mid="+option.id+"&show=we&hideheader=true"
 			
-			this.href = "http://oa_system.nxjiewei.com:8011/oa_login?staff_num=" + uni.getStorageSync('user')
+			this.href = "http://oa_system.nxmy.com:8011/oa_login?staff_num=" + uni.getStorageSync('user')
 				.staff_num + "&url=" + escape(url)
 		
 		}

+ 4 - 4
pages/production/shangtang/shangtang - 过期验证.vue

@@ -59,7 +59,7 @@
 					console.log("小于2天")
 					
 					// 小于5天,直接进入对应页面
-					this.href = "http://shangtang.nxjiewei.com:8011/?token=" + uni.getStorageSync('shangtang_token')
+					this.href = "http://shangtang.nxmy.com:8011/?token=" + uni.getStorageSync('shangtang_token')
 				}
 			}
 
@@ -69,7 +69,7 @@
 				uni.request({
 					// 登录 获取token
 					method:"POST",
-					url: "http://shangtang.nxjiewei.com:8011/v1/app/token/get",
+					url: "http://shangtang.nxmy.com:8011/v1/app/token/get",
 					header:{
 						"Content-Type": "application/json"
 					},
@@ -86,8 +86,8 @@
 						
 						// 登录成功后进入对应页面
 						// 商汤链接+token
-						this.href = "http://shangtang.nxjiewei.com:8011/?token=" + uni.getStorageSync('shangtang_token')
-						// this.href = "http://shangtang.nxjiewei.com:8011/?token=" + res.data.data.access_token
+						this.href = "http://shangtang.nxmy.com:8011/?token=" + uni.getStorageSync('shangtang_token')
+						// this.href = "http://shangtang.nxmy.com:8011/?token=" + res.data.data.access_token
 					},
 					fail: (err) => {
 						uni.showToast({

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

@@ -66,9 +66,9 @@
 
 			// 内外网
 			if (this.mine_code.indexOf('_neiwang') == -1) {
-				this.base_url = "http://video.nxjiewei.com:8011/api"
+				this.base_url = "http://anvideo.nxmy.com:8011/api"
 			} else {
-				this.base_url = "http://n.video.nxjiewei.com:8011/api"
+				this.base_url = "http://anvideo.nxmy.com:8011/api"
 			}
 
 			if (this.mine_code.indexOf('jinjiaqu') != -1 || this.mine_code.indexOf('wuyegongsi') != -1) {
@@ -96,7 +96,7 @@
 					},
 					url: this.base_url + "/camera/getlist?mine_id=" + this.mine_id + "&parent_id=" + this.parent_id,
 					// 内网
-					// url: "http://n.video.nxjiewei.com:8011/api/camera/getlist?mine_id=" + mine_id + "&parent_id=" + parent_id,
+					// url: "http://anvideo.nxmy.com:8011/api/camera/getlist?mine_id=" + mine_id + "&parent_id=" + parent_id,
 					success: res => {
 						console.log(res.data.content.data)
 						this.list = res.data.content.data

+ 2 - 2
pages/production/video_monitor_app/video_monitor_app.vue

@@ -19,9 +19,9 @@
 			this.mine_code = option.mine_code
 			
 			if(uni.getStorageSync("mine_code").indexOf('_neiwang') != -1){
-				this.base_url = "http://n.video.nxjiewei.com:8011/api"
+				this.base_url = "http://anvideo.nxmy.com:8011/api"
 			}else{
-				this.base_url = "http://video.nxjiewei.com:8011/api"
+				this.base_url = "http://anvideo.nxmy.com:8011/api"
 			}
 			
 			uni.request({

+ 3 - 2
pages/production/zaoquan/control_platform/coal_mining/coal_mining.vue

@@ -5,7 +5,8 @@
 		</view>
 
 		<view class="container">
-			<view class="btn" @click="goto_url('../../h5/h5?url=220707新智能综采首页')">
+			<!-- <view class="btn" @click="goto_url('../../h5/h5?url=220707新智能综采首页')"> -->
+			<view class="btn">
 				<view class="left">
 					<view class="icon">
 						<image src="../img/btn_icon.png" mode="widthFix"></image>
@@ -15,7 +16,7 @@
 					</view>
 				</view>
 				<view class="right">
-					<uni-icons type="arrowright" color="#FFF"></uni-icons>
+					<!-- <uni-icons type="arrowright" color="#FFF"></uni-icons> -->
 				</view>
 			</view>
 

+ 6 - 4
pages/production/zaoquan/control_platform/drainage/drainage.vue

@@ -5,7 +5,8 @@
 		</view>
 
 		<view class="container">
-			<view class="btn" @click="open('../../h5/h5?url=多级排水系统')">
+			<!-- <view class="btn" @click="open('../../h5/h5?url=多级排水系统')"> -->
+			<view class="btn">
 				<view class="left">
 					<view class="icon">
 						<image src="../img/btn_icon.png" mode="widthFix"></image>
@@ -15,7 +16,7 @@
 					</view>
 				</view>
 				<view class="right">
-					<uni-icons type="arrowright" color="#FFF"></uni-icons>
+					<!-- <uni-icons type="arrowright" color="#FFF"></uni-icons> -->
 				</view>
 			</view>
 
@@ -28,7 +29,8 @@
 				</view>
 			</view>
 
-			<view class="btn" @click="open('../../h5/h5?url=多级供水')">
+			<!-- <view class="btn" @click="open('../../h5/h5?url=多级供水')"> -->
+			<view class="btn">
 				<view class="left">
 					<view class="icon">
 						<image src="../img/btn_icon.png" mode="widthFix"></image>
@@ -38,7 +40,7 @@
 					</view>
 				</view>
 				<view class="right">
-					<uni-icons type="arrowright" color="#FFF"></uni-icons>
+					<!-- <uni-icons type="arrowright" color="#FFF"></uni-icons> -->
 				</view>
 			</view>
 

+ 1 - 1
pages/production/zaoquan/h5/h5.vue

@@ -8,7 +8,7 @@
 	export default {
 		data() {
 			return {
-				href: "http://zdh.zaoquan.nxjiewei.com:8011/g/?xmlname="
+				href: "http://zdh.zaoquan.nxmy.com:8011/g/?xmlname="
 			};
 		},
 		onLoad(option) {

+ 1 - 1
pages/production/zaoquan/power_monitoring/power_monitoring.vue

@@ -51,7 +51,7 @@
 	export default {
 		data() {
 			return {
-				base_url:"http://zaoquan.nxjiewei.com:8011/api",
+				base_url:"http://zaoquan.nxmy.com:8011/api",
 				open:99999,
 				
 				// 列表

文件差異過大導致無法顯示
+ 1122 - 0
pages/tabbar/index/index-安宁.vue


+ 1 - 1
pages/tabbar/my/my.vue

@@ -383,7 +383,7 @@
 					success: (res) => {
 						// 通过eventChannel向被打开页面传送数据
 						res.eventChannel.emit('acceptDataFromOpenerPage', {
-							url: 'http://oa_system.nxjiewei.com:8011/?m=ying&d=we&mnum=ndyybbug&show=we&hideheader=true',
+							url: 'http://oa_system.nxmy.com:8011/?m=ying&d=we&mnum=ndyybbug&show=we&hideheader=true',
 							title: "建议反馈"
 						})
 					}

+ 1 - 1
pages/tabbar/workbench/workbench - 副本 (2).vue

@@ -76,7 +76,7 @@
 				let link = item.link
 				
 				// OA系统
-				if(link.indexOf("oa_system.nxjiewei.com") != -1 ){
+				if(link.indexOf("oa_system.nxmy.com") != -1 ){
 					uni.navigateTo({
 						url:"../../origanization/OA/h5/h5",
 						success: (res) =>{

+ 3 - 3
pages/tabbar/workbench/workbench-新版样式.vue

@@ -11,8 +11,8 @@
 			<view class="list">
 				<view class="item" v-for="(item,index) in nav" :key="index"  @click="go_link(item)">
 					<view class="icon">
-						<view class="num" v-if="item.link.indexOf('http://oa_system.nxjiewei.com:8011/?m=ying&d=we&num=daiban&hideheader=true') != -1 && num_1 > 0">{{num_1}}</view>
-						<view class="num" v-if="item.link.indexOf('http://oa_system.nxjiewei.com:8011/?m=ying&d=we&num=todo&hideheader=true') != -1 && num_2 > 0">{{num_2}}</view>
+						<view class="num" v-if="item.link.indexOf('http://oa_system.nxmy.com:8011/?m=ying&d=we&num=daiban&hideheader=true') != -1 && num_1 > 0">{{num_1}}</view>
+						<view class="num" v-if="item.link.indexOf('http://oa_system.nxmy.com:8011/?m=ying&d=we&num=todo&hideheader=true') != -1 && num_2 > 0">{{num_2}}</view>
 						<image :src="item.icon" mode=""></image>
 					</view>
 					<view class="name">{{item.title}}</view>
@@ -101,7 +101,7 @@
 				let link = item.link
 				
 				// OA系统
-				if(link.indexOf("oa_system.nxjiewei.com") != -1 ){
+				if(link.indexOf("oa_system.nxmy.com") != -1 ){
 					uni.navigateTo({
 						url:"../../origanization/OA/h5/h5",
 						success: (res) =>{

+ 2 - 2
pages/tabbar/workbench/workbench.vue

@@ -25,11 +25,11 @@
 					</view>
 					<view class="name">
 						<view class="num"
-							v-if="item.link.indexOf('http://oa_system.nxjiewei.com:8011/?m=ying&d=we&num=daiban&hideheader=true') != -1 && num_1 > 0">
+							v-if="item.link.indexOf('http://oa_system.nxmy.com:8011/?m=ying&d=we&num=daiban&hideheader=true') != -1 && num_1 > 0">
 							{{num_1}}
 						</view>
 						<view class="num"
-							v-if="item.link.indexOf('http://oa_system.nxjiewei.com:8011/?m=ying&d=we&num=todo&hideheader=true') != -1 && num_2 > 0">
+							v-if="item.link.indexOf('http://oa_system.nxmy.com:8011/?m=ying&d=we&num=todo&hideheader=true') != -1 && num_2 > 0">
 							{{num_2}}
 						</view>
 						<view class="num" v-if="item.link.indexOf('closed_loop_management') != -1 && num_3 > 0">

+ 2 - 2
pages/workbench/free_car/free_car.vue

@@ -35,7 +35,7 @@
 		data() {
 			return {
 				mine_code:"",
-				base_url:"http://oa_system.nxjiewei.com:8011",
+				base_url:"http://oa_system.nxmy.com:8011",
 				list: []
 			};
 		},
@@ -43,7 +43,7 @@
 			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"
+				this.base_url = "http://oa_system.nxmy.com:8011"
 			}else{
 				console.log("公网")
 			}