Selaa lähdekoodia

数据对接,bugxiufu

Ming 4 vuotta sitten
vanhempi
commit
cabbbdc213

+ 23 - 0
common/common.js

@@ -0,0 +1,23 @@
+// 处理多次点击
+function noMultipleClicks(methods) {
+    let that = this;
+    
+    if (that.noClick) {
+        that.noClick= false;
+        // methods();
+        setTimeout(function () {
+            that.noClick= true;
+        }, 2000)
+    } else {
+        uni.showToast({
+            title: '请勿重复点击',
+            duration: 2000,
+            icon: 'none'
+        })
+    }
+}
+
+//导出
+export default {
+    noMultipleClicks,//禁止多次点击
+}

+ 6 - 1
main.js

@@ -7,7 +7,12 @@ import {myRequest} from './util/api.js'
 
 // 引入colorui组件
 import cuCustom from 'colorui/components/cu-custom.vue'
-Vue.component('cu-custom',cuCustom)
+Vue.component('cu-custom',cuCustom)
+
+ //配置公共方法
+ import common from './common/common.js'
+ Vue.prototype.$noMultipleClicks = common.noMultipleClicks; // (禁止重复点击)
+ 
 
 
 Vue.config.productionTip = false

+ 4 - 3
pages/accountManage/perAdd/perAdd.vue

@@ -44,7 +44,7 @@
 			</view>
 
 			<view class="btn-area submitBottomBtn padding-lr-sm">
-				<button class="bg-blue round  margin-top" @click="submit()">提 交 </button>
+				<button class="bg-blue round  margin-top" @click="$noMultipleClicks(submit())">提 交 </button>
 			</view>
 		</form>
 
