fix-bug from excel

.hbuilderx/launch.json

@@ -1,24 +1,26 @@
-{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
-  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
-    "version": "0.0",
-    "configurations": [{
-     	"app-plus" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"default" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"h5" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"mp-weixin" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"type" : "uniCloud"
-     }
+{
+    // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+    // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version" : "0.0",
+    "configurations" : [
+        {
+            "app-plus" : {
+                "launchtype" : "local"
+            },
+            "default" : {
+                "launchtype" : "local"
+            },
+            "h5" : {
+                "launchtype" : "local"
+            },
+            "mp-weixin" : {
+                "launchtype" : "local"
+            },
+            "type" : "uniCloud"
+        },
+        {
+            "playground" : "standard",
+            "type" : "uni-app:app-android"
+        }
     ]
 }

pages/afterSale/index.vue

@@ -339,6 +339,7 @@
 					line-height: 48rpx;
 					font-size: 24rpx;
 					color: #7d7d7d;
+					word-break: break-all;
 				}
 			}
 

pages/cb/bzy/equip-set/bzyhistoryile.vue

@@ -490,7 +490,7 @@
 			}
 
 			.pagenumber_page {
-				width: 100rpx;
+				min-width: 100rpx;
 				height: 50rpx;
 				line-height: 50rpx;
 				font-size: 26rpx;

pages/cb/cbd/equip-set/historyfile.vue

@@ -487,7 +487,7 @@
 			}
 
 			.pagenumber_page {
-				width: 100rpx;
+				min-width: 100rpx;
 				height: 50rpx;
 				line-height: 50rpx;
 				font-size: 26rpx;

pages/cb/equip-detail/equip-detail.vue

@@ -547,6 +547,8 @@
 				} else if (this.type == 7) {
 					path = "/pages/cb/bzy/equip-set/bzyhistoryile"
 				}
+				
+				console.log(path,'part clicks 12323333')
 				uni.navigateTo({
 					url: path + '?d_id=' + this.equipInfo.d_id + "&device_id=" + device_id + "&device_type=" + this
 						.type

pages/cb/sim/sim.vue

@@ -249,6 +249,14 @@
 				}
 			},
 			async submit() {
+				
+				const reg = new RegExp(/^[0-9a-zA-Z]+$/);
+				
+				if(!reg.test(this.hksiminp)){
+					uni.$u.toast('请输入正确的iccid，数字字母组合')
+					return 
+				}
+				
 				let res = await this.$myRequest({
 					url: '/api/api_gateway?method=forecast.send_control.device_sim',
 					data: {

pages/cb/thxydetail/thxydetail.vue

@@ -146,7 +146,7 @@
 					"padding-left": "20rpx",
 					"background-color": "#f6f6f6"
 				},
-				tishitext:""
+				tishitext: ""
 			}
 		},
 		methods: {
@@ -303,8 +303,10 @@
 				}
 			},
 			setdecoy() {
+				const isValidDate = this.equipInfo.xy_expire && (new Date(this.equipInfo.xy_expire)).toString() !==
+					'Invalid Date'
 				this.decoy = this.equipInfo.decoy
-				this.decoytime = this.equipInfo.xy_expire
+				this.decoytime = isValidDate ? this.equipInfo.xy_expire : ''
 				this.yxShow = true
 			},
 			settime() {
@@ -467,4 +469,4 @@
 			line-height: 25px;
 		}
 	}
-</style>
+</style>

pages/cb/xctdetail/xctdetail.vue

@@ -566,7 +566,7 @@
 			}
 
 			.pagenumber_page {
-				width: 100rpx;
+				min-width: 100rpx;
 				height: 50rpx;
 				line-height: 50rpx;
 				font-size: 26rpx;

pages/cb/xy/equip-set/xyhistoryile.vue

@@ -92,7 +92,7 @@
 						第 {{page}} 页
 					</view>
 					<view class="pagenumber_page">
-						第 {{pagesum}} 页
+						共 {{pagesum}} 页
 					</view>
 					<button @click="next" :disabled="forbidden">下一页</button>
 				</view>
@@ -557,7 +557,7 @@
 			}
 
 			.pagenumber_page {
-				width: 100rpx;
+				min-width: 100rpx;
 				height: 50rpx;
 				line-height: 50rpx;
 				font-size: 26rpx;

pages/cb/xy2.0/historydatas.vue

@@ -504,7 +504,7 @@
 			}
 
 			.pagenumber_page {
-				width: 100rpx;
+				min-width: 100rpx;
 				height: 50rpx;
 				line-height: 50rpx;
 				font-size: 26rpx;

pages/cbqxyj/cbwarn.vue

@@ -137,8 +137,8 @@
 			<u-swipe-action :show="item.show" :index="index" v-for="(item, index) in configlist" :key="item.id"
 				@click="delconfig(item.id)" :options="options" style="margin-bottom: 30rpx;">
 				<view class="wornsetbox_item" @click="toset(item.id)">
-					<view class="">
-						{{item.title}}
+					<view class="title">
+						{{item.title}} 是反反复复反反复复凤飞飞发发发发发发发发发发发发发发发发发发发发发发发发发发发发发发发发发发发发发发发发发发发发发发发发发发发发
 					</view>
 					<view class="" @click.stop>
 						<u-switch v-model="item.statustf" size="40" style="margin-top: 13rpx;"
@@ -516,7 +516,7 @@
 							device_type_id: 3
 						}
 					})
