演示版本4.11首次提交

.env

@@ -8,7 +8,7 @@ VUE_APP_AVATAR_KEY=admin.avatar
 VUE_APP_SETTING_KEY=admin.setting
 VUE_APP_TBAS_KEY=admin.tabs
 VUE_APP_TBAS_TITLES_KEY=admin.tabs.titles
-VUE_APP_API_BASE_URL=http://localhost:7244/api
-# VUE_APP_API_WS_URL=ws://172.0.10.100:3333/ws
-# VUE_APP_API_BASE_URL=http://180.76.133.253:17244/api
+VUE_APP_API_BASE_URL=http://106.12.36.89:7344/api
+# VUE_APP_API_WS_URL=ws://172.0.12.10.100:3333/ws
+# VUE_APP_API_BASE_URL=http://192.168.2.3:7244/api
 # VUE_APP_API_WS_URL=ws://192.168.0.106:3333/ws

src/components/menu/SideMenu.vue

@@ -2,7 +2,6 @@
   <a-layout-sider :theme="sideTheme" :class="['side-menu', 'beauty-scroll', isMobile ? null : 'shadow']" width="256px" :collapsible="collapsible" v-model="collapsed" :trigger="null">
     <div :class="['logo', theme]">
       <router-link to="/index">
-        <img src="@/assets/imgs/tops_logo.png" style="width: 70px; height: 36px;">
         <h1>{{systemName}}</h1>
       </router-link>
     </div>

src/layouts/header/AdminHeader.vue

@@ -2,7 +2,6 @@
   <a-layout-header :class="[headerTheme, 'admin-header']">
     <div :class="['admin-header-wide', layout, pageWidth]">
       <router-link v-if="isMobile || layout === 'head'" to="/" :class="['logo', isMobile ? null : 'pc', headerTheme]">
-        <img width="32" src="@/assets/img/logo.png" />
         <h1 v-if="!isMobile">{{ systemName }}</h1>
       </router-link>
 

src/pages/base_config/charge_cabinet/index.vue

