liwei19941102 2 лет назад
Родитель
Сommit
3fc17ad8a1

+ 25 - 13
src/api/data.ts

@@ -2,36 +2,48 @@ import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 
 export const getpassenger = () => {
-    return request({
-      url: '/statistic/passenger/flow',
-      method: 'get'
-    });
-  };
+  return request({
+    url: '/statistic/passenger/flow',
+    method: 'get'
+  });
+};
 
-export const getInfo = (code) =>{
+export const getInfo = (code) => {
   return request({
-    url: '/system/common/cabinet/'+code+'/info',
+    url: '/system/common/cabinet/' + code + '/info',
     method: 'post'
   });
 }
 
-export const getBoxInfo = (code) =>{
+export const getInfoWait = async (code) => {
+  const res = await request({
+    url: '/system/common/cabinet/' + code + '/info',
+    method: 'post'
+  });
+  if (res.code === 200) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.message));
+}
+
+
+export const getBoxInfo = (code) => {
   return request({
-    url: '/system/common/cabinet/'+code+'/allbox/info',
+    url: '/system/common/cabinet/' + code + '/allbox/info',
     method: 'post'
   });
 }
 
-export const getLock = (code,lockAddress) =>{
+export const getLock = (code, lockAddress) => {
   return request({
-    url: '/system/common/cabinet/'+code+'/openlock/'+lockAddress,
+    url: '/system/common/cabinet/' + code + '/openlock/' + lockAddress,
     method: 'post'
   });
 }
 
-export const openall = (code) =>{
+export const openall = (code) => {
   return request({
-    url: '/system/common/cabinet/'+code+'/lock/openall',
+    url: '/system/common/cabinet/' + code + '/lock/openall',
     method: 'post'
   });
 }

+ 0 - 1
src/components/HomeComponents/countPage.vue

@@ -56,7 +56,6 @@ const getCountDataList = () => {
     }
     console.log(obj)
     getCountData(obj).then(res => {
-        console.log(res)
         people.value = res.data.totalin
     })
 }

+ 0 - 1
src/components/HomeComponents/lineEcharts.vue

@@ -123,7 +123,6 @@ const getRecentDays = () => {
 
 const getpassengerData = () =>{
   getpassenger().then(res=>{
-      console.log(res)
       var date = [];
       var kldata = [];
       var hldata = [];

+ 33 - 8
src/components/HomeComponents/stationPie.vue

@@ -15,10 +15,10 @@
                             <div
                                 style="display: flex;flex-direction: row;justify-content: space-between;padding-left: 0.5vw;padding-right: 1vw;">
                                 <div class="typeClass">
-                                    总备数
+                                    总备数
                                 </div>
                                 <div class="countClass" style="color: #FEF822;">
-                                    80
+                                    {{device.total}}
                                 </div>
                             </div>
                             <div style="margin-left: 6vw;"><img style="width: 2vw;height: 1vh;"
@@ -109,7 +109,7 @@
 <script setup name="Index" lang="ts">
     import * as echarts from 'echarts';
     import { getDicts } from '@/api/system/dict/data'
-    import { getInfo, getBoxInfo, getLock, openall } from "@/api/data"
+    import { getInfo, getInfoWait, getBoxInfo, getLock, openall } from "@/api/data"
 
     const stationchart = ref();
 
@@ -126,22 +126,47 @@
         })
     }
 
+    const isJSON = (str) => {
+        if (typeof str == 'string') {
+            try {
+                var obj = JSON.parse(str);
+                if (typeof obj == 'object' && obj) {
+                    return true;
+                } else {
+                    return false;
+                }
+
+            } catch (e) {
+                return false;
+            }
+        }
+    }
+
     const initSiteData = async (res) => {
         console.log(device.value.total);
+        var total = 0
         for (var index in res.data) {
             // console.log(isNull(res.data[index].remark))
-            if (res.data[index].remark != null && res.data[index].remark != '') {
+            if (res.data[index].remark != null && res.data[index].remark != '' && isJSON(res.data[index].remark)) {
                 var devices = JSON.parse(res.data[index].remark)
-                device.value.total += devices.length
+                total += devices.length
                 for (var i in devices) {
                     if (devices[i].type == 'cabinet') {
-                        const boxinfo = await getInfo(devices[i].code)
-                        console.log(boxinfo)
+                        const boxinfo = null
+                        try {
+                             boxinfo =  await getInfo(devices[i].code);
+                        }
+                        catch (e) {
+                            // TODO sth with e
+                        }
+                        if(boxinfo != null){
+                             console.log(boxinfo);
+                        }
                     }
                 }
             }
         }
-        console.log(device.value.total)
+        // device.value.total = total
     }
 
     const drawEchart = () => {

+ 0 - 1
src/components/HomeStatics/lineEcharts.vue

@@ -173,7 +173,6 @@ const getRecentDays = () => {
 
 const getpassengerData = () =>{
   getpassenger().then(res=>{
-      console.log(res)
       var date = [];
       var kldata = [];
       var hldata = [];

+ 0 - 1
src/components/Public/table.vue

@@ -5,7 +5,6 @@
       <template #default="scope" v-if="item.isTemplate">
         <span>
           {{ getData(item.func, scope.row, item.prop, item.pprop) }}
-          <!-- {{ eval(item.prop)}} -->
         </span>
       </template>
 

+ 0 - 1
src/utils/request.ts

@@ -59,7 +59,6 @@ service.interceptors.request.use(
         data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
         time: new Date().getTime()
       };
-      console.log(requestObj);
       const sessionObj = cache.session.getJSON('sessionObj');
       if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
         cache.session.setJSON('sessionObj', requestObj);

+ 14 - 5
src/views/statics/passengerFlow.vue

@@ -83,8 +83,8 @@
                     </transition>
                     <el-card shadow="never">
                         <tableElm @childToParent='childrenClick' :columns="columns2" ref="table2"></tableElm>
-                        <pagination v-show="total2 > 0" :total="total" v-model:page="queryParams2.pageNum"
-                            v-model:limit="queryParams2.pageSize" @pagination="searchCar" />
+                        <pagination v-show="total2 > 0" :total="total2" v-model:page="queryParams2.pageNum"
+                            v-model:limit="queryParams2.pageSize" @pagination="searchSite" />
                     </el-card>
                 </div>
             </el-tab-pane>
@@ -500,21 +500,30 @@ const searchSite = () => {
         starttime: moment(dataValue2.value[0]).format("YYYY-MM-DD HH:mm:ss"),
         endtime: moment(dataValue2.value[1]).format("YYYY-MM-DD HH:mm:ss")
     }
+    if(sites.length > 0){
+        params.sites = sites.join(',')
+    }
     var obj = {
         dictLabel:queryParams2.value.site,
         pageSize: queryParams2.value.pageSize,
         pageNum: queryParams2.value.pageNum,
         params: params
     }
-    if(sites.length > 0){
-        obj.sites = sites.join(',')
-    }
     listsitesFlow(obj).then(res => {
+        console.log(res)
         total2.value = res.total
         for (var index in res.rows) {
             res.rows[index].startTime = moment(dataValue.value[0]).format("YYYY-MM-DD HH:mm:ss")
             res.rows[index].endTime = moment(dataValue.value[1]).format("YYYY-MM-DD HH:mm:ss")
+            if(res.rows[index].others == null || res.rows[index].others == ''){
+                var countData = {
+                    incount:0,
+                    outcount:0
+                }
+                res.rows[index].others = countData
+            }
         }
+        console.log(res.rows)
         table2.value.setButton([]);
         table2.value.setDataList(res.rows);
     })

+ 64 - 42
src/views/yunying/kdg/index.vue

@@ -61,41 +61,48 @@
               <div style="width: 9vw;border:0.5vw solid #000;">
                 <div style="width: 8vw;height: 86px;position:relative" @click="clickCabinet(1)">
                   <img style="width: 8vw;height: 86px" src="@/assets/images/cabinet1.png" />
+                  <div class="indexDivLeft">{{ getStatus(1) }}</div>
                   <div class="indexDiv">{{ formatIndex(1) }}</div>
                 </div>
                 <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(2)">
                   <img style="width: 8vw;height: 42px;" src="@/assets/images/cabinet2.png" />
+                  <div class="indexDivLeft">{{ getStatus(2) }}</div>
                   <div class="indexDiv">{{ formatIndex(2) }}</div>
                 </div>
                 <div style="width: 8vw;height: 28px;position:relative" @click="clickCabinet(index + 3)"
                   v-for="(item, index) in 6">
                   <img style="width: 8vw;height: 28px;" src="@/assets/images/cabinet3.png" />
+                  <div class="indexDivLeft">{{ getStatus(index+3) }}</div>
                   <div class="indexDiv">{{ formatIndex(index + 3) }}</div>
                 </div>
                 <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(index + 9)"
                   v-for="(item, index) in 3">
                   <img style="width: 8vw;height: 42px;" src="@/assets/images/cabinet3.png" />
+                  <div class="indexDivLeft">{{ getStatus(index+9) }}</div>
                   <div class="indexDiv">{{ formatIndex(index + 9) }}</div>
                 </div>
               </div>
               <div style="width: 9vw;border:0.5vw solid #000;">
                 <div style="width: 8vw;height: 86px;position:relative" @click="clickCabinet(12)">
                   <img style="width: 8vw;height: 86px" src="@/assets/images/cabinet1.png" />
+                  <div class="indexDivLeft">{{ getStatus(12) }}</div>
                   <div class="indexDiv">{{ formatIndex(12) }}</div>
                 </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="indexDiv">{{ formatIndex(13) }}</div> -->
                 </div>
-                <div style="width: 8vw;height: 28px;position:relative" @click="clickCabinet(index + 14)"
+                <div style="width: 8vw;height: 28px;position:relative" @click="clickCabinet(index + 13)"
                   v-for="(item, index) in 2">
                   <img style="width: 8vw;height: 28px;" src="@/assets/images/cabinet3.png" />
-                  <div class="indexDiv">{{ formatIndex(index + 14) }}</div>
+                  <div class="indexDivLeft">{{ getStatus(index+13) }}</div>
+                  <div class="indexDiv">{{ formatIndex(index + 13) }}</div>
                 </div>
-                <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(index + 16)"
+                <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(index + 15)"
                   v-for="(item, index) in 3">
                   <img style="width: 8vw;height: 42px;" src="@/assets/images/cabinet3.png" />
-                  <div class="indexDiv">{{ formatIndex(index + 16) }}</div>
+                  <div class="indexDivLeft">{{ getStatus(index+15) }}</div>
+                  <div class="indexDiv">{{ formatIndex(index + 15) }}</div>
                 </div>
               </div>
             </div>
@@ -105,81 +112,96 @@
               <div style="width: 9vw;border:0.5vw solid #000;">
                 <div style="width: 8vw;height: 86px;position:relative" @click="clickCabinet(1)">
                   <img style="width: 8vw;height: 86px" src="@/assets/images/cabinet1.png" />
+                  <div class="indexDivLeft">{{ getStatus(1) }}</div>
                   <div class="indexDiv">{{ formatIndex(1) }}</div>
                 </div>
                 <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(2)">
                   <img style="width: 8vw;height: 42px;" src="@/assets/images/cabinet2.png" />
+                  <div class="indexDivLeft">{{ getStatus(2) }}</div>
                   <div class="indexDiv">{{ formatIndex(2) }}</div>
                 </div>
                 <div style="width: 8vw;height: 28px;position:relative" @click="clickCabinet(index + 3)"
                   v-for="(item, index) in 6">
                   <img style="width: 8vw;height: 28px;" src="@/assets/images/cabinet3.png" />
+                  <div class="indexDivLeft">{{ getStatus(index+3) }}</div>
                   <div class="indexDiv">{{ formatIndex(index + 3) }}</div>
                 </div>
                 <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(index + 9)"
                   v-for="(item, index) in 3">
                   <img style="width: 8vw;height: 42px;" src="@/assets/images/cabinet3.png" />
+                  <div class="indexDivLeft">{{ getStatus(index+9) }}</div>
                   <div class="indexDiv">{{ formatIndex(index + 9) }}</div>
                 </div>
               </div>
               <div style="width: 9vw;border:0.5vw solid #000;">
                 <div style="width: 8vw;height: 86px;position:relative" @click="clickCabinet(12)">
                   <img style="width: 8vw;height: 86px" src="@/assets/images/cabinet1.png" />
+                  <div class="indexDivLeft">{{ getStatus(12) }}</div>
                   <div class="indexDiv">{{ formatIndex(12) }}</div>
                 </div>
                 <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(13)">
                   <img style="width: 8vw;height: 42px;" src="@/assets/images/cabinet2.png" />
+                  <div class="indexDivLeft">{{ getStatus(13) }}</div>
                   <div class="indexDiv">{{ formatIndex(13) }}</div>
                 </div>
                 <div style="width: 8vw;height: 28px;position:relative" @click="clickCabinet(index + 14)"
                   v-for="(item, index) in 6">
                   <img style="width: 8vw;height: 28px;" src="@/assets/images/cabinet3.png" />
+                  <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 + 20)"
                   v-for="(item, index) in 3">
                   <img style="width: 8vw;height: 42px;" src="@/assets/images/cabinet3.png" />
+                  <div class="indexDivLeft">{{ getStatus(index+20) }}</div>
                   <div class="indexDiv">{{ formatIndex(index + 20) }}</div>
                 </div>
               </div>
               <div style="width: 9vw;border:0.5vw solid #000;">
                 <div style="width: 8vw;height: 86px;position:relative" @click="clickCabinet(23)">
                   <img style="width: 8vw;height: 86px" src="@/assets/images/cabinet1.png" />
+                  <div class="indexDivLeft">{{ getStatus(23) }}</div>
                   <div class="indexDiv">{{ formatIndex(23) }}</div>
                 </div>
                 <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(24)">
                   <img style="width: 8vw;height: 42px;" src="@/assets/images/cabinet2.png" />
+                  <div class="indexDivLeft">{{ getStatus(24) }}</div>
                   <div class="indexDiv">{{ formatIndex(24) }}</div>
                 </div>
                 <div style="width: 8vw;height: 28px;position:relative" @click="clickCabinet(index + 25)"
                   v-for="(item, index) in 6">
                   <img style="width: 8vw;height: 28px;" src="@/assets/images/cabinet3.png" />
+                  <div class="indexDivLeft">{{ getStatus(index+25) }}</div>
                   <div class="indexDiv">{{ formatIndex(index + 25) }}</div>
                 </div>
                 <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(index + 31)"
                   v-for="(item, index) in 3">
                   <img style="width: 8vw;height: 42px;" src="@/assets/images/cabinet3.png" />
+                  <div class="indexDivLeft">{{ getStatus(index+31) }}</div>
                   <div class="indexDiv">{{ formatIndex(index + 31) }}</div>
                 </div>
               </div>
               <div style="width: 9vw;border:0.5vw solid #000;">
                 <div style="width: 8vw;height: 86px;position:relative" @click="clickCabinet(34)">
                   <img style="width: 8vw;height: 86px" src="@/assets/images/cabinet1.png" />
+                  <div class="indexDivLeft">{{ getStatus(34) }}</div>
                   <div class="indexDiv">{{ formatIndex(34) }}</div>
                 </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 + 36)"
+                <div style="width: 8vw;height: 28px;position:relative" @click="clickCabinet(index + 35)"
                   v-for="(item, index) in 2">
                   <img style="width: 8vw;height: 28px;" src="@/assets/images/cabinet3.png" />
-                  <div class="indexDiv">{{ formatIndex(index + 36) }}</div>
+                  <div class="indexDivLeft">{{ getStatus(index+35) }}</div>
+                  <div class="indexDiv">{{ formatIndex(index + 35) }}</div>
                 </div>
-                <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(index + 38)"
+                <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(index + 37)"
                   v-for="(item, index) in 3">
                   <img style="width: 8vw;height: 42px;" src="@/assets/images/cabinet3.png" />
-                  <div class="indexDiv">{{ formatIndex(index + 38) }}</div>
+                  <div class="indexDivLeft">{{ getStatus(index+37) }}</div>
+                  <div class="indexDiv">{{ formatIndex(index + 37) }}</div>
                 </div>
               </div>
             </div>
@@ -266,68 +288,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 + 36)"
+                <div style="width: 8vw;height: 28px;position:relative" @click="clickCabinet(index + 35)"
                   v-for="(item, index) in 2">
                   <img style="width: 8vw;height: 28px;" src="@/assets/images/cabinet3.png" />
-                  <div class="indexDivLeft">{{ getStatus(index+36) }}</div>
-                  <div class="indexDiv">{{ formatIndex(index + 36) }}</div>
+                  <div class="indexDivLeft">{{ getStatus(index+35) }}</div>
+                  <div class="indexDiv">{{ formatIndex(index + 35) }}</div>
                 </div>
-                <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(index + 38)"
+                <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(index + 37)"
                   v-for="(item, index) in 3">
                   <img style="width: 8vw;height: 42px;" src="@/assets/images/cabinet3.png" />
-                  <div class="indexDivLeft">{{ getStatus(index+38) }}</div>
-                  <div class="indexDiv">{{ formatIndex(index + 38) }}</div>
+                  <div class="indexDivLeft">{{ getStatus(index+37) }}</div>
+                  <div class="indexDiv">{{ formatIndex(index + 37) }}</div>
                 </div>
               </div>
               <div style="width: 9vw;border:0.5vw solid #000;">
-                <div style="width: 8vw;height: 86px;position:relative" @click="clickCabinet(41)">
+                <div style="width: 8vw;height: 86px;position:relative" @click="clickCabinet(40)">
                   <img style="width: 8vw;height: 86px" src="@/assets/images/cabinet1.png" />
-                  <div class="indexDivLeft">{{ getStatus(41) }}</div>
-                  <div class="indexDiv">{{ formatIndex(41) }}</div>
+                  <div class="indexDivLeft">{{ getStatus(40) }}</div>
+                  <div class="indexDiv">{{ formatIndex(40) }}</div>
                 </div>
-                <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(42)">
+                <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(42) }}</div>
-                  <div class="indexDiv">{{ formatIndex(42) }}</div>
+                  <div class="indexDivLeft">{{ getStatus(41) }}</div>
+                  <div class="indexDiv">{{ formatIndex(41) }}</div>
                 </div>
-                <div style="width: 8vw;height: 28px;position:relative" @click="clickCabinet(index + 43)"
+                <div style="width: 8vw;height: 28px;position:relative" @click="clickCabinet(index + 42)"
                   v-for="(item, index) in 6">
                   <img style="width: 8vw;height: 28px;" src="@/assets/images/cabinet3.png" />
-                  <div class="indexDivLeft">{{ getStatus(index+43) }}</div>
-                  <div class="indexDiv">{{ formatIndex(index + 43) }}</div>
+                  <div class="indexDivLeft">{{ getStatus(index+42) }}</div>
+                  <div class="indexDiv">{{ formatIndex(index + 42) }}</div>
                 </div>
-                <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(index + 49)"
+                <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(index + 48)"
                   v-for="(item, index) in 3">
                   <img style="width: 8vw;height: 42px;" src="@/assets/images/cabinet3.png" />
-                  <div class="indexDivLeft">{{ getStatus(index+49) }}</div>
-                  <div class="indexDiv">{{ formatIndex(index + 49) }}</div>
+                  <div class="indexDivLeft">{{ getStatus(index+48) }}</div>
+                  <div class="indexDiv">{{ formatIndex(index + 48) }}</div>
                 </div>
               </div>
               <div style="width: 9vw;border:0.5vw solid #000;">
-                <div style="width: 8vw;height: 86px;position:relative" @click="clickCabinet(52)">
+                <div style="width: 8vw;height: 86px;position:relative" @click="clickCabinet(51)">
                   <img style="width: 8vw;height: 86px" src="@/assets/images/cabinet1.png" />
-                  <div class="indexDivLeft">{{ getStatus(52) }}</div>
-                  <div class="indexDiv">{{ formatIndex(52) }}</div>
+                  <div class="indexDivLeft">{{ getStatus(51) }}</div>
+                  <div class="indexDiv">{{ formatIndex(51) }}</div>
                 </div>
-                <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(53)">
+                <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(53) }}</div>
-                  <div class="indexDiv">{{ formatIndex(53) }}</div>
+                  <div class="indexDivLeft">{{ getStatus(52) }}</div>
+                  <div class="indexDiv">{{ formatIndex(52) }}</div>
                 </div>
-                <div style="width: 8vw;height: 28px;position:relative" @click="clickCabinet(index + 54)"
+                <div style="width: 8vw;height: 28px;position:relative" @click="clickCabinet(index + 53)"
                   v-for="(item, index) in 6">
                   <img style="width: 8vw;height: 28px;" src="@/assets/images/cabinet3.png" />
-                  <div class="indexDivLeft">{{ getStatus(index+54) }}</div>
-                  <div class="indexDiv">{{ formatIndex(index + 54) }}</div>
+                  <div class="indexDivLeft">{{ getStatus(index+53) }}</div>
+                  <div class="indexDiv">{{ formatIndex(index + 53) }}</div>
                 </div>
-                <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(index + 60)"
+                <div style="width: 8vw;height: 42px;position:relative" @click="clickCabinet(index + 59)"
                   v-for="(item, index) in 3">
                   <img style="width: 8vw;height: 42px;" src="@/assets/images/cabinet3.png" />
-                  <div class="indexDivLeft">{{ getStatus(index+60) }}</div>
-                  <div class="indexDiv">{{ formatIndex(index + 60) }}</div>
+                  <div class="indexDivLeft">{{ getStatus(index+59) }}</div>
+                  <div class="indexDiv">{{ formatIndex(index + 59) }}</div>
                 </div>
               </div>
             </div>

+ 2 - 2
src/views/yunying/message/index.vue

@@ -21,7 +21,7 @@
           <el-radio :label="2">按线路</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="发布类型">
+      <el-form-item label="发布对象">
         <!-- <el-input v-model="input3" style="max-width: 600px" placeholder="搜索或选择" class="input-with-select">
           <template #prepend>
             <el-button :icon="Search" />
@@ -40,7 +40,7 @@
           </el-select>
         </div>
         <div v-if="radio == 1">
-          <el-select v-model="site" placeholder="请选择站点" style="width: 300px">
+          <el-select filterable v-model="site" placeholder="请选择站点" style="width: 300px">
             <el-option v-for="item in sites" :key="item.dictCode" :label="item.dictLabel" :value="item.dictCode" />
           </el-select>
         </div>