liwei19941102 2 lat temu
rodzic
commit
add46bce8b

+ 342 - 303
src/views/car/vehicleService/index.vue

@@ -11,14 +11,14 @@
                 <el-tabs type="card" class="demo-tabs" active-name="4" v-model="activeName">
                 <el-tabs type="card" class="demo-tabs" active-name="4" v-model="activeName">
                     <el-tab-pane label="行驶" name="1">
                     <el-tab-pane label="行驶" name="1">
                         <!-- <carWork></carWork> -->
                         <!-- <carWork></carWork> -->
-                        <oilUse @addInfoObj="openDialog" ref="service1Obj"></oilUse>
+                        <oilUse @addInfoObj="openDialog" @updateInfoObj="updateDialog" ref="service1Obj"></oilUse>
                     </el-tab-pane>
                     </el-tab-pane>
                     <el-tab-pane label="加油" name="2">
                     <el-tab-pane label="加油" name="2">
-                        <oilUse @addInfoObj="openDialog" ref="service2Obj"></oilUse>
+                        <oilUse @addInfoObj="openDialog" @updateInfoObj="updateDialog"  ref="service2Obj"></oilUse>
                         <!-- <schedule></schedule> -->
                         <!-- <schedule></schedule> -->
                     </el-tab-pane>
                     </el-tab-pane>
                     <el-tab-pane label="维修" name="3">
                     <el-tab-pane label="维修" name="3">
-                        <oilUse @addInfoObj="openDialog" ref="service3Obj"></oilUse>
+                        <oilUse @addInfoObj="openDialog" @updateInfoObj="updateDialog"  ref="service3Obj"></oilUse>
                     </el-tab-pane>
                     </el-tab-pane>
 
 
                 </el-tabs>
                 </el-tabs>
@@ -53,102 +53,78 @@
 </template>
 </template>
 
 
 <script setup name="CarInfo" lang="ts">
 <script setup name="CarInfo" lang="ts">