@@ -56,6 +56,7 @@
 	export default {
 		data() {
 			return {
+				noClick:true,
 				companyListData: [],
 				phoneListData: [],
 				formMess: {
@@ -78,12 +79,12 @@
 				//提交验证
 				if (!this.formMess.phone) {
 					uni.showToast({
-						title: "请输入联系方式",
+						title: "请选择联系方式",
 						icon: "none"
 					});
 					return
 				}
-				if (!this.formMess.name) {
+				if (!this.formMess.name.replace(/^\s*/g,'')) {
 					uni.showToast({
 						title: "请输入姓名",
 						icon: "none"

+ 9 - 7
pages/deviceManage/deviceManage.vue

@@ -11,7 +11,7 @@
 				<checkbox-group @change="changeCheckbox">
 					<view class="cu-list menu-avatar ">
 						<view class="cu-item" :class="modalName=='move-box-'+ index?'move-cur':''"
-							v-for="(item,index) in newDeviceManage" :key="index" :data-target="'move-box-' + index">
+							v-for="(item,index) in getData" :key="index" :data-target="'move-box-' + index">
 							<view class="cu-form-group margin-top">
 								<checkbox :value="String(item.id)" :checked="checkedArr.includes(String(item.id))"
 									:class="{'checked':checkedArr.includes(String(item.id))}"></checkbox>
@@ -20,14 +20,14 @@
 							</view>
 							<view class="content" @longpress="showDetail(item)">
 								<view class="pro-title">
-									<view class="cut">{{item.title}}</view>
+									<view class="cut">{{item.owner_name}}</view>
 								</view>
 								<view class="pro-des  ">
 									<view class="text-cut">
-										{{item.des}}
+										{{item.unitinfo}}
 									</view>
 								</view>
-								<view class="pro-date ">{{item.time}}</view>
+								<view class="pro-date ">{{item.install_time}}</view>
 
 								<view class="showDetail" v-if="item.isShow">
 									<view @tap="goDeviceEdit(item)">修改设备</view>
@@ -36,9 +36,9 @@
 							</view>
 							<view class="nav-right num">
 								<view class="text-grey">
-									<span class="online" v-if="item.status==0">在线</span>
-									<span class="offline" v-if="item.status==1">离线</span>
-									<span class="error" v-if="item.status==2">故障</span>
+									<span class="online" v-if="item.device_state=='在线'">在线</span>
+									<span class="offline" v-if="item.device_state==='离线'">离线</span>
+									<span class="error" v-if="item.device_state==='故障'">故障</span>
 									<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
 								</view>
 							</view>
@@ -141,6 +141,8 @@
 		},
 		data() {
 			return {
+				
+				getData:[],
 				validCode: '',
 
 				checkbox: [{

+ 2 - 2
pages/info/info.vue

@@ -14,7 +14,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="cu-item  shadow" @tap="goPushList()">
+			<!-- <view class="cu-item  shadow" @tap="goPushList()">
 				<view class="cu-avatar " style="background-image:url(../../static/pushList.png)"></view>
 				<view class="content">
 					<view class="">消息推送</view>
@@ -24,7 +24,7 @@
 						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
 					</view>
 				</view>
-			</view>
+			</view> -->
 			
 		</view>
 		

+ 3 - 2
pages/inspectList/unprocessDetail/unprocessDetail.vue

@@ -48,7 +48,7 @@
 							:value="reason"></textarea>
 						</view>
 						<view class="btn-area">
-							<button class="bg-blue round  margin-top" @click="powerSubmit()">提 交 </button>
+							<button class="bg-blue round  margin-top" @click="$noMultipleClicks(powerSubmit())">提 交 </button>
 						</view>
 					</form>
 				</view>
@@ -62,6 +62,7 @@
 	export default {
 		data() {
 			return {
+				noClick:true,
 				reason: '',
 				type: 0,
 				msg: '',
@@ -91,7 +92,7 @@
 				console.log(this.radioOne)
 			},
 			powerSubmit() {
-				if(!this.msg){
+				if(!this.msg.replace(/^\s*/g,'')){
 					uni.showToast({
 						title: "请输入处理内容",
 						icon:"none"

+ 4 - 3
pages/unprocessDetail/unprocessDetail.vue

@@ -51,9 +51,9 @@
 
 						</view>
 						<view class="btn-area">
-							<button class="bg-orange round missReport margin-top" @click="alarmSubmit(1)">误 报
+							<button class="bg-orange round missReport margin-top" @click="$noMultipleClicks(alarmSubmit(1))">误 报
 							</button>
-							<button class="bg-blue round  missReport margin-top " @click="alarmSubmit(0)">非 误 报
+							<button class="bg-blue round  missReport margin-top " @click="$noMultipleClicks(alarmSubmit(0))">非 误 报
 							</button>
 						</view>
 					</form>
@@ -70,6 +70,7 @@
 	export default {
 		data() {
 			return {
+				noClick:true,
 				modalName: null,
 				reason: '',
 				type: 1,
@@ -158,7 +159,7 @@
 			},
 
 			alarmSubmit(query) {
-				if (!this.msg) {
+				if (!this.msg.replace(/^\s*/g,'')) {
 					uni.showToast({
 						title: "请输入处理内容",
 						icon: "none"

+ 4 - 3
pages/weiBao/planDetail/planDetail.vue

@@ -48,7 +48,7 @@
 			</view>
 
 			<view class="btn-area submitBottomBtn padding-lr-sm">
-				<button class="bg-blue round  margin-top" @click="addSubmit">提 交 </button>
+				<button class="bg-blue round  margin-top" @click="$noMultipleClicks(addSubmit())">提 交 </button>
 			</view>
 		</form>
 	</view>
@@ -58,6 +58,7 @@
 	export default {
 		data() {
 			return {
+				noClick:true,
 				imgList: [],
 				msg: '',
 				id: '',
@@ -109,14 +110,14 @@
 			},
 
 			addSubmit() {
-				if (!this.reportName) {
+				if (!this.reportName.replace(/^\s*/g,'')) {
 					uni.showToast({
 						title: "请输入上报名称",
 						icon: "none"
 					});
 					return
 				}
-				if (!this.msg) {
+				if (!this.msg.replace(/^\s*/g,'')) {
 					uni.showToast({
 						title: "请输入维保描述",
 						icon: "none"

+ 4 - 3
pages/xunJian/planDetail/planDetail.vue

@@ -48,7 +48,7 @@
 			</view>
 
 			<view class="btn-area submitBottomBtn padding-lr-sm">
-				<button class="bg-blue round  margin-top" @click="addSubmit">提 交 </button>
+				<button class="bg-blue round  margin-top" @click="$noMultipleClicks(addSubmit())">提 交 </button>
 			</view>
 		</form>
 	</view>
@@ -58,6 +58,7 @@
 	export default {
 		data() {
 			return {
+				noClick:true,
 				imgList: [],
 				msg: '',
 				id: '',
@@ -109,14 +110,14 @@
 			},
 
 			addSubmit() {
-				if (!this.reportName) {
+				if (!this.reportName.replace(/^\s*/g,'')) {
 					uni.showToast({
 						title: "请输入上报名称",
 						icon: "none"
 					});
 					return
 				}
-				if (!this.msg) {
+				if (!this.msg.replace(/^\s*/g,'')) {
 					uni.showToast({
 						title: "请输入巡检描述",
 						icon: "none"