@@ -377,7 +377,7 @@ export default {
 		// this.getTRmChargeBinInfo();
 		// console.log(this.listQuery, "listQuery");
 		// this.getListHandler = index;
-		this.getList();
+		// this.getList();
 	},
 	methods: {
 		moment,

src/pages/base_config/stop/index.vue

@@ -156,7 +156,7 @@ export default {
       },
       visible: false,
       confirmLoading: false,
-      imgs_url: require("@/assets/imgs/tops_logo.png"),
+      imgs_url: '',
       // authorize: {
       //   //权限校验注入设置
       //   handleEdit: "commit", //key为需要注入权限校验的方法名，这里为 deleteRecord 方法；值为需要校验的操作权限，这里为 delete 操作权限

src/pages/charging/index.vue

@@ -10,7 +10,7 @@
     <!--  -->
     <div class="bot_main">
       <div v-for="(item, index) in cont_list" :key="index">
-        <!-- <div v-for="(item, index) in 24" :key="index"> -->
+        <!-- <div v-for="(item, index) in 12" :key="index"> -->
         <div class="tops_header">
           <div
             style="
@@ -154,7 +154,96 @@ import battery from "./components/battery.vue";
 export default {
   data() {
     return {
-      cont_list: [],
+      cont_list: [
+        {
+          fBinCode: '001',
+          fBinNo: '001',
+          fSoc: 10,
+          fBatteryNo: '001',
+          packCumulVolt: 10,
+          packCurr: 10,
+          fChargeStatus: 0,
+          fAppointmentLock: 0,
+          fChargeLinkStatus: 0
+        },
+        {
+          fBinCode: '002',
+          fBinNo: '002',
+          fSoc: 40,
+          fBatteryNo: '002',
+          packCumulVolt: 10,
+          packCurr: 10,
+          fChargeStatus: 0,
+          fAppointmentLock: 0,
+          fChargeLinkStatus: 0
+        },
+        {
+          fBinCode: '003',
+          fBinNo: '003',
+          fSoc: 100,
+          fBatteryNo: '003',
+          packCumulVolt: 10,
+          packCurr: 10,
+          fChargeStatus: 0,
+          fAppointmentLock: 0,
+          fChargeLinkStatus: 0
+        },
+        {
+          fBinCode: '004',
+          fBinNo: '004',
+          fSoc: 80,
+          fBatteryNo: '004',
+          packCumulVolt: 10,
+          packCurr: 10,
+          fChargeStatus: 0,
+          fAppointmentLock: 0,
+          fChargeLinkStatus: 0
+        },
+        {
+          fBinCode: '005',
+          fBinNo: '005',
+          fSoc: 0,
+          fBatteryNo: '005',
+          packCumulVolt: 10,
+          packCurr: 10,
+          fChargeStatus: 0,
+          fAppointmentLock: 0,
+          fChargeLinkStatus: 0
+        },
+        {
+          fBinCode: '006',
+          fBinNo: '006',
+          fSoc: 90,
+          fBatteryNo: '006',
+          packCumulVolt: 10,
+          packCurr: 10,
+          fChargeStatus: 0,
+          fAppointmentLock: 0,
+          fChargeLinkStatus: 0
+        },
+        {
+          fBinCode: '007',
+          fBinNo: '007',
+          fSoc: 35,
+          fBatteryNo: '007',
+          packCumulVolt: 10,
+          packCurr: 10,
+          fChargeStatus: 0,
+          fAppointmentLock: 0,
+          fChargeLinkStatus: 0
+        },
+        {
+          fBinCode: '008',
+          fBinNo: '008',
+          fSoc: 55,
+          fBatteryNo: '008',
+          packCumulVolt: 10,
+          packCurr: 10,
+          fChargeStatus: 0,
+          fAppointmentLock: 0,
+          fChargeLinkStatus: 0
+        },
+      ],
       config_imgs: {},
       customColors: [
         { color: "#f56c6c", percentage: 20 },
@@ -179,11 +268,11 @@ export default {
   components: { battery },
   created() {},
   mounted() {
-    this.getlist();
-    this.timer = setInterval(() => {
-      this.getlist();
-      this.handle_GetPLCSwapParamsValue();
-    }, 5000);
+    // this.getlist();
+    // this.timer = setInterval(() => {
+    //   this.getlist();
+    //   this.handle_GetPLCSwapParamsValue();
+    // }, 5000);
   },
   methods: {
     submitForm() {

src/pages/electricity/direct_current/index.vue

@@ -50,13 +50,30 @@
     data() {
       return {
         columns: columns,
-        dataSource: [],
+        dataSource: [
+          {
+            f_EqmCode: '001',
+            f_ShowEnergy: 220
+          },
+          {
+            f_EqmCode: '002',
+            f_ShowEnergy: 220
+          },
+          {
+            f_EqmCode: '003',
+            f_ShowEnergy: 220
+          },
+          {
+            f_EqmCode: '004',
+            f_ShowEnergy: 220
+          },
+        ],
         selectedRows: [],
       };
     },
     created() {},
     mounted() {
-      this.loadData();
+      // this.loadData();
     },
     methods: {
       loadData() {

src/pages/heat/liquid_cooling/index.vue

@@ -170,7 +170,9 @@ export default {
         f_EnvironTemp: 0,
       },
       timer: null,
-      radio_list: [],
+      radio_list: [
+        1,0,1,1,0,1,0,1,0,0,1,1,1,0,1,0,1,0,0,1
+      ],
       setTitle: "设置制热温度",
       dialogFormVisible: false,
       setform: {
@@ -440,7 +442,7 @@ export default {
       border-radius: 5px;
       margin: 8px;
       width: 100%;
-      height: 365px;
+      height: 430px;
       background: #fff;
       box-shadow: 2px 2px 2px #ccc;
       img {

src/pages/login/Login.vue

@@ -2,18 +2,13 @@
   <div class="login-bg">
     <div class="login-content">
       <a-form @submit="onSubmit" :form="form">
-        <a-row>
+        <a-row type="flex" justify="center">
           <a-col :span="4"></a-col>
           <a-col :span="10">
             <img src="../../assets/img/login_left2.png" height="560" />
           </a-col>
-          <a-col :span="10" style="text-align: center">
+          <a-col :span="10" style="text-align: center; display: flex; align-items: center;">
             <div class="login-form">
-              <!-- <img src="../../assets/img/login_logo.png" style="margin-top: 110px" /> -->
-              <img
-                src="../../assets/imgs/tops_logo.png"
-                style="margin-top: 30px; width: 200px; height: 100px"
-              />
               <h6 class="title">系统登录</h6>
 
               <div class="input-icon">
@@ -117,7 +112,7 @@ export default {
       "setAvatar",
     ]),
     onSubmit(e) {
-      //  this.$router.push("/index");
+      //  this.$router.push("/swapping");
       //=======
        e.preventDefault();
       this.form.validateFields((err) => {
@@ -179,9 +174,11 @@ export default {
 
 <style>
 .login-bg .title {
-  font-size: 18px;
+  font-size: 25px;
   color: #253143;
   margin: 20px 0px;
+  font-family: Georgia, 'Times New Roman', Times, serif;
+  font-weight: 600;
 }
 
 .input-icon {
@@ -210,7 +207,7 @@ export default {
 
 .login-form {
   width: 480px;
-  height: 560px;
+  height: 350px;
   background-color: white;
   border-radius: 16px;
 }

src/pages/login/LoginBak.vue

@@ -2,7 +2,6 @@
   <common-layout>
     <div class="top">
       <div class="header">
-        <img alt="logo" class="logo" src="@/assets/img/logo.png" />
         <span class="title">{{systemName}}</span>
       </div>
       <div class="desc">&nbsp;</div>

src/pages/swapping/index.vue

@@ -908,16 +908,16 @@ export default {
   },
   mounted() {
     this.load();
-    this.handlestatus();
-    this.geterror_list();
+    // this.handlestatus();
+    // this.geterror_list();
     this.getscreen_dates();
-    this.getbuleth_data();
-    this.timer = setInterval(() => {
-      this.getscreen_dates();
-      this.getbuleth_data();
-      this.handle_GetPLCSwapParamsValue();
-      this.geterror_list();
-    }, 3000);
+    // this.getbuleth_data();
+    // this.timer = setInterval(() => {
+    //   this.getscreen_dates();
+    //   this.getbuleth_data();
+    //   this.handle_GetPLCSwapParamsValue();
+    //   this.geterror_list();
+    // }, 3000);
   },
   created() {
     this.content_list = this.$store.state.account.wind_content_list;

src/utils/request.js

@@ -5,7 +5,7 @@ import config from '../config/config'
 // 跨域认证信息 header 名
 const xsrfHeaderName = 'Authorization'
 
-axios.defaults.timeout = 20000
+axios.defaults.timeout = 180000
 axios.defaults.withCredentials = true
 axios.defaults.xsrfHeaderName = xsrfHeaderName
 axios.defaults.xsrfCookieName = xsrfHeaderName

vue.config.js

@@ -49,8 +49,8 @@ module.exports = {
     hotOnly: false,
     proxy: {
       '/api': { //此处要与 /services/api.js 中的 API_PROXY_PREFIX 值保持一致
-        // target: 'http://172.0.10.100:3333/api',
-        target: 'http://localhost:7244/api',
+        target: 'http://106.12.36.89:7344/api',
+        // target: 'http://192.168.2.3:7244/api',
         // target: 'http://180.76.133.253:17244/api',
         changeOrigin: true,
         pathRewrite: {