zhangafei 1 ماه پیش
والد
کامیت
dc44bb1d71
2فایلهای تغییر یافته به همراه19 افزوده شده و 15 حذف شده
  1. 15 14
      src/views/home/HomePage.vue
  2. 4 1
      vite.config.ts

+ 15 - 14
src/views/home/HomePage.vue

@@ -6,8 +6,9 @@
           <div class="title-txt">当前车辆</div>
           <a-popover
             placement="bottomLeft"
-            v-if="Number(positionNo) === 13 && Number(ccmNo) === 6"
+            v-if="Number(ccmNo) === 5 || Number(ccmNo) === 6"
             trigger="click"
+            v-model:open="visible"
             :overlayClassName="`vehicle-operation-car-popover`"
           >
             <template #content>
@@ -21,9 +22,12 @@
                   {{ item.label }}
                 </a-tag>
               </div>
+              <div class="flex items-center justify-end">
+                <a-button type="primary" @click="handleClick('confirmCar')">确认</a-button>
+              </div>
             </template>
             <div class="click-wrap">
-              <div class="vehicle-content-top-icon" @click="handleOpen"></div>
+              <div class="vehicle-content-top-icon"></div>
               <a-input class="input-txt" v-model:value="vehicleInfo.licensePlate" disabled />
             </div>
           </a-popover>
@@ -42,8 +46,8 @@
             size="large"
             type="primary"
             danger
-            :disabled="!!vehicleInfo.outTime"
-            @click="handleClick('error')"
+            v-if="!!vehicleInfo.licensePlateStatus"
+            @click="handleOpen"
           >
             错误
           </a-button>
@@ -312,6 +316,7 @@ const { start, stop } = useTimeoutFn(() => {
 // 按钮操作
 const handleClick = (type: string) => {
   if (type === 'confirmCar') {
+    visible.value = false
     Modal.confirm({
       iconType: 'warning',
       title: '确认',
@@ -320,16 +325,12 @@ const handleClick = (type: string) => {
       okText: '确认',
       cancelText: '取消',
       onOk: () => {
-        if (Number(positionNo) === 3) {
-          editInfo(
-            {
-              licensePlate: vehicleInfo.value.licensePlate,
-            },
-            type,
-          )
-        } else {
-          message.success('确认成功!')
-        }
+        editInfo(
+          {
+            licensePlate: vehicleInfo.value.licensePlate,
+          },
+          type,
+        )
       },
     })
     return

+ 4 - 1
vite.config.ts

@@ -24,13 +24,16 @@ export default defineConfig({
       '@': fileURLToPath(new URL('./src', import.meta.url)),
     },
   },
+  build: {
+    outDir: 'dist_bus',
+  },
   server: {
     host: '0.0.0.0', //设置0.0.0.0和true 就是监听所有
     port: 5173,
     open: true,
     proxy: {
       '/jeecgbootbus': {
-        target: 'http://192.168.1.32:9999',
+        target: 'http://192.168.1.6:9999',
         changeOrigin: true,
         ws: true,
         rewrite: (path) => path.replace(/^\/jeecgbootbus/, ''),