4.22上午一第一次提交

src/pages/battery_details/index.vue

@@ -3361,6 +3361,7 @@ export default {
     // this.handle_GetS2MBATTENERGYINFO4();
     // this.handle_GetS2MBATTENERGYINFO5();
     // this.handle_GetS2MBATTENERGYINFO6();
+    // console.log(this.$route.query.id,'id');
   },
   created() {
     this.getListHandler = index;
@@ -3414,7 +3415,7 @@ export default {
     // 获取列表数据
     getList() {
       this.listLoading = true;
-      this.getListHandler()
+      this.getListHandler(this.$route.query.id)
         .then((response) => {
           const res = response.data;
           this.dataList = res;
@@ -3428,7 +3429,7 @@ export default {
     getAlarmOnelist() {
       // this.beforeGetList()
       this.listLoading = true;
-      this.getAlarmOnelistHandler()
+      this.getAlarmOnelistHandler(this.$route.query.id)
         .then((response) => {
           const alarmOne = response.data;
           this.alarmOneList = alarmOne;
@@ -3441,7 +3442,7 @@ export default {
     //
     getAlarmTwolist() {
       this.listLoading = true;
-      this.getAlarmTwolistHandler()
+      this.getAlarmTwolistHandler(this.$route.query.id)
         .then((response) => {
           const alarmTwo = response.data;
           this.alarmTwoList = alarmTwo;
@@ -3453,7 +3454,7 @@ export default {
     //
     getRelaystatusList() {
       this.listLoading = true;
-      this.getRelaystatusHandler()
+      this.getRelaystatusHandler(this.$route.query.id)
         .then((response) => {
           const Relaystatus = response.data;
           this.relaystatusList = Relaystatus;
@@ -3464,7 +3465,7 @@ export default {
     },
     getChargedischargecurrentList() {
       this.listLoading = true;
-      this.getChargedischargecurrentHandler()
+      this.getChargedischargecurrentHandler(this.$route.query.id)
         .then((response) => {
           const Chargecurrent = response.data;
           this.ChargedischargecurrentList = Chargecurrent;
@@ -3475,7 +3476,7 @@ export default {
     },
     getRunningstate() {
       this.listLoading = true;
-      this.getRunningstateHandler()
+      this.getRunningstateHandler(this.$route.query.id)
         .then((response) => {
           const runningstate = response.data;
           this.runningstateList = runningstate;
@@ -3487,7 +3488,7 @@ export default {
     // -----
     getSumvolt() {
       this.listLoading = true;
-      this.getSumvoltHandler()
+      this.getSumvoltHandler(this.$route.query.id)
         .then((response) => {
           const res1 = response.data;
           this.res1List = res1;
@@ -3498,7 +3499,7 @@ export default {
     },
     getSumTemp() {
       this.listLoading = true;
-      this.getSumTempHandler()
+      this.getSumTempHandler(this.$route.query.id)
         .then((response) => {
           const res2 = response.data;
           this.res2List = res2;
@@ -3509,7 +3510,7 @@ export default {
     },
     getChrgaccuInfo() {
       this.listLoading = true;
-      this.getChrgaccuInfoHandler()
+      this.getChrgaccuInfoHandler(this.$route.query.id)
         .then((response) => {
           const res3 = response.data;
           this.res31List = res3.s2MCHRGACCUINFO;
@@ -3523,7 +3524,7 @@ export default {
     },
     getBrachSumvolT() {
       this.listLoading = true;
-      this.getBrachSumvolTHandler()
+      this.getBrachSumvolTHandler(this.$route.query.id)
         .then((response) => {
           const res4 = response.data;
           this.res4List = res4;
@@ -3534,7 +3535,7 @@ export default {
     },
     getBrachSumtemp() {
       this.listLoading = true;
-      this.getBrachSumtempHandler()
+      this.getBrachSumtempHandler(this.$route.query.id)
         .then((response) => {
           const res5 = response.data;
           this.res5List = res5;
@@ -3545,7 +3546,7 @@ export default {
     },
     getCscSumvolt() {
       this.listLoading = true;
-      this.getCscSumvoltHandler()
+      this.getCscSumvoltHandler(this.$route.query.id)
         .then((response) => {
           const res6 = response.data;
           this.res6List = res6;
@@ -3556,7 +3557,7 @@ export default {
     },
     getCscSumtemp() {
       this.listLoading = true;
-      this.getCscSumtempHandler()
+      this.getCscSumtempHandler(this.$route.query.id)
         .then((response) => {
           const res7 = response.data;
           this.res7List = res7;
@@ -3566,42 +3567,42 @@ export default {
         });
     },
     handle_GetS2MBATTENERGYINFO1() {
-      handle_GetS2MBATTENERGYINFO1().then((response) => {
+      handle_GetS2MBATTENERGYINFO1(this.$route.query.id).then((response) => {
         this.batter_cum_one = response.data;
       });
     },
     handle_GetS2MBATTENERGYINFO2() {
-      handle_GetS2MBATTENERGYINFO2().then((response) => {
+      handle_GetS2MBATTENERGYINFO2(this.$route.query.id).then((response) => {
         this.batter_cum_two = response.data;
       });
     },
     handle_GetS2MBATTENERGYINFO3() {
-      handle_GetS2MBATTENERGYINFO3().then((response) => {
+      handle_GetS2MBATTENERGYINFO3(this.$route.query.id).then((response) => {
         this.batter_cum_three = response.data;
       });
     },
     handle_GetS2MBATTENERGYINFO4() {
-      handle_GetS2MBATTENERGYINFO4().then((response) => {
+      handle_GetS2MBATTENERGYINFO4(this.$route.query.id).then((response) => {
         this.batter_cum_four = response.data;
       });
     },
     handle_GetS2MBATTENERGYINFO5() {
-      handle_GetS2MBATTENERGYINFO5().then((response) => {
+      handle_GetS2MBATTENERGYINFO5(this.$route.query.id).then((response) => {
         this.batter_cum_five = response.data;
       });
     },
     handle_GetS2MBATTENERGYINFO6() {
-      handle_GetS2MBATTENERGYINFO6().then((response) => {
+      handle_GetS2MBATTENERGYINFO6(this.$route.query.id).then((response) => {
         this.batter_cum_six = response.data;
       });
     },
     handle_BatteryCelllVoltageInfo() {
-      handle_BatteryCelllVoltageInfo().then((response) => {
+      handle_BatteryCelllVoltageInfo(this.$route.query.id).then((response) => {
         this.BatteryCelllVoltageInfo_list = Object.values(response.data);
       });
     },
     handle_BatteryCellTempInfo() {
-      handle_BatteryCellTempInfo().then((response) => {
+      handle_BatteryCellTempInfo(this.$route.query.id).then((response) => {
         this.BatteryCellTempInfo_list = Object.values(response.data);
       });
     },

src/pages/charging/index.vue

@@ -75,7 +75,7 @@
         <div
           v-for="(item_son, index_son) in item"
           :key="index_son"
-          @click="handle_push"
+          @click="handle_push(item_son.fBinCode)"
         >
           <span>#{{ item_son.fBinCode }}</span>
           <span :class="handle_icons(item_son.fChargeStatus)"></span>
@@ -281,8 +281,15 @@ export default {
     this.real_list = resultArray;
   },
   methods: {
-    handle_push() {
-      this.$router.push("charge_battery/battery_details");
+    handle_push(data) {
+      // this.$router.push({name:"charge_battery/battery_details",query:{id:data}});//跳转页面带id
+      // this.$router.push("charge_battery/battery_details");
+      this.$router.push({
+        path: 'charge_battery/battery_details',
+        query: {
+          id: data
+        }
+      });
     },
     resetForm() {
       this.$refs["battr_form"].resetFields();

src/services/api.js

@@ -36,6 +36,8 @@ module.exports = {
 	GetBrachSumtemp: `${BASE_URL}/TCgRealTimeDisplay/GetBrachSumtemp1List`, // 支路单体温度
 	GetCscSumvolt: `${BASE_URL}/TCgRealTimeDisplay/GetCscSumvolt1List`, // CSC单体电压
 	GetCscSumtemp: `${BASE_URL}/TCgRealTimeDisplay/GetCscSumtemp1List`, // CSC单体温度
+	TCbStationDetail: `${BASE_URL}/TCbStationOrderSendedLog/TCbStationOrderSendedLogDetail`,//zz换电订单信息
+
 	// 
 	GetS2MBATTENERGYINFO1: `${second_url}/GetS2MBATTENERGYINFO1`, // 电池包数据1
 	GetS2MBATTENERGYINFO2: `${second_url}/GetS2MBATTENERGYINFO2`, // 电池包数据2

src/services/battery_details/index.js

@@ -31,79 +31,85 @@ import {
 // }
 
 export async function index(data) {
-    return request(Battery_Details, METHOD.GET, data)
+    return request(Battery_Details + '?sn=' + data, METHOD.GET,)
 }
 export async function alarmone(data) {
-    return request(Battery_Alarm_One, METHOD.GET, data)
+    return request(Battery_Alarm_One + '?sn=' + data, METHOD.GET,)
 }
 export async function alarmtwo(data) {
-    return request(Battery_Alarm_Two, METHOD.GET, data)
+    return request(Battery_Alarm_Two + '?sn=' + data, METHOD.GET,)
 }
 export async function Relaystatus(data) {
-    return request(Relay_status, METHOD.GET, data)
+    return request(Relay_status + '?sn=' + data, METHOD.GET,)
 }
 export async function Chargedischargecurrent(data) {
-    return request(Charge_discharge_current, METHOD.GET, data)
+    return request(Charge_discharge_current + '?sn=' + data, METHOD.GET)
 }
 
 export async function Runningstate(data) {
-    return request(Running_State, METHOD.GET, data)
+    return request(Running_State + '?sn=' + data, METHOD.GET)
 }
 
 export async function Sumvolt(data) {
-    return request(GetSumvolt, METHOD.GET, data)
+    return request(GetSumvolt + '?sn=' + data, METHOD.GET)
 }
 export async function SumTemp(data) {
-    return request(GetSumTemp, METHOD.GET, data)
+    return request(GetSumTemp + '?sn=' + data, METHOD.GET)
 }
 export async function ChrgaccuInfo(data) {
-    return request(GetChrgaccuInfo, METHOD.GET, data)
+    return request(GetChrgaccuInfo + '?sn=' + data, METHOD.GET)
 }
 export async function BrachSumvolT(data) {
-    return request(GetBrachSumvolT, METHOD.GET, data)
+    return request(GetBrachSumvolT + '?sn=' + data, METHOD.GET)
 }
 export async function BrachSumtemp(data) {
-    return request(GetBrachSumtemp, METHOD.GET, data)
+    return request(GetBrachSumtemp + '?sn=' + data, METHOD.GET)
 }
 export async function CscSumvolt(data) {
-    return request(GetCscSumvolt, METHOD.GET, data)
+    return request(GetCscSumvolt + '?sn=' + data, METHOD.GET)
 }
 export async function CscSumtemp(data) {
-    return request(GetCscSumtemp, METHOD.GET, data)
+    return request(GetCscSumtemp + '?sn=' + data, METHOD.GET)
 }
-
-export async function handle_GetS2MBATTENERGYINFO1() {
-    return request(GetS2MBATTENERGYINFO1, METHOD.GET)
+// 以上是zz
+// 
+export async function handle_GetS2MBATTENERGYINFO1(data) {
+    return request(GetS2MBATTENERGYINFO1 + data, METHOD.GET)
 }
 
-export async function handle_GetS2MBATTENERGYINFO2() {
-    return request(GetS2MBATTENERGYINFO2, METHOD.GET)
+export async function handle_GetS2MBATTENERGYINFO2(data) {
+    return request(GetS2MBATTENERGYINFO2 + data, METHOD.GET)
 }
 
-export async function handle_GetS2MBATTENERGYINFO3() {
-    return request(GetS2MBATTENERGYINFO3, METHOD.GET)
+export async function handle_GetS2MBATTENERGYINFO3(data) {
+    return request(GetS2MBATTENERGYINFO3 + data, METHOD.GET)
 }
 
-export async function handle_GetS2MBATTENERGYINFO4() {
-    return request(GetS2MBATTENERGYINFO4, METHOD.GET)
+export async function handle_GetS2MBATTENERGYINFO4(data) {
+    return request(GetS2MBATTENERGYINFO4 + data, METHOD.GET)
 }
 
-export async function handle_GetS2MBATTENERGYINFO5() {
-    return request(GetS2MBATTENERGYINFO5, METHOD.GET)
+export async function handle_GetS2MBATTENERGYINFO5(data) {
+    return request(GetS2MBATTENERGYINFO5 + data, METHOD.GET)
 }
 
-export async function handle_GetS2MBATTENERGYINFO6() {
-    return request(GetS2MBATTENERGYINFO6, METHOD.GET)
+export async function handle_GetS2MBATTENERGYINFO6(data) {
+    return request(GetS2MBATTENERGYINFO6 + data, METHOD.GET)
 }
 
-export async function handle_BatteryCelllVoltageInfo() {
-    return request(BatteryCelllVoltageInfo, METHOD.GET)
+export async function handle_BatteryCelllVoltageInfo(data) {
+    return request(BatteryCelllVoltageInfo + data, METHOD.GET)
 }
 
-export async function handle_BatteryCellTempInfo() {
-    return request(BatteryCellTempInfo, METHOD.GET)
+export async function handle_BatteryCellTempInfo(data) {
+    return request(BatteryCellTempInfo + data, METHOD.GET)
 }
 
+
+
+
+
+
 // export async function store (data) {
 //     return request(Battery_Maintain_Log, METHOD.POST, data)
 // }

src/services/charge_battery/log.js

@@ -6,7 +6,8 @@ import {
 	TCbStationOrderSendedLog_upload,
 	TCbStationOrderSendedlog,
 	AddExchangeOrder,
-	UpdateTCbStation0rderSendedLog
+	UpdateTCbStation0rderSendedLog,
+	TCbStationDetail
 } from '@/services/api'
 import {
 	request,
@@ -30,6 +31,10 @@ export async function GetChargeDetailInfo(data) {
 	return request(Get_Charge_Detail_Info, METHOD.POST, data)
 }
 
+
+export async function GetTCbStationDetail(data) {
+	return request(TCbStationDetail + '?id=' + data, METHOD.POST)
+}//zzz
 // export async function find (id) {
 // 	return request(Station_Order_Finished_Log_Info + '/' + id, METHOD.GET)
 // }
@@ -75,5 +80,6 @@ export default {
 	getTCbStationOrderSendedLog,
 	getTCbStationOrderSendedLog_upload,
 	getTCbStationOrderSendedlog,
-	handle_UpdateTCbStation0rderSendedLog
+	handle_UpdateTCbStation0rderSendedLog,
+	GetTCbStationDetail,
 }