Просмотр исходного кода

Merge branch 'master' of http://git.xt.wenhq.top:8083/wenhongquan/khyznh-ui

* 'master' of http://git.xt.wenhq.top:8083/wenhongquan/khyznh-ui:
  更新
  页面

# Conflicts:
#	src/utils/request.ts
wenhongquan 2 лет назад
Родитель
Сommit
c341a7429e

+ 5 - 2
package.json

@@ -17,25 +17,28 @@
     "url": "https://gitee.com/JavaLionLi/plus-ui.git"
   },
   "dependencies": {
+    "@amap/amap-jsapi-loader": "^1.0.1",
     "@element-plus/icons-vue": "2.1.0",
     "@vueup/vue-quill": "1.2.0",
     "@vueuse/core": "9.5.0",
     "animate.css": "4.1.1",
     "await-to-js": "^3.0.0",
     "axios": "^1.3.4",
+    "crypto-js": "^4.1.1",
     "echarts": "5.4.0",
     "element-plus": "2.2.27",
     "file-saver": "2.0.5",
     "fuse.js": "6.6.2",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.3.1",
-    "crypto-js": "^4.1.1",
+    "moment": "^2.30.1",
     "nprogress": "0.2.0",
     "path-browserify": "1.0.1",
     "path-to-regexp": "6.2.0",
     "pinia": "2.0.22",
     "screenfull": "6.0.0",
     "vform3-builds": "3.0.8",
+    "video.js": "^8.10.0",
     "vue": "3.2.45",
     "vue-cropper": "1.0.3",
     "vue-i18n": "9.2.2",
@@ -73,10 +76,10 @@
     "unplugin-auto-import": "0.13.0",
     "unplugin-icons": "0.15.1",
     "unplugin-vue-components": "0.23.0",
+    "unplugin-vue-setup-extend-plus": "0.4.9",
     "vite": "4.3.1",
     "vite-plugin-compression": "0.5.1",
     "vite-plugin-svg-icons": "2.0.1",
-    "unplugin-vue-setup-extend-plus": "0.4.9",
     "vitest": "^0.29.7",
     "vue-eslint-parser": "9.1.0",
     "vue-tsc": "0.35.0"

+ 1 - 0
src/api/carInfo/index.ts

@@ -21,6 +21,7 @@ export const listCarInfo = (query?: CarInfoQuery): AxiosPromise<CarInfoVO[]> =>
  * @param id
  */
 export const getCarInfo = (id: string | number): AxiosPromise<CarInfoVO> => {
+  console.log(id);
   return request({
     url: '/system/carInfo/' + id,
     method: 'get'

+ 1 - 0
src/api/login.ts

@@ -16,6 +16,7 @@ export function login(data: LoginData): AxiosPromise<LoginResult> {
     clientId: data.clientId || clientId,
     grantType: data.grantType || 'password'
   };
+  console.log(params);
   return request({
     url: '/auth/login',
     headers: {

+ 3 - 3
src/api/userVacate/types.ts

@@ -22,7 +22,7 @@ export interface UserVacateVO {
   /**
    * 内容描述
    */
-  desc: string;
+  des: string;
 
   /**
    * 状态( 1-通过  2-拒绝  0-待处理)
@@ -75,7 +75,7 @@ export interface UserVacateForm extends BaseEntity {
   /**
    * 内容描述
    */
-  desc?: string;
+  des?: string;
 
   /**
    * 状态( 1-通过  2-拒绝  0-待处理)
@@ -124,7 +124,7 @@ export interface UserVacateQuery extends PageQuery {
   /**
    * 内容描述
    */
-  desc?: string;
+  des?: string;
 
   /**
    * 状态( 1-通过  2-拒绝  0-待处理)

BIN
src/assets/images/icon/九宫格.png


BIN
src/assets/images/icon/四宫格.png


BIN
src/assets/images/icon/容器.png


BIN
src/assets/images/map.png


+ 67 - 0
src/assets/json/table.json

@@ -0,0 +1,67 @@
+[{
+	"dataName": "deviceInfos",
+	"buttons": [{
+		"type": "primary",
+		"text": "管理",
+		"func": "updateObj"
+	}, {
+		"type": "primary",
+		"text": "删除",
+		"func": "deleteObj"
+	}],
+	"columns": [{
+		"placeholder": "请输入设备名称",
+		"type": "input",
+		"label": "设备名称",
+		"prop": "name",
+		"visible": true,
+		"isTemplate": false
+	}, {
+		"placeholder": "请输入设备类型",
+		"type": "input",
+		"label": "设备类型",
+		"prop": "type",
+		"visible": true,
+		"isTemplate": false
+	}, {
+		"placeholder": "请输入设备code",
+		"type": "input",
+		"label": "设备code",
+		"prop": "code",
+		"visible": true,
+		"isTemplate": false
+	}]
+}, {
+	"dataName": "repairInfo",
+	"buttons": [{
+		"type": "primary",
+		"text": "管理",
+		"func": "updateObj"
+	}, {
+		"type": "primary",
+		"text": "删除",
+		"func": "deleteObj"
+	}],
+	"columns": [{
+		"placeholder": "请选择维修日期",
+		"type": "date",
+		"label": "日期",
+		"prop": "wsdate",
+		"visible": true,
+		"isTemplate": false
+	}, {
+		"placeholder": "请输入维修内容",
+		"type": "input",
+		"label": "维修内容",
+		"prop": "content",
+		"visible": true,
+		"isTemplate": false
+	}, {
+		"placeholder": "请输入金额",
+		"type": "input",
+		"label": "金额",
+		"prop": "cash",
+		"visible": true,
+		"isTemplate": false
+	}]
+}]

+ 1 - 0
src/components/DictTag/index.vue

@@ -11,6 +11,7 @@
           :disable-transitions="true"
           :key="item.value + ''"
           :index="index"
+          :effect="item.elTagClass"
           :type="(item.elTagType === 'primary' || item.elTagType === 'default')? '' : item.elTagType"
           :class="item.elTagClass"
         >

+ 134 - 0
src/components/Map/index.vue

@@ -0,0 +1,134 @@
+<template>
+    <div class="app-container">
+        <div style="background-color: #ffffff;height: 100%;">
+            <div id="container"></div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import AMapLoader from '@amap/amap-jsapi-loader';
+/*在Vue3中使用时,需要引入Vue3中的shallowRef方法(使用shallowRef进行非深度监听,
+因为在Vue3中所使用的Proxy拦截操作会改变JSAPI原生对象,所以此处需要区别Vue2使用方式对地图对象进行非深度监听,
+否则会出现问题,建议JSAPI相关对象采用非响应式的普通对象来存储)*/
+import { shallowRef } from '@vue/reactivity';
+import { ref } from "vue";
+import { getDicts } from '@/api/system/dict/data'
+import add from '@/views/car/carInfo/add.vue';
+
+// const map = shallowRef(null);
+const path = ref([]);
+const current_position = ref([]);
+let mapObj = ref()
+
+const getDictsData = (param) => {
+    getDicts(param).then(res => {
+        for (var index in res.data) {
+            var obj = res.data[index].dictValue.split(",");
+            console.log(obj)
+            addMarker(obj,res.data[index])
+        }
+    })
+}
+
+const initMap = () => {
+    window._AMapSecurityConfig = {
+        securityJsCode: '8e920f73eb2e6880a92ea6662eefc476',
+    }
+    AMapLoader.load({
+        key: "88d0fc14bcd5921a4e5a09ef1a3ab31a", // 申请好的Web端开发者Key,首次调用 load 时必填
+        version: "2.0", // 指定要加载的 JSAPI 的版本,缺省时默认为 1.4.15
+        // plugins:[''], // 需要使用的的插件列表,如比例尺'AMap.Scale'等
+    }).then((AMap) => {
+        const map = new AMap.Map("container", {  //设置地图容器id
+            viewMode: "3D",    //是否为3D地图模式
+            zoom: 13,           //初始化地图级别
+            center: [119.807462, 26.958413], //初始化地图中心点位置
+        });
+        mapObj = map;
+        // 添加插件
+        AMap.plugin(["AMap.ToolBar", "AMap.Scale", "AMap.HawkEye", "AMap.Geolocation", "AMap.MapType", "AMap.MouseTool"], function () {
+            //异步同时加载多个插件
+            // 添加地图插件
+            // map.addControl(new AMap.ToolBar()); // 工具条控件;范围选择控件
+            map.addControl(new AMap.Scale()); // 显示当前地图中心的比例尺
+            map.addControl(new AMap.HawkEye()); // 显示缩略图
+            map.addControl(new AMap.Geolocation()); // 定位当前位置
+            // map.addControl(new AMap.MapType()); // 实现默认图层与卫星图,实时交通图层之间切换
+
+        });
+
+        getDictsData("tbl_sites");
+        // 单击
+        map.on('click', (e) => {
+            // lng ==> 经度值  lat => 维度值
+            current_position.value = [e.lnglat.lng, e.lnglat.lat];
+            path.value.push([e.lnglat.lng, e.lnglat.lat]);
+            //addMarker();
+            // addPolyLine();
+        })
+
+
+        // 折线
+        function addPolyLine() {
+            const polyline = new AMap.Polyline({
+                path: path.value,
+                isOutline: true,
+                outlineColor: "#ffeeff",
+                borderWeight: 1,
+                strokeColor: "#3366FF",
+                strokeOpacity: 0.6,
+                strokeWeight: 5,
+                // 折线样式还支持 'dashed'
+                strokeStyle: "solid",
+                // strokeStyle是dashed时有效
+                // strokeDasharray: [10, 5],
+                lineJoin: "round",
+                lineCap: "round",
+                zIndex: 50,
+            });
+            map.add([polyline]);
+        }
+
+
+
+    }).catch(e => {
+        console.log(e);
+    })
+}
+
+const addMarker = (obj,data) => {
+    const marker = new AMap.Marker({
+        icon: new AMap.Icon({
+            image: '//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png',
+            imageSize: new AMap.Size(22, 28) //图标大小
+        }),
+        position: obj, // 这里我们通过上面的点击获取经纬度坐标,实时添加标记
+        // 通过设置 offset 来添加偏移量
+        offset: new AMap.Pixel(-10, -20),
+    });
+    marker.setMap(mapObj);
+     //给marker添加属性
+     marker.setExtData(data)
+    //给marker添加点击事件
+    marker.on('click', clickMarker)
+}
+
+const emit = defineEmits(['childToParent']);
+
+const clickMarker = (e) =>{
+       console.log(e.target.getExtData());
+       emit('childToParent',e.target.getExtData())
+}
+
+initMap()
+</script>
+
+<style>
+#container {
+    padding: 0px;
+    margin: 0px;
+    width: 100%;
+    height: 100%;
+}
+</style>

+ 125 - 0
src/components/Public/table.vue

@@ -0,0 +1,125 @@
+<template>
+    <el-table :data="tableData" :border="true">
+        <el-table-column type="selection" width="55" />
+        <el-table-column v-for="item in columns.filter(i => i.visible)" :prop="item.prop" :label="item.label">
+            <template #default="scope" v-if="item.isTemplate">
+                <span>
+                    {{ getData(item.func, scope.row, item.prop, item.pprop) }}
+                    <!-- {{ eval(item.prop)}} -->
+                </span>
+            </template>
+
+            <template #default="scope" v-if="item.isTemplateJson">
+                <span>
+                    {{ getJsonData(scope.row, item.pprop, item.prop) }}
+                    <!-- {{ eval(item.prop)}} -->
+                </span>
+            </template>
+
+            <template #default="scope" v-if="item.isTemplateTag">
+                <div style="display: flex;flex-direction: row;">
+                    <dict-tag :options="energy_type" :value="getObjectData(scope.row.ext1, 'energyType')" />
+                    <dict-tag style="margin-left: 5px;" :options="business_type"
+                        :value="getObjectData(scope.row.ext1, 'bussinessType')" />
+                </div>
+            </template>
+        </el-table-column>
+        <el-table-column label="操作" v-show="showButton">
+
+            <template #default="scope">
+                <div v-show="showButton">
+                    <el-button v-for="button in buttons" :key="button.text" :type="button.type" link
+                        @click="clickbutton(button.func, scope.row)">{{ button.text
+                        }}</el-button>
+                </div>
+            </template>
+        </el-table-column>
+    </el-table>
+</template>
+
+<script setup lang="ts">
+import { getType } from 'vue-types/dist/utils';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance
+const { energy_type, business_type } = toRefs<any>(proxy?.useDict("energy_type", "business_type"));
+
+const route = useRoute();
+const router = useRouter();
+
+
+const props = defineProps({
+    columns: {
+        type: [Object],
+        default: ""
+    },
+    showButton: {
+        type: [Boolean],
+        default: true
+    }
+});
+
+const buttons = ref([
+    { type: 'primary', text: '管理', func: "handleUpdate" },
+    { type: 'primary', text: '删除' },
+])
+
+const emit = defineEmits(['childToParent', "childFormat"]);
+
+const tableData = ref([])
+
+const getData = (str, data, prop, pprop) => {
+    let value = "";
+    let obj = {
+        func: str,
+        data: data,
+        prop: prop,
+    }
+    emit('childFormat', {
+        data: obj, fn: (i) => {
+            value = i
+        }
+    })
+    return value
+}
+
+const getObjectData = (data, prop) => {
+    var obj = JSON.parse(data);
+    return eval("obj." + prop)
+}
+
+const getJsonData = (data, pprop, prop) => {
+    var data = eval("data." + pprop)
+    return getObjectData(data, prop)
+}
+
+const setDataList = (data) => {
+    console.log(data)
+    tableData.value = data
+}
+
+const setButton = (data) => {
+    buttons.value = data
+}
+
+
+const clickbutton = (func, data) => {
+    let obj = {
+        func: func,
+        data: data
+    }
+    emit('childToParent', obj)
+}
+
+// getType(){
+
+// }
+
+defineExpose({
+    setDataList,
+    setButton
+})
+
+onMounted(() => {
+    console.log(props.showButton)
+});
+</script>

+ 110 - 0
src/components/Public/timeLine.vue

@@ -0,0 +1,110 @@
+<template>
+    <div class="processBox">
+      <div class="timelineProcessBox">
+        <el-timeline class="timeline">
+          <el-timeline-item
+            class="lineitem"
+            :class="activity.done ? 'active' : 'inactive'"
+            v-for="(activity, index) in activities"
+            :key="index"
+            :color="activity.color"
+            :timestamp="activity.time"
+          >
+            <span style="display: flex; flex-direction: column">
+              <span style="margin: 10px 0; font-size: 16px">
+                {{ activity.index }}
+              </span>
+            </span>
+            <span style="display: flex; flex-direction: column">
+              <span style="margin: 10px 0; font-size: 16px">
+                {{ activity.content }}
+              </span>
+            </span>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </div>
+  </template>
+  <script lang="ts" setup>
+  const activities = [
+    {
+      content: '白下',
+      time: '7:00',
+      people: '五六七',
+      done: true,
+      color:'#06D903',
+      index:'起点'
+    },
+    {
+      content: '白下',
+      people: '吉吉国王',
+      done: false,
+      time: '8:00-9:00',
+      index:'站点1',
+      color:'#409EFF'
+    },
+    {
+      content: '白下',
+      people: '吉吉国王',
+      done: false,
+      time: '8:00-9:00',
+      index:'站点2',
+      color:'#409EFF'
+    },
+  ]
+  </script>
+  <style lang="scss" scoped>
+  .processBox {
+    background-color: #fff;
+    height: 210px;
+   
+    .title {
+      font-size: 16px;
+      font-weight: 600;
+      padding-left: 32px;
+      padding-top: 16px;
+    }
+    .timelineProcessBox {
+      .timeline {
+        display: flex;
+        width: 95%;
+        margin: 40px auto;
+        .lineitem {
+          transform: translateX(50%);
+          width: 25%;
+        }
+      }
+    }
+  }
+   
+  :deep(.el-timeline-item__tail) {
+    border-left: none;
+    border-top: 2px solid #e4e7ed;
+    width: 100%;
+    position: absolute;
+    top: 6px;
+  }
+  :deep(.el-timeline-item__wrapper) {
+    padding-left: 0;
+    position: absolute;
+    top: 20px;
+    transform: translateX(-50%);
+    text-align: center;
+  }
+  :deep(.el-timeline-item__timestamp) {
+    font-size: 14px;
+  }
+  .active {
+    :deep(.el-timeline-item__node) {
+      background-color: #06D903;
+    }
+    :deep(.el-timeline-item__tail) {
+      border-color: #06D903;
+    }
+  }
+  .active + li {
+    :deep(.el-timeline-item__node) {
+      background-color: #06D903;
+    }
+  }
+  </style>

+ 27 - 1
src/router/index.ts

@@ -88,7 +88,33 @@ export const constantRoutes: RouteOption[] = [
         meta: { title: '个人中心', icon: 'user' }
       }
     ]
-  }
+  },
+  {
+    path: "/car/carInfo/add",
+    hidden: true,
+    component: Layout,
+    children: [
+      {
+        path: "",
+        component: () => import("@/views/car/carInfo/add"),
+        name: "CarInfoAdd",
+        meta: { title: "车辆信息新增", activeMenu: "/car/carInfo" },
+      },
+    ],
+  },
+  {
+    path: "/car/work/addWork",
+    hidden: true,
+    component: Layout,
+    children: [
+      {
+        path: "",
+        component: () => import("@/views/car/work/addCarWork"),
+        name: "CarWorkoAdd",
+        meta: { title: "车辆作业新增", activeMenu: "/car/work" },
+      },
+    ],
+  },
 ];
 
 // 动态路由,基于用户权限动态去加载

+ 2 - 1
src/utils/request.ts

@@ -41,7 +41,7 @@ service.interceptors.request.use(
     const isRepeatSubmit = (config.headers || {}).repeatSubmit === false;
     // 是否需要加密
     // const isEncrypt = (config.headers || {}).isEncrypt === 'true';
-    const isEncrypt = false;
+    const isEncrypt = false
     if (getToken() && !isToken) {
       config.headers['Authorization'] = 'Bearer ' + getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改
     }
@@ -59,6 +59,7 @@ service.interceptors.request.use(
         data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
         time: new Date().getTime()
       };
+      console.log(requestObj);
       const sessionObj = cache.session.getJSON('sessionObj');
       if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
         cache.session.setJSON('sessionObj', requestObj);

+ 615 - 0
src/views/car/carInfo/add.vue

@@ -0,0 +1,615 @@
+<template>
+    <div style="padding: 10px 15px">
+        <el-card class="box-card">
+            <template #header>
+                <div class="card-header">
+                    <span>车辆信息</span>
+                    <div>
+                        <el-button type="warning" @click="">取消</el-button>
+                        <el-button :loading="buttonLoading" type="primary" @click="submit()">保存</el-button>
+                    </div>
+                </div>
+
+            </template>
+            <el-row>
+                <el-col :span="24">
+                    <el-descriptions :column="3">
+                        <el-descriptions-item>
+
+                            <template #label>
+                                <div style="display: inline-block;min-width: 100px;text-align: right">
+                                    <span style="color: red">*</span> 车牌
+                                </div>
+                            </template>
+                            <div class="content-w">
+                                <el-input v-model="form.carNum" placeholder="请输入车牌" />
+                            </div>
+                        </el-descriptions-item>
+                        <el-descriptions-item>
+
+                            <template #label>
+                                <div style="display: inline-block;min-width: 100px;text-align: right">
+                                    <span style="color: red">*</span> 车辆分类
+                                </div>
+                            </template>
+                            <div class="content-w">
+                                <el-select v-model="form.carType" filterable placeholder="车辆分类">
+                                    <el-option v-for="item in carTypeList" :key="item.dictValue" :label="item.dictLabel"
+                                        :value="item.dictValue" />
+                                </el-select>
+                            </div>
+                        </el-descriptions-item>
+                        <el-descriptions-item>
+
+                            <template #label>
+                                <div style="display: inline-block;min-width: 100px;text-align: right">
+                                    <span style="color: red">*</span> 业务分类
+                                </div>
+                            </template>
+                            <div class="content-w">
+                                <el-select v-model="formParams.bussinessType" filterable placeholder="业务分类">
+                                    <el-option v-for="item in bussinessTypeList" :key="item.dictValue"
+                                        :label="item.dictLabel" :value="item.dictValue" />
+                                </el-select>
+                            </div>
+                        </el-descriptions-item>
+
+                        <el-descriptions-item>
+
+                            <template #label>
+                                <div style="display: inline-block;min-width: 100px;text-align: right">
+                                    <span style="color: red">*</span> 所属网格
+                                </div>
+                            </template>
+                            <div class="content-w">
+                                <el-input v-model="formParams.wangge" placeholder="请输入网格" />
+                            </div>
+                        </el-descriptions-item>
+                        <el-descriptions-item>
+
+                            <template #label>
+                                <div style="display: inline-block;min-width: 100px;text-align: right">
+                                    <span style="color: red">*</span> 能耗类型
+                                </div>
+                            </template>
+                            <div class="content-w">
+                                <el-select v-model="formParams.energyType" filterable placeholder="业务分类">
+                                    <el-option v-for="item in energyTypeList" :key="item.dictValue"
+                                        :label="item.dictLabel" :value="item.dictValue" />
+                                </el-select>
+                            </div>
+                        </el-descriptions-item>
+                        <el-descriptions-item>
+
+                            <template #label>
+                                <div style="display: inline-block;min-width: 100px;text-align: right">
+                                    <span style="color: red">*</span> 所属单位
+                                </div>
+                            </template>
+                            <div class="content-w">
+                                <el-input v-model="formParams.dept" placeholder="请输入所属单位" />
+                            </div>
+                        </el-descriptions-item>
+
+                        <el-descriptions-item>
+
+                            <template #label>
+                                <div style="display: inline-block;min-width: 100px;text-align: right">
+                                    车辆编号
+                                </div>
+                            </template>
+                            <div class="content-w">
+                                <el-input v-model="formParams.carNo" placeholder="请输入车牌编号" />
+                            </div>
+                        </el-descriptions-item>
+                        <el-descriptions-item>
+
+                            <template #label>
+                                <div style="display: inline-block;min-width: 100px;text-align: right">
+                                    车辆识别号
+                                </div>
+                            </template>
+                            <div class="content-w">
+                                <div class="content-w">
+                                    <el-input v-model="formParams.Identification" placeholder="请输入车牌识别号" />
+                                </div>
+                            </div>
+                        </el-descriptions-item>
+                        <el-descriptions-item>
+
+                            <template #label>
+                                <div style="display: inline-block;min-width: 100px;text-align: right">
+                                    发动机号
+                                </div>
+                            </template>
+                            <div class="content-w">
+                                <div class="content-w">
+                                    <el-input v-model="formParams.fdj" placeholder="请输入发动机" />
+                                </div>
+                            </div>
+                        </el-descriptions-item>
+
+                        <el-descriptions-item>
+
+                            <template #label>
+                                <div style="display: inline-block;min-width: 100px;text-align: right">
+                                    行驶证编号
+                                </div>
+
+                            </template>
+                            <div class="content-w">
+                                <el-input v-model="formParams.xszbh" placeholder="请输入行驶证编号" />
+                            </div>
+                        </el-descriptions-item>
+                        <el-descriptions-item>
+
+                            <template #label>
+                                <div style="display: inline-block;min-width: 100px;text-align: right">
+                                    行驶证保管人
+                                </div>
+                            </template>
+                            <div class="content-w">
+                                <div class="content-w">
+                                    <el-input v-model="formParams.xszbgr" placeholder="请输入行驶证保管人" />
+                                </div>
+                            </div>
+                        </el-descriptions-item>
+                        <el-descriptions-item>
+
+                            <template #label>
+                                <div style="display: inline-block;min-width: 100px;text-align: right">
+                                    采购审批单号
+                                </div>
+                            </template>
+                            <div class="content-w">
+                                <div class="content-w">
+                                    <el-input v-model="formParams.cgsp" placeholder="请输入采购审批单号" />
+                                </div>
+                            </div>
+                        </el-descriptions-item>
+
+                        <el-descriptions-item>
+
+                            <template #label>
+                                <div style="display: inline-block;min-width: 100px;text-align: right">
+                                    车辆品牌
+                                </div>
+                            </template>
+                            <div class="content-w">
+                                <el-input v-model="formParams.clpp" placeholder="请输入车牌品牌" />
+                            </div>
+                        </el-descriptions-item>
+                        <el-descriptions-item>
+
+                            <template #label>
+                                <div style="display: inline-block;min-width: 100px;text-align: right">
+                                    车辆信号
+                                </div>
+                            </template>
+                            <div class="content-w">
+                                <div class="content-w">
+                                    <el-input v-model="formParams.clxx" placeholder="请输入车辆信号" />
+                                </div>
+                            </div>
+                        </el-descriptions-item>
+                        <el-descriptions-item>
+
+                            <template #label>
+                                <div style="display: inline-block;min-width: 100px;text-align: right">
+                                    购置日期
+                                </div>
+                            </template>
+                            <div class="content-w">
+                                <div class="content-w">
+                                    <el-date-picker value-format="YYYY-MM-DD HH:mm:ss" v-model="formParams.gzrq"
+                                        type="date" placeholder="请选择购置日期" />
+                                </div>
+                            </div>
+                        </el-descriptions-item>
+
+                        <el-descriptions-item>
+
+                            <template #label>
+                                <div style="display: inline-block;min-width: 100px;text-align: right">
+                                    购置金额
+                                </div>
+                            </template>
+                            <div class="content-w">
+                                <el-input v-model="formParams.gzje" placeholder="请输入购置金额" />
+                            </div>
+                        </el-descriptions-item>
+                        <el-descriptions-item>
+
+                            <template #label>
+                                <div style="display: inline-block;min-width: 100px;text-align: right">
+                                    使用年限
+                                </div>
+                            </template>
+                            <div class="content-w">
+                                <div class="content-w">
+                                    <el-input v-model="formParams.synx" placeholder="请输入使用年限" />
+                                </div>
+                            </div>
+                        </el-descriptions-item>
+                        <el-descriptions-item>
+
+                            <template #label>
+                                <div style="display: inline-block;min-width: 100px;text-align: right">
+                                    额定载重
+                                </div>
+                            </template>
+                            <div class="content-w">
+                                <div class="content-w">
+                                    <el-input v-model="formParams.edzz" placeholder="请输入额定载重" />
+                                </div>
+                            </div>
+                        </el-descriptions-item>
+
+                        <el-descriptions-item>
+
+                            <template #label>
+                                <div style="display: inline-block;min-width: 100px;text-align: right">
+                                    使用单位
+                                </div>
+                            </template>
+                            <div class="content-w">
+                                <div class="content-w">
+                                    <el-input v-model="formParams.sydw" placeholder="请输入使用单位" />
+                                </div>
+                            </div>
+                        </el-descriptions-item>
+                    </el-descriptions>
+
+                </el-col>
+
+                <div style="margin-left: auto;margin-right: 20px;"><el-button type="primary"
+                        @click="addObj()">新增</el-button></div>
+
+                <el-col :span="24" v-if="carId != 0 && carId != null">
+                    <el-tabs type="card" class="demo-tabs" v-model="activeName" @tab-click="tabClick">
+                        <el-tab-pane label="车辆设备" name="1">
+                            <tableElm @childToParent='childrenClick' v-if="activeName == 1" :columns="columns[0]"
+                                ref="table">
+                            </tableElm>
+                        </el-tab-pane>
+                        <el-tab-pane label="维修记录" name="2">
+                            <tableElm @childToParent='childrenClick' v-if="activeName == 2" :columns="columns[1]"
+                                ref="table">
+                            </tableElm>
+                        </el-tab-pane>
+                        <el-tab-pane label="保养记录" name="3">
+
+                        </el-tab-pane>
+                        <el-tab-pane label="保险记录" name="4">
+                        </el-tab-pane>
+                        <el-tab-pane label="年检记录" name="5">
+
+                        </el-tab-pane>
+                        <el-tab-pane label="交通事故记录" name="6">
+
+                        </el-tab-pane>
+                        <el-tab-pane label="违章记录" name="7">
+
+                        </el-tab-pane>
+                        <el-tab-pane label="车辆变更记录" name="8">
+
+                        </el-tab-pane>
+                    </el-tabs>
+                </el-col>
+            </el-row>
+        </el-card>
+
+        <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+            <el-form ref="" :model="form" :rules="rules" label-width="120px">
+                <el-form-item v-for="(item, index) in formList" :label="item.label" prop="carNum">
+                    <el-input v-if="item.type == 'input'" v-model="addForm[item.prop]"
+                        :placeholder="item.placeholder" />
+                    <el-date-picker v-if="item.type == 'date'" value-format="YYYY-MM-DD HH:mm:ss"
+                        v-model="addForm[item.prop]" type="date" :placeholder="item.placeholder" />
+                </el-form-item>
+            </el-form>
+
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button type="primary" @click="submitForm">确 定</el-button>
+                    <el-button @click="dialog.visible = false">取 消</el-button>
+                </div>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup name="CarInfo" lang="ts">
+import { ref, toRaw } from "vue";
+import { useRoute, useRouter } from "vue-router";
+import { listCarInfo, getCarInfo, delCarInfo, addCarInfo, updateCarInfo } from '@/api/carInfo';
+import { CarInfoVO, CarInfoQuery, CarInfoForm } from '@/api/carInfo/types';
+import tableElm from "@/components/Public/table.vue";
+import { getDicts } from '@/api/system/dict/data'
+import tableJson from "@/assets/json/table.json"
+
+const route = useRoute();
+const router = useRouter();
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const initFormData: CarInfoForm = {
+    id: undefined,
+    carNum: undefined,
+    carType: undefined,
+    deviceInfos: undefined,
+    repairInfo: undefined,
+    maintenanceInfo: undefined,
+    insuranceInfo: undefined,
+    inspectionInfo: undefined,
+    trafficAccidentInfo: undefined,
+    violationInfo: undefined,
+    changeInfo: undefined,
+    ext1: undefined,
+    ext2: undefined
+}
+
+const formParams = ref({
+    bussinessType: undefined,
+    energyType: undefined,
+    wangge: undefined,
+    dept: undefined,
+    carNo: undefined,
+    Identification: undefined,
+    fdj: undefined,
+    xszbh: undefined,
+    xszbgr: undefined,
+    cgsp: undefined,
+    clpp: undefined,
+    clxx: undefined,
+    gzrq: undefined,
+    gzje: undefined,
+    synx: undefined,
+    edzz: undefined,
+    sydw: undefined
+})
+
+const table = ref(tableElm)
+
+const addForm = ref({});
+
+const activeName = ref("1")
+
+const data = reactive<PageData<CarInfoForm, CarInfoQuery>>({
+    form: { ...initFormData },
+    queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        carNum: undefined,
+        carType: undefined,
+        deviceInfos: undefined,
+        repairInfo: undefined,
+        maintenanceInfo: undefined,
+        insuranceInfo: undefined,
+        inspectionInfo: undefined,
+        trafficAccidentInfo: undefined,
+        violationInfo: undefined,
+        changeInfo: undefined,
+        ext1: undefined,
+        ext2: undefined,
+        params: {
+        }
+    },
+    rules: {
+        id: [
+            { required: true, message: "编号不能为空", trigger: "blur" }
+        ],
+        carNum: [
+            { required: true, message: "车牌号不能为空", trigger: "blur" }
+        ],
+        carType: [
+            { required: true, message: "车类型不能为空", trigger: "change" }
+        ],
+        deviceInfos: [
+            { required: true, message: "所有车载设备信息不能为空", trigger: "blur" }
+        ],
+        repairInfo: [
+            { required: true, message: "维修信息不能为空", trigger: "blur" }
+        ],
+        maintenanceInfo: [
+            { required: true, message: "保养信息不能为空", trigger: "blur" }
+        ],
+        insuranceInfo: [
+            { required: true, message: "保险信息不能为空", trigger: "blur" }
+        ],
+        inspectionInfo: [
+            { required: true, message: "年检信息不能为空", trigger: "blur" }
+        ],
+        trafficAccidentInfo: [
+            { required: true, message: "交通事故信息不能为空", trigger: "blur" }
+        ],
+        violationInfo: [
+            { required: true, message: "违章信息不能为空", trigger: "blur" }
+        ],
+        changeInfo: [
+            { required: true, message: "车辆变更信息不能为空", trigger: "blur" }
+        ],
+        ext1: [
+            { required: true, message: "扩展1不能为空", trigger: "blur" }
+        ],
+        ext2: [
+            { required: true, message: "扩展2不能为空", trigger: "blur" }
+        ]
+    }
+});
+
+const buttonLoading = ref(false);
+
+const { queryParams, form, rules } = toRefs(data);
+
+const formList = ref([
+    { placeholder: "请选择维修日期", type: 'date', label: '维修日期', prop: 'carNum', visible: true, isTemplate: false },
+    { placeholder: "请输入维修内容", type: 'input', label: '维修内容', prop: 'carNum', visible: true, isTemplate: false },
+    { placeholder: "请输入金额", type: 'input', label: '金额', prop: 'carNum', visible: true, isTemplate: false },
+])
+
+const reset = () => {
+    form.value = {};
+    console.log(0)
+}
+
+const columns = ref(
+    [[
+        // {label: '上层位置', prop: 'v', visible: true},
+        { label: '日期', prop: 'carNum', visible: true, isTemplate: false },
+        { label: '维修内容', prop: 'carNum', visible: true, isTemplate: false },
+        { label: '金额', prop: 'carNum', visible: true, isTemplate: false },
+    ]])
+
+const dialog = reactive<DialogOption>({
+    visible: false,
+    title: ''
+});
+
+const carTypeList = ref([]);
+const energyTypeList = ref([])
+const bussinessTypeList = ref([])
+const carId = ref(0);
+
+const getDictsData = (param, obj) => {
+    getDicts(param).then(res => {
+        obj.value = res.data;
+    })
+}
+
+const updateObj = (data) => {
+    dialog.visible = true
+    console.log(data)
+    addForm.value = data
+    console.log(addForm.value)
+}
+
+const childrenClick = (data) => {
+    console.log(data)
+    eval(data.func + "(data.data)")
+}
+
+const submit = async () => {
+    form.value.ext1 = JSON.stringify(formParams.value);
+    console.log(form.value)
+    buttonLoading.value = true;
+    if (form.value.id) {
+        await updateCarInfo(form.value).finally(() => buttonLoading.value = false);
+    } else {
+        await addCarInfo(form.value).finally(() => buttonLoading.value = false);
+    }
+    proxy?.$modal.msgSuccess("修改成功");
+    router.back()
+}
+
+const submitForm = () => {
+    console.log(addForm.value);
+    var param = {
+        id: route.query.id,
+    }
+    console.log(tableJson[activeName.value - 1]);
+    let prop = tableJson[activeName.value - 1].dataName
+    var data = eval("form.value." + prop);
+    console.log(data)
+    var arry = [];
+    if (data) {
+        if (data.length > 0) {
+            arry = JSON.parse(data)
+        }
+    }
+    addForm.value.id = 'id-' + new Date().getTime().toString(36) + '-' + Math.random().toString(36).substr(2, 9);
+    arry.push(addForm.value);
+    param[prop] = JSON.stringify(arry);
+    updateCarInfo(param).then(res => {
+        addForm.value = {}
+        dialog.visible = false
+        form.value[prop] = JSON.stringify(arry)
+        setTableData(activeName.value);
+    })
+}
+
+
+const tabClick = (tab, event) => {
+    setTimeout(() => {
+        setTableData(activeName.value);
+    }, 200);
+}
+
+const setTableData = (tab) => {
+    console.log(tab)
+    let obj = tableJson[tab - 1]
+    console.log(obj)
+    var data = eval("form.value." + obj.dataName);
+    console.log(data)
+    table.value.setDataList(JSON.parse(data));
+    table.value.setButton(obj.buttons);
+}
+
+// onMounted(() => {
+//     // getDictsData('tbl_car_type', carTypeList);
+//     // getDictsData('energy_type', energyTypeList);
+//     // getDictsData('business_type', bussinessTypeList);
+//     reset();
+//     setTimeout(() => {
+//         getData();
+//     }, 100);
+// });
+
+const setData = async (id) => {
+    const res = await getCarInfo(id);
+    formParams.value = JSON.parse(res.data.ext1)
+    form.value = res.data
+    // formParams.value = res
+}
+
+const addObj = () => {
+    formList.value = tableJson[activeName.value - 1].columns
+    addForm.value = {}
+    dialog.visible = true
+}
+
+const getData = async () => {
+    let objId = route.query.id
+    carId.value = route.query.id
+    await getDictsData('tbl_car_type', carTypeList);
+    await getDictsData('energy_type', energyTypeList);
+    await getDictsData('business_type', bussinessTypeList);
+    if (objId != 0 && objId != null) {
+        await setData(objId);
+        setTableData(activeName.value);
+    }
+    for (var i in tableJson) {
+        var obj = {}
+        var columnsList = [];
+        columns.value[i] = [];
+        for (var j in tableJson[i].columns) {
+            var dataObj = tableJson[i].columns[j]
+            var obj = {
+                label: dataObj.label,
+                prop: dataObj.prop,
+                visible: true,
+            }
+            columns.value[i].push(obj);
+        }
+    }
+}
+
+reset();
+setTimeout(() => {
+    getData();
+}, 100);
+
+</script>
+
+<style lang="scss" scoped>
+.card-header {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+}
+
+.content-w {
+    display: inline-flex;
+    max-width: 160px;
+}
+</style>

+ 283 - 0
src/views/car/carInfo/index.vue

@@ -0,0 +1,283 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+      :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div class="search" v-show="showSearch" style="display: flex;flex-direction: row;">
+        <div style="width: 85%;">
+        <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+          <el-form-item label="车牌号" prop="carNum">
+            <el-input v-model="queryParams.carNum" placeholder="请输入车牌号" clearable style="width: 160px"
+              @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="驾驶员" prop="carNum">
+            <el-input v-model="queryParams.carNum" placeholder="请输入车牌号" clearable style="width: 160px"
+              @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="业务类型" prop="carNum">
+            <el-input v-model="queryParams.carNum" placeholder="请输入车牌号" clearable style="width: 160px"
+              @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="能耗类型" prop="carNum">
+            <el-input v-model="queryParams.carNum" placeholder="请输入车牌号" clearable style="width: 160px"
+              @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="网格" prop="carNum">
+            <el-input v-model="queryParams.carNum" placeholder="请输入车牌号" clearable style="width: 160px"
+              @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="单位" prop="carNum">
+            <el-input v-model="queryParams.carNum" placeholder="请输入车牌号" clearable style="width: 160px"
+              @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-form>
+        </div>
+        <div style="width: 15%;">
+        <el-form-item>
+            <el-button type="primary" @click="goadd">新增</el-button>
+            <el-button type="primary" @click="resetQuery">查询</el-button>
+          </el-form-item>
+        </div>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+
+      <tableElm :columns="columns" @childToParent='childrenClick'  ref="table"></tableElm>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改车辆信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="carInfoFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="车牌号" prop="carNum">
+          <el-input v-model="form.carNum" placeholder="请输入车牌号" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+  
+<script setup name="CarInfo" lang="ts">
+import { listCarInfo, getCarInfo, delCarInfo, addCarInfo, updateCarInfo } from '@/api/carInfo';
+import { CarInfoVO, CarInfoQuery, CarInfoForm } from '@/api/carInfo/types';
+import tableElm from "@/components/Public/table.vue";
+import { useRoute, useRouter } from "vue-router";
+
+const route = useRoute();
+const router = useRouter();
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const carInfoList = ref<CarInfoVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const carInfoFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const table = ref(tableElm)
+
+const columns = ref([
+  // {label: '上层位置', prop: 'v', visible: true},
+  { label: '车牌号', prop: 'carNum', visible: true, isTemplate: false },
+  { label: '能源类型、业务类型', prop: 'ext1', visible: true, isTemplate: false, isTemplateTag: true },
+  { label: '车辆分类', prop: 'type',pprop:"ext1",visible: true, isTemplate: false,isTemplateJson:true },
+  { label: '网格', prop: 'wangge',pprop:"ext1",visible: true, isTemplate: false,isTemplateJson:true },
+  { label: '单位', prop: 'dept',pprop:"ext1",visible: true, isTemplate: false,isTemplateJson:true },
+])
+
+const initFormData: CarInfoForm = {
+  id: undefined,
+  carNum: undefined,
+  carType: undefined,
+  deviceInfos: undefined,
+  repairInfo: undefined,
+  maintenanceInfo: undefined,
+  insuranceInfo: undefined,
+  inspectionInfo: undefined,
+  trafficAccidentInfo: undefined,
+  violationInfo: undefined,
+  changeInfo: undefined,
+  ext1: undefined,
+  ext2: undefined
+}
+const data = reactive<PageData<CarInfoForm, CarInfoQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    carNum: undefined,
+    carType: undefined,
+    deviceInfos: undefined,
+    repairInfo: undefined,
+    maintenanceInfo: undefined,
+    insuranceInfo: undefined,
+    inspectionInfo: undefined,
+    trafficAccidentInfo: undefined,
+    violationInfo: undefined,
+    changeInfo: undefined,
+    ext1: undefined,
+    ext2: undefined,
+    params: {
+    }
+  },
+  rules: {
+    id: [
+      { required: true, message: "编号不能为空", trigger: "blur" }
+    ],
+    carNum: [
+      { required: true, message: "车牌号不能为空", trigger: "blur" }
+    ],
+    carType: [
+      { required: true, message: "车类型不能为空", trigger: "change" }
+    ],
+    deviceInfos: [
+      { required: true, message: "所有车载设备信息不能为空", trigger: "blur" }
+    ],
+    repairInfo: [
+      { required: true, message: "维修信息不能为空", trigger: "blur" }
+    ],
+    maintenanceInfo: [
+      { required: true, message: "保养信息不能为空", trigger: "blur" }
+    ],
+    insuranceInfo: [
+      { required: true, message: "保险信息不能为空", trigger: "blur" }
+    ],
+    inspectionInfo: [
+      { required: true, message: "年检信息不能为空", trigger: "blur" }
+    ],
+    trafficAccidentInfo: [
+      { required: true, message: "交通事故信息不能为空", trigger: "blur" }
+    ],
+    violationInfo: [
+      { required: true, message: "违章信息不能为空", trigger: "blur" }
+    ],
+    changeInfo: [
+      { required: true, message: "车辆变更信息不能为空", trigger: "blur" }
+    ],
+    ext1: [
+      { required: true, message: "扩展1不能为空", trigger: "blur" }
+    ],
+    ext2: [
+      { required: true, message: "扩展2不能为空", trigger: "blur" }
+    ]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+const goadd = () => {
+  router.push("/car/carInfo/add")
+}
+
+/** 查询车辆信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listCarInfo(queryParams.value);
+  table.value.setDataList(res.rows);
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  carInfoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: CarInfoVO[]) => {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加车辆信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: CarInfoVO) => {
+  router.push({ path: '/car/carInfo/add', query: { id: row.id } })
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  carInfoFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateCarInfo(form.value).finally(() => buttonLoading.value = false);
+      } else {
+        await addCarInfo(form.value).finally(() => buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("修改成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: CarInfoVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除车辆信息编号为"' + _ids + '"的数据项?').finally(() => loading.value = false);
+  await delCarInfo(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('system/carInfo/export', {
+    ...queryParams.value
+  }, `carInfo_${new Date().getTime()}.xlsx`)
+}
+
+const childrenClick = (data) =>{
+    eval(data.func+"(data.data)")
+}
+
+onMounted(() => {
+  getList();
+});
+</script>
+  

+ 244 - 0
src/views/car/examine/index.vue

@@ -0,0 +1,244 @@
+<template>
+    <div class="p-2">
+        <el-tabs type="card" class="demo-tabs" active-name="3">
+            <el-tab-pane label="作业监督" name="1">
+                  <!-- <carWork></carWork> -->
+            </el-tab-pane>
+            <el-tab-pane label="违规作业管理" name="2">
+                  <!-- <schedule></schedule> -->
+            </el-tab-pane>
+            <el-tab-pane label="进出场管理" name="3">
+                   <inout></inout>
+            </el-tab-pane>
+            <el-tab-pane label="出勤统计" name="4">
+                   <!-- <peopleLeave></peopleLeave> -->
+            </el-tab-pane>
+            <el-tab-pane label="考核管理" name="5">
+                   <!-- <peopleLeave></peopleLeave> -->
+            </el-tab-pane>
+        </el-tabs>
+    </div>
+</template>
+    
+<script setup name="CarInfo" lang="ts">
+import { listCarInfo, getCarInfo, delCarInfo, addCarInfo, updateCarInfo } from '@/api/carInfo';
+import { CarInfoVO, CarInfoQuery, CarInfoForm } from '@/api/carInfo/types';
+import tableElm from "@/components/Public/table.vue";
+import { useRoute, useRouter } from "vue-router";
+import inout from './inout.vue';
+import peopleLeave from './peopleLeave.vue';
+import schedule from './schedule.vue';
+
+const route = useRoute();
+const router = useRouter();
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const carInfoList = ref<CarInfoVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const carInfoFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+    visible: false,
+    title: ''
+});
+
+const table = ref(tableElm)
+
+const columns = ref([
+    // {label: '上层位置', prop: 'v', visible: true},
+    { label: '车牌号', prop: 'carNum', visible: true, isTemplate: false },
+    { label: '能源类型、业务类型', prop: 'ext1', visible: true, isTemplate: false, isTemplateTag: true },
+    { label: '车辆分类', prop: 'type', pprop: "ext1", visible: true, isTemplate: false, isTemplateJson: true },
+    { label: '网格', prop: 'wangge', pprop: "ext1", visible: true, isTemplate: false, isTemplateJson: true },
+    { label: '单位', prop: 'dept', pprop: "ext1", visible: true, isTemplate: false, isTemplateJson: true },
+    { label: '驾驶员、联系方式', prop: 'people', pprop: "ext1", visible: true, isTemplate: false, isTemplateJson: true },
+])
+
+const initFormData: CarInfoForm = {
+    id: undefined,
+    carNum: undefined,
+    carType: undefined,
+    deviceInfos: undefined,
+    repairInfo: undefined,
+    maintenanceInfo: undefined,
+    insuranceInfo: undefined,
+    inspectionInfo: undefined,
+    trafficAccidentInfo: undefined,
+    violationInfo: undefined,
+    changeInfo: undefined,
+    ext1: undefined,
+    ext2: undefined
+}
+const data = reactive<PageData<CarInfoForm, CarInfoQuery>>({
+    form: { ...initFormData },
+    queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        carNum: undefined,
+        carType: undefined,
+        deviceInfos: undefined,
+        repairInfo: undefined,
+        maintenanceInfo: undefined,
+        insuranceInfo: undefined,
+        inspectionInfo: undefined,
+        trafficAccidentInfo: undefined,
+        violationInfo: undefined,
+        changeInfo: undefined,
+        ext1: undefined,
+        ext2: undefined,
+        params: {
+        }
+    },
+    rules: {
+        id: [
+            { required: true, message: "编号不能为空", trigger: "blur" }
+        ],
+        carNum: [
+            { required: true, message: "车牌号不能为空", trigger: "blur" }
+        ],
+        carType: [
+            { required: true, message: "车类型不能为空", trigger: "change" }
+        ],
+        deviceInfos: [
+            { required: true, message: "所有车载设备信息不能为空", trigger: "blur" }
+        ],
+        repairInfo: [
+            { required: true, message: "维修信息不能为空", trigger: "blur" }
+        ],
+        maintenanceInfo: [
+            { required: true, message: "保养信息不能为空", trigger: "blur" }
+        ],
+        insuranceInfo: [
+            { required: true, message: "保险信息不能为空", trigger: "blur" }
+        ],
+        inspectionInfo: [
+            { required: true, message: "年检信息不能为空", trigger: "blur" }
+        ],
+        trafficAccidentInfo: [
+            { required: true, message: "交通事故信息不能为空", trigger: "blur" }
+        ],
+        violationInfo: [
+            { required: true, message: "违章信息不能为空", trigger: "blur" }
+        ],
+        changeInfo: [
+            { required: true, message: "车辆变更信息不能为空", trigger: "blur" }
+        ],
+        ext1: [
+            { required: true, message: "扩展1不能为空", trigger: "blur" }
+        ],
+        ext2: [
+            { required: true, message: "扩展2不能为空", trigger: "blur" }
+        ]
+    }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+const goadd = () => {
+    router.push("/car/carInfo/add")
+}
+
+/** 查询车辆信息列表 */
+const getList = async () => {
+    loading.value = true;
+    const res = await listCarInfo(queryParams.value);
+    table.value.setDataList(res.rows);
+    total.value = res.total;
+    loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+    reset();
+    dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+    form.value = { ...initFormData };
+    carInfoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+    queryParams.value.pageNum = 1;
+    getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+    queryFormRef.value?.resetFields();
+    handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: CarInfoVO[]) => {
+    ids.value = selection.map(item => item.id);
+    single.value = selection.length != 1;
+    multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+    reset();
+    dialog.visible = true;
+    dialog.title = "添加车辆信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: CarInfoVO) => {
+    reset();
+    const _id = row?.id || ids.value[0]
+    const res = await getCarInfo(_id);
+    Object.assign(form.value, res.data);
+    dialog.visible = true;
+    dialog.title = "修改车辆信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+    carInfoFormRef.value?.validate(async (valid: boolean) => {
+        if (valid) {
+            buttonLoading.value = true;
+            if (form.value.id) {
+                await updateCarInfo(form.value).finally(() => buttonLoading.value = false);
+            } else {
+                await addCarInfo(form.value).finally(() => buttonLoading.value = false);
+            }
+            proxy?.$modal.msgSuccess("修改成功");
+            dialog.visible = false;
+            await getList();
+        }
+    });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: CarInfoVO) => {
+    const _ids = row?.id || ids.value;
+    await proxy?.$modal.confirm('是否确认删除车辆信息编号为"' + _ids + '"的数据项?').finally(() => loading.value = false);
+    await delCarInfo(_ids);
+    proxy?.$modal.msgSuccess("删除成功");
+    await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+    proxy?.download('system/carInfo/export', {
+        ...queryParams.value
+    }, `carInfo_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+   // getList();
+});
+</script>
+    

+ 286 - 0
src/views/car/examine/inout.vue

@@ -0,0 +1,286 @@
+<template>
+    <div class="p-2">
+        <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+            :leave-active-class="proxy?.animate.searchAnimate.leave">
+            <div class="search" v-show="showSearch" style="display: flex;flex-direction: row;">
+                <div style="width: 85%;">
+                    <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+                        <el-form-item label="时间" prop="carNum">
+                            <el-date-picker v-model="value2" type="datetimerange" :shortcuts="shortcuts"
+                                range-separator="To" start-placeholder="Start date" end-placeholder="End date" />
+                        </el-form-item>
+                        <el-form-item label="网格" prop="carNum">
+                            <el-input v-model="queryParams.carNum" placeholder="请输入车牌号" clearable style="width: 160px"
+                                @keyup.enter="handleQuery" />
+                        </el-form-item>
+                        <el-form-item label="场站" prop="carNum">
+                            <el-input v-model="queryParams.carNum" placeholder="请输入车牌号" clearable style="width: 160px"
+                                @keyup.enter="handleQuery" />
+                        </el-form-item>
+                        <el-form-item label="车辆" prop="carNum">
+                            <el-input v-model="queryParams.carNum" placeholder="请输入车牌号" clearable style="width: 160px"
+                                @keyup.enter="handleQuery" />
+                        </el-form-item>
+                        <el-form-item label="驾驶员" prop="carNum">
+                            <el-input v-model="queryParams.carNum" placeholder="请输入车牌号" clearable style="width: 160px"
+                                @keyup.enter="handleQuery" />
+                        </el-form-item>
+
+                    </el-form>
+                </div>
+                <div style="width: 15%;">
+                    <el-form-item>
+                        <el-button type="primary" @click="goadd">新增</el-button>
+                        <el-button type="primary" @click="resetQuery">查询</el-button>
+                    </el-form-item>
+                </div>
+            </div>
+        </transition>
+        <el-card shadow="never">
+
+            <tableElm :columns="columns" ref="table"></tableElm>
+
+            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+                v-model:limit="queryParams.pageSize" @pagination="getList" />
+        </el-card>
+    </div>
+</template>
+
+<script setup name="CarInfo" lang="ts">
+import { listCarInfo, getCarInfo, delCarInfo, addCarInfo, updateCarInfo } from '@/api/carInfo';
+import { CarInfoVO, CarInfoQuery, CarInfoForm } from '@/api/carInfo/types';
+import tableElm from "@/components/Public/table.vue";
+import { useRoute, useRouter } from "vue-router";
+
+const route = useRoute();
+const router = useRouter();
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const carInfoList = ref<CarInfoVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const value2 = ref('')
+
+const queryFormRef = ref<ElFormInstance>();
+const carInfoFormRef = ref<ElFormInstance>();
+
+
+const dialog = reactive<DialogOption>({
+    visible: false,
+    title: ''
+});
+
+const table = ref(tableElm)
+
+const columns = ref([
+    // {label: '上层位置', prop: 'v', visible: true},
+    { label: '车牌号', prop: 'carNum', visible: true, isTemplate: false },
+    { label: '进出事件', prop: 'workTime', visible: true, isTemplate: false, },
+    { label: '出场事件', prop: 'workName', pprop: "ext1", visible: true, isTemplate: false },
+    { label: '告警内容', prop: 'type', pprop: "ext1", visible: true, isTemplate: false, },
+])
+
+const initFormData: CarInfoForm = {
+    id: undefined,
+    carNum: undefined,
+    carType: undefined,
+    deviceInfos: undefined,
+    repairInfo: undefined,
+    maintenanceInfo: undefined,
+    insuranceInfo: undefined,
+    inspectionInfo: undefined,
+    trafficAccidentInfo: undefined,
+    violationInfo: undefined,
+    changeInfo: undefined,
+    ext1: undefined,
+    ext2: undefined
+}
+const data = reactive<PageData<CarInfoForm, CarInfoQuery>>({
+    form: { ...initFormData },
+    queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        carNum: undefined,
+        carType: undefined,
+        deviceInfos: undefined,
+        repairInfo: undefined,
+        maintenanceInfo: undefined,
+        insuranceInfo: undefined,
+        inspectionInfo: undefined,
+        trafficAccidentInfo: undefined,
+        violationInfo: undefined,
+        changeInfo: undefined,
+        ext1: undefined,
+        ext2: undefined,
+        params: {
+        }
+    },
+    rules: {
+        id: [
+            { required: true, message: "编号不能为空", trigger: "blur" }
+        ],
+        carNum: [
+            { required: true, message: "车牌号不能为空", trigger: "blur" }
+        ],
+        carType: [
+            { required: true, message: "车类型不能为空", trigger: "change" }
+        ],
+        deviceInfos: [
+            { required: true, message: "所有车载设备信息不能为空", trigger: "blur" }
+        ],
+        repairInfo: [
+            { required: true, message: "维修信息不能为空", trigger: "blur" }
+        ],
+        maintenanceInfo: [
+            { required: true, message: "保养信息不能为空", trigger: "blur" }
+        ],
+        insuranceInfo: [
+            { required: true, message: "保险信息不能为空", trigger: "blur" }
+        ],
+        inspectionInfo: [
+            { required: true, message: "年检信息不能为空", trigger: "blur" }
+        ],
+        trafficAccidentInfo: [
+            { required: true, message: "交通事故信息不能为空", trigger: "blur" }
+        ],
+        violationInfo: [
+            { required: true, message: "违章信息不能为空", trigger: "blur" }
+        ],
+        changeInfo: [
+            { required: true, message: "车辆变更信息不能为空", trigger: "blur" }
+        ],
+        ext1: [
+            { required: true, message: "扩展1不能为空", trigger: "blur" }
+        ],
+        ext2: [
+            { required: true, message: "扩展2不能为空", trigger: "blur" }
+        ]
+    }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+const goadd = () => {
+    router.push("/car/work/addWork")
+}
+
+/** 查询车辆信息列表 */
+const getList = async () => {
+    // loading.value = true;
+    // const res = await listCarInfo(queryParams.value);
+    var res = {
+        rows: [
+            {
+                carNum: '苏A69213',
+                workTime: "2024-11-11 12:00:00",
+                workName: "2024-11-11 12:00:00",
+                type: "入场事件过长",
+                wangge: "仙林",
+                gpeople: "陈武",
+                people: "刘晨(13898219932)"
+
+            }
+        ],
+        total: 12
+    }
+    var buttons = [
+        { type: 'primary', text: '查看图片', func: "goAdd" },
+    ]
+    table.value.setDataList(res.rows);
+    table.value.setButton(buttons);
+    table.value.setDataList(res.rows);
+    total.value = res.total;
+    loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+    reset();
+    dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+    form.value = { ...initFormData };
+    carInfoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+    queryParams.value.pageNum = 1;
+    getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+    queryFormRef.value?.resetFields();
+    handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: CarInfoVO[]) => {
+    ids.value = selection.map(item => item.id);
+    single.value = selection.length != 1;
+    multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+    reset();
+    dialog.visible = true;
+    dialog.title = "添加车辆信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: CarInfoVO) => {
+    reset();
+    const _id = row?.id || ids.value[0]
+    const res = await getCarInfo(_id);
+    Object.assign(form.value, res.data);
+    dialog.visible = true;
+    dialog.title = "修改车辆信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+    carInfoFormRef.value?.validate(async (valid: boolean) => {
+        if (valid) {
+            buttonLoading.value = true;
+            if (form.value.id) {
+                await updateCarInfo(form.value).finally(() => buttonLoading.value = false);
+            } else {
+                await addCarInfo(form.value).finally(() => buttonLoading.value = false);
+            }
+            proxy?.$modal.msgSuccess("修改成功");
+            dialog.visible = false;
+            await getList();
+        }
+    });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: CarInfoVO) => {
+    const _ids = row?.id || ids.value;
+    await proxy?.$modal.confirm('是否确认删除车辆信息编号为"' + _ids + '"的数据项?').finally(() => loading.value = false);
+    await delCarInfo(_ids);
+    proxy?.$modal.msgSuccess("删除成功");
+    await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+    proxy?.download('system/carInfo/export', {
+        ...queryParams.value
+    }, `carInfo_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+    getList();
+});
+</script>

+ 607 - 0
src/views/car/people/index.vue

@@ -0,0 +1,607 @@
+<template>
+    <div class="p-2">
+      <el-row :gutter="20">
+        <!-- 部门树 -->
+        <el-col :lg="24" :xs="24">
+          <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+            <div class="mb-[10px]" v-show="showSearch">
+              <el-card shadow="hover">
+                <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="68px">
+                  <el-form-item label="用户名称" prop="userName">
+                    <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px" @keyup.enter="handleQuery" />
+                  </el-form-item>
+                  <el-form-item label="手机号码" prop="phonenumber">
+                    <el-input
+                      v-model="queryParams.phonenumber"
+                      placeholder="请输入手机号码"
+                      clearable
+                      style="width: 240px"
+                      @keyup.enter="handleQuery"
+                    />
+                  </el-form-item>
+  
+                  <el-form-item label="状态" prop="status">
+                    <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
+                      <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item label="创建时间" style="width: 308px;">
+                    <el-date-picker
+                      v-model="dateRange"
+                      value-format="YYYY-MM-DD"
+                      type="daterange"
+                      range-separator="-"
+                      start-placeholder="开始日期"
+                      end-placeholder="结束日期"
+                    ></el-date-picker>
+                  </el-form-item>
+                  <el-form-item>
+                    <el-button type="primary" @click="handleQuery" icon="Search">搜索</el-button>
+                    <el-button @click="resetQuery" icon="Refresh">重置</el-button>
+                  </el-form-item>
+                </el-form>
+              </el-card>
+            </div>
+          </transition>
+  
+          <el-card shadow="hover">
+            <template #header>
+              <el-row :gutter="10">
+                <el-col :span="1.5">
+                  <el-button type="primary" plain @click="handleAdd()" v-has-permi="['system:user:add']" icon="Plus">新增</el-button>
+                </el-col>
+                <el-col :span="1.5">
+                  <el-button type="success" plain @click="handleUpdate()" :disabled="single" v-has-permi="['system:user:add']" icon="Edit">
+                    修改
+                  </el-button>
+                </el-col>
+                <el-col :span="1.5">
+                  <el-button type="danger" plain @click="handleDelete()" :disabled="multiple" v-has-permi="['system:user:delete']" icon="Delete">
+                    删除
+                  </el-button>
+                </el-col>
+                <el-col :span="1.5">
+                  <el-dropdown class="mt-[1px]">
+                    <el-button plain type="info">
+                      更多
+                      <el-icon class="el-icon--right"><arrow-down /></el-icon
+                    ></el-button>
+                    <template #dropdown>
+                      <el-dropdown-menu>
+                        <el-dropdown-item @click="importTemplate" icon="Download">下载模板</el-dropdown-item>
+                        <el-dropdown-item @click="handleImport" icon="Top"> 导入数据</el-dropdown-item>
+                        <el-dropdown-item @click="handleExport" icon="Download"> 导出数据</el-dropdown-item>
+                      </el-dropdown-menu>
+                    </template>
+                  </el-dropdown>
+                </el-col>
+                <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns" :search="true"></right-toolbar>
+              </el-row>
+            </template>
+  
+            <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+              <el-table-column type="selection" width="50" align="center" />
+              <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
+              <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+              <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+              <el-table-column
+                label="部门"
+                align="center"
+                key="deptName"
+                prop="dept.deptName"
+                v-if="columns[3].visible"
+                :show-overflow-tooltip="true"
+              />
+              <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+              <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
+                <template #default="scope">
+                  <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+                </template>
+              </el-table-column>
+  
+              <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+                <template #default="scope">
+                  <span>{{ scope.row.createTime }}</span>
+                </template>
+              </el-table-column>
+  
+              <el-table-column label="操作" fixed="right" width="180" class-name="small-padding fixed-width">
+                <template #default="scope">
+                  <el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">
+                    <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
+                  </el-tooltip>
+                  <el-tooltip content="删除" placement="top" v-if="scope.row.userId !== 1">
+                    <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']"></el-button>
+                  </el-tooltip>
+  
+                  <el-tooltip content="重置密码" placement="top" v-if="scope.row.userId !== 1">
+                    <el-button link type="primary" icon="Key" @click="handleResetPwd(scope.row)" v-hasPermi="['system:user:resetPwd']"></el-button>
+                  </el-tooltip>
+  
+                  <el-tooltip content="分配角色" placement="top" v-if="scope.row.userId !== 1">
+                    <el-button link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
+                  </el-tooltip>
+                </template>
+              </el-table-column>
+            </el-table>
+  
+            <pagination
+              v-show="total > 0"
+              :total="total"
+              v-model:page="queryParams.pageNum"
+              v-model:limit="queryParams.pageSize"
+              @pagination="getList"
+            />
+          </el-card>
+        </el-col>
+      </el-row>
+  
+      <!-- 添加或修改用户配置对话框 -->
+      <el-dialog ref="formDialogRef" :title="dialog.title" v-model="dialog.visible" width="600px" append-to-body @close="closeDialog">
+        <el-form :model="form" :rules="rules" ref="userFormRef" label-width="80px">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="用户昵称" prop="nickName">
+                <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="归属部门" prop="deptId">
+                <el-tree-select
+                  v-model="form.deptId"
+                  :data="deptOptions"
+                  :props="{ value: 'id', label: 'label', children: 'children' }"
+                  value-key="id"
+                  placeholder="请选择归属部门"
+                  check-strictly
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="手机号码" prop="phonenumber">
+                <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="邮箱" prop="email">
+                <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
+                <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
+                <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="用户性别">
+                <el-select v-model="form.sex" placeholder="请选择">
+                  <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态">
+                <el-radio-group v-model="form.status">
+                  <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{
+                    dict.label }}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="岗位">
+                <el-select v-model="form.postIds" multiple placeholder="请选择">
+                  <el-option
+                    v-for="item in postOptions"
+                    :key="item.postId"
+                    :label="item.postName"
+                    :value="item.postId"
+                    :disabled="item.status == '1'"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="角色">
+                <el-select v-model="form.roleIds" multiple placeholder="请选择">
+                  <el-option
+                    v-for="item in roleOptions"
+                    :key="item.roleId"
+                    :label="item.roleName"
+                    :value="item.roleId"
+                    :disabled="item.status == '1'"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="备注">
+                <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <template #footer>
+          <div class="dialog-footer">
+            <el-button type="primary" @click="submitForm">确 定</el-button>
+            <el-button @click="cancel()">取 消</el-button>
+          </div>
+        </template>
+      </el-dialog>
+  
+      <!-- 用户导入对话框 -->
+      <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
+        <el-upload
+          ref="uploadRef"
+          :limit="1"
+          accept=".xlsx, .xls"
+          :headers="upload.headers"
+          :action="upload.url + '?updateSupport=' + upload.updateSupport"
+          :disabled="upload.isUploading"
+          :on-progress="handleFileUploadProgress"
+          :on-success="handleFileSuccess"
+          :auto-upload="false"
+          drag
+        >
+          <el-icon class="el-icon--upload">
+            <i-ep-upload-filled />
+          </el-icon>
+          <div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
+          <template #tip>
+            <div class="text-center el-upload__tip">
+              <div class="el-upload__tip"><el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据</div>
+              <span>仅允许导入xls、xlsx格式文件。</span>
+              <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+            </div>
+          </template>
+        </el-upload>
+        <template #footer>
+          <div class="dialog-footer">
+            <el-button type="primary" @click="submitFileForm">确 定</el-button>
+            <el-button @click="upload.open = false">取 消</el-button>
+          </div>
+        </template>
+      </el-dialog>
+    </div>
+  </template>
+  
+  <script setup name="User" lang="ts">
+  import api from "@/api/system/user"
+  import { UserForm, UserQuery, UserVO } from '@/api/system/user/types';
+  import { treeselect } from "@/api/system/dept";
+  import { DeptVO } from "@/api/system/dept/types";
+  import { RoleVO } from "@/api/system/role/types";
+  import { PostVO } from "@/api/system/post/types";
+  import { to } from "await-to-js";
+  import { globalHeaders } from "@/utils/request";
+  
+  const router = useRouter();
+  const { proxy } = getCurrentInstance() as ComponentInternalInstance
+  const { sys_normal_disable, sys_user_sex } = toRefs<any>(proxy?.useDict('sys_normal_disable', 'sys_user_sex'));
+  
+  const userList = ref<UserVO[]>();
+  const loading = ref(true);
+  const showSearch = ref(true)
+  const ids = ref<Array<number | string>>([]);
+  const single = ref(true);
+  const multiple = ref(true);
+  const total = ref(0);
+  const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
+  const deptName = ref('');
+  const deptOptions = ref<DeptVO[]>([]);
+  const initPassword = ref<String>('');
+  const postOptions = ref<PostVO[]>([]);
+  const roleOptions = ref<RoleVO[]>([]);
+  /*** 用户导入参数 */
+  const upload = reactive<ImportOption>({
+    // 是否显示弹出层(用户导入)
+    open: false,
+    // 弹出层标题(用户导入)
+    title: "",
+    // 是否禁用上传
+    isUploading: false,
+    // 是否更新已经存在的用户数据
+    updateSupport: 0,
+    // 设置上传的请求头部
+    headers: globalHeaders(),
+    // 上传的地址
+    url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData"
+  })
+  // 列显隐信息
+  const columns = ref<FieldOption[]>([
+    { key: 0, label: `用户编号`, visible: false,children: [] },
+    { key: 1, label: `用户名称`, visible: true,children: [] },
+    { key: 2, label: `用户昵称`, visible: true,children: [] },
+    { key: 3, label: `部门`, visible: true,children: [] },
+    { key: 4, label: `手机号码`, visible: true,children: [] },
+    { key: 5, label: `状态`, visible: true,children: [] },
+    { key: 6, label: `创建时间`, visible: true,children: [] }
+  ])
+  
+  
+  const deptTreeRef = ref<ElTreeInstance>();
+  const queryFormRef = ref<ElFormInstance>();
+  const userFormRef = ref<ElFormInstance>();
+  const uploadRef = ref<ElUploadInstance>();
+  const formDialogRef = ref<ElDialogInstance>();
+  
+  const dialog = reactive<DialogOption>({
+    visible: false,
+    title: ''
+  });
+  
+  const initFormData: UserForm = {
+    userId: undefined,
+    deptId: undefined,
+    userName: '',
+    nickName: undefined,
+    password: '',
+    phonenumber: undefined,
+    email: undefined,
+    sex: undefined,
+    status: "0",
+    remark: '',
+    postIds: [],
+    roleIds: []
+  }
+  const data = reactive<PageData<UserForm, UserQuery>>({
+    form: { ...initFormData },
+    queryParams: {
+      pageNum: 1,
+      pageSize: 10,
+      userName: '',
+      phonenumber: '',
+      status: '',
+      deptId: ''
+    },
+    rules: {
+      userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
+      nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
+      password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }],
+      email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
+      phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
+    }
+  })
+  
+  const { queryParams, form, rules } = toRefs<PageData<UserForm, UserQuery>>(data)
+  
+  /** 通过条件过滤节点  */
+  const filterNode = (value: string, data: any) => {
+    if (!value) return true
+    return data.label.indexOf(value) !== -1
+  }
+  /** 根据名称筛选部门树 */
+  watchEffect(
+    () => { deptTreeRef.value?.filter(deptName.value); },
+    {
+      flush: 'post' // watchEffect会在DOM挂载或者更新之前就会触发,此属性控制在DOM元素更新后运行
+    }
+  );
+  
+  /** 查询部门下拉树结构 */
+  const getTreeSelect = async () => {
+    const res = await api.deptTreeSelect();
+    deptOptions.value = res.data;
+  };
+  
+  /** 查询用户列表 */
+  const getList = async () => {
+    loading.value = true;
+    const res = await api.listUser(proxy?.addDateRange(queryParams.value, dateRange.value));
+    console.log(res)
+    loading.value = false;
+    userList.value = res.rows;
+    total.value = res.total;
+  }
+  
+  /** 节点单击事件 */
+  const handleNodeClick = (data: DeptVO) => {
+    queryParams.value.deptId = data.id;
+    handleQuery()
+  }
+  
+  
+  /** 搜索按钮操作 */
+  const handleQuery = () => {
+    queryParams.value.pageNum = 1
+    getList()
+  }
+  /** 重置按钮操作 */
+  const resetQuery = () => {
+    dateRange.value = ['', '']
+    queryFormRef.value?.resetFields();
+    queryParams.value.pageNum = 1;
+    queryParams.value.deptId = undefined;
+    deptTreeRef.value?.setCurrentKey(undefined);
+    handleQuery();
+  }
+  
+  /** 删除按钮操作 */
+  const handleDelete = async (row?: UserVO) => {
+    const userIds = row?.userId || ids.value;
+    const [err] = await to(proxy?.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项?') as any);
+    if (!err) {
+      await api.delUser(userIds);
+      await getList();
+      proxy?.$modal.msgSuccess("删除成功");
+    }
+  }
+  
+  /** 用户状态修改  */
+  const handleStatusChange = async (row: UserVO) => {
+    let text = row.status === "0" ? "启用" : "停用"
+    try {
+      await proxy?.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗?');
+      await api.changeUserStatus(row.userId, row.status);
+      proxy?.$modal.msgSuccess(text + "成功");
+    } catch (err) {
+      row.status = row.status === "0" ? "1" : "0";
+    }
+  }
+  /** 跳转角色分配 */
+  const handleAuthRole = (row: UserVO) => {
+    const userId = row.userId;
+    router.push("/system/user-auth/role/" + userId);
+  }
+  
+  /** 重置密码按钮操作 */
+  const handleResetPwd = async (row: UserVO) => {
+    const [err, res] = await to(ElMessageBox.prompt('请输入"' + row.userName + '"的新密码', "提示", {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+      closeOnClickModal: false,
+      inputPattern: /^.{5,20}$/,
+      inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
+    }))
+    if (!err) {
+      await api.resetUserPwd(row.userId, res.value);
+      proxy?.$modal.msgSuccess("修改成功,新密码是:" + res.value);
+    }
+  }
+  
+  /** 选择条数  */
+  const handleSelectionChange = (selection: UserVO[]) => {
+    ids.value = selection.map((item) => item.userId);
+    single.value = selection.length != 1;
+    multiple.value = !selection.length;
+  }
+  
+  /** 导入按钮操作 */
+  const handleImport = () => {
+    upload.title = "用户导入";
+    upload.open = true;
+  }
+  /** 导出按钮操作 */
+  const handleExport = () => {
+    proxy?.download("system/user/export", {
+      ...queryParams.value,
+    }, `user_${new Date().getTime()}.xlsx`);
+  };
+  /** 下载模板操作 */
+  const importTemplate = () => {
+    proxy?.download("system/user/importTemplate", {
+    }, `user_template_${new Date().getTime()}.xlsx`);
+  }
+  
+  /**文件上传中处理 */
+  const handleFileUploadProgress = () => {
+    upload.isUploading = true;
+  }
+  /** 文件上传成功处理 */
+  const handleFileSuccess = (response: any, file: UploadFile) => {
+    upload.open = false;
+    upload.isUploading = false;
+    uploadRef.value?.handleRemove(file);
+    ElMessageBox.alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+    getList();
+  }
+  
+  /** 提交上传文件 */
+  function submitFileForm() {
+    uploadRef.value?.submit();
+  }
+  
+  /** 初始化部门数据 */
+  const initTreeData = async () => {
+    // 判断部门的数据是否存在,存在不获取,不存在则获取
+    if (deptOptions.value === undefined) {
+      const { data } = await treeselect();
+      deptOptions.value = data;
+    }
+  }
+  
+  
+  /** 重置操作表单 */
+  const reset = () => {
+    form.value = { ...initFormData };
+    userFormRef.value?.resetFields();
+  }
+  /** 取消按钮 */
+  const cancel = () => {
+    dialog.visible = false;
+    reset();
+  }
+  
+  /** 新增按钮操作 */
+  const handleAdd = async () => {
+    reset();
+    const { data } = await api.getUser();
+    dialog.visible = true;
+    dialog.title = "新增用户";
+    await initTreeData();
+    postOptions.value = data.posts;
+    roleOptions.value = data.roles;
+    form.value.password = initPassword.value.toString();
+  }
+  /** 修改按钮操作 */
+  const handleUpdate = async (row?: UserForm) => {
+    reset();
+    const userId = row?.userId || ids.value[0]
+    const { data } = await api.getUser(userId)
+    dialog.visible = true;
+    dialog.title = "修改用户";
+    await initTreeData();
+    Object.assign(form.value, data.user);
+    postOptions.value = data.posts;
+    roleOptions.value = data.roles;
+    form.value.postIds = data.postIds;
+    form.value.roleIds = data.roleIds;
+    form.value.password = "";
+  }
+  
+  /** 提交按钮 */
+  const submitForm = () => {
+    userFormRef.value?.validate(async (valid: boolean) => {
+      if (valid) {
+        form.value.userId ? await api.updateUser(form.value) : await api.addUser(form.value);
+        proxy?.$modal.msgSuccess("操作成功");
+        dialog.visible = false;
+        await getList();
+      }
+    })
+  }
+  
+  
+  /**
+   * 关闭用户弹窗
+   */
+  const closeDialog = () => {
+    dialog.visible = false;
+    resetForm();
+  }
+  
+  /**
+   * 重置表单
+   */
+  const resetForm = () => {
+    userFormRef.value?.resetFields();
+    userFormRef.value?.clearValidate();
+  
+    form.value.id = undefined;
+    form.value.status = '1';
+  }
+  onMounted(() => {
+    getTreeSelect() // 初始化部门数据
+    getList() // 初始化列表数据
+    proxy?.getConfigKey("sys.user.initPassword").then(response => {
+      initPassword.value = response.data;
+    });
+  });
+  </script>
+  
+  <style lang="scss" scoped></style>
+  

+ 276 - 0
src/views/car/safe/index.vue

@@ -0,0 +1,276 @@
+<template>
+    <div class="p-2">
+        <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+            :leave-active-class="proxy?.animate.searchAnimate.leave">
+            <div class="search" v-show="showSearch" style="display: flex;flex-direction: row;">
+                <div style="width: 85%;">
+                    <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+                        <el-form-item label="驾驶员" prop="carNum">
+                            <el-input v-model="queryParams.carNum" placeholder="请输入车牌号" clearable style="width: 160px"
+                                @keyup.enter="handleQuery" />
+                        </el-form-item>
+                        <!-- <el-form-item label="身份证" prop="carNum">
+                            <el-input v-model="queryParams.carNum" placeholder="请输入车牌号" clearable style="width: 160px"
+                                @keyup.enter="handleQuery" />
+                        </el-form-item> -->
+                        <!-- <el-form-item label="时间" prop="carNum">
+                            <el-date-picker v-model="value2" type="datetimerange" :shortcuts="shortcuts"
+                                range-separator="To" start-placeholder="Start date" end-placeholder="End date" />
+                        </el-form-item> -->
+                    </el-form>
+                </div>
+                <div style="width: 15%;">
+                    <el-form-item>
+                        <el-button type="primary" @click="goadd">新增</el-button>
+                        <el-button type="primary" @click="resetQuery">查询</el-button>
+                    </el-form-item>
+                </div>
+            </div>
+        </transition>
+        <el-card shadow="never">
+
+            <tableElm :columns="columns" ref="table"></tableElm>
+
+            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+                v-model:limit="queryParams.pageSize" @pagination="getList" />
+        </el-card>
+    </div>
+</template>
+
+<script setup name="CarInfo" lang="ts">
+import { listCarInfo, getCarInfo, delCarInfo, addCarInfo, updateCarInfo } from '@/api/carInfo';
+import { CarInfoVO, CarInfoQuery, CarInfoForm } from '@/api/carInfo/types';
+import tableElm from "@/components/Public/table.vue";
+import { useRoute, useRouter } from "vue-router";
+
+const route = useRoute();
+const router = useRouter();
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const carInfoList = ref<CarInfoVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const value2 = ref('')
+
+const queryFormRef = ref<ElFormInstance>();
+const carInfoFormRef = ref<ElFormInstance>();
+
+
+const dialog = reactive<DialogOption>({
+    visible: false,
+    title: ''
+});
+
+const table = ref(tableElm)
+
+const columns = ref([
+    // {label: '上层位置', prop: 'v', visible: true},
+    { label: '姓名', prop: 'carNum', visible: true, isTemplate: false },
+    { label: '身份证', prop: 'workTime', visible: true, isTemplate: false, },
+    { label: '手机号', prop: 'workName', pprop: "ext1", visible: true, isTemplate: false },
+    { label: '设备号', prop: 'type', pprop: "ext1", visible: true, isTemplate: false,},
+    { label: '车辆', prop: 'wangge', pprop: "ext1", visible: true, isTemplate: false, },
+    { label: '工作小组', prop: 'gpeople', pprop: "ext1", visible: true, isTemplate: false,  },
+    { label: '类型', prop: 'people', pprop: "ext1", visible: true, isTemplate: false, },
+])
+
+const initFormData: CarInfoForm = {
+    id: undefined,
+    carNum: undefined,
+    carType: undefined,
+    deviceInfos: undefined,
+    repairInfo: undefined,
+    maintenanceInfo: undefined,
+    insuranceInfo: undefined,
+    inspectionInfo: undefined,
+    trafficAccidentInfo: undefined,
+    violationInfo: undefined,
+    changeInfo: undefined,
+    ext1: undefined,
+    ext2: undefined
+}
+const data = reactive<PageData<CarInfoForm, CarInfoQuery>>({
+    form: { ...initFormData },
+    queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        carNum: undefined,
+        carType: undefined,
+        deviceInfos: undefined,
+        repairInfo: undefined,
+        maintenanceInfo: undefined,
+        insuranceInfo: undefined,
+        inspectionInfo: undefined,
+        trafficAccidentInfo: undefined,
+        violationInfo: undefined,
+        changeInfo: undefined,
+        ext1: undefined,
+        ext2: undefined,
+        params: {
+        }
+    },
+    rules: {
+        id: [
+            { required: true, message: "编号不能为空", trigger: "blur" }
+        ],
+        carNum: [
+            { required: true, message: "车牌号不能为空", trigger: "blur" }
+        ],
+        carType: [
+            { required: true, message: "车类型不能为空", trigger: "change" }
+        ],
+        deviceInfos: [
+            { required: true, message: "所有车载设备信息不能为空", trigger: "blur" }
+        ],
+        repairInfo: [
+            { required: true, message: "维修信息不能为空", trigger: "blur" }
+        ],
+        maintenanceInfo: [
+            { required: true, message: "保养信息不能为空", trigger: "blur" }
+        ],
+        insuranceInfo: [
+            { required: true, message: "保险信息不能为空", trigger: "blur" }
+        ],
+        inspectionInfo: [
+            { required: true, message: "年检信息不能为空", trigger: "blur" }
+        ],
+        trafficAccidentInfo: [
+            { required: true, message: "交通事故信息不能为空", trigger: "blur" }
+        ],
+        violationInfo: [
+            { required: true, message: "违章信息不能为空", trigger: "blur" }
+        ],
+        changeInfo: [
+            { required: true, message: "车辆变更信息不能为空", trigger: "blur" }
+        ],
+        ext1: [
+            { required: true, message: "扩展1不能为空", trigger: "blur" }
+        ],
+        ext2: [
+            { required: true, message: "扩展2不能为空", trigger: "blur" }
+        ]
+    }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+const goadd = () => {
+    router.push("/car/work/addWork")
+}
+
+/** 查询车辆信息列表 */
+const getList = async () => {
+    // loading.value = true;
+    // const res = await listCarInfo(queryParams.value);
+    var res = {
+          rows:[
+            {
+                carNum:'张林',
+                workTime:"320902198711957841",
+                workName:"13898219932",
+                type:"xxxxx",
+                wangge:"苏A51972",
+                gpeople:"仙林",
+                people:"司机"
+
+            }
+          ],
+          total:12
+    }
+    table.value.setDataList(res.rows);
+    total.value = res.total;
+    loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+    reset();
+    dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+    form.value = { ...initFormData };
+    carInfoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+    queryParams.value.pageNum = 1;
+    getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+    queryFormRef.value?.resetFields();
+    handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: CarInfoVO[]) => {
+    ids.value = selection.map(item => item.id);
+    single.value = selection.length != 1;
+    multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+    reset();
+    dialog.visible = true;
+    dialog.title = "添加车辆信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: CarInfoVO) => {
+    reset();
+    const _id = row?.id || ids.value[0]
+    const res = await getCarInfo(_id);
+    Object.assign(form.value, res.data);
+    dialog.visible = true;
+    dialog.title = "修改车辆信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+    carInfoFormRef.value?.validate(async (valid: boolean) => {
+        if (valid) {
+            buttonLoading.value = true;
+            if (form.value.id) {
+                await updateCarInfo(form.value).finally(() => buttonLoading.value = false);
+            } else {
+                await addCarInfo(form.value).finally(() => buttonLoading.value = false);
+            }
+            proxy?.$modal.msgSuccess("修改成功");
+            dialog.visible = false;
+            await getList();
+        }
+    });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: CarInfoVO) => {
+    const _ids = row?.id || ids.value;
+    await proxy?.$modal.confirm('是否确认删除车辆信息编号为"' + _ids + '"的数据项?').finally(() => loading.value = false);
+    await delCarInfo(_ids);
+    proxy?.$modal.msgSuccess("删除成功");
+    await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+    proxy?.download('system/carInfo/export', {
+        ...queryParams.value
+    }, `carInfo_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+    getList();
+});
+</script>
+    

+ 262 - 0
src/views/car/vehicleService/index.vue

@@ -0,0 +1,262 @@
+<template>
+    <div style="display: flex;flex-direction: row;" class="custom-calendar">
+        <el-card shadow="never" style="width: 60%;">
+            <tableElm :columns="columns" :showButton="false" ref="table"></tableElm>
+
+            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+                v-model:limit="queryParams.pageSize" @pagination="getList" />
+        </el-card>
+        <el-card shadow="never" style="width: 38%;margin-left: 1%;">
+            <div>
+                <el-tabs type="card" class="demo-tabs" active-name="3">
+                    <el-tab-pane label="行驶" name="1">
+                        <!-- <carWork></carWork> -->
+                    </el-tab-pane>
+                    <el-tab-pane label="加油" name="2">
+                        <!-- <schedule></schedule> -->
+                    </el-tab-pane>
+                    <el-tab-pane label="油耗" name="3">
+                        <oilUse></oilUse>
+                    </el-tab-pane>
+                    <el-tab-pane label="维修" name="4">
+                        <!-- <peopleLeave></peopleLeave> -->
+                    </el-tab-pane>
+                    <el-tab-pane label="其它信息" name="5">
+                        <!-- <peopleLeave></peopleLeave> -->
+                    </el-tab-pane>
+                </el-tabs>
+            </div>
+        </el-card>
+    </div>
+</template>
+
+<script setup name="CarInfo" lang="ts">
+import { listCarInfo, getCarInfo, delCarInfo, addCarInfo, updateCarInfo } from '@/api/carInfo';
+import { CarInfoVO, CarInfoQuery, CarInfoForm } from '@/api/carInfo/types';
+import tableElm from "@/components/Public/table.vue";
+import { useRoute, useRouter } from "vue-router";
+
+import oilUse from './oilUse.vue';
+
+const route = useRoute();
+const router = useRouter();
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const carInfoList = ref<CarInfoVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const value2 = ref('')
+
+const queryFormRef = ref<ElFormInstance>();
+const carInfoFormRef = ref<ElFormInstance>();
+
+
+const dialog = reactive<DialogOption>({
+    visible: false,
+    title: ''
+});
+
+const table = ref(tableElm)
+
+const times = ref([""])
+
+const columns = ref([
+    // {label: '上层位置', prop: 'v', visible: true},
+    { label: '车牌号', prop: 'carNum', visible: true, isTemplate: false },
+    { label: '类型', prop: 'ext1', visible: true, isTemplate: false, isTemplateTag: true },
+    { label: '里程', prop: 'dept', pprop: "ext1", visible: true, isTemplate: false, },
+    { label: '状态', prop: 'people', pprop: "ext1", visible: true, isTemplate: false, },
+])
+
+
+const initFormData: CarInfoForm = {
+    id: undefined,
+    carNum: undefined,
+    carType: undefined,
+    deviceInfos: undefined,
+    repairInfo: undefined,
+    maintenanceInfo: undefined,
+    insuranceInfo: undefined,
+    inspectionInfo: undefined,
+    trafficAccidentInfo: undefined,
+    violationInfo: undefined,
+    changeInfo: undefined,
+    ext1: undefined,
+    ext2: undefined
+}
+const data = reactive<PageData<CarInfoForm, CarInfoQuery>>({
+    form: { ...initFormData },
+    queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        carNum: undefined,
+        carType: undefined,
+        deviceInfos: undefined,
+        repairInfo: undefined,
+        maintenanceInfo: undefined,
+        insuranceInfo: undefined,
+        inspectionInfo: undefined,
+        trafficAccidentInfo: undefined,
+        violationInfo: undefined,
+        changeInfo: undefined,
+        ext1: undefined,
+        ext2: undefined,
+        params: {
+        }
+    },
+    rules: {
+        id: [
+            { required: true, message: "编号不能为空", trigger: "blur" }
+        ],
+        carNum: [
+            { required: true, message: "车牌号不能为空", trigger: "blur" }
+        ],
+        carType: [
+            { required: true, message: "车类型不能为空", trigger: "change" }
+        ],
+        deviceInfos: [
+            { required: true, message: "所有车载设备信息不能为空", trigger: "blur" }
+        ],
+        repairInfo: [
+            { required: true, message: "维修信息不能为空", trigger: "blur" }
+        ],
+        maintenanceInfo: [
+            { required: true, message: "保养信息不能为空", trigger: "blur" }
+        ],
+        insuranceInfo: [
+            { required: true, message: "保险信息不能为空", trigger: "blur" }
+        ],
+        inspectionInfo: [
+            { required: true, message: "年检信息不能为空", trigger: "blur" }
+        ],
+        trafficAccidentInfo: [
+            { required: true, message: "交通事故信息不能为空", trigger: "blur" }
+        ],
+        violationInfo: [
+            { required: true, message: "违章信息不能为空", trigger: "blur" }
+        ],
+        changeInfo: [
+            { required: true, message: "车辆变更信息不能为空", trigger: "blur" }
+        ],
+        ext1: [
+            { required: true, message: "扩展1不能为空", trigger: "blur" }
+        ],
+        ext2: [
+            { required: true, message: "扩展2不能为空", trigger: "blur" }
+        ]
+    }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+const goadd = () => {
+    router.push("/car/work/addWork")
+}
+
+/** 查询车辆信息列表 */
+const getList = async () => {
+    loading.value = true;
+    const res = await listCarInfo(queryParams.value);
+    table.value.setDataList(res.rows);
+    total.value = res.total;
+    loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+    reset();
+    dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+    form.value = { ...initFormData };
+    carInfoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+    queryParams.value.pageNum = 1;
+    getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+    queryFormRef.value?.resetFields();
+    handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: CarInfoVO[]) => {
+    ids.value = selection.map(item => item.id);
+    single.value = selection.length != 1;
+    multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+    reset();
+    dialog.visible = true;
+    dialog.title = "添加车辆信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: CarInfoVO) => {
+    reset();
+    const _id = row?.id || ids.value[0]
+    const res = await getCarInfo(_id);
+    Object.assign(form.value, res.data);
+    dialog.visible = true;
+    dialog.title = "修改车辆信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+    carInfoFormRef.value?.validate(async (valid: boolean) => {
+        if (valid) {
+            buttonLoading.value = true;
+            if (form.value.id) {
+                await updateCarInfo(form.value).finally(() => buttonLoading.value = false);
+            } else {
+                await addCarInfo(form.value).finally(() => buttonLoading.value = false);
+            }
+            proxy?.$modal.msgSuccess("修改成功");
+            dialog.visible = false;
+            await getList();
+        }
+    });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: CarInfoVO) => {
+    const _ids = row?.id || ids.value;
+    await proxy?.$modal.confirm('是否确认删除车辆信息编号为"' + _ids + '"的数据项?').finally(() => loading.value = false);
+    await delCarInfo(_ids);
+    proxy?.$modal.msgSuccess("删除成功");
+    await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+    proxy?.download('system/carInfo/export', {
+        ...queryParams.value
+    }, `carInfo_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+    getList();
+});
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-calendar-table .el-calendar-day {
+    height: 40px;
+
+}
+</style>

