Merge branch 'master' of http://git.xt.wenhq.top:8083/wenhongquan/khyznh-ui

* 'master' of http://git.xt.wenhq.top:8083/wenhongquan/khyznh-ui:
  筛选
  优化

src/views/car/vehicleService/index.vue

@@ -275,9 +275,9 @@
     const updateObj = (data) => {
         carId.value = data.id
         console.log(carId.value)
-        service3Obj.value.initData(data, activeName.value)
-        service2Obj.value.initData(data, activeName.value)
-        service1Obj.value.initData(data, activeName.value)
+        service3Obj.value.initData(data, 3)
+        service2Obj.value.initData(data, 2)
+        service1Obj.value.initData(data, 1)
     }
 
     const submitService = () => {

src/views/car/work/carWork.vue

@@ -4,13 +4,13 @@
       <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-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> -->
             <el-form-item label="站点" prop="carNum">
-              <el-input v-model="queryParams.carNum" placeholder="请输入站点" clearable style="width: 160px" @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.params.station" placeholder="请输入站点" clearable style="width: 160px" @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="时间" prop="carNum">
+            <!-- <el-form-item label="时间" prop="carNum">
               <el-date-picker
                 v-model="value2"
                 type="datetimerange"
@@ -19,7 +19,7 @@
                 start-placeholder="开始时间"
                 end-placeholder="结束时间"
               />
-            </el-form-item>
+            </el-form-item> -->
           </el-form>
         </div>
         <div style="width: 15%;">
@@ -97,6 +97,7 @@ const data = reactive<PageData<CarPathForm, CarPathQuery>>({
     ext1: undefined,
     ext2: undefined,
     params: {
+      station:null
     }
   },
   rules: {

src/views/yunying/kdg/index.vue

@@ -90,19 +90,20 @@
                 </div>
                 <div style="width: 8vw;height: 154px;position:relative" @click="clickCabinet(13)">
                   <img style="width: 8vw;height: 154px;" src="@/assets/images/cabinet2.png" />
-                  <!-- <div class="indexDiv">{{ formatIndex(13) }}</div> -->
+                  <div class="indexDivLeft">{{ getStatus(13) }}</div>
+                  <div class="indexDiv">{{ formatIndex(13) }}</div>
                 </div>
-                <div style="width: 8vw;height: 28px;position:relative" @click="clickCabinet(index + 13)"
+                <div style="width: 8vw;height: 28px;position:relative" @click="clickCabinet(index + 14)"
                   v-for="(item, index) in 2">
                   <img style="width: 8vw;height: 28px;" src="@/assets/images/cabinet3.png" />
-                  <div class="indexDivLeft">{{ getStatus(index+13) }}</div>
-                  <div class="indexDiv">{{ formatIndex(index + 13) }}</div>
+                  <div class="indexDivLeft">{{ getStatus(index+14) }}</div>
+                  <div class="indexDiv">{{ formatIndex(index + 14) }}</div>
                 </div>
-                <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(index + 15)"
+                <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(index + 16)"
                   v-for="(item, index) in 3">
                   <img style="width: 8vw;height: 42px;" src="@/assets/images/cabinet3.png" />
-                  <div class="indexDivLeft">{{ getStatus(index+15) }}</div>
-                  <div class="indexDiv">{{ formatIndex(index + 15) }}</div>
+                  <div class="indexDivLeft">{{ getStatus(index+16) }}</div>
+                  <div class="indexDiv">{{ formatIndex(index + 16) }}</div>
                 </div>
               </div>
             </div>
@@ -189,19 +190,19 @@
                 </div>
                 <div style="width: 8vw;height: 154px;position:relative" @click="clickCabinet(35)">
                   <img style="width: 8vw;height: 154px;" src="@/assets/images/cabinet2.png" />
-                  <!-- <div class="indexDiv">{{ formatIndex(35) }}</div> -->
+                  <div class="indexDiv">{{ formatIndex(35) }}</div>
                 </div>
-                <div style="width: 8vw;height: 28px;position:relative" @click="clickCabinet(index + 35)"
+                <div style="width: 8vw;height: 28px;position:relative" @click="clickCabinet(index + 36)"
                   v-for="(item, index) in 2">
                   <img style="width: 8vw;height: 28px;" src="@/assets/images/cabinet3.png" />
-                  <div class="indexDivLeft">{{ getStatus(index+35) }}</div>
-                  <div class="indexDiv">{{ formatIndex(index + 35) }}</div>
+                  <div class="indexDivLeft">{{ getStatus(index+36) }}</div>
+                  <div class="indexDiv">{{ formatIndex(index + 36) }}</div>
                 </div>
-                <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(index + 37)"
+                <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(index + 38)"
                   v-for="(item, index) in 3">
                   <img style="width: 8vw;height: 42px;" src="@/assets/images/cabinet3.png" />
-                  <div class="indexDivLeft">{{ getStatus(index+37) }}</div>
-                  <div class="indexDiv">{{ formatIndex(index + 37) }}</div>
+                  <div class="indexDivLeft">{{ getStatus(index+38) }}</div>
+                  <div class="indexDiv">{{ formatIndex(index + 38) }}</div>
                 </div>
               </div>
             </div>
@@ -288,68 +289,68 @@
                 </div>
                 <div style="width: 8vw;height: 154px;position:relative" @click="clickCabinet(35)">
                   <img style="width: 8vw;height: 154px;" src="@/assets/images/cabinet2.png" />
-                  <!-- <div class="indexDivLeft">{{ getStatus(35) }}</div>
-                  <div class="indexDiv">{{ formatIndex(35) }}</div> -->
+                  <div class="indexDivLeft">{{ getStatus(35) }}</div>
+                  <div class="indexDiv">{{ formatIndex(35) }}</div>
                 </div>
-                <div style="width: 8vw;height: 28px;position:relative" @click="clickCabinet(index + 35)"
+                <div style="width: 8vw;height: 28px;position:relative" @click="clickCabinet(index + 36)"
                   v-for="(item, index) in 2">
                   <img style="width: 8vw;height: 28px;" src="@/assets/images/cabinet3.png" />
-                  <div class="indexDivLeft">{{ getStatus(index+35) }}</div>
-                  <div class="indexDiv">{{ formatIndex(index + 35) }}</div>
+                  <div class="indexDivLeft">{{ getStatus(index+36) }}</div>
+                  <div class="indexDiv">{{ formatIndex(index + 36) }}</div>
                 </div>
-                <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(index + 37)"
+                <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(index + 38)"
                   v-for="(item, index) in 3">
                   <img style="width: 8vw;height: 42px;" src="@/assets/images/cabinet3.png" />
-                  <div class="indexDivLeft">{{ getStatus(index+37) }}</div>
-                  <div class="indexDiv">{{ formatIndex(index + 37) }}</div>
+                  <div class="indexDivLeft">{{ getStatus(index+38) }}</div>
+                  <div class="indexDiv">{{ formatIndex(index + 38) }}</div>
                 </div>
               </div>
               <div style="width: 9vw;border:0.5vw solid #000;">
-                <div style="width: 8vw;height: 86px;position:relative" @click="clickCabinet(40)">
+                <div style="width: 8vw;height: 86px;position:relative" @click="clickCabinet(41)">
                   <img style="width: 8vw;height: 86px" src="@/assets/images/cabinet1.png" />
-                  <div class="indexDivLeft">{{ getStatus(40) }}</div>
-                  <div class="indexDiv">{{ formatIndex(40) }}</div>
-                </div>
-                <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(41)">
-                  <img style="width: 8vw;height: 42px;" src="@/assets/images/cabinet2.png" />
                   <div class="indexDivLeft">{{ getStatus(41) }}</div>
                   <div class="indexDiv">{{ formatIndex(41) }}</div>
                 </div>
-                <div style="width: 8vw;height: 28px;position:relative" @click="clickCabinet(index + 42)"
+                <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(42)">
+                  <img style="width: 8vw;height: 42px;" src="@/assets/images/cabinet2.png" />
+                  <div class="indexDivLeft">{{ getStatus(42) }}</div>
+                  <div class="indexDiv">{{ formatIndex(42) }}</div>
+                </div>
+                <div style="width: 8vw;height: 28px;position:relative" @click="clickCabinet(index + 43)"
                   v-for="(item, index) in 6">
                   <img style="width: 8vw;height: 28px;" src="@/assets/images/cabinet3.png" />
-                  <div class="indexDivLeft">{{ getStatus(index+42) }}</div>
-                  <div class="indexDiv">{{ formatIndex(index + 42) }}</div>
+                  <div class="indexDivLeft">{{ getStatus(index+43) }}</div>
+                  <div class="indexDiv">{{ formatIndex(index + 43) }}</div>
                 </div>
-                <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(index + 48)"
+                <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(index + 49)"
                   v-for="(item, index) in 3">
                   <img style="width: 8vw;height: 42px;" src="@/assets/images/cabinet3.png" />
-                  <div class="indexDivLeft">{{ getStatus(index+48) }}</div>
-                  <div class="indexDiv">{{ formatIndex(index + 48) }}</div>
+                  <div class="indexDivLeft">{{ getStatus(index+49) }}</div>
+                  <div class="indexDiv">{{ formatIndex(index + 49) }}</div>
                 </div>
               </div>
               <div style="width: 9vw;border:0.5vw solid #000;">
-                <div style="width: 8vw;height: 86px;position:relative" @click="clickCabinet(51)">
+                <div style="width: 8vw;height: 86px;position:relative" @click="clickCabinet(52)">
                   <img style="width: 8vw;height: 86px" src="@/assets/images/cabinet1.png" />
-                  <div class="indexDivLeft">{{ getStatus(51) }}</div>
-                  <div class="indexDiv">{{ formatIndex(51) }}</div>
-                </div>
-                <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(52)">
-                  <img style="width: 8vw;height: 42px;" src="@/assets/images/cabinet2.png" />
                   <div class="indexDivLeft">{{ getStatus(52) }}</div>
                   <div class="indexDiv">{{ formatIndex(52) }}</div>
                 </div>
-                <div style="width: 8vw;height: 28px;position:relative" @click="clickCabinet(index + 53)"
+                <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(53)">
+                  <img style="width: 8vw;height: 42px;" src="@/assets/images/cabinet2.png" />
+                  <div class="indexDivLeft">{{ getStatus(53) }}</div>
+                  <div class="indexDiv">{{ formatIndex(53) }}</div>
+                </div>
+                <div style="width: 8vw;height: 28px;position:relative" @click="clickCabinet(index + 54)"
                   v-for="(item, index) in 6">
                   <img style="width: 8vw;height: 28px;" src="@/assets/images/cabinet3.png" />
-                  <div class="indexDivLeft">{{ getStatus(index+53) }}</div>
-                  <div class="indexDiv">{{ formatIndex(index + 53) }}</div>
+                  <div class="indexDivLeft">{{ getStatus(index+54) }}</div>
+                  <div class="indexDiv">{{ formatIndex(index + 54) }}</div>
                 </div>
-                <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(index + 59)"
+                <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(index + 60)"
                   v-for="(item, index) in 3">
                   <img style="width: 8vw;height: 42px;" src="@/assets/images/cabinet3.png" />
-                  <div class="indexDivLeft">{{ getStatus(index+59) }}</div>
-                  <div class="indexDiv">{{ formatIndex(index + 59) }}</div>
+                  <div class="indexDivLeft">{{ getStatus(index+60) }}</div>
+                  <div class="indexDiv">{{ formatIndex(index + 60) }}</div>
                 </div>
               </div>
             </div>

src/views/yunying/scheduling/index.vue

@@ -348,9 +348,9 @@ const getScheduleList = async () => {
     var date = new Date();
     var param = {
         carNum: queryParams.value.carNum,
-        station: queryParams.value.station,
         params: {
             scheduleDate: moment(queryParams.value.params.scheduleDate).format('YYYY-MM-DD'),
+            station: queryParams.value.station,
             // carNum: queryParams.value.carNum,
             // station: queryParams.value.station
             // starttime:startTime,