-import { listCarInfo, getCarInfo, delCarInfo, addCarInfo, updateCarInfo } from '@/api/carInfo';
-import { CarInfoVO, CarInfoQuery, CarInfoForm } from '@/api/carInfo/types';
-import { listCarService, getCarService, delCarService, addCarService, updateCarService } from '@/api/carService';
-import tableElm from "@/components/Public/table.vue";
-import { useRoute, useRouter } from "vue-router";
-import { getToken } from '@/utils/auth';
-
-import oilUse from './serviceInfo.vue';
-import serviceJson from '@/assets/json/carService.json'
-
-const route = useRoute();
-const router = useRouter();
-
-const baseUrl = import.meta.env.VITE_APP_BASE_API;
-const uploadImgUrl = ref(baseUrl + "/resource/oss/upload");
-
-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 addForm = ref({});
-
-const activeName = ref("1")
-
-const queryFormRef = ref<ElFormInstance>();
-const carInfoFormRef = ref<ElFormInstance>();
-
-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 dialog = reactive<DialogOption>({
-    visible: false,
-    title: ''
-});
-
-const headers = ref({
-    "Authorization":'Bearer ' +getToken(),
-    "Clientid":'e5cd7e4891bf95d1d19206ce24a7b32e',
-    "Accept":'application/json, text/plain, */*'
-});
-
-const table = ref(tableElm)
-
-const service1Obj = ref(oilUse)
-const service2Obj = ref(oilUse)
-const service3Obj = ref(oilUse)
-
-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 carId = ref(null);
-
-const fileList = ref<UploadUserFile[]>([])
-
-const fileData = ref([])
-
-const data = reactive<PageData<CarInfoForm, CarInfoQuery>>({
-    form: { ...initFormData },
-    queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+    import { listCarInfo, getCarInfo, delCarInfo, addCarInfo, updateCarInfo } from '@/api/carInfo';
+    import { CarInfoVO, CarInfoQuery, CarInfoForm } from '@/api/carInfo/types';
+    import { listCarService, getCarService, delCarService, addCarService, updateCarService } from '@/api/carService';
+    import tableElm from "@/components/Public/table.vue";
+    import { useRoute, useRouter } from "vue-router";
+    import { getToken } from '@/utils/auth';
+
+    import oilUse from './serviceInfo.vue';
+    import serviceJson from '@/assets/json/carService.json'
+
+    const route = useRoute();
+    const router = useRouter();
+
+    const baseUrl = import.meta.env.VITE_APP_BASE_API;
+    const uploadImgUrl = ref(baseUrl + "/resource/oss/upload");
+
+    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 addForm = ref({});
+    const carServiceId = ref(null)
+
+    const activeName = ref("1")
+
+    const queryFormRef = ref < ElFormInstance > ();
+    const carInfoFormRef = ref < ElFormInstance > ();
+
+    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 dialog = reactive < DialogOption > ({
+        visible: false,
+        title: ''
+    });
+
+    const headers = ref({
+        "Authorization": 'Bearer ' + getToken(),
+        "Clientid": 'e5cd7e4891bf95d1d19206ce24a7b32e',
+        "Accept": 'application/json, text/plain, */*'
+    });
+
+    const table = ref(tableElm)
+
+    const service1Obj = ref(oilUse)
+    const service2Obj = ref(oilUse)
+    const service3Obj = ref(oilUse)
+
+    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,
         carNum: undefined,
         carType: undefined,
         carType: undefined,
         deviceInfos: undefined,
         deviceInfos: undefined,
@@ -160,219 +136,282 @@ const data = reactive<PageData<CarInfoForm, CarInfoQuery>>({
         violationInfo: undefined,
         violationInfo: undefined,
         changeInfo: undefined,
         changeInfo: undefined,
         ext1: undefined,
         ext1: undefined,
-        ext2: undefined,
-        params: {
+        ext2: undefined
+    }
+
+    const carId = ref(null);
+
+    const fileList = ref < UploadUserFile[] > ([])
+
+    const fileData = ref([])
+
+    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" }
+            ]
         }
         }
-    },
-    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 { 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 openDialog = () => {
-    formList.value = serviceJson[activeName.value - 1].columns
-    fileList.value = []
-    fileData.value = []
-    console.log(formList.value)
-    addForm.value = {}
-    dialog.visible = true
-}
-
-const handleUploadSuccess = (response, file, fileList) =>{
-     console.log(response)
-     console.log(response.data.url)
-     if(response.code == 200){
-        var obj = {
-            name:response.data.fileName,
-            url:response.data.url.replaceAll("http://127.0.0.1:9000","https://khy.xiaole.vip/khyfile").split('?')[0],
-            ossId:response.data.ossId
+
+    /** 查询车辆信息列表 */
+    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 openDialog = () => {
+        formList.value = serviceJson[activeName.value - 1].columns
+        fileList.value = []
+        fileData.value = []
+        console.log(formList.value)
+        addForm.value = {}
+        dialog.visible = true
+    }
+
+    const updateDialog = (item) => {
+        console.log(item)
+        carServiceId.value = item.id
+        console.log(carServiceId.value)
+        formList.value = serviceJson[activeName.value - 1].columns
+        fileList.value = []
+        fileData.value = []
+        var dataTable = serviceJson[activeName.value - 1].dataName
+        addForm.value = JSON.parse(item[dataTable])
+        fileData.value = addForm.value.file
+        fileList.value = addForm.value.file
+        dialog.visible = true
+    }
+
+    const handleUploadSuccess = (response, file, fileList) => {
+        console.log(response)
+        console.log(response.data.url)
+        if (response.code == 200) {
+            var obj = {
+                name: response.data.fileName,
+                url: response.data.url.replaceAll("http://127.0.0.1:9000", "https://khy.xiaole.vip/khyfile").split('?')[0],
+                ossId: response.data.ossId
+            }
         }
         }
-     } 
-     fileData.value.push(obj)
-}
-
-const handleRemove = (uploadFile, uploadFiles) =>{
-    console.log(uploadFile)
-    const arry = fileData.value.filter((item) => item.ossId != fileData.value.ossId)
-    fileData.value = arry;
-    fileList.value = arry;
-}
-
-const childrenClick = (data) => {
-    if (data.func == "updateObj") {
-        updateObj(data.data)
+        fileData.value.push(obj)
+    }
+
+    const handleRemove = (uploadFile, uploadFiles) => {
+        console.log(uploadFile)
+        const arry = fileData.value.filter((item) => item.ossId != fileData.value.ossId)
+        fileData.value = arry;
+        fileList.value = arry;
     }
     }
-}
-
-const updateObj = (data) => {
-    carId.value = data.id
-    console.log(carId.value)
-    service3Obj.value.initData(data, activeName.value)
-    service2Obj.value.initData(data, activeName.value)
-    service1Obj.value.initData(data, activeName.value)
-}
-
-const submitService = () => {
-    var obj = {
-        carId: carId.value
-    };
-    var key = serviceJson[activeName.value - 1].dataName
-    addForm.value.file = fileData.value
-    obj[key] = JSON.stringify(addForm.value);
-    addCarService(obj).then(res => {
-        if (res.code == 200) {
-            dialog.visible = false
+
+    const childrenClick = (data) => {
+        if (data.func == "updateObj") {
+            updateObj(data.data)
         }
         }
-    })
-}
-
-/** 取消按钮 */
-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 updateObj = (data) => {
+        carId.value = data.id
+        console.log(carId.value)
+        service3Obj.value.initData(data, activeName.value)
+        service2Obj.value.initData(data, activeName.value)
+        service1Obj.value.initData(data, activeName.value)
+    }
+
+    const submitService = () => {
+        var obj = {
+            carId: carId.value
+        };
+        var key = serviceJson[activeName.value - 1].dataName
+        addForm.value.file = fileData.value
+        obj[key] = JSON.stringify(addForm.value);
+        if (carServiceId.value != null) {
+            obj.id = carServiceId.value
+            updateCarService(obj).then(res=>{
+                if(res.code == 200){
+                    carServiceId.value = null
+                    dialog.visible = false
+                    if(activeName.value == 1){
+                        service1Obj.value.getServiceList(carId.value);
+                    }else if(activeName.value == 2){
+                        service2Obj.value.getServiceList(carId.value);
+                    }else{
+                        service3Obj.value.getServiceList(carId.value);
+                    }
+                }
+            })
+        }else{
+            addCarService(obj).then(res => {
+                if (res.code == 200) {
+                    dialog.visible = false
+                    if(activeName.value == 1){
+                        service1Obj.value.getServiceList(carId.value);
+                    }else if(activeName.value == 2){
+                        service2Obj.value.getServiceList(carId.value);
+                    }else{
+                        service3Obj.value.getServiceList(carId.value);
+                    }
+                }
+            })
         }
         }
+    }
+
+    /** 取消按钮 */
+    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();
+        table.value.setButton([{
+            "type": "primary",
+            "text": "管理",
+            "func": "updateObj"
+        }]);
     });
     });