-					console.log(res)
+					console.log(res,'add warning config')
 					if(res){
 						this.addshow = false
 						this.configlist = []
@@ -774,7 +774,7 @@
 			justify-content: space-between;
 			box-sizing: border-box;
 			line-height: 64rpx;
-			height: 124rpx;
+			// height: 124rpx;
 		}
 
 	}

pages/environment/gshistory.vue

@@ -173,7 +173,7 @@ export default {
         },
       });
       this.dataloadingtf = false;
-      console.log(res.nums);
+      console.log(res.nums,res,'gs history');
       this.pagesum = Math.ceil(res.nums / 10) || 1;
       this.historylistdata = res.dat_list;
       for (var i = 0; i < this.historylistdata.length; i++) {

pages/expertDiagnosis/particulars.vue

@@ -18,7 +18,8 @@
 				</view>
 				<view class="quiz_usertime">
 					<view style="display: flex;align-items: center;">
-						<image :src="quizdata.image?quizdata.image:'http://www.hnyfwlw.com:8006/bigdata_app/image/fourMoodBase/touxiang.png'"
+						<image
+							:src="quizdata.image?quizdata.image:'http://www.hnyfwlw.com:8006/bigdata_app/image/fourMoodBase/touxiang.png'"
 							mode=""></image>
 						<span>{{quizdata.username}}</span>
 					</view>
@@ -130,7 +131,7 @@
 			examine(list) {
 				console.log(list)
 				var imgarr = []
-				for(var i=0;i<list.length;i++){
+				for (var i = 0; i < list.length; i++) {
 					imgarr.unshift(list[0].image)
 				}
 				console.log(imgarr)
@@ -150,11 +151,19 @@
 				console.log(res)
 				this.quizdata = res.data[0]
 				console.log(this.quizdata)
+
+				// if (this.quizdata.image) {
+				// 	this.list = [{
+				// 		image: this.quizdata.image
+				// 	}]
+				// }
+				
 				var index2 = this.quizdata.content.indexOf('http')
+				console.log(index2,'------------- index2 num value')
 				this.recursion(index2)
-				if(!(index2+1)){
+				if (!(index2 + 1) && this.quizdata.image) {
 					var obj = {
-						image: this.quizdata.img_urls
+						image: this.quizdata.image
 					}
 					this.list.push(obj)
 				}
@@ -195,6 +204,7 @@
 		width: 95%;
 		margin: 0 auto 20rpx;
 		height: 428rpx;
+
 		image {
 			max-width: 100%;
 			max-height: 100%;
@@ -205,12 +215,14 @@
 		width: 95%;
 		margin: 20rpx auto;
 		border-bottom: 4rpx dashed #E8E8E8;
-		.quiz_title{
+
+		.quiz_title {
 			width: 100%;
 			font-size: 36rpx;
 			font-weight: 700;
 			text-align: center;
 		}
+
 		.quiz_username {
 			width: 100%;
 
@@ -250,7 +262,8 @@
 		.quiz_usercontert {
 			padding: 20rpx;
 			margin-bottom: 20rpx;
-			/deep/img{
+
+			/deep/img {
 				width: 0 !important;
 				height: 0 !important;
 			}
@@ -305,9 +318,11 @@
 
 			.comment_unit_con {
 				padding-left: 60rpx;
+				word-break: break-all;
 
 				/deep/p {
 					margin-top: 20rpx;
+					word-break: break-all;
 
 					img {
 						margin-top: 20rpx;
@@ -346,4 +361,4 @@
 			color: #7a7a7a;
 		}
 	}
-</style>
+</style>

pages/irrigate/index.vue

@@ -262,6 +262,7 @@
 			tabClick(index, type) {
 				this.active = index
 				this.side_type = type
+				this.imports =''
 				this.page = 1
 				if (type == 18) {
 					this.eqlistdata = []