+ 56 - 0
src/views/car/vehicleService/oilUse.vue

@@ -0,0 +1,56 @@
+<template>
+    <div class="p-2">
+        <div style="display: flex;flex-direction: row;justify-content: space-between;">
+            <div style="display: flex;flex-direction: row;">
+                <div>苏A69213</div>
+                <dict-tag style="margin-left: 5px;" :options="energy_type" :value="1" />
+                <dict-tag style="margin-left: 5px;" :options="business_type" :value="1" />
+            </div>
+            <el-button type="primary">新增</el-button>
+        </div>
+        <div style="margin-top: 1vh;">
+            <el-card body-style="background: rgba(0, 0, 0, 0.05);">
+                <el-row style="font-size: 12px;">
+                    <el-col :span="12">
+                       时间:2024-01-23 10:00:00
+                    </el-col>
+                    <el-col :span="12">
+                       维修类型:常规保养
+                    </el-col>
+                    <el-col :span="12">
+                        维修金额:589.00元
+                    </el-col>
+                    <el-col :span="12">
+                        里程:1000km
+                    </el-col>
+                    <el-col :span="24">
+                        维修地址:江苏省某某4s店xxxxxxxxxxxxxx
+                    </el-col>
+                    <el-col :span="24">
+                        维修项目:跟换发动机油
+                    </el-col>
+                </el-row>
+            </el-card>
+        </div>
+    </div>
+</template>
+
+<script setup name="CarInfo" lang="ts">
+import { listCarInfo, getCarInfo, delCarInfo, addCarInfo, updateCarInfo } from '@/api/carInfo';
+import { CarInfoVO, CarInfoQuery, CarInfoForm } from '@/api/carInfo/types';
+import tableElm from "@/components/Public/table.vue";
+import { useRoute, useRouter } from "vue-router";
+
+const route = useRoute();
+const router = useRouter();
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const { energy_type, business_type } = toRefs<any>(proxy?.useDict("energy_type", "business_type"));
+
+
+
+onMounted(() => {
+
+});
+</script>

