wy

.env.development

@@ -2,6 +2,6 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = 'http://zk.li-ai.com.cn:8080/api'
-# VUE_APP_BASE_API = 'http://192.168.0.124:8080/api'
+# VUE_APP_BASE_API = 'http://zk.li-ai.com.cn:8080/api'
+VUE_APP_BASE_API = 'https://53670u39m2.goho.co/api'
 VUE_APP_WS = 'ws://zk.li-ai.com.cn:8080/ws'

src/views/manage-log/battery-charger.vue

@@ -111,7 +111,7 @@
             :render-header="labelHead"
           >
             <template slot-scope="scope">
-              {{ scope.row[log.alarmId] }}
+              {{ scope.row[log.alarmCode] }}
             </template>
           </el-table-column>
         </el-table>
@@ -222,12 +222,16 @@ export default {
       if (l <= 3) {
         f = 30;
       }
-      column.minWidth = f * l;
+      if (column.label == "充电机编码" || column.label == "sn") {
+        column.minWidth = f * l + 100;
+      } else {
+        column.minWidth = f * l;
+      }
       return h("div", { class: "table-head", style: { minWidth: "100%" } }, [
         column.label,
       ]);
     },
-   
+
     // 获取充电机ID
     getChargeCode() {
       getChargeCode().then((res) => {
@@ -381,11 +385,14 @@ export default {
   },
 };
 </script>
-<style scoped>
-::v-deep .el-table__fixed {
-  height: calc(100% - 10px) !important;
-}
-::v-deep .el-table th.is-leaf{
+<style scoped lang="scss">
+/* @media screen and (max-width: 1440px) {
+  ::v-deep .el-table__fixed {
+    height: calc(100% - 13px) !important;
+  }
+} */
+
+::v-deep .el-table th.is-leaf {
   font-size: 15px !important;
 }
 </style>

src/views/manage-log/bms.vue

@@ -101,7 +101,7 @@
             :render-header="labelHead"
           >
             <template slot-scope="scope">
-              {{ scope.row[log.alarmId] }}
+              {{ scope.row[log.alarmCode] }}
             </template>
           </el-table-column>
         </el-table>
@@ -366,9 +366,9 @@ export default {
 };
 </script>
 <style scoped>
-::v-deep .el-table__fixed {
+/* ::v-deep .el-table__fixed {
   height: calc(100% - 10px) !important;
-}
+} */
 ::v-deep .el-table th.is-leaf{
   font-size: 15px !important;
 }

src/views/manage-log/data-export.vue

@@ -353,12 +353,12 @@ export default {
         if (typeof window.navigator.msSaveBlob !== "undefined") {
           // window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), fileName + '.xlsx');
           window.navigator.msSaveBlob(
-            new Blob([data], { type: "application/vnd.ms-excel" }),
+            new Blob([data],{ type: 'application/zip' }),
             fileName
           );
         } else {
           let url = window.URL.createObjectURL(
-            new Blob([data], { type: "application/vnd.ms-excel" })
+            new Blob([data],{ type: 'application/zip' })
           );
           let link = document.createElement("a");
           link.style.display = "none";
@@ -376,9 +376,9 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-::v-deep .el-table__fixed {
-  height: calc(100% - 10px) !important;
-}
+// ::v-deep .el-table__fixed {
+//   height: calc(100% - 10px) !important;
+// }
 ::v-deep .el-table th.is-leaf {
   font-size: 15px !important;
   div{

src/views/manage-log/robot.vue

@@ -19,9 +19,9 @@
             ></el-option>
             <el-option
               v-for="item in logOptions"
-              :key="item.alarmCode"
-              :label="item.alarmName"
-              :value="item.alarmCode"
+              :key="item.logCode"
+              :label="item.logName"
+              :value="item.logCode"
             />
           </el-select>
         </el-form-item>
@@ -82,12 +82,13 @@
           </el-table-column>
           <af-table-column
             v-for="log in logheader"
-            :key="log.alarmCode"
-            :label="log.alarmName"
+            :key="log.logCode"
+            :label="log.logName"
             :render-header="labelHead"
+            width="200"
           >
             <template slot-scope="scope">
-              {{ scope.row[log.alarmId] }}
+              {{ scope.row[log.logCode] }}
             </template>
           </af-table-column>
         </el-table>
@@ -207,7 +208,7 @@ export default {
       if (this.robotValue.length < this.logOptions.length) {
         this.robotValue = [];
         this.logOptions.map((item) => {
-          this.robotValue.push(item.alarmCode);
+          this.robotValue.push(item.logCode);
         });
       } else {
         this.robotValue = [];
@@ -239,7 +240,7 @@ export default {
         this.total = res.data.total;
         this.$nextTick(() => {
           this.$refs.tblist.doLayout();
-          this.loading = false;
+          setTimeout(()=>{this.loading = false;},1000)
         });
       });
     },
@@ -256,7 +257,7 @@ export default {
           let differenceSet = Array.from(
             new Set(
               [...this.logOptions].filter((x) =>
-                this.$route.params.signals.includes(x.alarmCode)
+                this.$route.params.signals.includes(x.logCode)
               )
             )
           );
@@ -299,7 +300,7 @@ export default {
           let differenceSet = Array.from(
             new Set(
               [...this.logOptions].filter((x) =>
-                this.robotValue.includes(x.alarmCode)
+                this.robotValue.includes(x.logCode)
               )
             )
           );
@@ -378,9 +379,9 @@ export default {
 };
 </script>
 <style scoped>
-::v-deep .el-table__fixed {
-  height: calc(100% - 10px) !important;
-}
+/* ::v-deep .el-table__fixed {
+  height: calc(100%) !important;
+} */
 ::v-deep .el-table th.is-leaf {
   font-size: 15px !important;
   height: 36px !important;

vue.config.js

@@ -17,7 +17,7 @@ module.exports = {
   
   productionSourceMap: false,
   devServer: {
-    host: '192.168.0.76',
+    host: 'localhost',
     port: 8080,
     open: true,
     overlay: {