Browse Source

最新分支 更改全局户号线路台区等字段,并wx域名,

ming 3 years ago
parent
commit
6f906a43ae

+ 3 - 3
pages/messagePush/messagePush.vue

@@ -51,7 +51,7 @@
 					{
 						value: 'm5',
 						checked: false,
-						title: '线电气故障总'
+						title: '线电气故障总'
 					},
 					{
 						value: 'm6',
@@ -61,12 +61,12 @@
 					{
 						value: 'm7',
 						checked: false,
-						title: '线带电'
+						title: '线带电'
 					},
 					{
 						value: 'm8',
 						checked: false,
-						title: '线开关状态'
+						title: '线开关状态'
 					},
 					{
 						value: 'm9',

+ 3 - 3
pages/processDetailEle/processDetailEle.vue

@@ -28,15 +28,15 @@
 						<text>{{detailMessage.siteName}}</text>
 					</view>
 					<view class="info-one-info ">
-						<text>区展示:</text>
+						<text>区展示:</text>
 						<text>{{detailMessage.platform_area_name}}</text>
 					</view>
 					<view>
-						<text>线名称:</text>
+						<text>线名称:</text>
 						<text>{{detailMessage.deviceName}}</text>
 					</view>
 					<view>
-						<text>号:</text>
+						<text>号:</text>
 						<text>{{detailMessage.account_number}}</text>
 					</view>
 					<view>

+ 3 - 3
pages/processDetailEle1/processDetailEle1.vue

@@ -28,15 +28,15 @@
 						<text>{{detailMessage.siteName}}</text>
 					</view>
 					<view class="info-one-info ">
-						<text>区展示:</text>
+						<text>区展示:</text>
 						<text>{{detailMessage.platform_area_name}}</text>
 					</view>
 					<view>
-						<text>线名称:</text>
+						<text>线名称:</text>
 						<text>{{detailMessage.deviceName}}</text>
 					</view>
 					<view>
-						<text>号:</text>
+						<text>号:</text>
 						<text>{{detailMessage.account_number}}</text>
 					</view>
 					<view>

+ 2 - 2
pages/processedDetail/processedDetail.vue

@@ -33,11 +33,11 @@
 						<text>{{detailMessage.siteName}}</text>
 					</view>
 					<view class="info-one-info ">
-						<text>区展示:</text>
+						<text>区展示:</text>
 						<text>{{detailMessage.platform_area_name}}</text>
 					</view>
 					<view>
-						<text>线名称:</text>
+						<text>线名称:</text>
 						<text>{{detailMessage.deviceName}}</text>
 					</view>
 					<view>

+ 2 - 2
pages/processedDetail1/processedDetail1.vue

@@ -32,11 +32,11 @@
 						<text>{{detailMessage.siteName}}</text>
 					</view>
 					<view class="info-one-info ">
-						<text>区展示:</text>
+						<text>区展示:</text>
 						<text>{{detailMessage.platform_area_name}}</text>
 					</view>
 					<view>
-						<text>线名称:</text>
+						<text>线名称:</text>
 						<text>{{detailMessage.deviceName}}</text>
 					</view>
 					<view>

+ 5 - 5
pages/siteAdd/siteAdd.vue

@@ -49,7 +49,7 @@
 			
 			
 			<view class="form-item">
-				<view class="title"><text class="necessary">*</text>所属线:</view>
+				<view class="title"><text class="necessary">*</text>所属线:</view>
 				<select name="" id="" filterable clearable v-model="router_id">
 					<option value="0">请选择</option>
 					<option :value=item.id v-for="item in routeListData">{{ item.route_name}}</option>
@@ -133,7 +133,7 @@
 				</select>
 			</view>
 			<view class="form-item">
-				<view class="title"><text class="necessary">*</text>所属线:</view>
+				<view class="title"><text class="necessary">*</text>所属线:</view>
 				<select name="" id=" " v-model="siteMessage.route_id">
 					<option value="0">请选择</option>
 					<option :value=item.id v-for="item in routeListData">{{ item.route_name}}</option>
@@ -203,7 +203,7 @@
 
 		methods: {
 			
-			//线名称下拉数据请求
+			//线名称下拉数据请求
 			async getRoutrBox(params = {}) {
 				const res = await this.$myRequest({
 					url: 'Archives/getRoutrBox',
@@ -328,7 +328,7 @@
 				 
 				 if (!this.router_id) {
 				 	uni.showToast({
-				 		title: "请选择所属线...",
+				 		title: "请选择所属线...",
 				 		icon: "none"
 				 	});
 				 	return
@@ -447,7 +447,7 @@
 				 }
 				 if (!this.siteMessage.route_id) {
 				 	uni.showToast({
-				 		title: "请选择所属线...",
+				 		title: "请选择所属线...",
 				 		icon: "none"
 				 	});
 				 	return

+ 2 - 2
pages/siteArchive/archiveDetail/archiveDetail.vue

@@ -3,7 +3,7 @@
 		<form action="">
 			<view class="form-item">
 				<view class="title">
-					号:
+					号:
 				</view>
 				<view class="sub">{{detailInfo.account_number}}</view>
 			</view>
@@ -16,7 +16,7 @@
 				<view class="sub">{{detailInfo.power_capacity}}</view>
 			</view>
 			<view class="form-item">
-				<view class="title">线:</view>
+				<view class="title">线:</view>
 				<view class="sub">{{detailInfo.route_name}}</view>
 			</view>
 			<view class="form-item">

+ 2 - 2
pages/siteArchive/siteArchive.vue

@@ -8,7 +8,7 @@
 			<view class="cu-bar search bg-gray filter-section" style="padding-top:10rpx">
 				<view class="search-form round bg-white" style="position:relative;overflow:auto">
 					<input name="siteName" v-model="formMess.siteName" @click="toggleShow" @focus="focusfns"
-						@input="handleInput()" placeholder="请输入或选择所属线"></input>
+						@input="handleInput()" placeholder="请输入或选择所属线"></input>
 				</view>
 			
 			</view>
@@ -129,7 +129,7 @@
 		},
 
 		methods: {
-			//线名称下拉数据请求
+			//线名称下拉数据请求
 			async getRoutrBox(params = {}) {
 				const res = await this.$myRequest({
 					url: 'Archives/getRoutrBox',

+ 5 - 5
pages/siteArchive/siteArchiveAdd/siteArchiveAdd.vue

@@ -5,7 +5,7 @@
 			<view class="form-item">
 				<view class="title">
 					<text class="necessary">*</text>
-					号:
+					号:
 				</view>
 				<input name="input" v-model="formMess.account_number" maxlength="50" :disabled="isdisabledFn"></input>
 			</view>
@@ -18,7 +18,7 @@
 				<input name="input" v-model="formMess.power_capacity" maxlength="10"></input>
 			</view>
 			<view class="form-item">
-				<view class="title"><text class="necessary">*</text>线:</view>
+				<view class="title"><text class="necessary">*</text>线:</view>
 				<select name="" id="" filterable clearable v-model="formMess.route_id">
 					<option value="0">请选择</option>
 					<option :value=item.id v-for="item in routeListData" :title="item.route_name">{{ item.route_name}}
@@ -582,7 +582,7 @@
 				this.formMess = res.data.data[0];
 			},
 
-			//线名称下拉数据请求
+			//线名称下拉数据请求
 			async getRoutrBox(params = {}) {
 				const res = await this.$myRequest({
 					url: 'Archives/getRoutrBox',
@@ -617,7 +617,7 @@
 				//提交验证
 				if (!this.formMess.account_number.replace(/^\s*/g, '')) {
 					uni.showToast({
-						title: "请输入号",
+						title: "请输入号",
 						icon: "none"
 					});
 					return
@@ -638,7 +638,7 @@
 				}
 				if (!this.formMess.route_id) {
 					uni.showToast({
-						title: "请输入所属线",
+						title: "请输入所属线",
 						icon: "none"
 					});
 					return

+ 2 - 2
pages/siteList/siteList.vue

@@ -7,7 +7,7 @@
 			<view class="cu-bar search bg-gray filter-section" style="padding-top:10rpx">
 				<view class="search-form round bg-white" style="position:relative;overflow:auto">
 					<input name="siteName" v-model="formMess.siteName" @click="toggleShow" @focus="focusfns"
-						@input="handleInput()" placeholder="请输入或选择所属线"></input>
+						@input="handleInput()" placeholder="请输入或选择所属线"></input>
 				</view>
 
 			</view>
@@ -141,7 +141,7 @@
 
 		methods: {
 
-			//线名称下拉数据请求
+			//线名称下拉数据请求
 			async getRoutrBox(params = {}) {
 				const res = await this.$myRequest({
 					url: 'Archives/getRoutrBox',

+ 2 - 2
pages/siteManage/siteManage.vue

@@ -6,7 +6,7 @@
 			<view class="cu-bar search bg-gray filter-section" style="padding-top:10rpx">
 				<view class="search-form round bg-white" style="position:relative;overflow:auto">
 					<input name="siteName" v-model="formMess.siteName" @click="toggleShow" @focus="focusfns"
-						@input="handleInput()" placeholder="请输入或选择所属线"></input>
+						@input="handleInput()" placeholder="请输入或选择所属线"></input>
 				</view>
 			</view>
 			<view class="cu-bar search bg-gray filter-section">
@@ -151,7 +151,7 @@
 				})
 			},
 
-			//线名称下拉数据请求
+			//线名称下拉数据请求
 			async getRoutrBox(params = {}) {
 				const res = await this.$myRequest({
 					url: 'Archives/getRoutrBox',

+ 2 - 2
pages/unprocessDetail/unprocessDetail.vue

@@ -20,12 +20,12 @@
 					</view>
 					
 					<view class="info-one-info ">
-						<text>区展示:</text>
+						<text>区展示:</text>
 						<text>等待对接中.....</text>
 					</view>
 					
 					<view>
-						<text>线名称:</text>
+						<text>线名称:</text>
 						<text>{{detailMessage.deviceName}}</text>
 					</view>
 					<view>

+ 2 - 2
pages/unprocessDetail1/unprocessDetail1.vue

@@ -19,12 +19,12 @@
 					</view>
 					
 					<view class="info-one-info ">
-						<text>区展示:</text>
+						<text>区展示:</text>
 						<text>等待对接中.....</text>
 					</view>
 					
 					<view>
-						<text>线名称:</text>
+						<text>线名称:</text>
 						<text>{{detailMessage.deviceName}}</text>
 					</view>
 					<view>

+ 3 - 3
util/api.js

@@ -2,8 +2,8 @@
 
 /** qhome.usky.cn测试域名  wx.ewoogi.com 正式域名 **/
 
-const BASE_URL = 'https://qhome.usky.cn/USKYOF/USKYOF.php/Home/'  
-const websiteUrl = 'https://qhome.usky.cn'
+const BASE_URL = 'https://wx.ewoogi.com/USKYOF/USKYOF.php/Home/'  
+const websiteUrl = 'https://wx.ewoogi.com'
 
 
 // 同时发送异步代码的次数,防止一次点击中有多次请求,用于处理
@@ -64,7 +64,7 @@ function myRequest(options){
 				let notIndexFail = ['Index/getDataStatistics', 'Com/getAuthorizationUrl'];
 				if (notIndexFail.includes(options.url)) {
 					window.location.href =
-						'https://qhome.usky.cn/wx/index.html#/pages/index/index';
+						'https://wx.ewoogi.com/wx/index.html#/pages/index/index';
 				} else {
 					uni.showModal({
 						showCancel: false,