+ 277 - 0
src/views/car/warring/index.vue

@@ -0,0 +1,277 @@
+<template>
+    <div class="p-2">
+        <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+            :leave-active-class="proxy?.animate.searchAnimate.leave">
+            <div class="search" v-show="showSearch" style="display: flex;flex-direction: row;">
+                <div style="width: 85%;">
+                    <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+                        <!-- <el-form-item label="姓名" prop="carNum">
+                            <el-input v-model="queryParams.carNum" placeholder="请输入车牌号" clearable style="width: 160px"
+                                @keyup.enter="handleQuery" />
+                        </el-form-item>
+                        <el-form-item label="身份证" prop="carNum">
+                            <el-input v-model="queryParams.carNum" placeholder="请输入车牌号" clearable style="width: 160px"
+                                @keyup.enter="handleQuery" />
+                        </el-form-item> -->
+                        <el-form-item label="时间" prop="carNum">
+                            <el-date-picker v-model="value2" type="datetimerange" :shortcuts="shortcuts"
+                                range-separator="至" start-placeholder="Start date" end-placeholder="End date" />
+                        </el-form-item>
+                    </el-form>
+                </div>
+                <div style="width: 15%;">
+                    <el-form-item>
+                        <el-button type="primary" @click="goadd">新增</el-button>
+                        <el-button type="primary" @click="resetQuery">查询</el-button>
+                    </el-form-item>
+                </div>
+            </div>
+        </transition>
+        <el-card shadow="never">
+
+            <tableElm :columns="columns" ref="table"></tableElm>
+
+            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+                v-model:limit="queryParams.pageSize" @pagination="getList" />
+        </el-card>
+    </div>
+</template>
+
+<script setup name="CarInfo" lang="ts">
+import { listCarInfo, getCarInfo, delCarInfo, addCarInfo, updateCarInfo } from '@/api/carInfo';
+import { CarInfoVO, CarInfoQuery, CarInfoForm } from '@/api/carInfo/types';
+import tableElm from "@/components/Public/table.vue";
+import { useRoute, useRouter } from "vue-router";
+
+const route = useRoute();
+const router = useRouter();
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const carInfoList = ref<CarInfoVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const value2 = ref('')
+
+const queryFormRef = ref<ElFormInstance>();
+const carInfoFormRef = ref<ElFormInstance>();
+
+
+const dialog = reactive<DialogOption>({
+    visible: false,
+    title: ''
+});
+
+const table = ref(tableElm)
+
+const columns = ref([
+    // {label: '上层位置', prop: 'v', visible: true},
+    { label: '来源', prop: 'carNum', visible: true, isTemplate: false },
+    { label: '时间', prop: 'workTime', visible: true, isTemplate: false, },
+    { label: '内容', prop: 'workName', pprop: "ext1", visible: true, isTemplate: false },
+])
+
+const initFormData: CarInfoForm = {
+    id: undefined,
+    carNum: undefined,
+    carType: undefined,
+    deviceInfos: undefined,
+    repairInfo: undefined,
+    maintenanceInfo: undefined,
+    insuranceInfo: undefined,
+    inspectionInfo: undefined,
+    trafficAccidentInfo: undefined,
+    violationInfo: undefined,
+    changeInfo: undefined,
+    ext1: undefined,
+    ext2: undefined
+}
+const data = reactive<PageData<CarInfoForm, CarInfoQuery>>({
+    form: { ...initFormData },
+    queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        carNum: undefined,
+        carType: undefined,
+        deviceInfos: undefined,
+        repairInfo: undefined,
+        maintenanceInfo: undefined,
+        insuranceInfo: undefined,
+        inspectionInfo: undefined,
+        trafficAccidentInfo: undefined,
+        violationInfo: undefined,
+        changeInfo: undefined,
+        ext1: undefined,
+        ext2: undefined,
+        params: {
+        }
+    },
+    rules: {
+        id: [
+            { required: true, message: "编号不能为空", trigger: "blur" }
+        ],
+        carNum: [
+            { required: true, message: "车牌号不能为空", trigger: "blur" }
+        ],
+        carType: [
+            { required: true, message: "车类型不能为空", trigger: "change" }
+        ],
+        deviceInfos: [
+            { required: true, message: "所有车载设备信息不能为空", trigger: "blur" }
+        ],
+        repairInfo: [
+            { required: true, message: "维修信息不能为空", trigger: "blur" }
+        ],
+        maintenanceInfo: [
+            { required: true, message: "保养信息不能为空", trigger: "blur" }
+        ],
+        insuranceInfo: [
+            { required: true, message: "保险信息不能为空", trigger: "blur" }
+        ],
+        inspectionInfo: [
+            { required: true, message: "年检信息不能为空", trigger: "blur" }
+        ],
+        trafficAccidentInfo: [
+            { required: true, message: "交通事故信息不能为空", trigger: "blur" }
+        ],
+        violationInfo: [
+            { required: true, message: "违章信息不能为空", trigger: "blur" }
+        ],
+        changeInfo: [
+            { required: true, message: "车辆变更信息不能为空", trigger: "blur" }
+        ],
+        ext1: [
+            { required: true, message: "扩展1不能为空", trigger: "blur" }
+        ],
+        ext2: [
+            { required: true, message: "扩展2不能为空", trigger: "blur" }
+        ]
+    }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+const goadd = () => {
+    router.push("/car/work/addWork")
+}
+
+/** 查询车辆信息列表 */
+const getList = async () => {
+    // loading.value = true;
+    // const res = await listCarInfo(queryParams.value);
+    var res = {
+          rows:[
+            {
+                carNum:'张林',
+                workTime:"320902198711957841",
+                workName:"13898219932",
+                type:"xxxxx",
+                wangge:"苏A51972",
+                gpeople:"仙林",
+                people:"司机"
+
+            }
+          ],
+          total:12
+    }
+    var buttons = [
+        { type: 'primary', text: '核销', func: "goAdd" },
+        { type: 'primary', text: '删除', func: "goAdd" },
+    ]
+    table.value.setDataList(res.rows);
+    table.value.setButton(buttons);
+    total.value = res.total;
+    loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+    reset();
+    dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+    form.value = { ...initFormData };
+    carInfoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+    queryParams.value.pageNum = 1;
+    getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+    queryFormRef.value?.resetFields();
+    handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: CarInfoVO[]) => {
+    ids.value = selection.map(item => item.id);
+    single.value = selection.length != 1;
+    multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+    reset();
+    dialog.visible = true;
+    dialog.title = "添加车辆信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: CarInfoVO) => {
+    reset();
+    const _id = row?.id || ids.value[0]
+    const res = await getCarInfo(_id);
+    Object.assign(form.value, res.data);
+    dialog.visible = true;
+    dialog.title = "修改车辆信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+    carInfoFormRef.value?.validate(async (valid: boolean) => {
+        if (valid) {
+            buttonLoading.value = true;
+            if (form.value.id) {
+                await updateCarInfo(form.value).finally(() => buttonLoading.value = false);
+            } else {
+                await addCarInfo(form.value).finally(() => buttonLoading.value = false);
+            }
+            proxy?.$modal.msgSuccess("修改成功");
+            dialog.visible = false;
+            await getList();
+        }
+    });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: CarInfoVO) => {
+    const _ids = row?.id || ids.value;
+    await proxy?.$modal.confirm('是否确认删除车辆信息编号为"' + _ids + '"的数据项?').finally(() => loading.value = false);
+    await delCarInfo(_ids);
+    proxy?.$modal.msgSuccess("删除成功");
+    await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+    proxy?.download('system/carInfo/export', {
+        ...queryParams.value
+    }, `carInfo_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+    getList();
+});
+</script>
+    

+ 414 - 0
src/views/car/work/addCarWork.vue

@@ -0,0 +1,414 @@
+<template>
+    <div style="padding: 10px 15px">
+        <el-card class="box-card">
+            <template #header>
+                <div class="card-header">
+                    <div style="display: flex;flex-direction: row;">
+                        <div style="width: 8px;height: 19px;opacity: 1;background: #409EFF"></div>
+                        <span
+                            style="font-family: PingFang SC;font-size: 14px;font-weight: normal;line-height: 19px;height: 19px;margin-left: 8px;">路线作业</span>
+                    </div>
+                    <div>
+                        <el-button type="warning" @click="">取消</el-button>
+                        <el-button type="primary" @click="submit()">保存</el-button>
+                    </div>
+                </div>
+
+            </template>
+            <el-row>
+                <el-col :span="24">
+                    <el-descriptions :column="3">
+                        <el-descriptions-item>
+
+                            <template #label>
+                                <div style="display: inline-block;min-width: 60px;text-align: right">
+                                    <span style="color: red">*</span> 作业名称
+                                </div>
+                            </template>
+                            <div class="content-w">
+                                <el-input v-model="initFormData.carNum" placeholder="请输入作业名称" />
+                            </div>
+                        </el-descriptions-item>
+                        <el-descriptions-item>
+
+                            <template #label>
+                                <div style="display: inline-block;min-width: 60px;text-align: right">
+                                    <span style="color: red">*</span> 作业类型
+                                </div>
+                            </template>
+                            <div class="content-w">
+                                <el-select v-model="value" class="m-2" placeholder="Select" style="width: 240px">
+                                    <el-option v-for="item in options" :key="item.value" :label="item.label"
+                                        :value="item.value" />
+                                </el-select>
+                            </div>
+                        </el-descriptions-item>
+                        <el-descriptions-item>
+
+                            <template #label>
+                                <div style="display: inline-block;min-width: 60px;text-align: right">
+                                    <span style="color: red">*</span> 所属网格
+                                </div>
+                            </template>
+                            <div class="content-w">
+                                <el-select v-model="value" class="m-2" placeholder="Select" style="width: 240px">
+                                    <el-option v-for="item in options" :key="item.value" :label="item.label"
+                                        :value="item.value" />
+                                </el-select>
+                            </div>
+                        </el-descriptions-item>
+
+                    </el-descriptions>
+                    <el-descriptions :column="4" style="width: 100%;">
+                        <el-descriptions-item>
+
+                            <template #label>
+                                <div style="display: inline-block;min-width: 60px;text-align: right">
+                                    <span style="color: red">*</span> 关联车辆
+                                </div>
+                            </template>
+                            <div class="content-w">
+                                <el-select v-model="carObj" value-key="id" class="m-2" placeholder="Select" style="width: 240px">
+                                    <el-option v-for="item in carInfoList" :key="item.id" :label="item.carNum"
+                                        :value="item" />
+                                </el-select>
+                            </div>
+                        </el-descriptions-item>
+                        <el-descriptions-item>
+
+                            <template #label>
+                                <div style="display: inline-block;min-width: 60px;text-align: right">
+                                    <span style="color: red">*</span> 司机
+                                </div>
+                            </template>
+                            <div class="content-w">
+                                <el-select v-model="driver" value-key="id" class="m-2" placeholder="Select" style="width: 240px">
+                                    <el-option v-for="item in sjList" :key="item.id" :label="item.nickName"
+                                        :value="item" />
+                                </el-select>
+                            </div>
+                        </el-descriptions-item>
+                        <el-descriptions-item>
+
+                            <template #label>
+                                <div style="display: inline-block;min-width: 60px;text-align: right">
+                                    <span style="color: red">*</span> 跟车人员
+                                </div>
+                            </template>
+                            <div class="content-w">
+                                <el-select v-model="ck" value-key="id" class="m-2" placeholder="Select" style="width: 240px">
+                                    <el-option v-for="item in ckList" :key="item.id" :label="item.nickName"
+                                        :value="item" />
+                                </el-select>
+                            </div>
+                        </el-descriptions-item>
+                    </el-descriptions>
+                    <!-- <tableElm :columns="columns" ref="table"></tableElm> -->
+                </el-col>
+            </el-row>
+        </el-card>
+        <el-card class="box-card">
+
+            <template #header>
+                <div class="card-header">
+                    <div style="display: flex;flex-direction: row;">
+                        <div style="width: 8px;height: 19px;opacity: 1;background: #409EFF"></div>
+                        <span
+                            style="font-family: PingFang SC;font-size: 14px;font-weight: normal;line-height: 19px;height: 19px;margin-left: 8px;">路线站点</span>
+                    </div>
+                </div>
+            </template>
+            <div style="display: flex;flex-direction: row;width: 100%;">
+                <div style="width:25%">
+                    <el-timeline>
+                        <el-timeline-item v-for="(activity, index) in activities" :key="index" :icon="activity.icon"
+                            :type="activity.type" :color="activity.color" :size="activity.size"
+                            :hollow="activity.hollow">
+                            <!-- {{ activity.content }} -->
+                            <div style="display: flex;flex-direction: column;" v-show="!activity.isadd">
+                                <div>{{ activity.content }}</div>
+                                <div v-if="activity.data != null">{{ activity.data.dictLabel }}</div>
+                                <div v-if="activity.timeObj != null">{{ activity.timeObj.startTime }}-{{
+                            activity.timeObj.endTime }}</div>
+                                <div>
+                                    <el-button style="width: 80px;" @click="selectSite(index)">选择地点</el-button>
+                                    <el-button style="width: 80px;" @click="selectTime(index)">选择时间</el-button>
+                                </div>
+                            </div>
+                            <div v-show="activity.isadd">
+                                <el-button type="primary" style="width: 80px;" @click="addSite()">新增站点</el-button>
+                            </div>
+                        </el-timeline-item>
+                    </el-timeline>
+                </div>
+                <div style="width: 75%;">
+                    <!-- <mapDiv></mapDiv> -->
+                    <!-- <img style="width:90%" src="@/assets/images/map.png"/> -->
+                    <mapDiv style="width:90%;height: 100%;" @childToParent='childrenClick'></mapDiv>
+                </div>
+            </div>
+        </el-card>
+
+        <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+            <el-form ref="carInfoFormRef" :model="dateObj" :rules="rules" label-width="80px">
+                <el-form-item label="进站时间">
+                    <el-time-select v-model="dateObj.startTime" style="width: 240px" start="00:00" step="00:15"
+                        end="23:59" placeholder="进站时间" />
+                </el-form-item>
+                <el-form-item label="出站时间">
+                    <el-time-select v-model="dateObj.endTime" style="width: 240px" start="00:00" step="00:15"
+                        end="23:59" placeholder="出站时间" />
+                </el-form-item>
+            </el-form>
+
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button :loading="buttonLoading" type="primary" @click="submitTime">确 定</el-button>
+                    <el-button @click="dialog.visible = false">取 消</el-button>
+                </div>
+            </template>
+        </el-dialog>
+
+    </div>
+</template>
+
+<script setup lang="ts">
+import { listCarPath, getCarPath, delCarPath, addCarPath, updateCarPath } from '@/api/carPath';
+import { listCarInfo, getCarInfo, delCarInfo, addCarInfo, updateCarInfo } from '@/api/carInfo';
+import { CarPathVO, CarPathQuery, CarPathForm } from '@/api/carPath/types';
+import { CarInfoVO, CarInfoQuery, CarInfoForm } from '@/api/carInfo/types';
+import tableElm from "@/components/Public/table.vue";
+import mapDiv from "@/components/Map/index.vue"
+import { allocatedUserList, authUserCancel, authUserCancelAll } from "@/api/system/role";
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const route = useRoute();
+const router = useRouter();
+
+const carPathList = ref<CarPathVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const siteId = ref(0);
+const timeId = ref(0);
+const timeData = ref();
+const carInfoList = ref<CarInfoVO[]>([])
+
+const queryFormRef = ref<ElFormInstance>();
+const carPathFormRef = ref<ElFormInstance>();
+
+const sjList = ref([])
+const driver = ref(null)
+const ckList = ref([])
+const ck = ref(null)
+
+
+
+const dialog = reactive<DialogOption>({
+    visible: false,
+    title: ''
+});
+
+const dateObj = ref({ startTime: '', endTime: "" })
+
+const carObj = ref(null)
+
+const initFormData: CarPathForm = {
+    id: undefined,
+    name: undefined,
+    stationList: undefined,
+    carId: undefined,
+    driverInfo: undefined,
+    attendantInfo: undefined,
+    remark: undefined,
+    ext1: undefined,
+    ext2: undefined
+}
+const data = reactive<PageData<CarPathForm, CarPathQuery>>({
+    form: { ...initFormData },
+    queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: undefined,
+        stationList: undefined,
+        carId: undefined,
+        driverInfo: undefined,
+        attendantInfo: undefined,
+        ext1: undefined,
+        ext2: undefined,
+        params: {
+        }
+    },
+    rules: {
+        id: [
+            { required: true, message: "不能为空", trigger: "blur" }
+        ],
+        name: [
+            { required: true, message: "路线名称不能为空", trigger: "blur" }
+        ],
+        stationList: [
+            { required: true, message: "起止及经过站点信息不能为空", trigger: "blur" }
+        ],
+        carId: [
+            { required: true, message: "车辆信息不能为空", trigger: "blur" }
+        ],
+        driverInfo: [
+            { required: true, message: "司机不能为空", trigger: "blur" }
+        ],
+        attendantInfo: [
+            { required: true, message: "随车人员不能为空", trigger: "blur" }
+        ],
+        remark: [
+            { required: true, message: "备注不能为空", trigger: "blur" }
+        ],
+        ext1: [
+            { required: true, message: "扩展不能为空", trigger: "blur" }
+        ],
+        ext2: [
+            { required: true, message: "扩展2不能为空", trigger: "blur" }
+        ]
+    }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+const options = [
+    {
+        value: 'Option1',
+        label: 'Option1',
+    },
+    {
+        value: 'Option2',
+        label: 'Option2',
+    },
+    {
+        value: 'Option3',
+        label: 'Option3',
+    },
+    {
+        value: 'Option4',
+        label: 'Option4',
+    },
+    {
+        value: 'Option5',
+        label: 'Option5',
+    },
+]
+
+const activities = ref([
+    {
+        content: '起点',
+        timestamp: '2018-04-12 20:46',
+        size: 'large',
+        color: '#0bbd87',
+        rank: 1,
+    },
+    {
+        content: '1',
+        timestamp: '2018-04-03 20:46',
+        color: '#409EFF',
+        rank: 2,
+    },
+    {
+        content: '2',
+        timestamp: '2018-04-03 20:46',
+        isadd: true,
+        rank: 998,
+    },
+    {
+        content: '终点',
+        timestamp: '2018-04-03 20:46',
+        size: 'large',
+        color: '#E37318',
+        rank: 999,
+    },
+])
+
+const columns = ref([
+    // {label: '上层位置', prop: 'v', visible: true},
+    { label: '车牌号', prop: 'carNum', visible: true, isTemplate: false },
+    { label: '司机', prop: 'people', visible: true, isTemplate: false },
+    { label: '跟车人员', prop: 'gpeople', visible: true, isTemplate: false },
+])
+
+const table = ref(tableElm)
+
+const submit = () => {
+    console.log(carObj.value);
+    console.log(driver.value);
+    console.log(ck.value)
+}
+
+const getUserList = async () => {
+    loading.value = true;
+    const res = await allocatedUserList({pageSize:1000,roleId:'1763484881548447746'});
+    sjList.value = res.rows
+    loading.value = true;
+    const ckres = await allocatedUserList({pageSize:1000,roleId:'1763484977044361217'});
+    ckList.value = ckres.rows
+    console.log(res)
+}
+
+const addSite = () => {
+    activities.value.push({
+        content: activities.value.length - 2,
+        timestamp: '2018-04-03 20:46',
+        color: '#409EFF',
+        rank: activities.value.length - 1,
+    },);
+    activities.value.sort(function (a, b) { return a.rank - b.rank })
+}
+
+const selectSite = (index) => {
+    siteId.value = index
+}
+
+const clickSite = (data) => {
+    activities.value[siteId.value].data = data;
+    console.log(activities.value[siteId.value].data);
+}
+
+const selectTime = (index) => {
+    timeId.value = index;
+    dateObj.value = { startTime: '', endTime: "" }
+    dialog.visible = true;
+}
+
+const childrenClick = (data) => {
+    clickSite(data);
+}
+
+const submitTime = () => {
+    activities.value[timeId.value].timeObj = dateObj.value
+    dialog.visible = false
+}
+
+const getcarInfoList = async () => {
+    const carList = await listCarInfo(queryParams.value);
+    carInfoList.value = carList.rows
+}
+
+onMounted(() => {
+    getcarInfoList();
+    getUserList();
+});
+
+</script>
+
+<style lang="scss" scoped>
+.card-header {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+}
+
+.content-w {
+    display: inline-flex;
+    max-width: 160px;
+}
+</style>

+ 236 - 0
src/views/car/work/carWork.vue

@@ -0,0 +1,236 @@
+<template>
+    <div class="p-2">
+        <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+            :leave-active-class="proxy?.animate.searchAnimate.leave">
+            <div class="search" v-show="showSearch" style="display: flex;flex-direction: row;">
+                <div style="width: 85%;">
+                    <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+                        <el-form-item label="车牌号" prop="carNum">
+                            <el-input v-model="queryParams.carNum" placeholder="请输入车牌号" clearable style="width: 160px"
+                                @keyup.enter="handleQuery" />
+                        </el-form-item>
+                        <el-form-item label="站点" prop="carNum">
+                            <el-input v-model="queryParams.carNum" placeholder="请输入车牌号" clearable style="width: 160px"
+                                @keyup.enter="handleQuery" />
+                        </el-form-item>
+                        <el-form-item label="时间" prop="carNum">
+                            <el-date-picker v-model="value2" type="datetimerange" :shortcuts="shortcuts"
+                                range-separator="To" start-placeholder="Start date" end-placeholder="End date" />
+                        </el-form-item>
+                    </el-form>
+                </div>
+                <div style="width: 15%;">
+                    <el-form-item>
+                        <el-button type="primary" @click="goadd">新增</el-button>
+                        <el-button type="primary" @click="resetQuery">查询</el-button>
+                    </el-form-item>
+                </div>
+            </div>
+        </transition>
+        <el-card shadow="never">
+
+            <tableElm :columns="columns" ref="table"></tableElm>
+
+            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+                v-model:limit="queryParams.pageSize" @pagination="getList" />
+        </el-card>
+    </div>
+</template>
+
+<script setup name="CarPath" lang="ts">
+import { listCarPath, getCarPath, delCarPath, addCarPath, updateCarPath } from '@/api/carPath';
+import { CarPathVO, CarPathQuery, CarPathForm } from '@/api/carPath/types';
+import tableElm from "@/components/Public/table.vue";
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const route = useRoute();
+const router = useRouter();
+
+const carPathList = ref<CarPathVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const carPathFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: CarPathForm = {
+  id: undefined,
+  name: undefined,
+  stationList: undefined,
+  carId: undefined,
+  driverInfo: undefined,
+  attendantInfo: undefined,
+  remark: undefined,
+  ext1: undefined,
+  ext2: undefined
+}
+const data = reactive<PageData<CarPathForm, CarPathQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    name: undefined,
+    stationList: undefined,
+    carId: undefined,
+    driverInfo: undefined,
+    attendantInfo: undefined,
+    ext1: undefined,
+    ext2: undefined,
+    params: {
+    }
+  },
+  rules: {
+    id: [
+      { required: true, message: "不能为空", trigger: "blur" }
+    ],
+    name: [
+      { required: true, message: "路线名称不能为空", trigger: "blur" }
+    ],
+    stationList: [
+      { required: true, message: "起止及经过站点信息不能为空", trigger: "blur" }
+    ],
+    carId: [
+      { required: true, message: "车辆信息不能为空", trigger: "blur" }
+    ],
+    driverInfo: [
+      { required: true, message: "司机不能为空", trigger: "blur" }
+    ],
+    attendantInfo: [
+      { required: true, message: "随车人员不能为空", trigger: "blur" }
+    ],
+    remark: [
+      { required: true, message: "备注不能为空", trigger: "blur" }
+    ],
+    ext1: [
+      { required: true, message: "扩展不能为空", trigger: "blur" }
+    ],
+    ext2: [
+      { required: true, message: "扩展2不能为空", trigger: "blur" }
+    ]
+  }
+});
+
+const columns = ref([
+    // {label: '上层位置', prop: 'v', visible: true},
+    { label: '车牌', prop: 'carNum',pprop:"ext1",visible: true, isTemplate: false,isTemplateJson:true },
+    { label: '作业名称', prop: 'name', pprop: "ext1", visible: true, isTemplate: false },
+    { label: '作业类型', prop: 'ext2', pprop: "ext1", visible: true, isTemplate: false,},
+    { label: '网格', prop: 'wangge', pprop: "ext1", visible: true, isTemplate: false, },
+    { label: '跟车人员', prop: 'gpeople', pprop: "ext1", visible: true, isTemplate: false,  },
+    { label: '驾驶员、联系方式', prop: 'people', pprop: "ext1", visible: true, isTemplate: false, },
+])
+
+const { queryParams, form, rules } = toRefs(data);
+
+const table = ref(tableElm)
+
+/** 查询车辆路线列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listCarPath(queryParams.value);
+  table.value.setDataList(res.rows);
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  carPathFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: CarPathVO[]) => {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加车辆路线";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: CarPathVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getCarPath(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改车辆路线";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  carPathFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateCarPath(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addCarPath(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("修改成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: CarPathVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除车辆路线编号为"' + _ids + '"的数据项?').finally(() => loading.value = false);
+  await delCarPath(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('system/carPath/export', {
+    ...queryParams.value
+  }, `carPath_${new Date().getTime()}.xlsx`)
+}
+
+
+const goadd = () => {
+    router.push("/car/work/addWork")
+}
+
+onMounted(() => {
+  getList();
+});
+</script>

+ 238 - 0
src/views/car/work/index.vue

@@ -0,0 +1,238 @@
+<template>
+    <div class="p-2">
+        <el-tabs type="card" class="demo-tabs" active-name="1">
+            <el-tab-pane label="车辆作业" name="1">
+                  <carWork></carWork>
+            </el-tab-pane>
+            <el-tab-pane label="车辆排班" name="2">
+                  <schedule></schedule>
+            </el-tab-pane>
+            <el-tab-pane label="人员请假" name="3">
+                   <peopleLeave></peopleLeave>
+            </el-tab-pane>
+        </el-tabs>
+    </div>
+</template>
+    
+<script setup name="CarInfo" lang="ts">
+import { listCarInfo, getCarInfo, delCarInfo, addCarInfo, updateCarInfo } from '@/api/carInfo';
+import { CarInfoVO, CarInfoQuery, CarInfoForm } from '@/api/carInfo/types';
+import tableElm from "@/components/Public/table.vue";
+import { useRoute, useRouter } from "vue-router";
+import carWork from './carWork.vue';
+import peopleLeave from './peopleLeave.vue';
+import schedule from './schedule.vue';
+
+const route = useRoute();
+const router = useRouter();
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const carInfoList = ref<CarInfoVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const carInfoFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+    visible: false,
+    title: ''
+});
+
+const table = ref(tableElm)
+
+const columns = ref([
+    // {label: '上层位置', prop: 'v', visible: true},
+    { label: '车牌号', prop: 'carNum', visible: true, isTemplate: false },
+    { label: '能源类型、业务类型', prop: 'ext1', visible: true, isTemplate: false, isTemplateTag: true },
+    { label: '车辆分类', prop: 'type', pprop: "ext1", visible: true, isTemplate: false, isTemplateJson: true },
+    { label: '网格', prop: 'wangge', pprop: "ext1", visible: true, isTemplate: false, isTemplateJson: true },
+    { label: '单位', prop: 'dept', pprop: "ext1", visible: true, isTemplate: false, isTemplateJson: true },
+    { label: '驾驶员、联系方式', prop: 'people', pprop: "ext1", visible: true, isTemplate: false, isTemplateJson: true },
+])
+
+const initFormData: CarInfoForm = {
+    id: undefined,
+    carNum: undefined,
+    carType: undefined,
+    deviceInfos: undefined,
+    repairInfo: undefined,
+    maintenanceInfo: undefined,
+    insuranceInfo: undefined,
+    inspectionInfo: undefined,
+    trafficAccidentInfo: undefined,
+    violationInfo: undefined,
+    changeInfo: undefined,
+    ext1: undefined,
+    ext2: undefined
+}
+const data = reactive<PageData<CarInfoForm, CarInfoQuery>>({
+    form: { ...initFormData },
+    queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        carNum: undefined,
+        carType: undefined,
+        deviceInfos: undefined,
+        repairInfo: undefined,
+        maintenanceInfo: undefined,
+        insuranceInfo: undefined,
+        inspectionInfo: undefined,
+        trafficAccidentInfo: undefined,
+        violationInfo: undefined,
+        changeInfo: undefined,
+        ext1: undefined,
+        ext2: undefined,
+        params: {
+        }
+    },
+    rules: {
+        id: [
+            { required: true, message: "编号不能为空", trigger: "blur" }
+        ],
+        carNum: [
+            { required: true, message: "车牌号不能为空", trigger: "blur" }
+        ],
+        carType: [
+            { required: true, message: "车类型不能为空", trigger: "change" }
+        ],
+        deviceInfos: [
+            { required: true, message: "所有车载设备信息不能为空", trigger: "blur" }
+        ],
+        repairInfo: [
+            { required: true, message: "维修信息不能为空", trigger: "blur" }
+        ],
+        maintenanceInfo: [
+            { required: true, message: "保养信息不能为空", trigger: "blur" }
+        ],
+        insuranceInfo: [
+            { required: true, message: "保险信息不能为空", trigger: "blur" }
+        ],
+        inspectionInfo: [
+            { required: true, message: "年检信息不能为空", trigger: "blur" }
+        ],
+        trafficAccidentInfo: [
+            { required: true, message: "交通事故信息不能为空", trigger: "blur" }
+        ],
+        violationInfo: [
+            { required: true, message: "违章信息不能为空", trigger: "blur" }
+        ],
+        changeInfo: [
+            { required: true, message: "车辆变更信息不能为空", trigger: "blur" }
+        ],
+        ext1: [
+            { required: true, message: "扩展1不能为空", trigger: "blur" }
+        ],
+        ext2: [
+            { required: true, message: "扩展2不能为空", trigger: "blur" }
+        ]
+    }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+const goadd = () => {
+    router.push("/car/carInfo/add")
+}
+
+/** 查询车辆信息列表 */
+const getList = async () => {
+    loading.value = true;
+    const res = await listCarInfo(queryParams.value);
+    table.value.setDataList(res.rows);
+    total.value = res.total;
+    loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+    reset();
+    dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+    form.value = { ...initFormData };
+    carInfoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+    queryParams.value.pageNum = 1;
+    getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+    queryFormRef.value?.resetFields();
+    handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: CarInfoVO[]) => {
+    ids.value = selection.map(item => item.id);
+    single.value = selection.length != 1;
+    multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+    reset();
+    dialog.visible = true;
+    dialog.title = "添加车辆信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: CarInfoVO) => {
+    reset();
+    const _id = row?.id || ids.value[0]
+    const res = await getCarInfo(_id);
+    Object.assign(form.value, res.data);
+    dialog.visible = true;
+    dialog.title = "修改车辆信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+    carInfoFormRef.value?.validate(async (valid: boolean) => {
+        if (valid) {
+            buttonLoading.value = true;
+            if (form.value.id) {
+                await updateCarInfo(form.value).finally(() => buttonLoading.value = false);
+            } else {
+                await addCarInfo(form.value).finally(() => buttonLoading.value = false);
+            }
+            proxy?.$modal.msgSuccess("修改成功");
+            dialog.visible = false;
+            await getList();
+        }
+    });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: CarInfoVO) => {
+    const _ids = row?.id || ids.value;
+    await proxy?.$modal.confirm('是否确认删除车辆信息编号为"' + _ids + '"的数据项?').finally(() => loading.value = false);
+    await delCarInfo(_ids);
+    proxy?.$modal.msgSuccess("删除成功");
+    await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+    proxy?.download('system/carInfo/export', {
+        ...queryParams.value
+    }, `carInfo_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+   // getList();
+});
+</script>
+    

