修改

src/assets/json/table.json

@@ -219,6 +219,68 @@
 		"isTemplate": false
 	}]
 },{
+	"dataName": "nianjianInfo",
+	"buttons": [{
+		"type": "primary",
+		"text": "管理",
+		"func": "updateObj"
+	}, {
+		"type": "danger",
+		"text": "删除",
+		"func": "deleteObj"
+	}],
+	"columns": [{
+		"placeholder": "请选择年检日期",
+		"type": "date",
+		"label": "年检日期",
+		"prop": "sgdate",
+		"visible": true,
+		"isTemplate": false
+	},{
+		"placeholder": "请输入金额",
+		"type": "input",
+		"label": "金额",
+		"prop": "cash",
+		"visible": true,
+		"isTemplate": false
+	},{
+		"placeholder": "请输入年检信息",
+		"type": "input",
+		"label": "处理信息",
+		"prop": "clxx",
+		"visible": true,
+		"isTemplate": false
+	},
+	{
+		"placeholder": "请输入备注",
+		"type": "input",
+		"label": "备注",
+		"prop": "blr",
+		"visible": true,
+		"isTemplate": false
+	},{
+		"placeholder": "请输入办理人",
+		"type": "input",
+		"label": "办理人",
+		"prop": "blr",
+		"visible": true,
+		"isTemplate": false
+	},{
+		"placeholder": "请输入录入人",
+		"type": "input",
+		"label": "录入人",
+		"prop": "lrr",
+		"visible": true,
+		"isTemplate": false
+	},{
+		"placeholder": "请输入图片",
+		"type": "image",
+		"label": "图片",
+		"prop": "file",
+		"visible": true,
+		"isTemplate": false
+	}]
+},{
 	"dataName": "trafficAccidentInfo",
 	"buttons": [{
 		"type": "primary",

src/components/HomeComponents/countPage.vue

@@ -19,7 +19,7 @@
             </div>
             <div>
                 <div class="hldivBackGround">
-                    <div class="countFont" style="color: #0EF7FF;">5718</div>
+                    <div class="countFont" style="color: #0EF7FF;">{{ goods }}</div>
                 </div>
                 <div style="display: flex;flex-direction: row;justify-content: center;margin-top: 10px">
                     <div class="titleClass">
@@ -37,8 +37,10 @@
 <script setup name="CarInfo" lang="ts">
 import moment from 'moment';
 import { getCountData } from '@/api/gpsData';
+import { listGoodsOrder } from "@/api/goodsOrder";
 
 const people = ref(0)
+const goods = ref(0)
 
 const getCountDataList = () => {
     var startDate = moment(new Date()).format('YYYY-MM-DD');
@@ -59,9 +61,17 @@ const getCountDataList = () => {
     })
 }
 
+const getlistGoodsOrder = () =>{
+    var gotime =  moment(new Date()).format('YYYY-MM-DD 00:00:00')
+    listGoodsOrder({pageSize:1000,gotime:gotime}).then(res=>{
+          goods.value = res.rows.length
+    }) 
+}
+
 onMounted(() => {
     // getList();
     getCountDataList();
+    getlistGoodsOrder();
 });
 </script>
 <style scoped lang="scss">

src/components/HomeComponents/messageTable.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="messagePageClass">
         <div class="titleBg">
-            <div class="titleFont">到站提醒</div>
+            <div class="titleFont">车辆报警</div>
         </div>
         <div class="divContent">
             <div style="margin-left: 1vw;max-height: 30vh;overflow-y: scroll;" class="tableClass">

src/components/HomeComponents/warnTable.vue

@@ -2,7 +2,7 @@
     <div class="warnPageClass">
         <div class="messagePageClass">
             <div class="titleBg">
-                <div class="titleFont">到站提醒</div>
+                <div class="titleFont">车辆报警</div>
             </div>
             <div class="divContent">
                 <div style="padding-left: 1vw;max-height: 30vh;overflow-y: scroll;" class="tableClass">

src/components/HomeStatics/countPage.vue

@@ -11,7 +11,7 @@
             <div class="bgClass1">
                 <img class="imgClass" src="@/assets/images/home/路径6@2x.png" />
                 <div class="bgTitle">货流数</div>
-                <div class="countClass">5718</div>
+                <div class="countClass">{{ goods }}</div>
                 <div class="unitClass">件</div>
             </div>
         </div>
@@ -21,8 +21,10 @@
 <script setup name="CarInfo" lang="ts">
 import moment from 'moment';
 import { getCountData } from '@/api/gpsData';
+import { listGoodsOrder } from "@/api/goodsOrder";
 
 const people = ref(0)
+const goods = ref(0)
 
 const getCountDataList = () => {
     var startDate = moment(new Date()).format('YYYY-MM-DD');
@@ -43,9 +45,18 @@ const getCountDataList = () => {
     })
 }
 
+const getlistGoodsOrder = () =>{
+    var gotime =  moment(new Date()).format('YYYY-MM-DD 00:00:00')
+    listGoodsOrder({pageSize:1000,gotime:gotime}).then(res=>{
+        goods.value = res.rows.length
+    }) 
+}
+
+
 onMounted(() => {
     // getList();
     getCountDataList();
+    getlistGoodsOrder();
 });
 </script>
 <style scoped lang="scss">

src/components/HomeStatics/messageTable.vue

@@ -1,7 +1,7 @@
 <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 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;">

src/components/HomeStatics/stationPie.vue

@@ -3,7 +3,7 @@
         <div class="title">电子站台统计</div>
         <div style="display: flex;flex-direction: row;margin-top: 1vh;padding-left: 1vw;">
             <div ref="stationchart" style="width:11vw;height: 20vh;"></div>
-            <div style="width:10vw;margin-left: 1vw;padding-right: 1vw;">
+            <div style="width:10vw;margin-left: 1vw;padding-right: 1vw;height: 20vh;justify-content: center;display: flex;flex-direction: column;">
                 <div style="display: flex;flex-direction: row;justify-content: space-around;align-items: start;">
                     <div class="stationkeyClass">设备总数</div>
                     <div class="stationvalueClass">80</div>

src/views/car/activeSupervision/index.vue

@@ -6,6 +6,10 @@
                 <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>

src/views/car/carInfo/add.vue

@@ -293,7 +293,7 @@
                         <el-descriptions-item>
                             <template #label>
                                 <div style="display: inline-block;min-width: 100px;text-align: right">
-                                    <span style="color: red">*</span> 跟车人员
+                                    <span style="color: red"></span> 跟车人员
                                 </div>
                             </template>
                             <div class="content-w">

src/views/car/safe/index.vue

@@ -3,12 +3,16 @@
         <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
             :leave-active-class="proxy?.animate.searchAnimate.leave">
             <div class="search" v-show="showSearch" style="display: flex;flex-direction: row;">
-                <div style="width: 85%;">
+                <div style="width: 75%;">
                     <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" />
@@ -19,10 +23,11 @@
                         </el-form-item> -->
                     </el-form>
                 </div>
-                <div style="width: 15%;">
+                <div style="width: 25%;">
                     <el-form-item>
-                        <el-button type="primary" @click="goadd">新增</el-button>
+                        <!-- <el-button type="primary" @click="goadd">新增</el-button> -->
                         <el-button type="primary" @click="resetQuery">查询</el-button>
+                        <!-- <el-button type="primary" @click="resetQuery">删除</el-button> -->
                     </el-form-item>
                 </div>
             </div>

src/views/car/warring/index.vue

@@ -13,6 +13,10 @@
                             <el-input v-model="queryParams.carNum" placeholder="请输入车牌号" clearable style="width: 160px"
                                 @keyup.enter="handleQuery" />
                         </el-form-item> -->
+                        <el-form-item label="车牌号" prop="carNum">
+                            <el-input v-model="queryParams.carNum" placeholder="请输入车牌号" clearable style="width: 160px"
+                                @keyup.enter="handleQuery" />
+                        </el-form-item>
                         <el-form-item label="时间" prop="carNum">
                             <el-date-picker v-model="value2" type="datetimerange" :shortcuts="shortcuts"
                                 range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
@@ -21,7 +25,7 @@
                 </div>
                 <div style="width: 15%;">
                     <el-form-item>
-                        <el-button type="primary" @click="goadd">新增</el-button>
+                        <!-- <el-button type="primary" @click="goadd">新增</el-button> -->
                         <el-button type="primary" @click="resetQuery">查询</el-button>
                     </el-form-item>
                 </div>

src/views/yunying/kdg/index.vue

@@ -17,11 +17,11 @@
           </div>
         </div>
         <div style="margin-top: 20px; padding-left: 10px">
-          <el-select v-model="line" placeholder="请选择路线" style="width: 240px">
+          <el-select v-model="line" placeholder="请选择路线" style="width: 240px" @change="getLineSites()">
             <el-option v-for="item in carPathList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           <el-input style="margin-top: 10px;" v-model="filterText" placeholder="输入关键字" />
-          <el-tree-v2 style="margin-top: 10px" ref="treeRef" class="filter-tree" :height="gettreeheight()" :data="data"
+          <el-tree-v2 v-if="showTree" style="margin-top: 10px" ref="treeRef" class="filter-tree" :height="gettreeheight()" :data="data"
             :indent="treeIndent" :props="defaultProps" :filter-method="filterNode" @node-click="treeclick">
             <template v-slot:default="{ node }">
               <element-tree-line :node="node" :treeData="data" :showLabelLine="false" :indent="treeIndent">
@@ -351,6 +351,8 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const sites = ref([]);
 
+const showTree = ref(true)
+
 const type = ref([])
 
 
@@ -426,6 +428,34 @@ const savedata = () => {
   })
 }
 
