部分ui及功能优化

src/components/Map/index.vue

@@ -26,7 +26,7 @@ const getDictsData = (param) => {
         for (var index in res.data) {
             var obj = res.data[index].dictValue.split(",");
             console.log(obj)
-            addMarker(obj,res.data[index])
+            addMarker(obj, res.data[index])
         }
     })
 }
@@ -97,7 +97,8 @@ const initMap = () => {
     })
 }
 
-const addMarker = (obj,data) => {
+const addMarker = (obj, data) => {
+    console.log(data)
     const marker = new AMap.Marker({
         icon: new AMap.Icon({
             image: '//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png',
@@ -107,18 +108,22 @@ const addMarker = (obj,data) => {
         // 通过设置 offset 来添加偏移量
         offset: new AMap.Pixel(-10, -20),
     });
+    marker.setLabel({
+        offset: new AMap.Pixel(-30, 20),
+        content: data.dictLabel
+    });
     marker.setMap(mapObj);
-     //给marker添加属性
-     marker.setExtData(data)
+    //给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())
+const clickMarker = (e) => {
+    console.log(e.target.getExtData());
+    emit('childToParent', e.target.getExtData())
 }
 
 initMap()

src/components/Public/table.vue

@@ -97,7 +97,6 @@ const getJsonDataFormat = (str, data, prop, pprop) =>{
         prop: prop,
         pprop:pprop,
     }
-    console.log(obj)
     emit('childFormat', {
         data: obj, fn: (i) => {
             value = i

src/components/Public/timeLine.vue

@@ -1,28 +1,8 @@
 <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 v-for="(item,index) in activities">
+          
+        </div>
     </div>
   </template>
   <script lang="ts" setup>
@@ -33,7 +13,8 @@
       people: '五六七',
       done: true,
       color:'#06D903',
-      index:'起点'
+      index:'起点',
+      rank:1
     },
     {
       content: '白下',
@@ -41,7 +22,8 @@
       done: false,
       time: '8:00-9:00',
       index:'站点1',
-      color:'#409EFF'
+      color:'#409EFF',
+      rank:2
     },
     {
       content: '白下',
@@ -49,7 +31,8 @@
       done: false,
       time: '8:00-9:00',
       index:'站点2',
-      color:'#409EFF'
+      color:'#409EFF',
+      rank:3
     },
   ]
   </script>

src/views/car/carInfo/add.vue

@@ -262,7 +262,7 @@
 
                 </el-col>
 
-                <div style="margin-left: auto;margin-right: 20px;"><el-button type="primary"
+                <div style="margin-left: auto;margin-right: 20px;" v-if="carId != 0 && carId != null"><el-button type="primary"
                         @click="addObj()">新增</el-button></div>
 
                 <el-col :span="24" v-if="carId != 0 && carId != null">
@@ -327,6 +327,7 @@ 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"
+import useTagsViewStore from '@/store/modules/tagsView';
 
 const route = useRoute();
 const router = useRouter();
@@ -499,7 +500,8 @@ const submit = async () => {
         await addCarInfo(form.value).finally(() => buttonLoading.value = false);
     }
     proxy?.$modal.msgSuccess("修改成功");
-    router.back()
+    useTagsViewStore().delView(route);
+    router.push({path:'/car/carInfo'})
 }
 
 const submitForm = () => {

src/views/car/carInfo/index.vue

@@ -4,35 +4,35 @@
       :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>
+          <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-form-item>
             <el-button type="primary" @click="goadd">新增</el-button>
             <el-button type="primary" @click="resetQuery">查询</el-button>
           </el-form-item>
@@ -42,7 +42,7 @@
 
     <el-card shadow="never">
 
-      <tableElm :columns="columns" @childToParent='childrenClick'  ref="table"></tableElm>
+      <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" />
@@ -63,12 +63,13 @@
     </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";
+import useTagsViewStore from '@/store/modules/tagsView';
 
 const route = useRoute();
 const router = useRouter();
@@ -98,9 +99,9 @@ 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: '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 = {
@@ -184,13 +185,17 @@ const data = reactive<PageData<CarInfoForm, CarInfoQuery>>({
 const { queryParams, form, rules } = toRefs(data);
 
 const goadd = () => {
-  router.push("/car/carInfo/add")
+  useTagsViewStore().delView(route);
+  // 跳转路由
+  router.push({ path: "/car/carInfo/add" });
+  // router.push("/car/carInfo/add")
 }
 
 /** 查询车辆信息列表 */
 const getList = async () => {
   loading.value = true;
   const res = await listCarInfo(queryParams.value);
+  console.log(res)
   table.value.setDataList(res.rows);
   total.value = res.total;
   loading.value = false;
@@ -236,6 +241,7 @@ const handleAdd = () => {
 
 /** 修改按钮操作 */
 const handleUpdate = async (row?: CarInfoVO) => {
+  useTagsViewStore().delView(route);
   router.push({ path: '/car/carInfo/add', query: { id: row.id } })
 }
 
@@ -272,12 +278,15 @@ const handleExport = () => {
   }, `carInfo_${new Date().getTime()}.xlsx`)
 }
 
-const childrenClick = (data) =>{
-    eval(data.func+"(data.data)")
+const childrenClick = (data) => {
+  eval(data.func + "(data.data)")
 }
 
+getList();
+
 onMounted(() => {
-  getList();
+  // getList();
 });
-</script>
-  
+
+
+</script>

src/views/car/work/carWork.vue

@@ -44,6 +44,7 @@ import { listCarPath, getCarPath, delCarPath, addCarPath, updateCarPath } from '
 import { CarPathVO, CarPathQuery, CarPathForm } from '@/api/carPath/types';
 import tableElm from "@/components/Public/table.vue";
 import { getDicts } from '@/api/system/dict/data'
+import useTagsViewStore from '@/store/modules/tagsView';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
@@ -294,6 +295,7 @@ const handleExport = () => {
 
 
 const goadd = () => {
+  useTagsViewStore().delView(route);
   router.push("/car/work/addWork")
 }
 

src/views/yunying/scheduling/index.vue

@@ -59,6 +59,8 @@ 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";
+import useTagsViewStore from '@/store/modules/tagsView';
+
 
 
 const route = useRoute();
@@ -179,6 +181,7 @@ const data = reactive<PageData<CarInfoForm, CarInfoQuery>>({
 const { queryParams, form, rules } = toRefs(data);
 
 const goadd = () => {
+    useTagsViewStore().delView(route);
     router.push("/car/work/addWork")
 }