+ 296 - 0
src/views/car/work/peopleLeave.vue

@@ -0,0 +1,296 @@
+<template>
+    <div class="p-2">
+        <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+            :leave-active-class="proxy?.animate.searchAnimate.leave">
+            <div class="search" v-show="showSearch" style="display: flex;flex-direction: row;">
+                <div style="width: 85%;">
+                    <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+                        <el-form-item label="时间" prop="carNum">
+                            <el-date-picker v-model="value2" type="datetimerange" :shortcuts="shortcuts"
+                                range-separator="To" start-placeholder="Start date" end-placeholder="End date" />
+                        </el-form-item>
+                        <el-form-item label="状态" prop="carNum">
+                            <el-select v-model="value" class="m-2" placeholder="Select" style="width: 240px">
+                                <el-option v-for="item in options" :key="item.value" :label="item.label"
+                                    :value="item.value" />
+                            </el-select>
+                        </el-form-item>
+                    </el-form>
+                </div>
+                <div style="width: 15%;">
+                    <el-form-item>
+                        <!-- <el-button type="primary" @click="goadd">新增</el-button> -->
+                        <el-button type="primary" @click="resetQuery">查询</el-button>
+                    </el-form-item>
+                </div>
+            </div>
+        </transition>
+        <el-card shadow="never">
+
+            <tableElm @childToParent='childrenClick' @childFormat="childFormat" :columns="columns" ref="table">
+            </tableElm>
+
+            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+                v-model:limit="queryParams.pageSize" @pagination="getList" />
+        </el-card>
+    </div>
+</template>
+
+<script setup name="CarInfo" lang="ts">
+import { listUserVacate, getUserVacate, delUserVacate, addUserVacate, updateUserVacate } from '@/api/userVacate';
+import { UserVacateVO, UserVacateQuery, UserVacateForm } from '@/api/userVacate/types';
+import tableElm from "@/components/Public/table.vue";
+import { useRoute, useRouter } from "vue-router";
+import carWork from './carWork.vue';
+import { fa } from 'element-plus/es/locale';
+
+import moment from 'moment';
+
+const route = useRoute();
+const router = useRouter();
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const userVacateList = ref<UserVacateVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const value2 = ref('')
+
+const queryFormRef = ref<ElFormInstance>();
+const carInfoFormRef = ref<ElFormInstance>();
+
+
+const dialog = reactive<DialogOption>({
+    visible: false,
+    title: ''
+});
+
+const table = ref(tableElm)
+
+const columns = ref([
+    // {label: '上层位置', prop: 'v', visible: true},
+    { label: '姓名', prop: 'nickName',pprop:"userInfo", visible: true, isTemplate: false,isTemplateJson:true },
+    { label: '请假时间', prop: 'leaveData', visible: true, isTemplate: false },
+    { label: '事由', prop: 'des', pprop: "ext1", visible: true, isTemplate: false },
+    { label: '状态', prop: 'status', pprop: "ext1", visible: true, isTemplate: true, func: "getStatus" },
+])
+
+const initFormData: UserVacateForm = {
+    id: undefined,
+    userInfo: undefined,
+    startDate: undefined,
+    endDate: undefined,
+    des: undefined,
+    status: undefined,
+    cTime: undefined,
+    uTime: undefined,
+    ext1: undefined,
+    ext2: undefined,
+}
+const data = reactive<PageData<UserVacateForm, UserVacateQuery>>({
+    form: { ...initFormData },
+    queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userInfo: undefined,
+        startDate: undefined,
+        endDate: undefined,
+        des: undefined,
+        status: undefined,
+        cTime: undefined,
+        uTime: undefined,
+        ext1: undefined,
+        ext2: undefined,
+        params: {
+        }
+    },
+    rules: {
+        id: [
+            { required: true, message: "编号不能为空", trigger: "blur" }
+        ],
+        userInfo: [
+            { required: true, message: "用户信息不能为空", trigger: "blur" }
+        ],
+        startDate: [
+            { required: true, message: "请假开始日期不能为空", trigger: "blur" }
+        ],
+        endDate: [
+            { required: true, message: "结束日期不能为空", trigger: "blur" }
+        ],
+        des: [
+            { required: true, message: "内容描述不能为空", trigger: "blur" }
+        ],
+        status: [
+            { required: true, message: "状态不能为空", trigger: "change" }
+        ],
+        cTime: [
+            { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ],
+        uTime: [
+            { required: true, message: "跟新时间不能为空", trigger: "blur" }
+        ],
+        ext1: [
+            { required: true, message: "扩展1不能为空", trigger: "blur" }
+        ],
+        ext2: [
+            { required: true, message: "扩展2不能为空", trigger: "blur" }
+        ],
+    }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+const goadd = () => {
+    router.push("/car/work/addWork")
+}
+
+
+
+/** 查询车辆信息列表 */
+const getList = async () => {
+    loading.value = true;
+    const res = await listUserVacate(queryParams.value);
+    for (var index in res.rows) {
+        res.rows[index].leaveData = moment(res.rows[index].startDate).format('YYYY-MM-DD') + " - " + moment(res.rows[index].endDate).format('YYYY-MM-DD')
+    }
+    var buttons = [
+        { type: 'primary', text: '批准', func: "approve" },
+        { type: 'primary', text: '拒绝', func: "refuse" },
+    ]
+    table.value.setDataList(res.rows);
+    table.value.setButton(buttons);
+    total.value = res.total;
+    loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+    reset();
+    dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+    form.value = { ...initFormData };
+    carInfoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+    queryParams.value.pageNum = 1;
+    getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+    queryFormRef.value?.resetFields();
+    handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: UserVacateVO[]) => {
+    ids.value = selection.map(item => item.id);
+    single.value = selection.length != 1;
+    multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+    reset();
+    dialog.visible = true;
+    dialog.title = "添加车辆信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: UserVacateVO) => {
+    reset();
+    const _id = row?.id || ids.value[0]
+    const res = await getUserVacate(_id);
+    Object.assign(form.value, res.data);
+    dialog.visible = true;
+    dialog.title = "修改车辆信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+    carInfoFormRef.value?.validate(async (valid: boolean) => {
+        if (valid) {
+            buttonLoading.value = true;
+            if (form.value.id) {
+                await updateUserVacate(form.value).finally(() => buttonLoading.value = false);
+            } else {
+                await addUserVacate(form.value).finally(() => buttonLoading.value = false);
+            }
+            proxy?.$modal.msgSuccess("修改成功");
+            dialog.visible = false;
+            await getList();
+        }
+    });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: UserVacateVO) => {
+    const _ids = row?.id || ids.value;
+    await proxy?.$modal.confirm('是否确认删除车辆信息编号为"' + _ids + '"的数据项?').finally(() => loading.value = false);
+    await delUserVacate(_ids);
+    proxy?.$modal.msgSuccess("删除成功");
+    await getList();
+}
+
+const approve = (data) => {
+    var param = {};
+    param.id = data.id
+    param.status = 1
+    console.log(param)
+    updateUserVacate(param).then(res => {
+        getList();
+    });
+}
+
+const refuse = (data) => {
+    var param = {};
+    param.id = data.id
+    param.status = 2
+    updateUserVacate(param).then(res => {
+        getList();
+    });
+}
+
+const childrenClick = (data) => {
+    console.log(data)
+    eval(data.func + "(data.data)")
+}
+
+const childFormat = ({ data, fn }) => {
+    var value = data.data[data.prop]
+    var data = eval(data.func + "(value)")
+    fn(data)
+    //   return data
+}
+
+const getStatus = (value) => {
+    if (value == 0) {
+        return "待审核"
+    } else if (value == 1) {
+        return "批准"
+    } else if (value == 2) {
+        return "拒绝"
+    }
+}
+
+/** 导出按钮操作 */
+// const handleExport = () => {
+//     proxy?.download('system/carInfo/export', {
+//         ...queryParams.value
+//     }, `carInfo_${new Date().getTime()}.xlsx`)
+// }
+
+onMounted(() => {
+    getList();
+});
+</script>

