站控锁定调整

.env.development

@@ -5,8 +5,8 @@ VITE_APP_TITLE = 智慧换电管理系统
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.5.213:9100/gateway'
+# VITE_APP_BASE_API = 'http://192.168.5.230:9100/gateway'
-#VITE_APP_BASE_API = 'http://192.168.5.230:9100/gateway'
+VITE_APP_BASE_API = 'http://192.168.5.230:9100/gateway'
 #VITE_APP_BASE_API = '/dev-api'
 #VITE_APP_BASE_API = 'https://api.evo-techina.com'
 

src/views/swapstation/hdz/index.vue

@@ -97,7 +97,18 @@
                     <div v-else>放开</div>
                 </template>
             </el-table-column>
-            <el-table-column label="锁定时间" min-width="160" align="center" prop="stopTime" :show-overflow-tooltip="true" />
+            <el-table-column label="锁定时间" min-width="160" align="center" prop="stopTime" :show-overflow-tooltip="true" >
+               <template #default="scope">
+                    <div v-if="scope.row.stop">{{scope.row.stopTime}}</div>
+                    <div v-else>-</div>
+                </template>
+            </el-table-column>
+            <el-table-column label="锁定提醒" min-width="300" align="center" prop="stopTip" :show-overflow-tooltip="true" >
+               <template #default="scope">
+                    <div v-if="scope.row.stop">{{scope.row.stopTip}}</div>
+                    <div v-else>-</div>
+                </template>
+            </el-table-column>
             <el-table-column label="地址" min-width="400" align="center" prop="address" :show-overflow-tooltip="true" />
             <el-table-column label="注册日期" min-width="120" align="center" prop="registerDate" :show-overflow-tooltip="true" />
             <el-table-column label="联系人" min-width="200" align="center" prop="contacts" :show-overflow-tooltip="true" />
@@ -710,10 +721,25 @@
           :close-on-click-modal="false"
         >
         <el-form ref="locksRef" :model="lockata" :rules="lockrules" label-width="110px">
-          <el-form-item label="延迟时间" prop="hour">
+          <el-form-item label="锁定时间" prop="stopTime">
-              <el-select v-model="lockata.hour" placeholder="请选择时间">
+              <el-date-picker
-                  <el-option v-for="n in 48" :label="`${n}小时后`" :value="n" />
+                v-model="lockata.stopTime"
-              </el-select>
+                type="datetime"
+                style="width: 240px"
+                placeholder="锁定时间"
+                format="YYYY/MM/DD HH:mm"
+              />
+          </el-form-item>
+          <el-form-item label="提醒内容" prop="stopTip">
+            <el-input
+              v-model="lockata.stopTip"
+              style="width: 240px"
+              placeholder="提醒内容"
+              type="textarea"
+              rows = '3'
+              resize="none" 
+              clearable
+            />
           </el-form-item>
         </el-form>
         
@@ -757,6 +783,7 @@
       import Latilonmap from '@/views/components/latilonmap.vue'
 
       import { useRoute } from 'vue-router'
+     import { formatDate } from '@/utils/ruoyi'
 
       function timestamp() {
         return new Date().getTime()
@@ -1091,12 +1118,16 @@
      let hdzname = ref('')
      let lockata = reactive<any>({
       stop:true,
-      hour:''
+      stopTime:'',
+      stopTip:''
      }) 
      let locksRef = ref()
      const lockrules = {
-      hour:[
+      stopTime:[
             { required: true, message: "请选择时间", trigger: "blur" }
+        ],
+        stopTip:[
+            { required: true, message: "请输入提醒内容", trigger: "blur" }
         ]
      }
 
@@ -1104,7 +1135,8 @@
       hdzname.value = row.name
       hdzid.value = row.pkId
       lockpop.value = true
-      lockata.hour = ''
+      lockata.stopTime = ''
+      lockata.stopTip = ''
       querform.value?.resetFields()
     }
 
@@ -1112,6 +1144,9 @@
     function lockhand() {
       locksRef.value?.validate((valid:Boolean) => {
           if (valid) {
+            if (lockata.stopTime) {
+                  lockata.stopTime = formatDate(lockata.stopTime)
+                }
               stastop(hdzid.value,lockata).then(() => {
               ElMessage({
                   type: 'success',

vite/vite.config.serve.ts

@@ -5,7 +5,8 @@ export default defineConfig({
   envPrefix: "VITE_", //环境变量默认前缀
   server: {
     // 服务器主机名，默认是 localhost
-    host: "192.168.5.231",
+    //host: "192.168.5.231",
+    host:true,
     // 是否开启自动打开浏览器
     open: true,
     // proxy: {