现场调试

src/pages/Alarm/RealTime/index.vue

@@ -169,7 +169,6 @@ export default {
     },
     DbalarmTimes() {
       DbalarmTime().then((res) => {
-        console.log(res.AverageTime);
         let dataAry = {};
         res.AverageTime.forEach((item, index, arr) => {
           // console.log(arr[index].execute_vehicle_id)

src/pages/ArmManage/index.vue

@@ -20,6 +20,13 @@
     <div class="ARM_content">
       <el-scrollbar style="width: 100%; height: 100%">
         <div class="item_body" v-for="(item, index) in datalist" :key="index">
+          <div class="photoelectricity">
+            <div :class="item.bpC1 == false ? 'greens' : 'reds'"></div>
+            <div :class="item.bpC2 == false ? 'greens' : 'reds'"></div>
+            <div :class="item.bpC3 == false ? 'greens' : 'reds'"></div>
+            <div :class="item.bpC4 == false ? 'greens' : 'reds'"></div>
+            <div :class="item.bpC5 == false ? 'greens' : 'reds'"></div>
+          </div>
           <div class="item_left">
             <div class="left_text">{{ item.nickname }}</div>
             <img
@@ -111,7 +118,7 @@
             </div>
           </div>
           <div class="item_right">
-            <div class="right_item_body">
+            <!-- <div class="right_item_body">
               <div class="item_upper" :class="">
                 <div class="upper_title">手动任务</div>
               </div>
@@ -134,7 +141,7 @@
                   </el-option>
                 </el-select>
               </div>
-            </div>
+            </div> -->
 
             <div class="right_item_body">
               <div
@@ -167,7 +174,8 @@
                 @click="overTask(item, index)"
                 v-if="
                   item.move_state != 'MT_NA' &&
-                  item.move_state != 'MT_IN_CANCEL'
+                  item.move_state != 'MT_IN_CANCEL' &&
+                  item.move_state != 'MT_FINISHED'
                 "
               >
                 <div class="upper_title">取消任务</div>
@@ -577,6 +585,11 @@ export default {
                 uI_Restart: "",
                 uI_StartCharge: "",
                 uI_StopCharge: "",
+                bpC1: "",
+                bpC2: "",
+                bpC3: "",
+                bpC4: "",
+                bpC5: "",
               };
               item["nickname"] = vehicles[index].nickname;
               item.move_state = vehicles[index].move_state;
@@ -590,6 +603,11 @@ export default {
               item.uI_Restart = vehicles[index].uI_Restart;
               item.uI_StartCharge = vehicles[index].uI_StartCharge;
               item.uI_StopCharge = vehicles[index].uI_StopCharge;
+              item.bpC1 = vehicles[index].bpC1;
+              item.bpC2 = vehicles[index].bpC2;
+              item.bpC3 = vehicles[index].bpC3;
+              item.bpC4 = vehicles[index].bpC4;
+              item.bpC5 = vehicles[index].bpC5;
               item["id"] = vehicles[index].id;
               item["ifOnline"] = vehicles[index].is_online;
               item["taskId"] = "";
@@ -1227,6 +1245,41 @@ export default {
     border: 1px solid #164078;
     flex-direction: row;
     float: left;
+    position: relative;
+    > .photoelectricity {
+      position: absolute;
+      width: 100px;
+      left: 0%;
+      top: 29%;
+      height: 99px;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+
+      // justify-content: space-between;
+      // align-items: center;
+      > .greens {
+        width: 13px;
+        height: 13px;
+        background: rgb(0, 255, 0);
+        border-radius: 50%;
+        box-shadow: 0 0 10px rgb(0, 255, 0);
+      }
+      > .reds {
+        width: 13px;
+        height: 13px;
+        background: rgb(255, 0, 0);
+        border-radius: 50%;
+        box-shadow: 0 0 10px rgb(255, 0, 0);
+      }
+      > .greys {
+        width: 13px;
+        height: 13px;
+        background: rgb(169, 169, 169);
+        border-radius: 50%;
+        box-shadow: 0 0 10px rgb(169, 169, 169);
+      }
+    }
     .item_right {
       flex: 1;
       // padding: 0px 24px;

src/pages/Baggage/index/index.vue

@@ -119,8 +119,7 @@ export default {
       // xhr.send();
       let a = document.createElement("a");
       a.href =
-        window.g.url +
-        "/Framework/ExportExcel/ExportBagTrack?filename=行李追踪";
+        window.g.url + "/Framework/ExportExcel/ExportBagTrack?filename=xingli";
       a.click();
     },
     downFile() {
@@ -146,7 +145,7 @@ export default {
     },
     changePage(e) {
       this.pageSize = e;
-      this.getData();
+      this.BaggageInquiryList();
     },
     //搜索
     queryList() {

src/pages/Common/home.vue

@@ -14,7 +14,7 @@
 			</div>
 		</div> -->
     <div class="right_body">
-      <el-scrollbar>
+      <el-scrollbar style="height: 100%">
         <div class="right_upper">
           <div class="right_upper_left">
             <top-title title="地图信息"></top-title>
@@ -173,7 +173,7 @@
                 <div
                   style="
                     width: 100%;
-                    height: 110px;
+                    height: 100%;
                     position: relative;
                     top: 0px;
                     float: left;
@@ -186,7 +186,7 @@
                       class="carbtn_item"
                       style="
                         width: 100%;
-                        height: 120px;
+                        height: 50%;
                         margin-bottom: 13px;
                         background-color: #092754;
                         display: flex;
@@ -238,7 +238,7 @@
               class="alarm_up"
               style="
                 width: 100%;
-                height: 120px;
+                height: 13vh;
                 position: relative;
                 top: 0px;
                 float: left;
@@ -289,7 +289,7 @@
                   </el-option>
                 </el-select>
               </div>
-              <el-table :data="tableData" height="267px" width="100%">
+              <el-table :data="tableData" height="30vh" width="100%">
                 <el-table-column
                   :label="item.label"
                   :align="item.label == '完成进度' ? 'left' : 'center'"
@@ -859,13 +859,13 @@ export default {
     clearInterval(this.sj);
     this.TemplateOrderList();
     let that = this;
+    that.getbuttonstats();
     this.js = setInterval(() => {
       //实时更新数据
       that.getVehicle();
       that.GetTemplate();
       that.gettempalteMode();
       that.Getorder();
-      that.getbuttonstats();
       that.alarmList();
       this.getmapurl();
     }, 3000);
@@ -1809,7 +1809,7 @@ export default {
       flex: 2;
       display: flex;
       flex-direction: row;
-
+      height: 87vh;
       .right_upper_left {
         width: 40%;
         display: flex;
@@ -1938,7 +1938,7 @@ export default {
         }
         .right_upper_top {
           width: 100%;
-          height: 295px;
+          height: 31.5vh;
           display: flex;
           justify-content: space-between;
           .right_upper_top_left {

src/pages/ReportStatistics/index.vue

@@ -310,6 +310,32 @@ export default {
       Dborder(data).then((res) => {
         let TOdata = JSON.parse(JSON.parse(JSON.stringify(res)).resultData).data
           .ORDER[0].VEHICLE;
+        // console.log(
+        //   JSON.parse(JSON.parse(JSON.stringify(res)).resultData),
+        //   "111111111"
+        // );
+        let arr = [];
+        JSON.parse(
+          JSON.parse(JSON.stringify(res)).resultData
+        ).data.ORDER.forEach((res, index) => {
+          res.VEHICLE.forEach((element) => {
+            if (index !== 0) {
+              arr.push(element);
+            }
+          });
+        });
+        arr.forEach((res) => {
+          TOdata.forEach((element) => {
+            if (element.nickname == res.nickname) {
+              element.work_completion_count += res.work_completion_count;
+              element.avg_execution_time += res.avg_execution_time;
+              element.exception_times += res.exception_times;
+              element.failure_count += res.failure_count;
+              element.free_seconds += res.free_seconds;
+              element.battery_use_cycles += res.battery_use_cycles;
+            }
+          });
+        });
         this.tableData = TOdata;
       });
     },
@@ -385,7 +411,6 @@ export default {
       //日期范围查询
       this.reqData.begin = Format("yyyy-MM-dd hh:mm:ss", this.dateMan[0]);
       this.reqData.end = Format("yyyy-MM-dd hh:mm:ss", this.dateMan[1]);
-      debugger;
       this.getData();
     },
     goTo() {

src/pages/SystemSet/User/index.vue

@@ -24,20 +24,16 @@
       </ul>
     </div>
     <!-- <el-button type="primary" class="addUser" v-if="isAdmin" @click="addUser">新增用户</el-button> -->
-    <div class="downlodTables" @click="downlodTables" v-if="actives != 4">
+    <!-- <div class="downlodTables" @click="downlodTables" v-if="actives != 4">
       导入
-    </div>
+    </div> -->
     <!-- <el-upload
       v-if="actives != 2"
       class="upload-demo"
       :action="url"
-      :on-preview="handlePreview"
-      :on-remove="handleRemove"
-      :before-remove="beforeRemove"
+      :on-change="change"
       multiple
-      :limit="3"
-      :on-exceed="handleExceed"
-      :file-list="fileList"
+      :limit="1"
     >
       <div class="downlodTables" v-if="actives != 2">导入</div>
     </el-upload> -->
@@ -331,16 +327,7 @@ export default {
       }
     };
     return {
-      fileList: [
-        {
-          name: "food.jpeg",
-          url: "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100",
-        },
-        {
-          name: "food2.jpeg",
-          url: "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100",
-        },
-      ],
+      fileList: [],
       currentPage3: 1,
       totalPages: 0,
       dialogVisiblenetwork: false, //新增网络配置
@@ -375,9 +362,6 @@ export default {
         {
           name: "告警配置",
         },
-        {
-          name: "其他配置",
-        },
       ],
       form: {
         addUserName: "",
@@ -497,6 +481,9 @@ export default {
     },
   },
   methods: {
+    change(file) {
+      console.log(file, "11111111111");
+    },
     downlodTables() {
       this.$confirm("是否需要导入xlsx文档, 是否继续?", "提示", {
         confirmButtonText: "确定",
@@ -505,10 +492,10 @@ export default {
       })
         .then(() => {
           this.ImportUp();
-          this.$message({
-            type: "success",
-            message: "导入成功!",
-          });
+          // this.$message({
+          //   type: "success",
+          //   message: "导入成功!",
+          // });
         })
         .catch(() => {
           this.$message({
@@ -558,19 +545,20 @@ export default {
     },
     AlarmD() {
       let a = document.createElement("a");
+      let arr = "";
       if (this.actives == 0) {
-        a.href =
-          window.g.url +
-          "/Framework/ExportExcel/ExportAmrPlc?filename=网络配置";
+        arr =
+          window.g.url + "/Framework/ExportExcel/ExportAmrPlc?filename=wangluo";
       } else if (this.actives == 1) {
-        a.href =
+        arr =
           window.g.url +
-          "/Framework/ExportExcel/ExportConfigOrder?filename=订单配置";
+          "/Framework/ExportExcel/ExportConfigOrder?filename=dingdan";
       } else if (this.actives == 3) {
-        a.href =
+        arr =
           window.g.url +
-          "/Framework/ExportExcel/ExportAlarmPlc?filename=告警配置";
+          "/Framework/ExportExcel/ExportAlarmPlc?filename=gaojing";
       }
+      a.href = arr;
       a.click();
     },
     navUp(index, item) {
@@ -828,26 +816,26 @@ export default {
     // goTo() {
     //   this.$router.push("/Alarm/RealTime");
     // },
-    downlodTable() {
-      this.$confirm("是否需要导出xlsx文档, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.downFile();
-          this.$message({
-            type: "success",
-            message: "导出成功!",
-          });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消导出",
-          });
-        });
-    },
+    // downlodTable() {
+    //   this.$confirm("是否需要导出xlsx文档, 是否继续?", "提示", {
+    //     confirmButtonText: "确定",
+    //     cancelButtonText: "取消",
+    //     type: "warning",
+    //   })
+    //     .then(() => {
+    //       this.downFile();
+    //       this.$message({
+    //         type: "success",
+    //         message: "导出成功!",
+    //       });
+    //     })
+    //     .catch(() => {
+    //       this.$message({
+    //         type: "info",
+    //         message: "已取消导出",
+    //       });
+    //     });
+    // },
     downFile() {
       var wb = XLSX.utils.table_to_book(
         document.querySelector("#userTableData")