-}
-
-/** 删除按钮操作 */
-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();
-    table.value.setButton([{
-        "type": "primary",
-        "text": "管理",
-        "func": "updateObj"
-    }]);
-});
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
-::v-deep .el-calendar-table .el-calendar-day {
-    height: 40px;
+    ::v-deep .el-calendar-table .el-calendar-day {
+        height: 40px;
 
 
-}
+    }
 </style>
 </style>

+ 33 - 5
src/views/car/vehicleService/serviceInfo.vue

@@ -13,14 +13,19 @@
                 <el-row style="font-size: 12px;line-height: 20px;">
                 <el-row style="font-size: 12px;line-height: 20px;">
                     <el-col :span="item.itemSpan" v-for="(item,index) in keyList">
                     <el-col :span="item.itemSpan" v-for="(item,index) in keyList">
                         <div v-if=" item.prop != 'file'">
                         <div v-if=" item.prop != 'file'">
-                        {{ item.label }}:{{ JSON.parse(card[dataName])[item.prop] }} {{ item.unit }}
+                            {{ item.label }}:{{ JSON.parse(card[dataName])[item.prop] }} {{ item.unit }}
                         </div>
                         </div>
-                        <div v-if="item.prop == 'file' && JSON.parse(card[dataName])[item.prop] !=null" v-for="(image,j) in JSON.parse(card[dataName])[item.prop]">
+                        <div v-if="item.prop == 'file' && JSON.parse(card[dataName])[item.prop] !=null"
+                            v-for="(image,j) in JSON.parse(card[dataName])[item.prop]">
                             <!-- {{ image.url }} -->
                             <!-- {{ image.url }} -->
                             <img style="height: 4vw;width: 4vw;" :src="image.url" />
                             <img style="height: 4vw;width: 4vw;" :src="image.url" />
                         </div>
                         </div>
                     </el-col>
                     </el-col>
                 </el-row>
                 </el-row>