+const getLineSites = () => {
+  console.log(line.value)
+  var sitesList = []
+  for (var index in carPathList.value) {
+    if (carPathList.value[index].id == line.value) {
+      sitesList = JSON.parse(carPathList.value[index].stationList)
+    }
+  }
+  console.log(sitesList)
+  var sites = []
+  for (var i in sitesList) {
+    sites.push({ id: i, label: sitesList[i].data.dictLabel })
+  }
+  console.log(sites)
+  data.value = [{
+    id: 1,
+    label: "站点",
+  },];
+  data.value[0].children = sites
+  console.log(data.value)
+  showTree.value = false;
+  setTimeout(() => {
+    showTree.value = true
+  }, 100);
+
+}
+
+
 const getSites = () => {
   listData({ dictType: "tbl_sites" }).then(res2 => {
     sites.value = res2.rows;

src/views/yunying/scheduling/index.vue

@@ -3,7 +3,7 @@
         <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
             :leave-active-class="proxy?.animate.searchAnimate.leave">
             <div class="search" v-show="showSearch" style="display: flex;flex-direction: row;">
-                <div style="width: 85%;">
+                <div style="width: 55%;">
                     <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"
@@ -27,9 +27,9 @@
                         </el-form-item>
                     </el-form>
                 </div>
-                <div style="width: 15%;">
+                <div style="width: 45%;">
                     <el-form-item>
-                        <el-button type="primary" @click="goadd">新增</el-button>
+                        <!-- <el-button type="primary" @click="goadd">新增</el-button> -->
                         <el-button type="primary" @click="resetQuery">查询</el-button>
                     </el-form-item>
                 </div>

src/views/yunying/video/index.vue

@@ -17,11 +17,11 @@
           </div>
         </div>
         <div style="margin-top: 20px; padding-left: 10px">
-          <el-select v-model="line" placeholder="请选择路线" style="width: 240px">
+          <el-select v-model="line" placeholder="请选择路线" style="width: 240px" @change="getLineSites()">
             <el-option v-for="item in carPathList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           <el-input style="margin-top: 10px;" v-model="filterText" placeholder="输入关键字" />
-          <el-tree-v2 style="margin-top: 10px" ref="treeRef" class="filter-tree" :height="gettreeheight()" :data="data"
+          <el-tree-v2 v-if="showTree" style="margin-top: 10px" ref="treeRef" class="filter-tree" :height="gettreeheight()" :data="data"
             :indent="treeIndent" :props="defaultProps" :filter-method="filterNode" @node-click="treeclick">
             <template v-slot:default="{ node }">
               <element-tree-line :node="node" :treeData="data" :showLabelLine="false" :indent="treeIndent">
@@ -67,7 +67,8 @@
                     v-if="scope.row.type == 'cabinet'">{{ `共 ${currentCabinet.total} 格` }}<span
                       style="margin-left: 5px;color:green">{{ `可用 ${currentCabinet.total - currentCabinet.unused} 格`
                       }}</span></span> -->
-                  <span style="margin-left: 20px;" v-if="scope.row.type == 'cabinet'">{{ getTypeName(scope.row) }}</span>
+                  <span style="margin-left: 20px;" v-if="scope.row.type == 'cabinet'">{{ getTypeName(scope.row)
+                    }}</span>
                 </div>
               </template>
             </el-table-column>
@@ -163,6 +164,8 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const sites = ref([]);
 
+const showTree = ref(true)
+
 
 const formdata = ref({
   name: "",
@@ -244,6 +247,33 @@ const savedata = () => {
   })
 }
 
+const getLineSites = () => {
+  console.log(line.value)
+  var sitesList = []
+  for (var index in carPathList.value) {
+    if (carPathList.value[index].id == line.value) {
+      sitesList = JSON.parse(carPathList.value[index].stationList)
+    }
+  }
+  console.log(sitesList)
+  var sites = []
+  for (var i in sitesList) {
+    sites.push({ id: i, label: sitesList[i].data.dictLabel })
+  }
+  console.log(sites)
+  data.value = [{
+    id: 1,
+    label: "站点",
+  },];
+  data.value[0].children = sites
+  console.log(data.value)
+  showTree.value = false;
+  setTimeout(() => {
+    showTree.value = true
+  }, 100);
+
+}
+
 const getSites = () => {
   listData({ dictType: "tbl_sites" }).then(res2 => {
     sites.value = res2.rows;