Merge branch 'master' of https://gitee.com/js-yhsec/energy_storage

web/src/views/monitor.vue

@@ -4,7 +4,7 @@
       <div class="left">
         <div class="search-item">
           <span>场站切换</span>
-          <a-select v-model:value="selectStationId" style="width: 400px" @change="getStationChange">
+          <a-select v-model:value="selectStationId" style="width: 300px" @change="getStationChange">
             <a-select-option v-for="station in stations" :value="station['station_id']"
               >{{ station.name }}
             </a-select-option>

web/src/views/system/log.vue

@@ -26,9 +26,9 @@
     <a-modal v-model:open="formModal" width="750px" style="top: 80px" :footer="null">
       <!-- action:edit add -->
       <EditCom
-        :record="record"
+        :record="formState"
         @operateForm="operateForm"
-        type="user"
+        type="syslog"
         :action="formStatus"
       ></EditCom>
     </a-modal>