+ 281 - 0
src/views/car/work/schedule.vue

@@ -0,0 +1,281 @@
+<template>
+    <div style="display: flex;flex-direction: row;" class="custom-calendar">
+        <el-card shadow="never" style="width: 30%;">
+            <el-calendar style="font-size: 10px;">
+                <template slot="dateCell" #date-cell="{ data }">
+                    <p :class="data.isSelected ? 'is-selected' : ''">
+                        {{ data.day.split('-').slice(1)[1] }}
+                        <!-- {{ data.isSelected ? '✔️' : '' }} -->
+                    </p>
+                    <div></div>
+                </template>
+            </el-calendar>
+            <div>注:</div>
+            <div style="display: flex;flex-direction: row;margin-top: 5px;">
+                <div style="width: 18.17px;height: 18.17px;border-radius: 9.5px;opacity: 1;background: #FFC55F;"></div>
+                <div
+                    style="font-family: Poppins;font-size: 13px;font-weight: normal;line-height: 16px;letter-spacing: 0px;color: #9CB2CD;margin-left: 10px;">
+                    存在未设置完成的</div>
+            </div>
+            <div style="display: flex;flex-direction: row;margin-top: 5px;">
+                <div style="width: 18.17px;height: 18.17px;border-radius: 9.5px;opacity: 1;background: #FF8784;"></div>
+                <div
+                    style="font-family: Poppins;font-size: 13px;font-weight: normal;line-height: 16px;letter-spacing: 0px;color: #9CB2CD;margin-left: 10px;">
+                    未排班</div>
+            </div>
+            <div style="display: flex;flex-direction: row;margin-top: 5px;">
+                <div style="width: 18.17px;height: 18.17px;border-radius: 9.5px;opacity: 1;background: #538FFF;"></div>
+                <div
+                    style="font-family: Poppins;font-size: 13px;font-weight: normal;line-height: 16px;letter-spacing: 0px;color: #9CB2CD;margin-left: 10px;">
+                    已排班</div>
+            </div>
+        </el-card>
+        <el-card shadow="never" style="width: 68%;margin-left: 1%;">
+
+            <tableElm :columns="columns" ref="table"></tableElm>
+
+            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+                v-model:limit="queryParams.pageSize" @pagination="getList" />
+        </el-card>
+    </div>
+</template>
+
+<script setup name="CarInfo" lang="ts">
+import { listCarInfo, getCarInfo, delCarInfo, addCarInfo, updateCarInfo } from '@/api/carInfo';
+import { CarInfoVO, CarInfoQuery, CarInfoForm } from '@/api/carInfo/types';
+import tableElm from "@/components/Public/table.vue";
+import { useRoute, useRouter } from "vue-router";
+
+const route = useRoute();
+const router = useRouter();
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const carInfoList = ref<CarInfoVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const value2 = ref('')
+
+const queryFormRef = ref<ElFormInstance>();
+const carInfoFormRef = ref<ElFormInstance>();
+
+
+const dialog = reactive<DialogOption>({
+    visible: false,
+    title: ''
+});
+
+const table = ref(tableElm)
+
+const times = ref([""])
+
+const columns = ref([
+    // {label: '上层位置', prop: 'v', visible: true},
+    { label: '车牌号', prop: 'carNum', visible: true, isTemplate: false },
+    { label: '作业时间', prop: 'workTime', visible: true, isTemplate: false, },
+    { label: '跟车人员', prop: 'gpeople', pprop: "ext1", visible: true, isTemplate: false, },
+    { label: '驾驶员、联系方式', prop: 'people', pprop: "ext1", visible: true, isTemplate: false, },
+])
+
+const initFormData: CarInfoForm = {
+    id: undefined,
+    carNum: undefined,
+    carType: undefined,
+    deviceInfos: undefined,
+    repairInfo: undefined,
+    maintenanceInfo: undefined,
+    insuranceInfo: undefined,
+    inspectionInfo: undefined,
+    trafficAccidentInfo: undefined,
+    violationInfo: undefined,
+    changeInfo: undefined,
+    ext1: undefined,
+    ext2: undefined
+}
+const data = reactive<PageData<CarInfoForm, CarInfoQuery>>({
+    form: { ...initFormData },
+    queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        carNum: undefined,
+        carType: undefined,
+        deviceInfos: undefined,
+        repairInfo: undefined,
+        maintenanceInfo: undefined,
+        insuranceInfo: undefined,
+        inspectionInfo: undefined,
+        trafficAccidentInfo: undefined,
+        violationInfo: undefined,
+        changeInfo: undefined,
+        ext1: undefined,
+        ext2: undefined,
+        params: {
+        }
+    },
+    rules: {
+        id: [
+            { required: true, message: "编号不能为空", trigger: "blur" }
+        ],
+        carNum: [
+            { required: true, message: "车牌号不能为空", trigger: "blur" }
+        ],
+        carType: [
+            { required: true, message: "车类型不能为空", trigger: "change" }
+        ],
+        deviceInfos: [
+            { required: true, message: "所有车载设备信息不能为空", trigger: "blur" }
+        ],
+        repairInfo: [
+            { required: true, message: "维修信息不能为空", trigger: "blur" }
+        ],
+        maintenanceInfo: [
+            { required: true, message: "保养信息不能为空", trigger: "blur" }
+        ],
+        insuranceInfo: [
+            { required: true, message: "保险信息不能为空", trigger: "blur" }
+        ],
+        inspectionInfo: [
+            { required: true, message: "年检信息不能为空", trigger: "blur" }
+        ],
+        trafficAccidentInfo: [
+            { required: true, message: "交通事故信息不能为空", trigger: "blur" }
+        ],
+        violationInfo: [
+            { required: true, message: "违章信息不能为空", trigger: "blur" }
+        ],
+        changeInfo: [
+            { required: true, message: "车辆变更信息不能为空", trigger: "blur" }
+        ],
+        ext1: [
+            { required: true, message: "扩展1不能为空", trigger: "blur" }
+        ],
+        ext2: [
+            { required: true, message: "扩展2不能为空", trigger: "blur" }
+        ]
+    }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+const goadd = () => {
+    router.push("/car/work/addWork")
+}
+
+/** 查询车辆信息列表 */
+const getList = async () => {
+    // loading.value = true;
+    // const res = await listCarInfo(queryParams.value);
+    var res = {
+        rows: [
+            {
+                carNum: '苏A69213',
+                workTime: "2024-11-11 12:00:00",
+                workName: "运输钢铁",
+                type: "大件运输",
+                wangge: "仙林",
+                gpeople: "陈武",
+                people: "刘晨(13898219932)"
+
+            }
+        ],
+        total: 12
+    }
+    table.value.setDataList(res.rows);
+    total.value = res.total;
+    loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+    reset();
+    dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+    form.value = { ...initFormData };
+    carInfoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+    queryParams.value.pageNum = 1;
+    getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+    queryFormRef.value?.resetFields();
+    handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: CarInfoVO[]) => {
+    ids.value = selection.map(item => item.id);
+    single.value = selection.length != 1;
+    multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+    reset();
+    dialog.visible = true;
+    dialog.title = "添加车辆信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: CarInfoVO) => {
+    reset();
+    const _id = row?.id || ids.value[0]
+    const res = await getCarInfo(_id);
+    Object.assign(form.value, res.data);
+    dialog.visible = true;
+    dialog.title = "修改车辆信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+    carInfoFormRef.value?.validate(async (valid: boolean) => {
+        if (valid) {
+            buttonLoading.value = true;
+            if (form.value.id) {
+                await updateCarInfo(form.value).finally(() => buttonLoading.value = false);
+            } else {
+                await addCarInfo(form.value).finally(() => buttonLoading.value = false);
+            }
+            proxy?.$modal.msgSuccess("修改成功");
+            dialog.visible = false;
+            await getList();
+        }
+    });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: CarInfoVO) => {
+    const _ids = row?.id || ids.value;
+    await proxy?.$modal.confirm('是否确认删除车辆信息编号为"' + _ids + '"的数据项?').finally(() => loading.value = false);
+    await delCarInfo(_ids);
+    proxy?.$modal.msgSuccess("删除成功");
+    await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+    proxy?.download('system/carInfo/export', {
+        ...queryParams.value
+    }, `carInfo_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+    getList();
+});
+</script>
+<style lang="scss" scoped>::v-deep .el-calendar-table .el-calendar-day {
+    height: 40px;
+
+}</style>

+ 10 - 0
src/views/system/user/index.vue

@@ -430,6 +430,16 @@ const handleNodeClick = (data: DeptVO) => {
   handleQuery()
 }
 
+const getObjectData = (data, prop) => {
+    var obj = JSON.parse(data);
+    return eval("obj." + prop)
+}
+
+const getJsonData = (data, pprop, prop) => {
+    var data = eval("data." + pprop)
+    return getObjectData(data, prop)
+}
+
 
 /** 搜索按钮操作 */
 const handleQuery = () => {

+ 344 - 0
src/views/yunying/scheduling/index.vue

@@ -0,0 +1,344 @@
+<template>
+    <div class="p-2">
+        <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+            :leave-active-class="proxy?.animate.searchAnimate.leave">
+            <div class="search" v-show="showSearch" style="display: flex;flex-direction: row;">
+                <div style="width: 85%;">
+                    <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+                        <el-form-item label="车牌" prop="carNum">
+                            <el-input v-model="queryParams.carNum" placeholder="请输入车牌号" clearable style="width: 160px"
+                                @keyup.enter="handleQuery" />
+                        </el-form-item>
+                        <el-form-item label="状态" prop="carNum">
+                            <el-input v-model="queryParams.carNum" placeholder="请输入车牌号" clearable style="width: 160px"
+                                @keyup.enter="handleQuery" />
+                        </el-form-item>
+                        <el-form-item label="站点" prop="carNum">
+                            <el-input v-model="queryParams.carNum" placeholder="请输入车牌号" clearable style="width: 160px"
+                                @keyup.enter="handleQuery" />
+                        </el-form-item>
+                        <el-form-item label="司机" prop="carNum">
+                            <el-input v-model="queryParams.carNum" placeholder="请输入车牌号" clearable style="width: 160px"
+                                @keyup.enter="handleQuery" />
+                        </el-form-item>
+                        <el-form-item label="时间" prop="carNum">
+                            <el-date-picker v-model="value2" type="datetimerange" :shortcuts="shortcuts"
+                                range-separator="至" start-placeholder="Start date" end-placeholder="End date" />
+                        </el-form-item>
+                    </el-form>
+                </div>
+                <div style="width: 15%;">
+                    <el-form-item>
+                        <el-button type="primary" @click="goadd">新增</el-button>
+                        <el-button type="primary" @click="resetQuery">查询</el-button>
+                    </el-form-item>
+                </div>
+            </div>
+        </transition>
+        <el-card shadow="never">
+            <div class="carDiv">
+                <div
+                    style="width: 20%;background: #7BC932;text-align: center;display: flex;flex-direction: column;justify-content: center;align-items:center;">
+                    <div class="carDetail">苏A xxxxx</div>
+                    <div class="carFont">07:00-10:00</div>
+                    <div class="carFont">白下/新港</div>
+                    <div class="carFont">张三</div>
+                    <div class="carFont">小型电动吊桶车</div>
+                </div>
+                <div style="width: 80%;">
+                   <timeLineDiv></timeLineDiv>
+                </div>
+            </div>
+        </el-card>
+    </div>
+</template>
+
+<script setup name="CarInfo" lang="ts">
+import { listCarInfo, getCarInfo, delCarInfo, addCarInfo, updateCarInfo } from '@/api/carInfo';
+import { CarInfoVO, CarInfoQuery, CarInfoForm } from '@/api/carInfo/types';
+import tableElm from "@/components/Public/table.vue";
+import { useRoute, useRouter } from "vue-router";
+import timeLineDiv from "@/components/Public/timeline";
+
+
+const route = useRoute();
+const router = useRouter();
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const carInfoList = ref<CarInfoVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const value2 = ref('')
+
+const queryFormRef = ref<ElFormInstance>();
+const carInfoFormRef = ref<ElFormInstance>();
+
+
+const dialog = reactive<DialogOption>({
+    visible: false,
+    title: ''
+});
+
+const table = ref(tableElm)
+
+const columns = ref([
+    // {label: '上层位置', prop: 'v', visible: true},
+    { label: '姓名', prop: 'carNum', visible: true, isTemplate: false },
+    { label: '身份证', prop: 'workTime', visible: true, isTemplate: false, },
+    { label: '手机号', prop: 'workName', pprop: "ext1", visible: true, isTemplate: false },
+    { label: '设备号', prop: 'type', pprop: "ext1", visible: true, isTemplate: false, },
+    { label: '车辆', prop: 'wangge', pprop: "ext1", visible: true, isTemplate: false, },
+    { label: '工作小组', prop: 'gpeople', pprop: "ext1", visible: true, isTemplate: false, },
+    { label: '类型', prop: 'people', pprop: "ext1", visible: true, isTemplate: false, },
+])
+
+const initFormData: CarInfoForm = {
+    id: undefined,
+    carNum: undefined,
+    carType: undefined,
+    deviceInfos: undefined,
+    repairInfo: undefined,
+    maintenanceInfo: undefined,
+    insuranceInfo: undefined,
+    inspectionInfo: undefined,
+    trafficAccidentInfo: undefined,
+    violationInfo: undefined,
+    changeInfo: undefined,
+    ext1: undefined,
+    ext2: undefined
+}
+const data = reactive<PageData<CarInfoForm, CarInfoQuery>>({
+    form: { ...initFormData },
+    queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        carNum: undefined,
+        carType: undefined,
+        deviceInfos: undefined,
+        repairInfo: undefined,
+        maintenanceInfo: undefined,
+        insuranceInfo: undefined,
+        inspectionInfo: undefined,
+        trafficAccidentInfo: undefined,
+        violationInfo: undefined,
+        changeInfo: undefined,
+        ext1: undefined,
+        ext2: undefined,
+        params: {
+        }
+    },
+    rules: {
+        id: [
+            { required: true, message: "编号不能为空", trigger: "blur" }
+        ],
+        carNum: [
+            { required: true, message: "车牌号不能为空", trigger: "blur" }
+        ],
+        carType: [
+            { required: true, message: "车类型不能为空", trigger: "change" }
+        ],
+        deviceInfos: [
+            { required: true, message: "所有车载设备信息不能为空", trigger: "blur" }
+        ],
+        repairInfo: [
+            { required: true, message: "维修信息不能为空", trigger: "blur" }
+        ],
+        maintenanceInfo: [
+            { required: true, message: "保养信息不能为空", trigger: "blur" }
+        ],
+        insuranceInfo: [
+            { required: true, message: "保险信息不能为空", trigger: "blur" }
+        ],
+        inspectionInfo: [
+            { required: true, message: "年检信息不能为空", trigger: "blur" }
+        ],
+        trafficAccidentInfo: [
+            { required: true, message: "交通事故信息不能为空", trigger: "blur" }
+        ],
+        violationInfo: [
+            { required: true, message: "违章信息不能为空", trigger: "blur" }
+        ],
+        changeInfo: [
+            { required: true, message: "车辆变更信息不能为空", trigger: "blur" }
+        ],
+        ext1: [
+            { required: true, message: "扩展1不能为空", trigger: "blur" }
+        ],
+        ext2: [
+            { required: true, message: "扩展2不能为空", trigger: "blur" }
+        ]
+    }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+const goadd = () => {
+    router.push("/car/work/addWork")
+}
+
+/** 查询车辆信息列表 */
+const getList = async () => {
+    // loading.value = true;
+    // const res = await listCarInfo(queryParams.value);
+    var res = {
+        rows: [
+            {
+                carNum: '张林',
+                workTime: "320902198711957841",
+                workName: "13898219932",
+                type: "xxxxx",
+                wangge: "苏A51972",
+                gpeople: "仙林",
+                people: "司机"
+
+            }
+        ],
+        total: 12
+    }
+    table.value.setDataList(res.rows);
+    total.value = res.total;
+    loading.value = false;
+}
+
+const activities = [
+  {
+    content: 'Event start',
+    timestamp: '2018-04-15',
+  },
+  {
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+
+/** 取消按钮 */
+const cancel = () => {
+    reset();
+    dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+    form.value = { ...initFormData };
+    carInfoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+    queryParams.value.pageNum = 1;
+    getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+    queryFormRef.value?.resetFields();
+    handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: CarInfoVO[]) => {
+    ids.value = selection.map(item => item.id);
+    single.value = selection.length != 1;
+    multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+    reset();
+    dialog.visible = true;
+    dialog.title = "添加车辆信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: CarInfoVO) => {
+    reset();
+    const _id = row?.id || ids.value[0]
+    const res = await getCarInfo(_id);
+    Object.assign(form.value, res.data);
+    dialog.visible = true;
+    dialog.title = "修改车辆信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+    carInfoFormRef.value?.validate(async (valid: boolean) => {
+        if (valid) {
+            buttonLoading.value = true;
+            if (form.value.id) {
+                await updateCarInfo(form.value).finally(() => buttonLoading.value = false);
+            } else {
+                await addCarInfo(form.value).finally(() => buttonLoading.value = false);
+            }
+            proxy?.$modal.msgSuccess("修改成功");
+            dialog.visible = false;
+            await getList();
+        }
+    });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: CarInfoVO) => {
+    const _ids = row?.id || ids.value;
+    await proxy?.$modal.confirm('是否确认删除车辆信息编号为"' + _ids + '"的数据项?').finally(() => loading.value = false);
+    await delCarInfo(_ids);
+    proxy?.$modal.msgSuccess("删除成功");
+    await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+    proxy?.download('system/carInfo/export', {
+        ...queryParams.value
+    }, `carInfo_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+    getList();
+});
+</script>
+
+<style lang="scss" scoped>
+.carDiv {
+    border-radius: 7px;
+    opacity: 1;
+    box-sizing: border-box;
+    border: 1px solid #7BC932;
+    height: 20vh;
+    display: flex;
+    flex-direction: row;
+}
+
+.carDetail {
+    width: 135px;
+    height: 35px;
+    border-radius: 22px;
+    opacity: 1;
+    background: #FFFFFF;
+    font-family: 思源黑体;
+    font-size: 20px;
+    font-weight: bold;
+    line-height: normal;
+    color: #7BC932;
+}
+
+.carFont {
+    font-family: 思源黑体;
+    font-size: 16px;
+    font-weight: bold;
+    line-height: normal;
+    align-items: center;
+    letter-spacing: 0px;
+    font-feature-settings: "kern" on;
+    color: #FFFFFF;
+}
+</style>

