wenhongquan 2 سال پیش
والد
کامیت
2e3629ffe8

+ 8 - 0
src/api/gpsData/index.ts

@@ -66,3 +66,11 @@ export function devicestatic(): AxiosPromise<any> {
   });
   });
 }
 }
 
 
+export function playlist(): AxiosPromise<any> {
+  return request({
+    url: `/system/common/playlist/static`,
+    data: {},
+    method: 'post'
+  });
+}
+

+ 2 - 3
src/components/HomeComponents/countPage.vue

@@ -54,7 +54,6 @@ const getCountDataList = () => {
             endtime: endDate
             endtime: endDate
         }
         }
     }
     }
-    console.log(obj)
     getCountData(obj).then(res => {
     getCountData(obj).then(res => {
         people.value = res.data.totalin
         people.value = res.data.totalin
     })
     })
@@ -64,7 +63,7 @@ const getlistGoodsOrder = () =>{
     var gotime =  moment(new Date()).format('YYYY-MM-DD 00:00:00')
     var gotime =  moment(new Date()).format('YYYY-MM-DD 00:00:00')
     listGoodsOrder({pageSize:1000,gotime:gotime}).then(res=>{
     listGoodsOrder({pageSize:1000,gotime:gotime}).then(res=>{
           goods.value = res.rows.length
           goods.value = res.rows.length
-    }) 
+    })
 }
 }
 
 
 onMounted(() => {
 onMounted(() => {
@@ -152,4 +151,4 @@ onMounted(() => {
         text-transform: none;
         text-transform: none;
     }
     }
 }
 }
-</style>
+</style>

+ 13 - 13
src/components/HomeComponents/messageTable.vue

@@ -8,9 +8,9 @@
         <div v-for="(item, index) in messageList" :key="index">
         <div v-for="(item, index) in messageList" :key="index">
           <div style="display: flex;flex-direction: row;justify-content: space-around;margin-top: 20px;">
           <div style="display: flex;flex-direction: row;justify-content: space-around;margin-top: 20px;">
             <div :class="item.type == 1 ? 'carClass' : 'goodClass'">{{ item.carNum }}</div>
             <div :class="item.type == 1 ? 'carClass' : 'goodClass'">{{ item.carNum }}</div>
-            <div class="contentClass">{{ item.content }}</div>
+            <div class="contentClass">{{ "即将到达" }}</div>
             <div class="stationClass">{{ item.station }}</div>
             <div class="stationClass">{{ item.station }}</div>
-            <div class="timeClass">{{ item.time }}</div>
+            <div class="timeClass">{{ moment(item.time).format("MM/DD HH:mm") }}</div>
           </div>
           </div>
           <el-divider />
           <el-divider />
         </div>
         </div>
@@ -34,21 +34,21 @@
 </template>
 </template>
 
 
 <script setup name="CarInfo" lang="ts">
 <script setup name="CarInfo" lang="ts">
+import moment from 'moment';
+import { playlist } from '@/api/gpsData';
 
 
-const messageList = ref([{ carNum: '闽JY3013', content: '即将到达', station: '铁湖站', time: '5/10 17:26', type: 1 },
-{ carNum: '闽JY3013', content: '即将到达', station: '铁湖站', time: '5/10 17:26', type: 2 },
-{ carNum: '闽JY3013', content: '即将到达', station: '铁湖站', time: '5/10 17:26', type: 1 },
-{ carNum: '闽JY3013', content: '即将到达', station: '铁湖站', time: '5/10 17:26', type: 1 },
-{ carNum: '闽JY3013', content: '即将到达', station: '铁湖站', time: '5/10 17:26', type: 2 },
-{ carNum: '闽JY3013', content: '即将到达', station: '铁湖站', time: '5/10 17:26', type: 1 },
-{ carNum: '闽JY3013', content: '即将到达', station: '铁湖站', time: '5/10 17:26', type: 1 },
-{ carNum: '闽JY3013', content: '即将到达', station: '铁湖站', time: '5/10 17:26', type: 2 },
-{ carNum: '闽JY3013', content: '即将到达', station: '铁湖站', time: '5/10 17:26', type: 1 },
-{ carNum: '闽JY3013', content: '即将到达', station: '铁湖站', time: '5/10 17:26', type: 1 }
+const messageList = ref([
 ]);
 ]);
 
 
+const getList = () => {
+    playlist().then(res => {
+        messageList.value = res;
+    });
+};
+
+
 onMounted(() => {
 onMounted(() => {
-    // getList();
+    getList();
 });
 });
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">

+ 3 - 5
src/components/HomeComponents/pieEcharts.vue

@@ -24,7 +24,6 @@ const initData = async () => {
     var total = carTotal.total
     var total = carTotal.total
     const data = await getDicts('tbl_car_type')
     const data = await getDicts('tbl_car_type')
     carTypeList.value = data.data
     carTypeList.value = data.data
-    console.log(carTypeList.value)
     var label = {
     var label = {
         normal: {
         normal: {
             formatter: '{c|{c}}' + "\n\n" + '{b|{b}} ',
             formatter: '{c|{c}}' + "\n\n" + '{b|{b}} ',
@@ -50,12 +49,11 @@ const initData = async () => {
         length2: 50
         length2: 50
     }
     }
     for (var index in carTypeList.value) {
     for (var index in carTypeList.value) {
-        console.log(carTypeList.value[0])
+
         var obj = {
         var obj = {
             pageSize: 1000,
             pageSize: 1000,
             carType: carTypeList.value[index].dictValue
             carType: carTypeList.value[index].dictValue
         }
         }
-        console.log(obj)
         const res = await listCarInfo(obj);
         const res = await listCarInfo(obj);
         total = total - res.total
         total = total - res.total
         var cObj = {
         var cObj = {
@@ -73,7 +71,7 @@ const initData = async () => {
 const getDictsData = (param, obj) => {
 const getDictsData = (param, obj) => {
     getDicts(param).then(res => {
     getDicts(param).then(res => {
         obj.value = res.data;
         obj.value = res.data;
-        console.log(carTypeList.value)
+
     })
     })
 }
 }
 
 
@@ -177,4 +175,4 @@ onMounted(() => {
         height: 22vh;
         height: 22vh;
     }
     }
 }
 }
-</style>
+</style>

+ 2 - 4
src/components/HomeStatics/countPage.vue

@@ -38,9 +38,7 @@ const getCountDataList = () => {
             endtime: endDate
             endtime: endDate
         }
         }
     }
     }
-    console.log(obj)
     getCountData(obj).then(res=>{
     getCountData(obj).then(res=>{
-        console.log(res)
         people.value = res.data.totalin
         people.value = res.data.totalin
     })
     })
 }
 }
@@ -49,7 +47,7 @@ const getlistGoodsOrder = () =>{
     var gotime =  moment(new Date()).format('YYYY-MM-DD 00:00:00')
     var gotime =  moment(new Date()).format('YYYY-MM-DD 00:00:00')
     listGoodsOrder({pageSize:1000,gotime:gotime}).then(res=>{
     listGoodsOrder({pageSize:1000,gotime:gotime}).then(res=>{
         goods.value = res.rows.length
         goods.value = res.rows.length
-    }) 
+    })
 }
 }
 
 
 
 
@@ -140,4 +138,4 @@ onMounted(() => {
     font-style: normal;
     font-style: normal;
     text-transform: none;
     text-transform: none;
 }
 }
-</style>
+</style>

+ 27 - 19
src/components/HomeStatics/messageTable.vue

@@ -1,32 +1,40 @@
 <template>
 <template>
-    <div class="countPageClass" style="padding-left: 1vw;padding-top: 1.5vh;padding-right: 2vw;">
-        <div>
-            <div class="title" style="padding-left: 0.5vw;">车辆报站</div>
-            <div style="margin-left: 1vw;max-height: 20vh;overflow-y: scroll;" class="tableClass">
-                <div v-for="(item, index) in messageList">
-                    <div style="display: flex;flex-direction: row;justify-content: space-around;margin-top: 20px;">
-                        <div :class="item.type == 1 ? 'carClass' : 'goodClass'">{{ item.carNum }}</div>
-                        <div class="contentClass">{{ item.content }}</div>
-                        <div class="stationClass">{{ item.station }}</div>
-                        <div class="timeClass">{{ item.time }}</div>
-                    </div>
-                    <el-divider />
-                </div>
-            </div>
+  <div class="countPageClass" style="padding-left: 1vw;padding-top: 1.5vh;padding-right: 2vw;">
+    <div>
+      <div class="title" style="padding-left: 0.5vw;">车辆报站</div>
+      <div style="margin-left: 1vw;max-height: 20vh;overflow-y: scroll;" class="tableClass">
+        <div v-for="(item, index) in messageList" :key="index">
+          <div style="display: flex;flex-direction: row;justify-content: space-around;margin-top: 20px;">
+            <div :class="item.type == '1' ? 'carClass' : 'goodClass'">{{ item.carNum }}</div>
+            <div class="contentClass">{{ "即将到达" }}</div>
+            <div class="stationClass">{{ item.station }}</div>
+            <div class="timeClass">{{ moment(item.time).format("MM/DD HH:mm") }}</div>
+          </div>
+          <el-divider />
         </div>
         </div>
+      </div>
     </div>
     </div>
+  </div>
 </template>
 </template>
 
 
 <script setup name="CarInfo" lang="ts">
 <script setup name="CarInfo" lang="ts">
+import moment from 'moment';
+import { playlist } from '@/api/gpsData';
 
 
-const messageList = ref([{ carNum: '闽JY3013', content: '即将到达', station: '铁湖站', time: '5/10 17:26', type: 1 },
-{ carNum: '闽JY3013', content: '即将到达', station: '铁湖站', time: '5/10 17:26', type: 2 },
-{ carNum: '闽JY3013', content: '即将到达', station: '铁湖站', time: '5/10 17:26', type: 1 },
-{ carNum: '闽JY3013', content: '即将到达', station: '铁湖站', time: '5/10 17:26', type: 1 }
+
+const messageList = ref([
 ]);
 ]);
 
 
+const getList = () => {
+    playlist().then(res => {
+        console.log(res);
+        messageList.value = res;
+    });
+};
+
+
 onMounted(() => {
 onMounted(() => {
-    // getList();
+    getList();
 });
 });
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">

+ 4 - 5
src/components/HomeStatics/pieEcharts.vue

@@ -20,7 +20,7 @@ const initData = async () => {
     var total = carTotal.total
     var total = carTotal.total
     const data = await getDicts('tbl_car_type')
     const data = await getDicts('tbl_car_type')
     carTypeList.value = data.data
     carTypeList.value = data.data
-    console.log(carTypeList.value)
+
     var label = {
     var label = {
         normal: {
         normal: {
             formatter: '{c|{c}}'+"\n\n"+'{b|{b}} ',
             formatter: '{c|{c}}'+"\n\n"+'{b|{b}} ',
@@ -46,12 +46,11 @@ const initData = async () => {
         length2: 50
         length2: 50
     }
     }
     for (var index in carTypeList.value) {
     for (var index in carTypeList.value) {
-        console.log(carTypeList.value[0])
+
         var obj = {
         var obj = {
             pageSize: 1000,
             pageSize: 1000,
             carType: carTypeList.value[index].dictValue
             carType: carTypeList.value[index].dictValue
         }
         }
-        console.log(obj)
         const res = await listCarInfo(obj);
         const res = await listCarInfo(obj);
         total = total - res.total
         total = total - res.total
         var cObj = {
         var cObj = {
@@ -69,7 +68,7 @@ const initData = async () => {
 const getDictsData = (param, obj) => {
 const getDictsData = (param, obj) => {
     getDicts(param).then(res => {
     getDicts(param).then(res => {
         obj.value = res.data;
         obj.value = res.data;
-        console.log(carTypeList.value)
+
     })
     })
 }
 }
 
 
@@ -160,4 +159,4 @@ onMounted(() => {
         text-transform: none;
         text-transform: none;
     }
     }
 }
 }
-</style>
+</style>

+ 4 - 9
src/components/Map/editMap.vue

@@ -61,7 +61,6 @@ const iconImage = new URL("@/assets/images/home/Point.png", import.meta.url);
 
 
 const getCarInfoList = () => {
 const getCarInfoList = () => {
     listCarInfo({ pageSzie: 1000 }).then(res => {
     listCarInfo({ pageSzie: 1000 }).then(res => {
-        console.log(res)
         for (var index in res.rows) {
         for (var index in res.rows) {
             var obj = res.rows[index].location;
             var obj = res.rows[index].location;
             // console.log(obj.toString())
             // console.log(obj.toString())
@@ -97,7 +96,6 @@ const getDictsData = (param) => {
 
 
 const getGpsDataList = (param) => {
 const getGpsDataList = (param) => {
     getGpsData(param).then(res => {
     getGpsData(param).then(res => {
-        console.log(res);
         addLine(res.rows);
         addLine(res.rows);
         if (singleMarker.value != null) {
         if (singleMarker.value != null) {
             mapObj.value.remove(singleMarker.value);
             mapObj.value.remove(singleMarker.value);
@@ -149,10 +147,7 @@ const initMap = () => {
             center: [119.807462, 26.958413], //初始化地图中心点位置
             center: [119.807462, 26.958413], //初始化地图中心点位置
         });
         });
 
 
-        console.log(11111111111);
-        console.log(map)
         mapObj.value = map;
         mapObj.value = map;
-        console.log(map)
         if (props.darkType) {
         if (props.darkType) {
             var styleName = "amap://styles/darkblue";
             var styleName = "amap://styles/darkblue";
             map.setMapStyle(styleName);
             map.setMapStyle(styleName);
@@ -284,8 +279,8 @@ const formatGCJ = (lng, lat) => {
 
 
     /**
     /**
      * 纬度转换
      * 纬度转换
-     * @param { Number } lng 
-     * @param { Number } lat 
+     * @param { Number } lng
+     * @param { Number } lat
      */
      */
     function transformlng(lng, lat) {
     function transformlng(lng, lat) {
         var ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng))
         var ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng))
@@ -297,8 +292,8 @@ const formatGCJ = (lng, lat) => {
 
 
     /**
     /**
      * 判断是否在国内,不在国内则不做偏移
      * 判断是否在国内,不在国内则不做偏移
-     * @param {*} lng 
-     * @param {*} lat 
+     * @param {*} lng
+     * @param {*} lat
      */
      */
     function outOfChina(lng, lat) {
     function outOfChina(lng, lat) {
         return (lng < 72.004 || lng > 137.8347) || ((lat < 0.8293 || lat > 55.8271) || false)
         return (lng < 72.004 || lng > 137.8347) || ((lat < 0.8293 || lat > 55.8271) || false)

+ 9 - 12
src/components/Map/index.vue

@@ -52,7 +52,6 @@
 
 
     const getGpsDataList = (param) => {
     const getGpsDataList = (param) => {
         getGpsData(param).then(res => {
         getGpsData(param).then(res => {
-            console.log(res);
             addLine(res.rows);
             addLine(res.rows);
             if (singleMarker.value != null) {
             if (singleMarker.value != null) {
                 mapObj.value.remove(singleMarker.value);
                 mapObj.value.remove(singleMarker.value);
@@ -85,15 +84,13 @@
                 zoom: 13,           //初始化地图级别
                 zoom: 13,           //初始化地图级别
                 center: [119.807462, 26.958413], //初始化地图中心点位置
                 center: [119.807462, 26.958413], //初始化地图中心点位置
             });
             });
-            console.log(11111111111);
-            console.log(props.darkType)
+
             if (props.darkType) {
             if (props.darkType) {
                 var styleName = "amap://styles/darkblue";
                 var styleName = "amap://styles/darkblue";
                 map.setMapStyle(styleName);
                 map.setMapStyle(styleName);
             }
             }
-            console.log(map)
+
             mapObj.value = map;
             mapObj.value = map;
-            console.log(map)
             // 添加插件
             // 添加插件
             // AMap.plugin(["AMap.ToolBar", "AMap.Scale", "AMap.HawkEye", "AMap.Geolocation", "AMap.MapType", "AMap.MouseTool"], function () {
             // AMap.plugin(["AMap.ToolBar", "AMap.Scale", "AMap.HawkEye", "AMap.Geolocation", "AMap.MapType", "AMap.MouseTool"], function () {
             //     //异步同时加载多个插件
             //     //异步同时加载多个插件
@@ -155,9 +152,9 @@
                     var styleName = "amap://styles/darkblue";
                     var styleName = "amap://styles/darkblue";
                     map.setMapStyle(styleName);
                     map.setMapStyle(styleName);
                 }
                 }
-                console.log(map)
+
                 mapObj.value = map;
                 mapObj.value = map;
-                console.log(map)
+
                 // 添加插件
                 // 添加插件
                 // AMap.plugin(["AMap.ToolBar", "AMap.Scale", "AMap.HawkEye", "AMap.Geolocation", "AMap.MapType", "AMap.MouseTool"], function () {
                 // AMap.plugin(["AMap.ToolBar", "AMap.Scale", "AMap.HawkEye", "AMap.Geolocation", "AMap.MapType", "AMap.MouseTool"], function () {
                 //     //异步同时加载多个插件
                 //     //异步同时加载多个插件
@@ -292,8 +289,8 @@
 
 
         /**
         /**
          * 纬度转换
          * 纬度转换
-         * @param { Number } lng 
-         * @param { Number } lat 
+         * @param { Number } lng
+         * @param { Number } lat
          */
          */
         function transformlng(lng, lat) {
         function transformlng(lng, lat) {
             var ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng))
             var ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng))
@@ -305,8 +302,8 @@
 
 
         /**
         /**
          * 判断是否在国内,不在国内则不做偏移
          * 判断是否在国内,不在国内则不做偏移
-         * @param {*} lng 
-         * @param {*} lat 
+         * @param {*} lng
+         * @param {*} lat
          */
          */
         function outOfChina(lng, lat) {
         function outOfChina(lng, lat) {
             return (lng < 72.004 || lng > 137.8347) || ((lat < 0.8293 || lat > 55.8271) || false)
             return (lng < 72.004 || lng > 137.8347) || ((lat < 0.8293 || lat > 55.8271) || false)
@@ -336,4 +333,4 @@
     background-color: transparent;
     background-color: transparent;
     color: #ffffff;
     color: #ffffff;
 } */
 } */
-</style>
+</style>

+ 5 - 9
src/components/Map/map.vue

@@ -44,7 +44,6 @@ const iconImage = new URL("@/assets/images/home/Point.png",import.meta.url);
 
 
 const getCarInfoList = () => {
 const getCarInfoList = () => {
     listCarInfo({pageSzie:1000}).then(res=>{
     listCarInfo({pageSzie:1000}).then(res=>{
-            console.log(res)
             for (var index in res.rows) {
             for (var index in res.rows) {
             var obj = res.rows[index].location;
             var obj = res.rows[index].location;
             // console.log(obj.toString())
             // console.log(obj.toString())
@@ -70,7 +69,6 @@ const getDictsData = (param) => {
 
 
 const getGpsDataList = (param) => {
 const getGpsDataList = (param) => {
     getGpsData(param).then(res => {
     getGpsData(param).then(res => {
-        console.log(res);
         addLine(res.rows);
         addLine(res.rows);
         if (singleMarker.value != null) {
         if (singleMarker.value != null) {
             mapObj.value.remove(singleMarker.value);
             mapObj.value.remove(singleMarker.value);
@@ -103,10 +101,8 @@ const initMap = () => {
             zoom: 13,           //初始化地图级别
             zoom: 13,           //初始化地图级别
             center: [119.807462, 26.958413], //初始化地图中心点位置
             center: [119.807462, 26.958413], //初始化地图中心点位置
         });
         });
-        console.log(11111111111);
-        console.log(map)
         mapObj.value = map;
         mapObj.value = map;
-        console.log(map)
+
         if (props.darkType) {
         if (props.darkType) {
             var styleName = "amap://styles/8b9b98f3e261fb3096f4425490da9c5d";
             var styleName = "amap://styles/8b9b98f3e261fb3096f4425490da9c5d";
             map.setMapStyle(styleName);
             map.setMapStyle(styleName);
@@ -253,8 +249,8 @@ const formatGCJ = (lng, lat) => {
 
 
     /**
     /**
      * 纬度转换
      * 纬度转换
-     * @param { Number } lng 
-     * @param { Number } lat 
+     * @param { Number } lng
+     * @param { Number } lat
      */
      */
     function transformlng(lng, lat) {
     function transformlng(lng, lat) {
         var ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng))
         var ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng))
@@ -266,8 +262,8 @@ const formatGCJ = (lng, lat) => {
 
 
     /**
     /**
      * 判断是否在国内,不在国内则不做偏移
      * 判断是否在国内,不在国内则不做偏移
-     * @param {*} lng 
-     * @param {*} lat 
+     * @param {*} lng
+     * @param {*} lat
      */
      */
     function outOfChina(lng, lat) {
     function outOfChina(lng, lat) {
         return (lng < 72.004 || lng > 137.8347) || ((lat < 0.8293 || lat > 55.8271) || false)
         return (lng < 72.004 || lng > 137.8347) || ((lat < 0.8293 || lat > 55.8271) || false)

+ 0 - 1
src/components/Map/videoMap.vue

@@ -66,7 +66,6 @@ const closeVideo = () =>{
 
 
 const getGpsDataList = (param) => {
 const getGpsDataList = (param) => {
     getGpsData(param).then(res => {
     getGpsData(param).then(res => {
-        console.log(res);
         addLine(res.rows);
         addLine(res.rows);
         if (singleMarker.value != null) {
         if (singleMarker.value != null) {
             mapObj.value.remove(singleMarker.value);
             mapObj.value.remove(singleMarker.value);

+ 2 - 3
src/views/car/carInfo/add.vue

@@ -603,7 +603,7 @@ const handleUploadSuccess = (response, file, fileList) =>{
             url:response.data.url.replaceAll("http://127.0.0.1:9000","https://khy.xiaole.vip/khyfile").split('?')[0],
             url:response.data.url.replaceAll("http://127.0.0.1:9000","https://khy.xiaole.vip/khyfile").split('?')[0],
             ossId:response.data.ossId
             ossId:response.data.ossId
         }
         }
-     } 
+     }
      fileData.value.push(obj)
      fileData.value.push(obj)
 }
 }
 
 
@@ -734,7 +734,6 @@ const setTableData = (tab) => {
 
 
 const setData = async (id) => {
 const setData = async (id) => {
     const res = await getCarInfo(id);
     const res = await getCarInfo(id);
-    console.log(res)
     formParams.value = JSON.parse(res.data.ext1)
     formParams.value = JSON.parse(res.data.ext1)
     if (res.data.ext2 != null) {
     if (res.data.ext2 != null) {
         ext2.value = JSON.parse(res.data.ext2)
         ext2.value = JSON.parse(res.data.ext2)
@@ -809,4 +808,4 @@ setTimeout(() => {
     display: inline-flex;
     display: inline-flex;
     max-width: 160px;
     max-width: 160px;
 }
 }
-</style>
+</style>

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

@@ -286,7 +286,6 @@ const openMapDiv = (data) => {
 const getList = async () => {
 const getList = async () => {
   loading.value = true;
   loading.value = true;
   const res = await listCarInfo(queryParams.value);
   const res = await listCarInfo(queryParams.value);
-  console.log(res)
   table.value.setDataList(res.rows);
   table.value.setDataList(res.rows);
   total.value = res.total;
   total.value = res.total;
   loading.value = false;
   loading.value = false;

+ 41 - 43
src/views/car/people/index.vue

@@ -19,7 +19,7 @@
                       @keyup.enter="handleQuery"
                       @keyup.enter="handleQuery"
                     />
                     />
                   </el-form-item>
                   </el-form-item>
-  
+
                   <el-form-item label="状态" prop="status">
                   <el-form-item label="状态" prop="status">
                     <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
                     <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-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
@@ -43,7 +43,7 @@
               </el-card>
               </el-card>
             </div>
             </div>
           </transition>
           </transition>
-  
+
           <el-card shadow="hover">
           <el-card shadow="hover">
             <template #header>
             <template #header>
               <el-row :gutter="10">
               <el-row :gutter="10">
@@ -78,7 +78,7 @@
                 <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns" :search="true"></right-toolbar>
                 <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns" :search="true"></right-toolbar>
               </el-row>
               </el-row>
             </template>
             </template>
-  
+
             <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
             <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
               <el-table-column type="selection" width="50" align="center" />
               <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="userId" prop="userId" v-if="columns[0].visible" />
@@ -100,13 +100,13 @@
                   <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
                   <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
-  
+
               <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
               <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
                 <template #default="scope">
                 <template #default="scope">
                   <span>{{ scope.row.createTime }}</span>
                   <span>{{ scope.row.createTime }}</span>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
-  
+
               <el-table-column label="操作" fixed="right" width="180" class-name="small-padding fixed-width">
               <el-table-column label="操作" fixed="right" width="180" class-name="small-padding fixed-width">
                 <template #default="scope">
                 <template #default="scope">
                   <el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">
                   <el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">
@@ -115,18 +115,18 @@
                   <el-tooltip content="删除" placement="top" v-if="scope.row.userId !== 1">
                   <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-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']"></el-button>
                   </el-tooltip>
                   </el-tooltip>
-  
+
                   <el-tooltip content="重置密码" placement="top" v-if="scope.row.userId !== 1">
                   <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-button link type="primary" icon="Key" @click="handleResetPwd(scope.row)" v-hasPermi="['system:user:resetPwd']"></el-button>
                   </el-tooltip>
                   </el-tooltip>
-  
+
                   <el-tooltip content="分配角色" placement="top" v-if="scope.row.userId !== 1">
                   <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-button link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
                   </el-tooltip>
                   </el-tooltip>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
             </el-table>
             </el-table>
-  
+
             <pagination
             <pagination
               v-show="total > 0"
               v-show="total > 0"
               :total="total"
               :total="total"
@@ -137,7 +137,7 @@
           </el-card>
           </el-card>
         </el-col>
         </el-col>
       </el-row>
       </el-row>
-  
+
       <!-- 添加或修改用户配置对话框 -->
       <!-- 添加或修改用户配置对话框 -->
       <el-dialog ref="formDialogRef" :title="dialog.title" v-model="dialog.visible" width="600px" append-to-body @close="closeDialog">
       <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-form :model="form" :rules="rules" ref="userFormRef" label-width="80px">
@@ -247,7 +247,7 @@
           </div>
           </div>
         </template>
         </template>
       </el-dialog>
       </el-dialog>
-  
+
       <!-- 用户导入对话框 -->
       <!-- 用户导入对话框 -->
       <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
       <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
         <el-upload
         <el-upload
@@ -283,7 +283,7 @@
       </el-dialog>
       </el-dialog>
     </div>
     </div>
   </template>
   </template>
-  
+
   <script setup name="User" lang="ts">
   <script setup name="User" lang="ts">
   import api from "@/api/system/user"
   import api from "@/api/system/user"
   import { UserForm, UserQuery, UserVO } from '@/api/system/user/types';
   import { UserForm, UserQuery, UserVO } from '@/api/system/user/types';
@@ -293,11 +293,11 @@
   import { PostVO } from "@/api/system/post/types";
   import { PostVO } from "@/api/system/post/types";
   import { to } from "await-to-js";
   import { to } from "await-to-js";
   import { globalHeaders } from "@/utils/request";
   import { globalHeaders } from "@/utils/request";
-  
+
   const router = useRouter();
   const router = useRouter();
   const { proxy } = getCurrentInstance() as ComponentInternalInstance
   const { proxy } = getCurrentInstance() as ComponentInternalInstance
   const { sys_normal_disable, sys_user_sex } = toRefs<any>(proxy?.useDict('sys_normal_disable', 'sys_user_sex'));
   const { sys_normal_disable, sys_user_sex } = toRefs<any>(proxy?.useDict('sys_normal_disable', 'sys_user_sex'));
-  
+
   const userList = ref<UserVO[]>();
   const userList = ref<UserVO[]>();
   const loading = ref(true);
   const loading = ref(true);
   const showSearch = ref(true)
   const showSearch = ref(true)
@@ -336,19 +336,19 @@
     { key: 5, label: `状态`, visible: true,children: [] },
     { key: 5, label: `状态`, visible: true,children: [] },
     { key: 6, label: `创建时间`, visible: true,children: [] }
     { key: 6, label: `创建时间`, visible: true,children: [] }
   ])
   ])
-  
-  
+
+
   const deptTreeRef = ref<ElTreeInstance>();
   const deptTreeRef = ref<ElTreeInstance>();
   const queryFormRef = ref<ElFormInstance>();
   const queryFormRef = ref<ElFormInstance>();
   const userFormRef = ref<ElFormInstance>();
   const userFormRef = ref<ElFormInstance>();
   const uploadRef = ref<ElUploadInstance>();
   const uploadRef = ref<ElUploadInstance>();
   const formDialogRef = ref<ElDialogInstance>();
   const formDialogRef = ref<ElDialogInstance>();
-  
+
   const dialog = reactive<DialogOption>({
   const dialog = reactive<DialogOption>({
     visible: false,
     visible: false,
     title: ''
     title: ''
   });
   });
-  
+
   const initFormData: UserForm = {
   const initFormData: UserForm = {
     userId: undefined,
     userId: undefined,
     deptId: undefined,
     deptId: undefined,
@@ -384,9 +384,9 @@
       phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
       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 { queryParams, form, rules } = toRefs<PageData<UserForm, UserQuery>>(data)
-  
+
   /** 通过条件过滤节点  */
   /** 通过条件过滤节点  */
   const filterNode = (value: string, data: any) => {
   const filterNode = (value: string, data: any) => {
     if (!value) return true
     if (!value) return true
@@ -399,30 +399,29 @@
       flush: 'post' // watchEffect会在DOM挂载或者更新之前就会触发,此属性控制在DOM元素更新后运行
       flush: 'post' // watchEffect会在DOM挂载或者更新之前就会触发,此属性控制在DOM元素更新后运行
     }
     }
   );
   );
-  
+
   /** 查询部门下拉树结构 */
   /** 查询部门下拉树结构 */
   const getTreeSelect = async () => {
   const getTreeSelect = async () => {
     const res = await api.deptTreeSelect();
     const res = await api.deptTreeSelect();
     deptOptions.value = res.data;
     deptOptions.value = res.data;
   };
   };
-  
+
   /** 查询用户列表 */
   /** 查询用户列表 */
   const getList = async () => {
   const getList = async () => {
     loading.value = true;
     loading.value = true;
     const res = await api.listUser(proxy?.addDateRange(queryParams.value, dateRange.value));
     const res = await api.listUser(proxy?.addDateRange(queryParams.value, dateRange.value));
-    console.log(res)
     loading.value = false;
     loading.value = false;
     userList.value = res.rows;
     userList.value = res.rows;
     total.value = res.total;
     total.value = res.total;
   }
   }
-  
+
   /** 节点单击事件 */
   /** 节点单击事件 */
   const handleNodeClick = (data: DeptVO) => {
   const handleNodeClick = (data: DeptVO) => {
     queryParams.value.deptId = data.id;
     queryParams.value.deptId = data.id;
     handleQuery()
     handleQuery()
   }
   }
-  
-  
+
+
   /** 搜索按钮操作 */
   /** 搜索按钮操作 */
   const handleQuery = () => {
   const handleQuery = () => {
     queryParams.value.pageNum = 1
     queryParams.value.pageNum = 1
@@ -437,7 +436,7 @@
     deptTreeRef.value?.setCurrentKey(undefined);
     deptTreeRef.value?.setCurrentKey(undefined);
     handleQuery();
     handleQuery();
   }
   }
-  
+
   /** 删除按钮操作 */
   /** 删除按钮操作 */
   const handleDelete = async (row?: UserVO) => {
   const handleDelete = async (row?: UserVO) => {
     const userIds = row?.userId || ids.value;
     const userIds = row?.userId || ids.value;
@@ -448,7 +447,7 @@
       proxy?.$modal.msgSuccess("删除成功");
       proxy?.$modal.msgSuccess("删除成功");
     }
     }
   }
   }
-  
+
   /** 用户状态修改  */
   /** 用户状态修改  */
   const handleStatusChange = async (row: UserVO) => {
   const handleStatusChange = async (row: UserVO) => {
     let text = row.status === "0" ? "启用" : "停用"
     let text = row.status === "0" ? "启用" : "停用"
@@ -465,7 +464,7 @@
     const userId = row.userId;
     const userId = row.userId;
     router.push("/system/user-auth/role/" + userId);
     router.push("/system/user-auth/role/" + userId);
   }
   }
-  
+
   /** 重置密码按钮操作 */
   /** 重置密码按钮操作 */
   const handleResetPwd = async (row: UserVO) => {
   const handleResetPwd = async (row: UserVO) => {
     const [err, res] = await to(ElMessageBox.prompt('请输入"' + row.userName + '"的新密码', "提示", {
     const [err, res] = await to(ElMessageBox.prompt('请输入"' + row.userName + '"的新密码', "提示", {
@@ -480,14 +479,14 @@
       proxy?.$modal.msgSuccess("修改成功,新密码是:" + res.value);
       proxy?.$modal.msgSuccess("修改成功,新密码是:" + res.value);
     }
     }
   }
   }
-  
+
   /** 选择条数  */
   /** 选择条数  */
   const handleSelectionChange = (selection: UserVO[]) => {
   const handleSelectionChange = (selection: UserVO[]) => {
     ids.value = selection.map((item) => item.userId);
     ids.value = selection.map((item) => item.userId);
     single.value = selection.length != 1;
     single.value = selection.length != 1;
     multiple.value = !selection.length;
     multiple.value = !selection.length;
   }
   }
-  
+
   /** 导入按钮操作 */
   /** 导入按钮操作 */
   const handleImport = () => {
   const handleImport = () => {
     upload.title = "用户导入";
     upload.title = "用户导入";
@@ -504,7 +503,7 @@
     proxy?.download("system/user/importTemplate", {
     proxy?.download("system/user/importTemplate", {
     }, `user_template_${new Date().getTime()}.xlsx`);
     }, `user_template_${new Date().getTime()}.xlsx`);
   }
   }
-  
+
   /**文件上传中处理 */
   /**文件上传中处理 */
   const handleFileUploadProgress = () => {
   const handleFileUploadProgress = () => {
     upload.isUploading = true;
     upload.isUploading = true;
@@ -517,12 +516,12 @@
     ElMessageBox.alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
     ElMessageBox.alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
     getList();
     getList();
   }
   }
-  
+
   /** 提交上传文件 */
   /** 提交上传文件 */
   function submitFileForm() {
   function submitFileForm() {
     uploadRef.value?.submit();
     uploadRef.value?.submit();
   }
   }
-  
+
   /** 初始化部门数据 */
   /** 初始化部门数据 */
   const initTreeData = async () => {
   const initTreeData = async () => {
     // 判断部门的数据是否存在,存在不获取,不存在则获取
     // 判断部门的数据是否存在,存在不获取,不存在则获取
@@ -531,8 +530,8 @@
       deptOptions.value = data;
       deptOptions.value = data;
     }
     }
   }
   }
-  
-  
+
+
   /** 重置操作表单 */
   /** 重置操作表单 */
   const reset = () => {
   const reset = () => {
     form.value = { ...initFormData };
     form.value = { ...initFormData };
@@ -543,7 +542,7 @@
     dialog.visible = false;
     dialog.visible = false;
     reset();
     reset();
   }
   }
-  
+
   /** 新增按钮操作 */
   /** 新增按钮操作 */
   const handleAdd = async () => {
   const handleAdd = async () => {
     reset();
     reset();
@@ -570,7 +569,7 @@
     form.value.roleIds = data.roleIds;
     form.value.roleIds = data.roleIds;
     form.value.password = "";
     form.value.password = "";
   }
   }
-  
+
   /** 提交按钮 */
   /** 提交按钮 */
   const submitForm = () => {
   const submitForm = () => {
     userFormRef.value?.validate(async (valid: boolean) => {
     userFormRef.value?.validate(async (valid: boolean) => {
@@ -582,8 +581,8 @@
       }
       }
     })
     })
   }
   }
-  
-  
+
+
   /**
   /**
    * 关闭用户弹窗
    * 关闭用户弹窗
    */
    */
@@ -591,14 +590,14 @@
     dialog.visible = false;
     dialog.visible = false;
     resetForm();
     resetForm();
   }
   }
-  
+
   /**
   /**
    * 重置表单
    * 重置表单
    */
    */
   const resetForm = () => {
   const resetForm = () => {
     userFormRef.value?.resetFields();
     userFormRef.value?.resetFields();
     userFormRef.value?.clearValidate();
     userFormRef.value?.clearValidate();
-  
+
     form.value.id = undefined;
     form.value.id = undefined;
     form.value.status = '1';
     form.value.status = '1';
   }
   }
@@ -610,6 +609,5 @@
     });
     });
   });
   });
   </script>
   </script>
-  
+
   <style lang="scss" scoped></style>
   <style lang="scss" scoped></style>
-  

+ 41 - 43
src/views/car/people/yonghu.vue

@@ -19,7 +19,7 @@
                       @keyup.enter="handleQuery"
                       @keyup.enter="handleQuery"
                     />
                     />
                   </el-form-item>
                   </el-form-item>
-  
+
                   <el-form-item label="状态" prop="status">
                   <el-form-item label="状态" prop="status">
                     <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
                     <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-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
@@ -43,7 +43,7 @@
               </el-card>
               </el-card>
             </div>
             </div>
           </transition>
           </transition>
-  
+
           <el-card shadow="hover">
           <el-card shadow="hover">
             <template #header>
             <template #header>
               <el-row :gutter="10">
               <el-row :gutter="10">
@@ -78,7 +78,7 @@
                 <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns" :search="true"></right-toolbar>
                 <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns" :search="true"></right-toolbar>
               </el-row>
               </el-row>
             </template>
             </template>
-  
+
             <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
             <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
               <el-table-column type="selection" width="50" align="center" />
               <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="userId" prop="userId" v-if="columns[0].visible" />
@@ -100,13 +100,13 @@
                   <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
                   <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
-  
+
               <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
               <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
                 <template #default="scope">
                 <template #default="scope">
                   <span>{{ scope.row.createTime }}</span>
                   <span>{{ scope.row.createTime }}</span>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
-  
+
               <el-table-column label="操作" fixed="right" width="180" class-name="small-padding fixed-width">
               <el-table-column label="操作" fixed="right" width="180" class-name="small-padding fixed-width">
                 <template #default="scope">
                 <template #default="scope">
                   <el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">
                   <el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">
@@ -115,18 +115,18 @@
                   <el-tooltip content="删除" placement="top" v-if="scope.row.userId !== 1">
                   <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-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']"></el-button>
                   </el-tooltip>
                   </el-tooltip>
-  
+
                   <el-tooltip content="重置密码" placement="top" v-if="scope.row.userId !== 1">
                   <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-button link type="primary" icon="Key" @click="handleResetPwd(scope.row)" v-hasPermi="['system:user:resetPwd']"></el-button>
                   </el-tooltip>
                   </el-tooltip>
-  
+
                   <el-tooltip content="分配角色" placement="top" v-if="scope.row.userId !== 1">
                   <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-button link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
                   </el-tooltip>
                   </el-tooltip>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
             </el-table>
             </el-table>
-  
+
             <pagination
             <pagination
               v-show="total > 0"
               v-show="total > 0"
               :total="total"
               :total="total"
@@ -137,7 +137,7 @@
           </el-card>
           </el-card>
         </el-col>
         </el-col>
       </el-row>
       </el-row>
-  
+
       <!-- 添加或修改用户配置对话框 -->
       <!-- 添加或修改用户配置对话框 -->
       <el-dialog ref="formDialogRef" :title="dialog.title" v-model="dialog.visible" width="600px" append-to-body @close="closeDialog">
       <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-form :model="form" :rules="rules" ref="userFormRef" label-width="80px">
@@ -247,7 +247,7 @@
           </div>
           </div>
         </template>
         </template>
       </el-dialog>
       </el-dialog>
-  
+
       <!-- 用户导入对话框 -->
       <!-- 用户导入对话框 -->
       <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
       <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
         <el-upload
         <el-upload
@@ -283,7 +283,7 @@
       </el-dialog>
       </el-dialog>
     </div>
     </div>
   </template>
   </template>
-  
+
   <script setup name="User" lang="ts">
   <script setup name="User" lang="ts">
   import api from "@/api/system/user"
   import api from "@/api/system/user"
   import { UserForm, UserQuery, UserVO } from '@/api/system/user/types';
   import { UserForm, UserQuery, UserVO } from '@/api/system/user/types';
@@ -293,11 +293,11 @@
   import { PostVO } from "@/api/system/post/types";
   import { PostVO } from "@/api/system/post/types";
   import { to } from "await-to-js";
   import { to } from "await-to-js";
   import { globalHeaders } from "@/utils/request";
   import { globalHeaders } from "@/utils/request";
-  
+
   const router = useRouter();
   const router = useRouter();
   const { proxy } = getCurrentInstance() as ComponentInternalInstance
   const { proxy } = getCurrentInstance() as ComponentInternalInstance
   const { sys_normal_disable, sys_user_sex } = toRefs<any>(proxy?.useDict('sys_normal_disable', 'sys_user_sex'));
   const { sys_normal_disable, sys_user_sex } = toRefs<any>(proxy?.useDict('sys_normal_disable', 'sys_user_sex'));
-  
+
   const userList = ref<UserVO[]>();
   const userList = ref<UserVO[]>();
   const loading = ref(true);
   const loading = ref(true);
   const showSearch = ref(true)
   const showSearch = ref(true)
@@ -336,19 +336,19 @@
     { key: 5, label: `状态`, visible: true,children: [] },
     { key: 5, label: `状态`, visible: true,children: [] },
     { key: 6, label: `创建时间`, visible: true,children: [] }
     { key: 6, label: `创建时间`, visible: true,children: [] }
   ])
   ])
-  
-  
+
+
   const deptTreeRef = ref<ElTreeInstance>();
   const deptTreeRef = ref<ElTreeInstance>();
   const queryFormRef = ref<ElFormInstance>();
   const queryFormRef = ref<ElFormInstance>();
   const userFormRef = ref<ElFormInstance>();
   const userFormRef = ref<ElFormInstance>();
   const uploadRef = ref<ElUploadInstance>();
   const uploadRef = ref<ElUploadInstance>();
   const formDialogRef = ref<ElDialogInstance>();
   const formDialogRef = ref<ElDialogInstance>();
-  
+
   const dialog = reactive<DialogOption>({
   const dialog = reactive<DialogOption>({
     visible: false,
     visible: false,
     title: ''
     title: ''
   });
   });
-  
+
   const initFormData: UserForm = {
   const initFormData: UserForm = {
     userId: undefined,
     userId: undefined,
     deptId: undefined,
     deptId: undefined,
@@ -384,9 +384,9 @@
       phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
       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 { queryParams, form, rules } = toRefs<PageData<UserForm, UserQuery>>(data)
-  
+
   /** 通过条件过滤节点  */
   /** 通过条件过滤节点  */
   const filterNode = (value: string, data: any) => {
   const filterNode = (value: string, data: any) => {
     if (!value) return true
     if (!value) return true
@@ -399,30 +399,29 @@
       flush: 'post' // watchEffect会在DOM挂载或者更新之前就会触发,此属性控制在DOM元素更新后运行
       flush: 'post' // watchEffect会在DOM挂载或者更新之前就会触发,此属性控制在DOM元素更新后运行
     }
     }
   );
   );
-  
+
   /** 查询部门下拉树结构 */
   /** 查询部门下拉树结构 */
   const getTreeSelect = async () => {
   const getTreeSelect = async () => {
     const res = await api.deptTreeSelect();
     const res = await api.deptTreeSelect();
     deptOptions.value = res.data;
     deptOptions.value = res.data;
   };
   };
-  
+
   /** 查询用户列表 */
   /** 查询用户列表 */
   const getList = async () => {
   const getList = async () => {
     loading.value = true;
     loading.value = true;
     const res = await api.listUser(proxy?.addDateRange(queryParams.value, dateRange.value));
     const res = await api.listUser(proxy?.addDateRange(queryParams.value, dateRange.value));
-    console.log(res)
     loading.value = false;
     loading.value = false;
     userList.value = res.rows;
     userList.value = res.rows;
     total.value = res.total;
     total.value = res.total;
   }
   }
-  
+
   /** 节点单击事件 */
   /** 节点单击事件 */
   const handleNodeClick = (data: DeptVO) => {
   const handleNodeClick = (data: DeptVO) => {
     queryParams.value.deptId = data.id;
     queryParams.value.deptId = data.id;
     handleQuery()
     handleQuery()
   }
   }
-  
-  
+
+
   /** 搜索按钮操作 */
   /** 搜索按钮操作 */
   const handleQuery = () => {
   const handleQuery = () => {
     queryParams.value.pageNum = 1
     queryParams.value.pageNum = 1
@@ -437,7 +436,7 @@
     deptTreeRef.value?.setCurrentKey(undefined);
     deptTreeRef.value?.setCurrentKey(undefined);
     handleQuery();
     handleQuery();
   }
   }
-  
+
   /** 删除按钮操作 */
   /** 删除按钮操作 */
   const handleDelete = async (row?: UserVO) => {
   const handleDelete = async (row?: UserVO) => {
     const userIds = row?.userId || ids.value;
     const userIds = row?.userId || ids.value;
@@ -448,7 +447,7 @@
       proxy?.$modal.msgSuccess("删除成功");
       proxy?.$modal.msgSuccess("删除成功");
     }
     }
   }
   }
-  
+
   /** 用户状态修改  */
   /** 用户状态修改  */
   const handleStatusChange = async (row: UserVO) => {
   const handleStatusChange = async (row: UserVO) => {
     let text = row.status === "0" ? "启用" : "停用"
     let text = row.status === "0" ? "启用" : "停用"
@@ -465,7 +464,7 @@
     const userId = row.userId;
     const userId = row.userId;
     router.push("/system/user-auth/role/" + userId);
     router.push("/system/user-auth/role/" + userId);
   }
   }
-  
+
   /** 重置密码按钮操作 */
   /** 重置密码按钮操作 */
   const handleResetPwd = async (row: UserVO) => {
   const handleResetPwd = async (row: UserVO) => {
     const [err, res] = await to(ElMessageBox.prompt('请输入"' + row.userName + '"的新密码', "提示", {
     const [err, res] = await to(ElMessageBox.prompt('请输入"' + row.userName + '"的新密码', "提示", {
@@ -480,14 +479,14 @@
       proxy?.$modal.msgSuccess("修改成功,新密码是:" + res.value);
       proxy?.$modal.msgSuccess("修改成功,新密码是:" + res.value);
     }
     }
   }
   }
-  
+
   /** 选择条数  */
   /** 选择条数  */
   const handleSelectionChange = (selection: UserVO[]) => {
   const handleSelectionChange = (selection: UserVO[]) => {
     ids.value = selection.map((item) => item.userId);
     ids.value = selection.map((item) => item.userId);
     single.value = selection.length != 1;
     single.value = selection.length != 1;
     multiple.value = !selection.length;
     multiple.value = !selection.length;
   }
   }
-  
+
   /** 导入按钮操作 */
   /** 导入按钮操作 */
   const handleImport = () => {
   const handleImport = () => {
     upload.title = "用户导入";
     upload.title = "用户导入";
@@ -504,7 +503,7 @@
     proxy?.download("system/user/importTemplate", {
     proxy?.download("system/user/importTemplate", {
     }, `user_template_${new Date().getTime()}.xlsx`);
     }, `user_template_${new Date().getTime()}.xlsx`);
   }
   }
-  
+
   /**文件上传中处理 */
   /**文件上传中处理 */
   const handleFileUploadProgress = () => {
   const handleFileUploadProgress = () => {
     upload.isUploading = true;
     upload.isUploading = true;
@@ -517,12 +516,12 @@
     ElMessageBox.alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
     ElMessageBox.alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
     getList();
     getList();
   }
   }
-  
+
   /** 提交上传文件 */
   /** 提交上传文件 */
   function submitFileForm() {
   function submitFileForm() {
     uploadRef.value?.submit();
     uploadRef.value?.submit();
   }
   }
-  
+
   /** 初始化部门数据 */
   /** 初始化部门数据 */
   const initTreeData = async () => {
   const initTreeData = async () => {
     // 判断部门的数据是否存在,存在不获取,不存在则获取
     // 判断部门的数据是否存在,存在不获取,不存在则获取
@@ -531,8 +530,8 @@
       deptOptions.value = data;
       deptOptions.value = data;
     }
     }
   }
   }
-  
-  
+
+
   /** 重置操作表单 */
   /** 重置操作表单 */
   const reset = () => {
   const reset = () => {
     form.value = { ...initFormData };
     form.value = { ...initFormData };
@@ -543,7 +542,7 @@
     dialog.visible = false;
     dialog.visible = false;
     reset();
     reset();
   }
   }
-  
+
   /** 新增按钮操作 */
   /** 新增按钮操作 */
   const handleAdd = async () => {
   const handleAdd = async () => {
     reset();
     reset();
@@ -570,7 +569,7 @@
     form.value.roleIds = data.roleIds;
     form.value.roleIds = data.roleIds;
     form.value.password = "";
     form.value.password = "";
   }
   }
-  
+
   /** 提交按钮 */
   /** 提交按钮 */
   const submitForm = () => {
   const submitForm = () => {
     userFormRef.value?.validate(async (valid: boolean) => {
     userFormRef.value?.validate(async (valid: boolean) => {
@@ -582,8 +581,8 @@
       }
       }
     })
     })
   }
   }
-  
-  
+
+
   /**
   /**
    * 关闭用户弹窗
    * 关闭用户弹窗
    */
    */
@@ -591,14 +590,14 @@
     dialog.visible = false;
     dialog.visible = false;
     resetForm();
     resetForm();
   }
   }
-  
+
   /**
   /**
    * 重置表单
    * 重置表单
    */
    */
   const resetForm = () => {
   const resetForm = () => {
     userFormRef.value?.resetFields();
     userFormRef.value?.resetFields();
     userFormRef.value?.clearValidate();
     userFormRef.value?.clearValidate();
-  
+
     form.value.id = undefined;
     form.value.id = undefined;
     form.value.status = '1';
     form.value.status = '1';
   }
   }
@@ -610,6 +609,5 @@
     });
     });
   });
   });
   </script>
   </script>
-  
+
   <style lang="scss" scoped></style>
   <style lang="scss" scoped></style>
-  

+ 1 - 2
src/views/car/work/schedule.vue

@@ -209,7 +209,6 @@ const getScheduleData = () => {
     endtime: year + "-12-31"
     endtime: year + "-12-31"
   }
   }
   listCarSchedule({ pageSize: 1000, params: obj }).then(res => {
   listCarSchedule({ pageSize: 1000, params: obj }).then(res => {
-    console.log(res)
     scheduleList.value = res.rows
     scheduleList.value = res.rows
     proxy?.$forceUpdate
     proxy?.$forceUpdate
 
 
@@ -526,4 +525,4 @@ onMounted(() => {
   height: 40px;
   height: 40px;
 
 
 }
 }
-</style>
+</style>

+ 1 - 2
src/views/statics/passengerFlow.vue

@@ -510,7 +510,6 @@ const searchSite = () => {
         params: params
         params: params
     }
     }
     listsitesFlow(obj).then(res => {
     listsitesFlow(obj).then(res => {
-        console.log(res)
         total2.value = res.total
         total2.value = res.total
         for (var index in res.rows) {
         for (var index in res.rows) {
             res.rows[index].startTime = moment(dataValue.value[0]).format("YYYY-MM-DD HH:mm:ss")
             res.rows[index].startTime = moment(dataValue.value[0]).format("YYYY-MM-DD HH:mm:ss")
@@ -586,4 +585,4 @@ onMounted(() => {
 </script>
 </script>
 
 
 
 
-<style></style>
+<style></style>

+ 1 - 2
src/views/yunying/kdg/index.vue

@@ -576,7 +576,6 @@
     )
     )
       .then(() => {
       .then(() => {
         openall(code).then(res => {
         openall(code).then(res => {
-          console.log(res)
           if (res.code == 0) {
           if (res.code == 0) {
             ElMessage.success("打开所有柜子成功");
             ElMessage.success("打开所有柜子成功");
           }
           }
@@ -794,4 +793,4 @@
     font-size: 10px;
     font-size: 10px;
     text-align: center;
     text-align: center;
   }
   }
-</style>
+</style>

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

@@ -417,7 +417,6 @@ const getList = async () => {
     // queryParams.value.starttime = value2.value
     // queryParams.value.starttime = value2.value
     const res = await listCarInfo({ pageSize: 1000 });
     const res = await listCarInfo({ pageSize: 1000 });
     carInfoList.value = res.rows
     carInfoList.value = res.rows
-    //   console.log(res);
 }
 }
 
 
 const getDictsData = (param, obj) => {
 const getDictsData = (param, obj) => {