查看厕所格子状态

configs/env.js

@@ -9,12 +9,8 @@ let configs = {
 if (process.env.NODE_ENV === 'development') {
 	// 测试环境
 	configs = Object.assign(configs, {
-		// baseUrl: 'http://app.sunzee.com.cn:8090/cleanMachineServer',
 		baseUrl: 'https://app.sunzee.com.cn:9443/cleanMachineServer',
-		// baseUrl: 'http://127.0.0.1:8090/cleanMachineServer',
-		// baseUrl:'http://sunzee.myqnapcloud.com:8090/cleanMachineServer'
-		// baseUrl:'http://192.168.0.184:8090/cleanMachineServer'
-				// baseUrl: 'https://clean.sunzee.com.cn/cleanMachineServer',
+		// baseUrl: 'http://127.0.0.1:8090',
 	});
 }
 

main.js

@@ -22,13 +22,8 @@ const i18n = new VueI18n({
 
 App.mpType = 'app'
 
-// Vue.prototype.serverurl="http://127.0.0.1:8090/cleanMachineServer";
-// Vue.prototype.serverurl="http://sunzee.myqnapcloud.com:8090/cleanMachineServer";
-// Vue.prototype.serverurl="http://192.168.0.184:8090/cleanMachineServer";
-// Vue.prototype.serverurl="https://app.sunzee.com.cn:8090/cleanMachineServer";
-// Vue.prototype.serverurl="http://app.sunzee.com.cn:8090/cleanMachineServer";
+// Vue.prototype.serverurl="http://127.0.0.1:8090";
 Vue.prototype.serverurl="https://app.sunzee.com.cn:9443/cleanMachineServer";
-// Vue.prototype.serverurl="https://clean.sunzee.com.cn/cleanMachineServer";
 Vue.prototype.$store = store;
 Vue.prototype._i18n = i18n;
 const app = new Vue({

pages.json

@@ -6,6 +6,7 @@
 				"navigationStyle": "custom",
 				"disableScroll": true
 			}
+			
         },
 		{
 		    "path" : "pages/Login/loginWeixin",
@@ -21,30 +22,6 @@
 				// "enablePullDownRefresh": true
 			}
 		},
-		// {
-		//     "path" : "pages/User/merchantList",
-		//     "style" : {
-		// 		"navigationBarTitleText":"机器销售",
-		// 		// "disableScroll": true,
-		// 		"enablePullDownRefresh": true
-		// 	}
-		// },
-		// {
-		//     "path" : "pages/User/equipmentSratisticsList",
-		//     "style" : {
-		// 		"navigationBarTitleText":"机器排行",
-		// 		// "disableScroll": true,
-		// 		"enablePullDownRefresh": true
-		// 	}
-		// },
-		// {
-		//     "path" : "pages/User/equipmentStatusList",
-		//     "style" : {
-		// 		"navigationBarTitleText":"机器状态",
-		// 		// "disableScroll": true,
-		// 		"enablePullDownRefresh": true
-		// 	}
-		// },
 		{
 		    "path" : "pages/Setting/Setting",
 		    "style" : {
@@ -78,6 +55,30 @@
 			}
 		},
 		{
+		    "path" : "pages/Setting/parameters",
+		    "style" : {
+				"navigationBarTitleText":"参数类型",
+				// "disableScroll": true,
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+		    "path" : "pages/Setting/generalParameters",
+		    "style" : {
+				"navigationBarTitleText":"通用参数",
+				// "disableScroll": true,
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+		    "path" : "pages/Setting/advancedParameters",
+		    "style" : {
+				"navigationBarTitleText":"进阶参数",
+				// "disableScroll": true,
+				"enablePullDownRefresh": true
+			}
+		},
+		{
 		    "path" : "pages/Setting/dayPay",
 		    "style" : {
 				"navigationBarTitleText":"按日支付",
@@ -140,6 +141,12 @@
 				// "disableScroll": true
 			}
         }
+   //      ,{
+   //          "path" : "pages/Setting/saoma",
+   //          "style" : {
+			// 	"navigationBarTitleText": "扫码"
+			// }
+   //      }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",

pages/Charts/mainStatistics.vue

@@ -101,161 +101,198 @@
 				</view>
 			</view>
 		</view>
-		
-		<!-- 机器详情表 -->
+
+		<!-- 厕所实时使用情况 -->
 		<view class="">
-			<view v-if="merchantList.length>1">
-				<uni-collapse :accordion="true">
-					<view class="titleFlag">
-						<image class="img" src="../../static/img/red.png"></image>
-						<font class="wenziT">红色代表机器报警</font>
-						<image class="img" src="../../static/img/green.png"></image>
-						<font class="wenziT">绿色代表机器正常</font>
+			<view class="titleFlag">
+				<image class="img" src="../../static/img/red.png"></image>
+				<font class="wenziT">红色正在使用</font>
+				<image class="img" src="../../static/img/green.png"></image>
+				<font class="wenziT">绿色空闲</font>
+				<image class="img" src="../../static/img/yellow.png"></image>
+				<font class="wenziT">黄色清洗中</font>
+			</view>
+			<view class="td-right">
+				<view class="uni-list">
+					<view class="uni-list-cell">
+						<view class="uni-list-cell-left">
+							当前选择
+						</view>
+						<view class="uni-list-cell-db">
+							<picker @change="changeEquipment" :value="index" :range="equipmentNameList">
+								<view class="uni-input">{{equipmentNameList[index]}}</view>
+							</picker>
+						</view>
 					</view>
-					<view class="titlelist" v-for="(merchant,index) in merchantList" :key="merchant.id">
-						<uni-collapse-item :title="getMerchantTitle(merchant)" :open="index===0">
-							<view style="padding: 20upx;background-color: aliceblue;">
-								<view v-if="merchant.equipmentList.length==0" style="text-align: center;">暂无数据</view>
-								<view v-if="merchant.equipmentList.length>0">
-									<uni-collapse :show-animation="true">
-										<view style="position: relative;" v-for="equipment in merchant.equipmentList" :key="equipment.id">
-											<span class="status-css" :class="equipment.hasTodayAlarm===true?statusError : statusNormal"></span>
-											<uni-collapse-item :title="getEquipmentTitle(equipment)">
-												<view style="padding: 20upx;background-color: #F8F8F8;">
-													<view class="swithBox" v-if="equipment.isSleep">
-														<view class="swichFont">睡眠状态：机器已睡眠</view>
-														<view class="switch">
-															<switch style="transform:scale(0.65)" checked @change="change(equipment.id,0)" />
-														</view>
-													</view>
-													<view class="swithBox" v-else>
-														<view class="swichFont">睡眠状态：未睡眠</view>
-														<view class="switch">
-															<switch style="transform:scale(0.65)" :checked="sleepChecked" @change="change(equipment.id,1)" />
-														</view>
+				</view>
+			</view>
+			<view class="single-poster" v-for="(box,num) in boxs" :key="num">
+				<view class="poster-wapper">
+					<image v-show="box.status==0" src="../../static/img/green.png" mode="" class="image"></image> 
+					<image v-show="box.status==1" src="../../static/img/red.png" mode="" class="image"></image> 
+					<image v-show="box.status==2" src="../../static/img/yellow.png" mode="" class="image"></image> 
+				</view>
+				<view class="box-name">
+					{{box.sn}}
+				</view>
+			</view>
+		</view>
+
+
+	<!-- 机器详表 -->
+	<view class="">
+		<view v-if="merchantList.length>1">
+			<uni-collapse :accordion="true">
+				<view class="titleFlag">
+					<image class="img" src="../../static/img/red.png"></image>
+					<font class="wenziT">红色代表机器报警</font>
+					<image class="img" src="../../static/img/green.png"></image>
+					<font class="wenziT">绿色代表机器正常</font>
+				</view>
+				<view class="titlelist" v-for="(merchant,index) in merchantList" :key="merchant.id">
+					<uni-collapse-item :title="getMerchantTitle(merchant)" :open="index===0">
+						<view style="padding: 20upx;background-color: aliceblue;">
+							<view v-if="merchant.equipmentList.length==0" style="text-align: center;">暂无数据</view>
+							<view v-if="merchant.equipmentList.length>0">
+								<uni-collapse :show-animation="true">
+									<view style="position: relative;" v-for="equipment in merchant.equipmentList" :key="equipment.id">
+										<span class="status-css" :class="equipment.hasTodayAlarm===true?statusError : statusNormal"></span>
+										<uni-collapse-item :title="getEquipmentTitle(equipment)">
+											<view style="padding: 20upx;background-color: #F8F8F8;">
+												<view class="swithBox" v-if="equipment.isSleep">
+													<view class="swichFont">睡眠状态：机器已睡眠</view>
+													<view class="switch">
+														<switch style="transform:scale(0.65)" checked @change="change(equipment.id,0)" />
 													</view>
-													<view class="line1"></view>
-													<view class="swithBox" v-if="equipment.eqeStatus==0">
-														<view class="swichFont">关机：已关机</view>
-														<view class="switch">
-															<switch style="transform:scale(0.65)" checked @change="OnOff(equipment.id,1)" />
-														</view>
+												</view>
+												<view class="swithBox" v-else>
+													<view class="swichFont">睡眠状态：未睡眠</view>
+													<view class="switch">
+														<switch style="transform:scale(0.65)" :checked="sleepChecked" @change="change(equipment.id,1)" />
 													</view>
-													<view class="swithBox" v-else>
-														<view class="swichFont">关机：未关机</view>
-														<view class="switch">
-															<switch style="transform:scale(0.65)" :checked="onffChecked" @change="OnOff(equipment.id,0)" />
-														</view>
+												</view>
+												<view class="line1"></view>
+												<view class="swithBox" v-if="equipment.eqeStatus==0">
+													<view class="swichFont">关机：已关机</view>
+													<view class="switch">
+														<switch style="transform:scale(0.65)" checked @change="OnOff(equipment.id,1)" />
 													</view>
-													<view class="line1"></view>
-													<view><span>机器唯一码：</span><span>{{equipment.clientId}}</span></view>
-													<!-- <view><span>所在地：</span><span>{{equipment.fullName?equipment.fullName:''}}</span></view> -->
-													<view><span>清洁剂余量：</span><span>{{equipment.cleaner?equipment.cleaner:''}}</span></view>
-													<view><span>消毒水余量：</span><span>{{equipment.disinfectant?equipment.disinfectant:''}}</span></view>
-													<view><span>机器到期时间：</span><span>{{equipment.overdueDate?equipment.overdueDate:''}}</span></view>
-													<view><span>机器剩余使用次数：</span><span>{{equipment.remaining?equipment.remaining:''}}</span></view>
-													<view><span>机器温度：</span><span>{{equipment.furnaceTm?equipment.furnaceTm:''}}</span></view>
-													<view><span>室内湿度：</span><span>{{equipment.cabinetHd?equipment.cabinetHd:''}}</span></view>
-													<view><span>室内温度：</span><span>{{equipment.cabinetTm?equipment.cabinetTm:''}}</span></view>
-													<view v-if="equipment.hasTodayAlarm">
-														<view><span>报警内容：</span></view>
-														<view v-for="(alarm,index) in equipment.alarmList" :key="index">
-															<view><span class="baojing">{{alarm.occurrenceTime?alarm.occurrenceTime:''}} {{alarm.alarmContent}}</span></view>
-														</view>
+												</view>
+												<view class="swithBox" v-else>
+													<view class="swichFont">关机：未关机</view>
+													<view class="switch">
+														<switch style="transform:scale(0.65)" :checked="onffChecked" @change="OnOff(equipment.id,0)" />
 													</view>
-													<view v-else>
-														<view><span>报警内容：</span><span>{{equipment.occurrenceTime?equipment.occurrenceTime:''}}
-																{{equipment.alarmContent}}</span></view>
+												</view>
+												<view class="line1"></view>
+												<view><span>机器唯一码：</span><span>{{equipment.clientId}}</span></view>
+												<!-- <view><span>所在地：</span><span>{{equipment.fullName?equipment.fullName:''}}</span></view> -->
+												<view><span>清洁剂余量：</span><span>{{equipment.cleaner?equipment.cleaner:''}}</span></view>
+												<view><span>消毒水余量：</span><span>{{equipment.disinfectant?equipment.disinfectant:''}}</span></view>
+												<view><span>机器到期时间：</span><span>{{equipment.overdueDate?equipment.overdueDate:''}}</span></view>
+												<view><span>机器剩余使用次数：</span><span>{{equipment.remaining?equipment.remaining:''}}</span></view>
+												<view><span>机器温度：</span><span>{{equipment.furnaceTm?equipment.furnaceTm:''}}</span></view>
+												<view><span>室内湿度：</span><span>{{equipment.cabinetHd?equipment.cabinetHd:''}}</span></view>
+												<view><span>室内温度：</span><span>{{equipment.cabinetTm?equipment.cabinetTm:''}}</span></view>
+												<view v-if="equipment.hasTodayAlarm">
+													<view><span>报警内容：</span></view>
+													<view v-for="(alarm,index) in equipment.alarmList" :key="index">
+														<view><span class="baojing">{{alarm.occurrenceTime?alarm.occurrenceTime:''}} {{alarm.alarmContent}}</span></view>
 													</view>
 												</view>
-											</uni-collapse-item>
-										</view>
-									</uni-collapse>
+												<view v-else>
+													<view><span>报警内容：</span><span>{{equipment.occurrenceTime?equipment.occurrenceTime:''}}
+															{{equipment.alarmContent}}</span></view>
+												</view>
+											</view>
+										</uni-collapse-item>
+									</view>
+								</uni-collapse>
+							</view>
+						</view>
+					</uni-collapse-item>
+				</view>
+			</uni-collapse>
+		</view>
+		<view v-else>
+			<uni-collapse :show-animation="true">
+				<view class="titleFlag">
+					<image class="img" src="../../static/img/red.png"></image>
+					<font class="wenziT">{{$t('equipmentStatusList.red')}}</font>
+					<image class="img" src="../../static/img/green.png"></image>
+					<font class="wenziT">{{$t('equipmentStatusList.green')}}</font>
+				</view>
+				<view class="titlelist" style="position: relative;" v-for="equipment in merchantList[0].equipmentList" :key="equipment.id">
+					<span class="status-css" :class="equipment.hasTodayAlarm===true?statusError : statusNormal"></span>
+					<uni-collapse-item :title="getEquipmentTitle(equipment)">
+						<!-- 睡眠 -->
+						<view style="padding: 20upx;background-color:#F8F8F8;">
+							<view class="swithBox" v-if="equipment.isSleep">
+								<view class="swichFont">{{$t('equipmentStatusList.sleep')}}</view>
+								<view class="switch">
+									<switch style="transform:scale(0.65)" checked @change="change(equipment.id,0)" />
 								</view>
 							</view>
-						</uni-collapse-item>
-					</view>
-				</uni-collapse>
-			</view>
-			<view v-else>
-				<uni-collapse :show-animation="true">
-					<view class="titleFlag">
-						<image class="img" src="../../static/img/red.png"></image>
-						<font class="wenziT">{{$t('equipmentStatusList.red')}}</font>
-						<image class="img" src="../../static/img/green.png"></image>
-						<font class="wenziT">{{$t('equipmentStatusList.green')}}</font>
-					</view>
-					<view class="titlelist" style="position: relative;" v-for="equipment in merchantList[0].equipmentList" :key="equipment.id">
-						<span class="status-css" :class="equipment.hasTodayAlarm===true?statusError : statusNormal"></span>
-						<uni-collapse-item :title="getEquipmentTitle(equipment)">
-							<!-- 睡眠 -->
-							<view style="padding: 20upx;background-color:#F8F8F8;">
-								<view class="swithBox" v-if="equipment.isSleep">
-									<view class="swichFont">{{$t('equipmentStatusList.sleep')}}</view>
+							<view class="swithBox" v-else>
+								<view class="swichFont">{{$t('equipmentStatusList.unsleep')}}</view>
+								<view class="switch">
+									<switch style="transform:scale(0.65)" :checked="sleepChecked" @change="change(equipment.id,1)" />
+								</view>
+							</view>
+							<view class="line1"></view>
+							<!-- 关机 -->
+							<view class="" v-if="globalUser.open==0">
+								<view class="swithBox" v-if="equipment.eqeStatus==0">
+									<view class="swichFont">{{$t('equipmentStatusList.off')}}</view>
 									<view class="switch">
-										<switch style="transform:scale(0.65)" checked @change="change(equipment.id,0)" />
+										<switch style="transform:scale(0.65)" checked @change="OnOff(equipment.id,1)" />
 									</view>
 								</view>
 								<view class="swithBox" v-else>
-									<view class="swichFont">{{$t('equipmentStatusList.unsleep')}}</view>
+									<view class="swichFont">{{$t('equipmentStatusList.on')}}</view>
 									<view class="switch">
-										<switch style="transform:scale(0.65)" :checked="sleepChecked" @change="change(equipment.id,1)" />
-									</view>
-								</view>
-								<view class="line1"></view>
-								<!-- 关机 -->
-								<view class="" v-if="globalUser.open==0">
-									<view class="swithBox" v-if="equipment.eqeStatus==0">
-										<view class="swichFont">{{$t('equipmentStatusList.off')}}</view>
-										<view class="switch">
-											<switch style="transform:scale(0.65)" checked @change="OnOff(equipment.id,1)" />
-										</view>
-									</view>
-									<view class="swithBox" v-else>
-										<view class="swichFont">{{$t('equipmentStatusList.on')}}</view>
-										<view class="switch">
-											<switch style="transform:scale(0.65)" :checked="onffChecked" @change="OnOff(equipment.id,0)" />
-										</view>
+										<switch style="transform:scale(0.65)" :checked="onffChecked" @change="OnOff(equipment.id,0)" />
 									</view>
 								</view>
-			
-								<view class="line1"></view>
-								<!-- 远程开门 -->
-								<view class="opendoor"><span>{{$t('equipmentStatusList.door')}}：</span>
-									<view class="">
-										<button type="primary" @click="openDoor(equipment.id)" class="button">
-											<p class="p">{{$t('equipmentStatusList.open')}}</p>
-										</button>
-									</view>
+							</view>
+
+							<view class="line1"></view>
+							<!-- 远程开门 -->
+							<view class="opendoor"><span>{{$t('equipmentStatusList.door')}}：</span>
+								<view class="">
+									<button type="primary" @click="openDoor(equipment.id)" class="button">
+										<p class="p">{{$t('equipmentStatusList.open')}}</p>
+									</button>
 								</view>
-			
-								<view><span>{{$t('equipmentStatusList.equipmentNo')}}：</span><span>{{equipment.clientId}}</span></view>
-								<!-- <view><span>{{$t('equipmentStatusList.area')}}：</span><span>{{equipment.fullName?equipment.fullName:''}}</span></view>
+							</view>
+
+							<view><span>{{$t('equipmentStatusList.equipmentNo')}}：</span><span>{{equipment.clientId}}</span></view>
+							<!-- <view><span>{{$t('equipmentStatusList.area')}}：</span><span>{{equipment.fullName?equipment.fullName:''}}</span></view>
 								 -->
-								 <view><span>清洁剂余量：</span><span>{{equipment.cleaner?equipment.cleaner:''}}</span></view>
-								 <view><span>消毒水余量：</span><span>{{equipment.disinfectant?equipment.disinfectant:''}}</span></view>
-								 <view><span>机器到期时间：</span><span>{{equipment.overdueDate?equipment.overdueDate:''}}</span></view>
-								 <view><span>机器剩余使用次数：</span><span>{{equipment.remaining?equipment.remaining:''}}</span></view>
-								<view><span>{{$t('equipmentStatusList.temperature')}}：</span><span>{{equipment.furnaceTm?equipment.furnaceTm:''}}</span></view>
-								<view><span>{{$t('equipmentStatusList.humidity')}}：</span><span>{{equipment.cabinetHd?equipment.cabinetHd:''}}</span></view>
-								<view><span>{{$t('equipmentStatusList.equipmentTemperature')}}：</span><span>{{equipment.cabinetTm?equipment.cabinetTm:''}}</span></view>
-								<view class="" v-if="equipment.hasTodayAlarm">
-									<view><span>{{$t('equipmentStatusList.alarm')}}：</span></view>
-									<view v-for="(alarm,index) in equipment.alarmList" :key="index">
-										<view><span class="baojing">{{alarm.occurrenceTime?alarm.occurrenceTime:''}} {{alarm.alarmContent}}</span></view>
-									</view>
-								</view>
-								<view class="" v-else>
-									<view><span>{{$t('equipmentStatusList.alarm')}}：</span><span>{{equipment.occurrenceTime?equipment.occurrenceTime:''}}
-											{{equipment.alarmContent}}</span></view>
+							<view><span>清洁剂余量：</span><span>{{equipment.cleaner?equipment.cleaner:''}}</span></view>
+							<view><span>消毒水余量：</span><span>{{equipment.disinfectant?equipment.disinfectant:''}}</span></view>
+							<view><span>机器到期时间：</span><span>{{equipment.overdueDate?equipment.overdueDate:''}}</span></view>
+							<view><span>机器剩余使用次数：</span><span>{{equipment.remaining?equipment.remaining:''}}</span></view>
+							<view><span>{{$t('equipmentStatusList.temperature')}}：</span><span>{{equipment.furnaceTm?equipment.furnaceTm:''}}</span></view>
+							<view><span>{{$t('equipmentStatusList.humidity')}}：</span><span>{{equipment.cabinetHd?equipment.cabinetHd:''}}</span></view>
+							<view><span>{{$t('equipmentStatusList.equipmentTemperature')}}：</span><span>{{equipment.cabinetTm?equipment.cabinetTm:''}}</span></view>
+							<view class="" v-if="equipment.hasTodayAlarm">
+								<view><span>{{$t('equipmentStatusList.alarm')}}：</span></view>
+								<view v-for="(alarm,index) in equipment.alarmList" :key="index">
+									<view><span class="baojing">{{alarm.occurrenceTime?alarm.occurrenceTime:''}} {{alarm.alarmContent}}</span></view>
 								</view>
 							</view>
-						</uni-collapse-item>
-					</view>
-				</uni-collapse>
-			</view>
+							<view class="" v-else>
+								<view><span>{{$t('equipmentStatusList.alarm')}}：</span><span>{{equipment.occurrenceTime?equipment.occurrenceTime:''}}
+										{{equipment.alarmContent}}</span></view>
+							</view>
+						</view>
+					</uni-collapse-item>
+				</view>
+			</uni-collapse>
 		</view>
 	</view>
+	</view>
 </template>
 
 <script>
@@ -284,7 +321,7 @@
 			uniCollapse,
 			uniCollapseItem,
 			uniList,
-			uniListItem,
+			uniListItem
 		},
 		data() {
 			return {
@@ -300,11 +337,16 @@
 				yearRegularTimes: 0,
 				today: '',
 				week: '',
-				
+
 				globalUser: {},
 				merchantList: [{
 					equipmentList: []
 				}],
+				index: 0,
+				equipmentName: null,
+				equipmentNameList: [],
+				boxs: [],
+				num:null,
 				extraIcon: {
 					color: '#4cd964',
 					size: '22',
@@ -316,12 +358,12 @@
 				onffChecked: null,
 				time: null,
 				timeAll: {
-				
+
 				},
 				// input: 0
 			}
 		},
-		
+
 		computed: {
 			...mapState(['loginUser']),
 			pnameData: {
@@ -341,7 +383,7 @@
 			var token = uni.getStorageSync("token");
 			if (token.toString().length > 1) {
 				this.init();
-				
+
 			} else {
 				uni.reLaunch({
 					url: '../Login/Login',
@@ -375,7 +417,7 @@
 			this.equipmentStatus();
 		},
 		methods: {
-			...mapActions('chart', ['getStatistics', 'getMainStatistics', 'getMachineNum','getEquipmentListByUser']),
+			...mapActions('chart', ['getStatistics', 'getMainStatistics', 'getMachineNum', 'getEquipmentListByUser']),
 			async init() {
 				if (!this.pname) {
 					this.pname = this.loginUser.name;
@@ -396,6 +438,12 @@
 				this.week = this.$t('mainStatistics.week' + date.getDay());
 
 			},
+			//改变机器
+			changeEquipment: function(e) {
+				this.index = e.target.value;
+				var list = uni.getStorageSync("listName");
+				this.getBoxs(list[e.target.value].id);
+			},
 			equipmentStatus() {
 				var id = uni.getStorageSync("globalUser").id;
 				var token = uni.getStorageSync("token");
@@ -413,6 +461,22 @@
 					},
 				});
 			},
+			getBoxs(equipmentId) {
+				var token = uni.getStorageSync("token");
+				uni.request({
+					url: this.serverurl + '/TEquipment/getBoxs',
+					data: {
+						"equipmentId": equipmentId
+					},
+					header: {
+						'token': token
+					},
+					method: "POST",
+					success: (res) => {
+						this.boxs = res.data.data;
+					},
+				});
+			},
 			getMainStatisticsData() {
 				const param = {};
 				if (this.adminId) { // 子组件，则拿传过来的参
@@ -454,44 +518,44 @@
 					.then(data => {
 						for (let bean of data) {
 							if (bean['categorie'] === 'day') {
-								if(bean['randomTimes']!=null){
+								if (bean['randomTimes'] != null) {
 									this.dayRandomTimes = bean['randomTimes'];
 								}
-								if(bean['regularTimes']!=null){
+								if (bean['regularTimes'] != null) {
 									this.dayRegularTimes = bean['regularTimes'];
 								}
-								
-								
+
+
 							}
 							if (bean['categorie'] === 'week') {
-								if(bean['randomTimes']!=null){
+								if (bean['randomTimes'] != null) {
 									this.weekRandomTimes = bean['randomTimes'];
 								}
-								if(bean['regularTimes']!=null){
+								if (bean['regularTimes'] != null) {
 									this.weekRegularTimes = bean['regularTimes'];
 								}
-								
-								
+
+
 							}
 							if (bean['categorie'] === 'month') {
-								if(bean['randomTimes']!=null){
+								if (bean['randomTimes'] != null) {
 									this.monthRandomTimes = bean['randomTimes'];
 								}
-								if(bean['regularTimes']!=null){
+								if (bean['regularTimes'] != null) {
 									this.monthRegularTimes = bean['regularTimes'];
 								}
-								
-								
+
+
 							}
 							if (bean['categorie'] === 'year') {
-								if(bean['randomTimes']!=null){
+								if (bean['randomTimes'] != null) {
 									this.yearRandomTimes = bean['randomTimes'];
 								}
-								if(bean['regularTimes']!=null){
+								if (bean['regularTimes'] != null) {
 									this.yearRegularTimes = bean['regularTimes'];
 								}
-								
-								
+
+
 							}
 						}
 						uni.stopPullDownRefresh();
@@ -509,14 +573,16 @@
 					.then(data => {
 						this.merchantList = data;
 						var listName = data[0].equipmentList;
+						var equipmentNameList = [];
+						for (var i = 0; i < listName.length; i++) {
+							equipmentNameList.push(listName[i].name);
+							if (i == 0) {
+								this.getBoxs(listName[i].id);
+							}
+
+						}
+						this.equipmentNameList = equipmentNameList;
 						var times = new Map;
-						// if (this.input == 1) {
-						// 	for (var i = 0; i < listName.length; i++) {
-						// 		var k = listName[i].id;
-						// 		times.set(k, null);
-						// 	}
-						// 	this.timeAll = times;
-						// }
 						var listId = data[0].id;
 						if (listId != null && listId != '1') {
 							uni.setStorageSync("listName", listName);
@@ -560,8 +626,8 @@
 										"equipmentId": equipmentId
 									},
 									method: "POST",
-									header:{
-										'token':token
+									header: {
+										'token': token
 									},
 									success: (res) => {
 										var list = res.data.data;
@@ -577,8 +643,8 @@
 												content: that.$t('equipmentStatusList.tishi'),
 												success: function(res) {
 													that.getEquipmentListData();
-													setTimeout(function () {
-													    that.network(id);
+													setTimeout(function() {
+														that.network(id);
 													}, 7000);
 												}
 											})
@@ -592,7 +658,7 @@
 												}
 											})
 										}
-			
+
 									}
 								});
 							} else if (res.cancel) {
@@ -613,8 +679,8 @@
 							"equipmentId": equipmentId
 						},
 						method: "POST",
-						header:{
-							'token':token
+						header: {
+							'token': token
 						},
 						success: (res) => {
 							// that.input = 2;
@@ -630,8 +696,8 @@
 									content: that.$t('equipmentStatusList.tishi'),
 									success: function(res) {
 										that.getEquipmentListData();
-										setTimeout(function () {
-										    that.network(id);
+										setTimeout(function() {
+											that.network(id);
 										}, 7000);
 									}
 								})
@@ -645,12 +711,12 @@
 									}
 								})
 							}
-			
+
 						}
 					});
 				}
 			},
-			network(id){
+			network(id) {
 				var token = uni.getStorageSync("token");
 				var equipmentId = id;
 				uni.request({
@@ -659,16 +725,16 @@
 						"equipmentId": id
 					},
 					method: "POST",
-					header:{
-						'token':token
+					header: {
+						'token': token
 					},
 					success: (res) => {
 						var data = res.data.data;
-						if(data=='fail'){
+						if (data == 'fail') {
 							uni.showToast({
-							    title: this.$t('equipmentStatusList.network'),
-								icon:'none',
-							    duration: 3000
+								title: this.$t('equipmentStatusList.network'),
+								icon: 'none',
+								duration: 3000
 							});
 							this.getEquipmentListData();
 						}
@@ -683,15 +749,15 @@
 						"equipmentId": id
 					},
 					method: "POST",
-					header:{
-						'token':token
+					header: {
+						'token': token
 					},
 					success: (res) => {
 						uni.showModal({
 							title: this.$t('equipmentStatusList.open'),
 							content: this.$t('equipmentStatusList.opensuccess'),
 							success: function(res) {
-			
+
 							}
 						})
 					}
@@ -717,8 +783,8 @@
 										"equipmentId": equipmentId
 									},
 									method: "POST",
-									header:{
-										'token':token
+									header: {
+										'token': token
 									},
 									success: (res) => {
 										var list = res.data.data;
@@ -743,8 +809,8 @@
 							"equipmentId": equipmentId
 						},
 						method: "POST",
-						header:{
-							'token':token
+						header: {
+							'token': token
 						},
 						success: (res) => {
 							var list = res.data.data;
@@ -875,6 +941,7 @@
 	.fontLeft {
 		margin-right: 6upx;
 	}
+
 	/* 参数表 */
 	.status-css {
 		position: absolute;
@@ -886,19 +953,19 @@
 		color: "#596D83";
 		font-size: 12upx;
 	}
-	
+
 	.status-error {
 		background-color: #dd524d
 	}
-	
+
 	.status-normal {
 		background-color: #4cd964
 	}
-	
+
 	.baojing {
 		padding-left: 120upx;
 	}
-	
+
 	.titleFlag {
 		height: 56upx;
 		background-color: #F8F8F8;
@@ -907,10 +974,10 @@
 		display: flex;
 		flex-direction: row;
 	}
-	
+
 	.opendoor {
 		/* #ifdef H5 */
-		
+
 		/* #endif */
 		padding-top: 10upx;
 		padding-bottom: 10upx;
@@ -918,22 +985,22 @@
 		display: flex;
 		flex-direction: row;
 	}
-	
+
 	.button {
 		/* #ifdef H5 */
 		text-align: center;
 		height: 50upx;
-		weight:20upx ;
+		weight: 20upx;
 		/* #endif */
 		padding-left: 15upx;
 		/* padding-top: 2upx; */
 	}
-	
+
 	.p {
 		/* #ifdef H5 */
 		font-size: 28upx;
 		height: 50upx;
-		weight:20upx ;
+		weight: 20upx;
 		transform: translateY(-14upx);
 		/* text-align: center; */
 		/* #endif */
@@ -941,45 +1008,72 @@
 		text-align: center;
 		padding-left: 13upx;
 	}
-	
+
 	.img {
 		padding-top: 20upx;
 		padding-left: 30upx;
 		width: 15upx;
 		height: 15upx;
 	}
-	
+
 	.wenziT {
 		padding-top: 10upx;
 		padding-left: 10upx;
 	}
-	
+
 	.titlelist {
 		color: #363D44;
 		font-size: 16upx;
 		font-family: "PingFang-SC-Medium";
 	}
-	
+
 	.swithBox {
 		display: flex;
 		flex-direction: row;
 		padding-bottom: 15upx;
 		padding-top: 5upx;
 	}
-	
+
 	.switch {
 		width: 44upx;
 		height: 22upx;
 	}
-	
+
 	.swichFont {
 		width: 85%;
 		padding-top: 12upx;
 	}
-	
+
 	.line1 {
 		width: 100%;
 		height: 3upx;
 		background: #000000;
 	}
+
+	.single-poster {
+		display: inline-block;
+		margin-left: 20upx;
+		padding-top: 10upx;
+		text-align: center;
+		/* height: 30upx; */
+	}
+
+	.poster-wapper {
+		text-align: center;
+		display: flex;
+		flex-direction: column;
+	}
+	.image{
+		height: 30upx;
+		width: 30upx;
+	}
+	.box-name{
+		/* width: 200upx; */
+		/* margin-top: 10upx; */
+		font-size: 22upx;
+		font-weight: bold;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
 </style>

pages/Login/Login.vue

@@ -13,6 +13,7 @@
 			</view>
 			<view class="btn-area">
 				<button type="primary" formType="submit" :loading="isLoading">{{loginBtnLabel}}</button>
+				<!-- <button type="primary" bindtap="submit" :loading="isLoading">{{loginBtnLabel}}</button> -->
 			</view>
 		</form>
 		<!-- 第三方登录H5不支持，所以隐藏掉 -->
@@ -93,6 +94,7 @@
 						// 获得微信登录的code：授权码
 						var code = loginResult.code;
 						var openid = "";
+						
 						uni.request({
 							url: serverUrl+"/TWeixin/getOpenid?code="+code,
 							mothod: "GET",

pages/Setting/Setting.vue

@@ -7,7 +7,8 @@
 						<uni-list-item title="使用统计" note="单台机器的使用次数统计" @click="useStatistics(equipment.id,equipment.name)" thumb="../../static/img/tongji.png"></uni-list-item>
 						<uni-list-item title="清洗规则" note="设定机器每天的清洗时间段(单台机器)" @click="rule(equipment.id,equipment.name,equipment.rule)" thumb="../../static/img/renwu.png"></uni-list-item>
 						<uni-list-item title="支付" note="按天数/次数支付(单台机器)" show-extra-icon="true" @click="pay(equipment.id,equipment.name)" thumb="../../static/img/pay.png"></uni-list-item>
-						<uni-list-item title="参数调整" thumb="../../static/img/canshu.png"></uni-list-item>
+						<uni-list-item title="参数调整" thumb="../../static/img/canshu.png"  @click="paramters(equipment.id,equipment.name)"></uni-list-item>
+						<!-- <uni-list-item title="扫码测试" thumb="../../static/img/canshu.png"  @click="test()"></uni-list-item> -->
 					</uni-list>
 				</uni-collapse-item>
 			</view>
@@ -120,6 +121,18 @@
 					url: 'pay',
 				});
 			},
+			paramters(equipmentId,equipmentName){
+				uni.setStorageSync('nowEquipmentId', equipmentId);
+				uni.setStorageSync('nowEquipmentName', equipmentName);
+				uni.navigateTo({
+					url: 'parameters',
+				});
+			},
+			// test(){
+			// 	uni.navigateTo({
+			// 		url: 'saoma',
+			// 	});
+			// },
 		}
 	}
 </script>

pages/Setting/advancedParameters.vue

@@ -0,0 +1,248 @@
+<template>
+	<view class="">
+		<view class="line">
+
+		</view>
+		<!-- <view class="body">
+			<p class="p">X轴回零速度：</p>
+			<input class="input" type="text" v-model="D420" />
+			<button type="primary" class="button" @click="update('D-420',D420)">
+				<p class="p2">更新</P>
+			</button>
+		</view>
+		<view class="line2"></view>
+		<view class="body">
+			<p class="p">X轴爬行速度：</p>
+			<input class="input" type="text" v-model="D421" />
+			<button type="primary" class="button" @click="update('D-421',D421)">
+				<p class="p2">更新</P>
+			</button>
+		</view>
+		<view class="line2"></view>
+		<view class="body">
+			<p class="p">Y轴回零速度：</p>
+			<input class="input" type="text" v-model="D422" />
+			<button type="primary" class="button" @click="update('D-422',D422)">
+				<p class="p2">更新</P>
+			</button>
+		</view>
+		<view class="line2"></view>
+		<view class="body">
+			<p class="p">Y轴爬行速度：</p>
+			<input class="input" type="text" v-model="D423" />
+			<button type="primary" class="button" @click="update('D-423',D423)">
+				<p class="p2">更新</P>
+			</button>
+		</view>
+		<view class="line2"></view>
+		<view class="body">
+			<p class="p">E轴回零速度：</p>
+			<input class="input" type="text" v-model="D424" />
+			<button type="primary" class="button" @click="update('D-424',D424)">
+				<p class="p2">更新</P>
+			</button>
+		</view>
+		<view class="line2"></view>
+		<view class="body">
+			<p class="p">E轴爬行速度：</p>
+			<input class="input" type="text" v-model="D425" />
+			<button type="primary" class="button" @click="update('D-425',D425)">
+				<p class="p2">更新</P>
+			</button>
+		</view>
+		<view class="line2"></view> -->
+		<view class="body">
+			<p class="p">X轴加速度：</p>
+			<input class="input" type="text" v-model="D426" />
+			<button type="primary" class="button" @click="update('D426',D426)">
+				<p class="p2">更新</P>
+			</button>
+		</view>
+		<view class="line2"></view>
+		<view class="body">
+			<p class="p">X轴减速度：</p>
+			<input class="input" type="text" v-model="D427" />
+			<button type="primary" class="button" @click="update('D427',D427)">
+				<p class="p2">更新</P>
+			</button>
+		</view>
+		<view class="line2"></view>
+		<view class="body">
+			<p class="p">Y轴加速度：</p>
+			<input class="input" type="text" v-model="D428" />
+			<button type="primary" class="button" @click="update('D428',D428)">
+				<p class="p2">更新</P>
+			</button>
+		</view>
+		<view class="line2"></view>
+		<view class="body">
+			<p class="p">Y轴减速度：</p>
+			<input class="input" type="text" v-model="D429" />
+			<button type="primary" class="button" @click="update('D429',D429)">
+				<p class="p2">更新</P>
+			</button>
+		</view>
+		<view class="line2"></view>
+		<view class="body">
+			<p class="p">E轴加速度：</p>
+			<input class="input" type="text" v-model="D430" />
+			<button type="primary" class="button" @click="update('D430',D430)">
+				<p class="p2">更新</P>
+			</button>
+		</view>
+		<view class="line2"></view>
+		<view class="body">
+			<p class="p">E轴加速度：</p>
+			<input class="input" type="text" v-model="D431" />
+			<button type="primary" class="button" @click="update('D431',D431)">
+				<p class="p2">更新</P>
+			</button>
+		</view>
+		<view class="line2"></view>
+	</view>
+</template>
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from 'vuex'
+	export default {
+		data() {
+			return {
+				D420: 0,
+				D421: 0,
+				D422: 0,
+				D423: 0,
+				D424: 0,
+				D425: 0,
+				D426: 0,
+				D427: 0,
+				D428: 0,
+				D429: 0,
+				D430: 0,
+				D431: 0,
+			}
+		},
+		onShow() {
+			this.getParam();
+		},
+		methods: {
+			...mapActions('chart', ['getParameters', 'updateParameters']),
+			getParam() {
+				const param = {};
+				param['id'] = uni.getStorageSync("nowEquipmentId");
+				param['code'] = '1';
+				this.getParameters(param).then(data => {
+					var info = data;
+					if (info!=null||info!='') {
+						for (var i = 0; i < info.length; i++) {
+							if(info[i].name=='D-420'){
+								this.D420=info[i].val;
+							}
+							if(info[i].name=='D-421'){
+								this.D421=info[i].val;
+							}
+							if(info[i].name=='D-422'){
+								this.D422=info[i].val;
+							}
+							if(info[i].name=='D-423'){
+								this.D423=info[i].val;
+							}
+							if(info[i].name=='D-424'){
+								this.D424=info[i].val;
+							}
+							if(info[i].name=='D-425'){
+								this.D425=info[i].val;
+							}
+							if(info[i].name=='D-426'){
+								this.D426=info[i].val;
+							}
+							if(info[i].name=='D-427'){
+								this.D427=info[i].val;
+							}
+							if(info[i].name=='D-428'){
+								this.D428=info[i].val;
+							}
+							if(info[i].name=='D-429'){
+								this.D429=info[i].val;
+							}
+							if(info[i].name=='D-430'){
+								this.D430=info[i].val;
+							}
+							if(info[i].name=='D-431'){
+								this.D431=info[i].val;
+							}
+						}
+					}
+
+				}, _ => void uni.stopPullDownRefresh());
+			},
+			update(name, val) {
+				const param = {};
+				param['id'] = uni.getStorageSync("nowEquipmentId");
+				param['name'] = name;
+				param['val'] = val;
+				this.updateParameters(param).then(data => {
+					if (data == 'SUCCESS') {
+						uni.showToast({
+							title: '修改成功',
+							duration: 1000
+						});
+					}
+				}, _ => void uni.stopPullDownRefresh());
+			},
+		},
+	}
+</script>
+
+<style>
+	.line {
+		height: 50upx;
+	}
+
+	.line2 {
+		height: 10upx;
+	}
+
+	.body {
+		background-color: #FFFFFF;
+		width: 600upx;
+		padding: 10upx 10upx 10upx 10upx;
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+		font-size: 32upx;
+	}
+
+	.p {
+		width: 200upx;
+		text-align: right;
+	}
+
+	.input {
+		width: 200upx;
+		box-shadow: 0upx 0upx 20upx #D3D3D3;
+		border-radius: 5upx;
+	}
+
+	.button {
+		width: 120upx;
+		height: 60upx;
+		text-align: left;
+		border-radius: 10upx;
+
+	}
+
+	.p2 {
+		font-size: 30upx;
+		/* #ifndef H5 */
+		padding-top: 3upx;
+		/* #endif */
+		position: absolute;
+		/* 水平居中 */
+		left: 50%;
+		-webkit-transform: translateX(-50%);
+		transform: translateX(-50%);
+	}
+</style>

pages/Setting/generalParameters.vue

@@ -0,0 +1,247 @@
+<template>
+	<view class="">
+		<view class="line">
+
+		</view>
+		<view class="body">
+			<p class="p">自测试模式</p>
+			<!-- <input class="input" type="text" v-model="M17" /> -->
+			<!-- <button type="primary" class="button" @click="update('M-17',M17)">
+				<p class="p2">更新</P>
+			</button> -->
+			<button type="primary" class="button" @click="update('M17','0')">
+				<p class="p2">启动</P>
+			</button>
+			<button type="primary" class="button" @click="update('M17','1')">
+				<p class="p2">关闭</P>
+			</button>
+		</view>
+		<view class="line2"></view>
+		<view class="body">
+			<p class="p">A轴正转</p>
+			<!-- <input class="input" type="text" v-model="M311" /> -->
+			<button type="primary" class="button" @click="update('M311','0')">
+				<p class="p2">启动</P>
+			</button>
+			<button type="primary" class="button" @click="update('M311','1')">
+				<p class="p2">关闭</P>
+			</button>
+		</view>
+		<view class="line2"></view>
+		<view class="body">
+			<p class="p">A轴反转</p>
+			<!-- <input class="input" type="text" v-model="M312" />
+			<button type="primary" class="button" @click="update('M-312',M312)">
+				<p class="p2">更新</P>
+			</button> -->
+			<button type="primary" class="button" @click="update('M312','0')">
+				<p class="p2">启动</P>
+			</button>
+			<button type="primary" class="button" @click="update('M312','1')">
+				<p class="p2">关闭</P>
+			</button>
+		</view>
+		<view class="line2"></view>
+		<view class="body">
+			<p class="p">喷水泵启动</p>
+			<!-- <input class="input" type="text" v-model="M313" />
+			<button type="primary" class="button" @click="update('M-313',M313)">
+				<p class="p2">更新</P>
+			</button> -->
+			<button type="primary" class="button" @click="update('M313','0')">
+				<p class="p2">启动</P>
+			</button>
+			<button type="primary" class="button" @click="update('M313','1')">
+				<p class="p2">关闭</P>
+			</button>
+		</view>
+		<view class="line2"></view>
+		<view class="body">
+			<p class="p">气泵启动</p>
+			<!-- <input class="input" type="text" v-model="M315" />
+			<button type="primary" class="button" @click="update('M-315',M315)">
+				<p class="p2">更新</P>
+			</button> -->
+			<button type="primary" class="button" @click="update('M315','0')">
+				<p class="p2">启动</P>
+			</button>
+			<button type="primary" class="button" @click="update('M315','1')">
+				<p class="p2">关闭</P>
+			</button>
+		</view>
+		<view class="line2"></view>
+		<view class="body">
+			<p class="p">清洁消毒喷水泵</p>
+			<!-- <input class="input" type="text" v-model="M316" />
+			<button type="primary" class="button" @click="update('M-316',M316)">
+				<p class="p2">更新</P>
+			</button> -->
+			<button type="primary" class="button" @click="update('M316','0')">
+				<p class="p2">启动</P>
+			</button>
+			<button type="primary" class="button" @click="update('M316','1')">
+				<p class="p2">关闭</P>
+			</button>
+		</view>
+		<view class="line2"></view>
+		<view class="body">
+			<p class="p">清洗洁厕灵+水</p>
+			<!-- <input class="input" type="text" v-model="M317" />
+			<button type="primary" class="button" @click="update('M-317',M317)">
+				<p class="p2">更新</P>
+			</button> -->
+			<button type="primary" class="button" @click="update('M317','0')">
+				<p class="p2">启动</P>
+			</button>
+			<button type="primary" class="button" @click="update('M317','1')">
+				<p class="p2">关闭</P>
+			</button>
+		</view>
+		<view class="line2"></view>
+		<view class="body">
+			<p class="p">消毒液+水</p>
+			<!-- <input class="input" type="text" v-model="M318" /> -->
+			<!-- <button type="primary" class="button" @click="update('M-318',M318)">
+				<p class="p2">更新</P>
+			</button> -->
+			<button type="primary" class="button" @click="update('M318','0')">
+				<p class="p2">启动</P>
+			</button>
+			<button type="primary" class="button" @click="update('M318','1')">
+				<p class="p2">关闭</P>
+			</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from 'vuex'
+	export default {
+		data() {
+			return {
+				M17: 0,
+				M311: 0,
+				M312: 0,
+				M313: 0,
+				M315: 0,
+				M316: 0,
+				M317: 0,
+				M318: 0,
+			}
+		},
+		onShow() {
+			this.getParam();
+		},
+		methods: {
+			...mapActions('chart', ['getParameters', 'updateParameters']),
+			getParam() {
+				const param = {};
+				param['id'] = uni.getStorageSync("nowEquipmentId");
+				param['code'] = '0';
+				this.getParameters(param).then(data => {
+					var info = data;
+					if (info!=null||info!='') {
+						for (var i = 0; i < info.length; i++) {
+							if(info[i].name=='M-17'){
+								this.M17=info[i].val;
+							}
+							if(info[i].name=='M-311'){
+								this.M311=info[i].val;
+							}
+							if(info[i].name=='M-312'){
+								this.M312=info[i].val;
+							}
+							if(info[i].name=='M-313'){
+								this.M313=info[i].val;
+							}
+							if(info[i].name=='M-315'){
+								this.M315=info[i].val;
+							}
+							if(info[i].name=='M-316'){
+								this.M316=info[i].val;
+							}
+							if(info[i].name=='M-317'){
+								this.M317=info[i].val;
+							}
+							if(info[i].name=='M-318'){
+								this.M318=info[i].val;
+							}
+						}
+					}
+			
+				}, _ => void uni.stopPullDownRefresh());
+			},
+			update(name, val) {
+				const param = {};
+				param['id'] = uni.getStorageSync("nowEquipmentId");
+				param['name'] = name;
+				param['val'] = val;
+				this.updateParameters(param).then(data => {
+					if (data == 'SUCCESS') {
+						uni.showToast({
+							title: '修改成功',
+							duration: 1000
+						});
+					}
+				}, _ => void uni.stopPullDownRefresh());
+			},
+		},
+	}
+</script>
+
+<style>
+	.line {
+		height: 50upx;
+	}
+
+	.line2 {
+		height: 10upx;
+	}
+
+	.body {
+		padding-top: 10upx;
+		background-color: #FFFFFF;
+		width: 550upx;
+		padding: 10upx 10upx 10upx 10upx;
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+		font-size: 32upx;
+	}
+
+	.p {
+		width: 250upx;
+		padding-top: 3upx;
+		text-align: right;
+	}
+
+	.input {
+		width: 200upx;
+		box-shadow: 0upx 0upx 20upx #D3D3D3;
+		border-radius: 5upx;
+	}
+
+	.button {
+		width: 120upx;
+		height: 60upx;
+		text-align: left;
+		border-radius: 10upx;
+
+	}
+
+	.p2 {
+		font-size: 30upx;
+		/* #ifndef H5 */
+		padding-top: 3upx;
+		/* #endif */
+		position: absolute;
+		/* 水平居中 */
+		left: 50%;
+		-webkit-transform: translateX(-50%);
+		transform: translateX(-50%);
+	}
+</style>

pages/Setting/parameters.vue

@@ -0,0 +1,29 @@
+<template>
+	<view class="">
+		<uni-list>
+			<uni-list-item title="通用参数"  @click="general()"></uni-list-item>
+			<uni-list-item title="进阶参数"  @click="advanced()"></uni-list-item>
+		</uni-list>
+	</view>
+</template>
+
+<script>
+	export default {
+		methods: {
+			general(){
+				uni.navigateTo({
+					url:'generalParameters',
+				});
+			},
+			advanced(){
+				uni.navigateTo({
+					url: 'advancedParameters',
+				});
+			},
+			
+		}
+	}
+</script>
+
+<style>
+</style>

pages/Setting/saoma.vue

@@ -0,0 +1,35 @@
+<!-- 
+<template>
+	<view>
+		<input class="input" type="text" v-model="date" />
+		<button type="primary" @click="tel()">扫描</button>
+	</view>
+</template>
+ 
+<script>
+	export default {
+		data() {
+			return {
+				date: 0,
+			};
+		},		
+		methods:{
+			tel(){
+				var that = this;
+				// 允许从相机和相册扫码
+				uni.scanCode({
+				    success(res) {
+				        console.log('条码类型：' + res.scanType);
+				        console.log('条码内容：' + res.result);
+						that.date = res.result;
+				    }
+				});
+			},
+			
+		}
+	}
+</script>
+ 
+<style>
+ 
+</style> -->

store/modules/chart.js

@@ -100,6 +100,22 @@ export default {
 					return data;
 				});
 		},
+		//获取参数
+		getParameters({ commit },param) {
+			return apis.sz.post('/TEquipment/getParameters',param)
+				.then(res => {
+					const { data } = res;
+					return data;
+				});
+		},
+		//修改参数
+		updateParameters({ commit },param) {
+			return apis.sz.post('/TEquipment/updateParameters',param)
+				.then(res => {
+					const { data } = res;
+					return data;
+				});
+		},
 	}
 }