+ 177 - 0
src/views/yunying/video/index.vue

@@ -0,0 +1,177 @@
+<template>
+  <div class="p-2">
+    <div style="display: flex;flex-direction: row;">
+      <div style="width:20%">
+        <div class="card-header">
+          <div style="display: flex;flex-direction: row;">
+            <div style="width: 8px;height: 19px;opacity: 1;background: #409EFF"></div>
+            <span
+              style="font-family: PingFang SC;font-size: 14px;font-weight: normal;line-height: 19px;height: 19px;margin-left: 2px;">车辆信息</span>
+          </div>
+        </div>
+        <div style="margin-top: 1vh;">
+          <el-input v-model="filterText" placeholder="输入车牌号" />
+          <el-tree show-checkbox ref="treeRef" class="filter-tree" :data="data" :props="defaultProps" default-expand-all
+            :filter-node-method="filterNode" />
+        </div>
+      </div>
+      <div style="width: 77%;margin-left: 2%;">
+        <div class="card-header">
+          <div style="display: flex;flex-direction: row;">
+            <div style="width: 8px;height: 19px;opacity: 1;background: #409EFF"></div>
+            <span
+              style="font-family: PingFang SC;font-size: 14px;font-weight: normal;line-height: 19px;height: 19px;margin-left: 2px;">视频</span>
+          </div>
+          <div>
+            <img style="width: 14.5px;height:14.5px;" @click="videoType = 1" src="@/assets/images/icon/容器.png" />
+            <img style="width: 14.5px;height:14.5px;margin-left: 5px" @click="videoType = 4" src="@/assets/images/icon/四宫格.png" />
+            <img style="width: 14.5px;height:14.5px;margin-left: 5px;" @click="videoType = 9" src="@/assets/images/icon/九宫格.png" />
+          </div>
+        </div>
+        <div style="margin-top: 5vh;">
+          <div style="width: 100%;" v-if="videoType == 1">
+            <!-- <div v-for="item in 9"> -->
+            <video v-for="item in 1" style="width: 99%;margin-left:0.5%" controls="controls" :autoplay="false"
+              muted="muted" :ref="`videoref${item}`"></video>
+            <!-- </div> -->
+          </div>
+          <div style="width: 100%;" v-if="videoType == 4">
+            <!-- <div v-for="item in 9"> -->
+            <video v-for="item in 4" style="width: 49%;margin-left:0.5%" controls="controls" :autoplay="false"
+              muted="muted" :ref="`videoref${item}`"></video>
+            <!-- </div> -->
+          </div>
+          <div style="width: 100%;" v-if="videoType == 9">
+            <!-- <div v-for="item in 9"> -->
+            <video v-for="item in 9" style="width: 32%;margin-left:0.5%" controls="controls" :autoplay="false"
+              muted="muted" :ref="`videoref${item}`"></video>
+            <!-- </div> -->
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+    
+<script setup name="CarInfo" lang="ts">
+import { listCarInfo, getCarInfo, delCarInfo, addCarInfo, updateCarInfo } from '@/api/carInfo';
+import { CarInfoVO, CarInfoQuery, CarInfoForm } from '@/api/carInfo/types';
+import tableElm from "@/components/Public/table.vue";
+import { useRoute, useRouter } from "vue-router";
+
+import videojs from "video.js"
+import "video.js/dist/video-js.css"
+
+const route = useRoute();
+const router = useRouter();
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const carInfoList = ref<CarInfoVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const carInfoFormRef = ref<ElFormInstance>();
+
+const videoPlayer = ref(null)
+
+const myPlayer = ref(null)
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const table = ref(tableElm)
+
+const videoType = ref(4)
+
+
+const initFormData: CarInfoForm = {
+  id: undefined,
+  carNum: undefined,
+  carType: undefined,
+  deviceInfos: undefined,
+  repairInfo: undefined,
+  maintenanceInfo: undefined,
+  insuranceInfo: undefined,
+  inspectionInfo: undefined,
+  trafficAccidentInfo: undefined,
+  violationInfo: undefined,
+  changeInfo: undefined,
+  ext1: undefined,
+  ext2: undefined
+}
+
+interface Tree {
+  [key: string]: any
+}
+
+const filterText = ref('')
+const treeRef = ref<InstanceType<typeof ElTree>>()
+
+const defaultProps = {
+  children: 'children',
+  label: 'carNum',
+}
+
+watch(filterText, (val) => {
+  treeRef.value!.filter(val)
+})
+
+const filterNode = (value: string, data: Tree) => {
+  if (!value) return true
+  return data.label.includes(value)
+}
+
+const data: Tree[] = [
+  {
+    id: 1,
+    carNum: '在线车辆',
+    children: [
+      {carNum:'苏A8762'},
+      {carNum:'苏A8762'},
+    ],
+  },
+]
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询车辆信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listCarInfo({ pageSize:1000 });
+  for(var index in res.rows){
+      data[0].children.push(res.rows[index]);
+  }
+  console.log(data);
+}
+
+onMounted(() => {
+  getList();
+});
+
+onUnmounted(() => {
+  if (myPlayer.value) {
+    myPlayer.value.dispose()
+  }
+})
+
+
+</script>
+
+
+<style lang="scss" scoped>
+.card-header {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
+</style>
+    

+ 1 - 1
vite.config.ts

@@ -26,7 +26,7 @@ export default defineConfig(({ mode, command }: ConfigEnv): UserConfig => {
       open: true,
       proxy: {
         [env.VITE_APP_BASE_API]: {
-          target: 'http://localhost:8080',
+          target: 'http://localhost:8089',
           changeOrigin: true,
           ws: true,
           rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')