wy

pages/basic-data/BasicDrawer.vue

@@ -10,10 +10,10 @@
 			<uni-forms-item label="电池距离:" name="CarDistance" label-align="right" label-width="120px">
 				<uni-easyinput type="text" v-model.trim="basicFrom.CarDistance" :clear="false" />
 			</uni-forms-item>
-			<uni-forms-item label="状态:" name="state" label-align="right" label-width="120px">
+			<!-- <uni-forms-item label="状态:" name="state" label-align="right" label-width="120px">
 				<uni-data-select v-model.trim="basicFrom.state" :localdata="range"
 					 :clear="false"></uni-data-select>
-			</uni-forms-item>
+			</uni-forms-item> -->
 		</uni-forms>
 	</view>
 	<!-- 剩个已充时长和落座信号没有对字段 -->

pages/basic-data/baseData-table/baseDateTable.vue

@@ -40,15 +40,15 @@
 					  zIndex:hindex<=columnFixed-1?9:'unset',
 					  backgroundColor:'inherit'}">
 							<template v-if="header.key == 'source'">
-								<text>{{content[header.key] === 0 ? '本地站控':'云端'}}</text>
+								<text>{{content[header.key] === 0 ? '站控':'云端'}}</text>
 							</template>
-							<template v-else-if="header.key == 'state'">
+							<!-- <template v-else-if="header.key == 'state'">
 								<text>{{content[header.key] === 0 ? '停用':'启用'}}</text>
-							</template>
+							</template> -->
 							<template v-else>
 								<view v-if="header.label == '操作'" class="editColor">
-									<view @click="EditBacisData(content)">编辑</view>
-									<view @click="DelBacisData(content)">删除</view>
+									<!-- <view @click="EditBacisData(content)">编辑</view> -->
+									<view @click="DelBacisData(content)" v-if="content['source']==0">删除</view>
 								</view>
 								<text v-else>{{content[header.key]||emptyString}}</text>
 							</template>
@@ -430,15 +430,6 @@
 
 	.editColor {
 		color: #55B693;
-		font-weight: bold;
-		display: flex;
-		width: 100%;
-		justify-items: center;
-
-		view {
-			width: 50%;
-			text-align: center;
-		}
 	}
 
 	.container {

pages/basic-data/index.vue

@@ -65,7 +65,7 @@
 				popupType: 'success',
 				formSelect: [{
 						value: 0,
-						text: "本地站控"
+						text: "站控"
 					},
 					{
 						value: 1,
@@ -103,7 +103,7 @@
 				headers: [{
 					label: '车牌号',
 					key: 'vehiclePlate',
-					widtd: 150
+					widtd: 210
 				}, {
 					label: '车辆识别码(VIN码)',
 					key: 'vehicleVin',
@@ -111,21 +111,24 @@
 				}, {
 					label: '前端电池距离(mm)',
 					key: 'modelDistance',
-					widtd: 210
+					widtd: 200
 				}, {
 					label: '来源',
 					key: 'source',
-					widtd: 108,
-				}, {
-					label: '状态',
-					key: 'state',
-					widtd: 108,
+					widtd: 100,
+				}, 
+				// {
+				// 	label: '状态',
+				// 	key: 'state',
+				// 	widtd: 108,
 
-				}, {
+				// }, 
+				{
 					label: '操作',
 					key: 'id',
 					widtd: 108,
-				}],
+				},
+				],
 				showLoadMore: false,
 				loadMore: 'more',
 				dialogType: 'new', // 按钮类型(new、edit)
@@ -165,7 +168,7 @@
 									if (res.code === 0) {
 										that.vehicleList()
 									}
-									that.ExchangeMessage(res.code === 0 ? 'success' : 'error', res.msg)
+									that.ExchangeMessage(res.code === 0 ? 'success' : 'error', res.code === 0 ? '删除车辆成功' : '删除车辆失败')
 								}).catch(err => {
 									console.error(err)
 								})
@@ -233,12 +236,12 @@
 						modelDistance: this.basicFrom.CarDistance,
 						vehiclePlate: this.basicFrom.CarPlate,
 						vehicleVin: this.basicFrom.CarVin,
-						state: this.basicFrom.state * 1
+						source: 0,
 					}
 					this.$http.addvehicle(params)
 						.then(res => {
 							this.closeDrawer()
-							this.ExchangeMessage(res.code === 0 ? 'success' : 'error', res.msg)
+							this.ExchangeMessage(res.code === 0 ? 'success' : 'error', res.code === 0 ? '新增车辆成功' : '新增车辆失败')
 							if (res.code === 0) {
 								this.vehicleList()
 							}

pages/equipment-monitoring/components/BatteryCharger.vue

@@ -86,18 +86,20 @@
 						if (res.confirm) { //点击确定
 							//充电操作
 							if (that.chgState === 0 || that.chgState === 3) {
+								that.ExchangeMessage('success','充电指令已下发')
 								that.$http.startCharge(params)
 									.then(res => {
-										that.ExchangeMessage(res.code === 0 ? 'success' : 'error', res.msg)
+										that.ExchangeMessage(res.code === 0 ? 'success' : 'error', res.code === 0?'充电成功':'充电失败')
 									}).catch(err => {
 										console.error(err)
 									})
 							}
 							//断电操作
 							else if (that.chgState === 2) {
+								that.ExchangeMessage('success','断电指令已下发')
 								that.$http.stopCharge(params)
 									.then(res => {
-										that.ExchangeMessage(res.code === 0 ? 'success' : 'error', res.msg)
+										that.ExchangeMessage(res.code === 0 ? 'success' : 'error', res.code === 0?'换电成功':'换电失败')
 									}).catch(err => {
 										console.error(err)
 									})