+                <div>
+                    <el-button size="mini" type="primary" @click="clickUpdate(card)">修改</el-button>
+                    <el-button size="mini" type="danger" @click="deleteService(card.id)">删除</el-button>
+                </div>
             </el-card>
             </el-card>
         </div>
         </div>
     </div>
     </div>
@@ -35,13 +40,14 @@
     import { defineEmits } from 'vue'
     import { defineEmits } from 'vue'
     import serviceJson from '@/assets/json/carService.json'
     import serviceJson from '@/assets/json/carService.json'
 
 
-    const emit = defineEmits(['addInfoObj'])
+    const emit = defineEmits(['addInfoObj','updateInfoObj'])
 
 
     const route = useRoute();
     const route = useRoute();
     const router = useRouter();
     const router = useRouter();
 
 
     const energyType = ref(2)
     const energyType = ref(2)
     const businessType = ref(1)
     const businessType = ref(1)
+    const carData = ref(null);
     const carName = ref('');
     const carName = ref('');
     const keyList = ref([]);
     const keyList = ref([]);
     const dataName = ref('');
     const dataName = ref('');
@@ -73,6 +79,10 @@
         emit('addInfoObj')
         emit('addInfoObj')
     }
     }
 
 
+    const clickUpdate = (item) =>{
+        emit('updateInfoObj',item)
+    }
+
     const initData = (data, activeName) => {
     const initData = (data, activeName) => {
         carName.value = data.carNum
         carName.value = data.carNum
         console.log(carName.value)
         console.log(carName.value)
@@ -82,10 +92,25 @@
         dataName.value = serviceJson[activeName - 1].dataName
         dataName.value = serviceJson[activeName - 1].dataName
         keyList.value = serviceJson[activeName - 1].columns
         keyList.value = serviceJson[activeName - 1].columns
         console.log(keyList.value)
         console.log(keyList.value)
+        carData.value = data
         getServiceList(data.id);
         getServiceList(data.id);
         console.log(energyType.value)
         console.log(energyType.value)
     }
     }
 
 
+
+    const updateCarService = (id) =>{
+        
+    }
+
+    const deleteService = (id) => {
+        delCarService(id).then(res => {
+            // console.log(res)
+            if (res.code == 200) {
+                getServiceList(carData.value.id);
+            }
+        })
+    }
+
     const getServiceList = (id) => {
     const getServiceList = (id) => {
         var obj = {
         var obj = {
             carId: id,
             carId: id,
@@ -94,7 +119,9 @@
         serviceList.value = [];
         serviceList.value = [];
         listCarService(obj).then(res => {
         listCarService(obj).then(res => {
             for (var index in res.rows) {
             for (var index in res.rows) {
-                if (res.rows[index][dataName.value] != null) {
+                // console.log(dataName.value)
+                // console.log(res.rows[index][dataName.value].length)
+                if (res.rows[index][dataName.value].length > 2) {
                     serviceList.value.push(res.rows[index])
                     serviceList.value.push(res.rows[index])
                 }
                 }
             }
             }
@@ -102,7 +129,8 @@
     }
     }
 
 
     defineExpose({
     defineExpose({
-        initData
+        initData,
+        getServiceList
     })
     })
 
 
     onMounted(() => {
     onMounted(() => {