功能完善

src/components/Map/index.vue

@@ -25,7 +25,6 @@ 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])
         }
     })

src/components/Public/table.vue

@@ -67,7 +67,7 @@ const props = defineProps({
 
 const buttons = ref([
     { type: 'primary', text: '管理', func: "handleUpdate" },
-    { type: 'danger', text: '删除' },
+    { type: 'danger', text: '删除',func:'handleDelete' },
 ])
 
 const emit = defineEmits(['childToParent', "childFormat"]);

src/router/index.ts

@@ -103,6 +103,19 @@ export const constantRoutes: RouteOption[] = [
     ],
   },
   {
+    path: "/car/carInfo/update",
+    hidden: true,
+    component: Layout,
+    children: [
+      {
+        path: "",
+        component: () => import("@/views/car/carInfo/add"),
+        name: "CarInfoupDate",
+        meta: { title: "车辆信息管理", activeMenu: "/car/carInfo" },
+      },
+    ],
+  },
+  {
     path: "/car/work/addWork",
     hidden: true,
     component: Layout,
@@ -115,6 +128,19 @@ export const constantRoutes: RouteOption[] = [
       },
     ],
   },
+  {
+    path: "/car/work/updateWork",
+    hidden: true,
+    component: Layout,
+    children: [
+      {
+        path: "",
+        component: () => import("@/views/car/work/addCarWork"),
+        name: "CarWorkoUpdate",
+        meta: { title: "车辆作业管理", activeMenu: "/car/work" },
+      },
+    ],
+  },
 ];
 
 // 动态路由，基于用户权限动态去加载

src/views/car/carInfo/add.vue

@@ -5,7 +5,7 @@
                 <div class="card-header">
                     <span>车辆信息</span>
                     <div>
-                        <el-button type="warning" @click="">取消</el-button>
+                        <el-button type="warning" @click="goBack()">取消</el-button>
                         <el-button :loading="buttonLoading" type="primary" @click="submit()">保存</el-button>
                     </div>
                 </div>
@@ -540,7 +540,6 @@ const tabClick = (tab, event) => {
 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));
@@ -564,6 +563,11 @@ const setData = async (id) => {
     // formParams.value = res
 }
 
+const goBack = () =>{
+    useTagsViewStore().delView(route);
+    router.back();
+}
+
 const addObj = () => {
     formList.value = tableJson[activeName.value - 1].columns
     addForm.value = {}

src/views/car/carInfo/index.vue

@@ -242,7 +242,7 @@ const handleAdd = () => {
 /** 修改按钮操作 */
 const handleUpdate = async (row?: CarInfoVO) => {
   useTagsViewStore().delView(route);
-  router.push({ path: '/car/carInfo/add', query: { id: row.id } })
+  router.push({ path: '/car/carInfo/update', query: { id: row.id } })
 }
 
 /** 提交按钮 */

src/views/car/work/addCarWork.vue

@@ -9,7 +9,7 @@
                             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="warning" @click="goBack()">取消</el-button>
                         <el-button type="primary" @click="submit()">保存</el-button>
                     </div>
                 </div>
@@ -179,6 +179,7 @@ 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";
+import useTagsViewStore from '@/store/modules/tagsView';
 import { getDicts } from '@/api/system/dict/data'
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -200,6 +201,7 @@ const timeData = ref();
 const carInfoList = ref<CarInfoVO[]>([])
 const type = ref(null)
 const workTypeList = ref([])
+const carPathId = ref(null)
 
 const queryFormRef = ref<ElFormInstance>();
 const carPathFormRef = ref<ElFormInstance>();
@@ -424,10 +426,33 @@ const getcarInfoList = async () => {
     carInfoList.value = carList.rows
 }
 
+const initData = async() =>{
+    let objId = route.query.id
+    carPathId.value = route.query.id
+    await getDictsData('work_type', workTypeList);
+    await getcarInfoList();
+    await getUserList();
+    if (objId != 0 && objId != null) {
+        setData(objId)
+    }
+}
+
+const setData = async(id) =>{
+    const res = await getCarPath(id);
+    console.log(res)
+    form.value = res.data
+    extObj.value = JSON.parse(res.data.ext2)
+    carObj.value = JSON.parse(res.data.ext1)
+    activities.value = JSON.parse(res.data.stationList)
+}
+
+const goBack = () =>{
+    useTagsViewStore().delView(route);
+    router.back();
+}
+
 onMounted(() => {
-    getDictsData('work_type', workTypeList);
-    getcarInfoList();
-    getUserList();
+    initData()
 });
 
 </script>

src/views/car/work/carWork.vue

@@ -29,7 +29,7 @@
     </transition>
     <el-card shadow="never">
 
-      <tableElm @childFormat="childFormat" :columns="columns" ref="table"></tableElm>
+      <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" />
@@ -223,6 +223,10 @@ const reset = () => {
   carPathFormRef.value?.resetFields();
 }
 
+const childrenClick = (data) => {
+  eval(data.func + "(data.data)")
+}
+
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
@@ -250,15 +254,6 @@ const handleAdd = () => {
   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 = () => {
@@ -299,6 +294,11 @@ const goadd = () => {
   router.push("/car/work/addWork")
 }
 
+const handleUpdate = async (row?: CarInfoVO) => {
+  useTagsViewStore().delView(route);
+  router.push({ path: '/car/work/updateWork', query: { id: row.id } })
+}
+
 const initData = async () => {
   await getDictsData('work_type', workTypeList);
   await getUserList();

src/views/yunying/scheduling/index.vue

@@ -109,7 +109,7 @@ const dialogMap = reactive<DialogOption>({
 });
 
 const dialog = reactive<DialogOption>({
-    visible: true,
+    visible: false,
     title: '在线视频'
 });