fix：大屏增加所属分公司

src/views/big-screen/disease-components/traffic-log.vue

@@ -2,7 +2,7 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2024-11-08 11:56:02
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2024-12-04 17:33:58
+ * @LastEditTime: 2024-12-06 15:57:02
  * @FilePath: \znxjxt-ui\src\views\big-screen\disease-components\traffic-log.vue
  * @Description: 病害巡检-病害日志
 -->
@@ -10,60 +10,147 @@
   <div class="content">
     <!-- 搜索表单 -->
     <div class="traffic-form">
-      <el-form :model="trafficForm" ref="trafficForm" size="small" :inline="true" label-position="left"
+      <el-form
-        label-width="5rem">
+        :model="trafficForm"
+        ref="trafficForm"
+        size="small"
+        :inline="true"
+        label-position="left"
+        label-width="5rem"
+      >
         <el-form-item class="form-item" label="路线名称" prop="routeId">
-          <el-select v-model="trafficForm.routeId" :popper-append-to-body="false" placeholder="请选择路线" filterable
+          <el-select
-            clearable @change="chengeLine">
+            v-model="trafficForm.routeId"
-            <el-option v-for="item in lineList" :key="item.value" :label="item.label" :value="item.value" />
+            :popper-append-to-body="false"
+            placeholder="请选择路线"
+            filterable
+            clearable
+            @change="chengeLine"
+          >
+            <el-option
+              v-for="item in lineList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
         <el-form-item class="form-item" label="路段名称" prop="segmentId">
-          <el-select v-model="trafficForm.segmentId" :popper-append-to-body="false" placeholder="请选择路段" filterable
+          <el-select
-            clearable>
+            v-model="trafficForm.segmentId"
-            <el-option v-for="item in segmentList" :key="item.value" :label="item.label" :value="item.value" />
+            :popper-append-to-body="false"
+            placeholder="请选择路段"
+            filterable
+            clearable
+          >
+            <el-option
+              v-for="item in segmentList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
         <el-form-item class="form-item" label="上下行" prop="inspectDirection">
-          <el-select v-model="trafficForm.inspectDirection" :popper-append-to-body="false" placeholder="请选择上下行"
+          <el-select
-            clearable>
+            v-model="trafficForm.inspectDirection"
+            :popper-append-to-body="false"
+            placeholder="请选择上下行"
+            clearable
+          >
             <el-option label="上行" value="0" />
             <el-option label="下行" value="1" />
           </el-select>
         </el-form-item>
         <el-form-item class="form-item" label="公里桩" prop="stakeRange">
-          <el-input v-model="trafficForm.stakeStart" placeholder="格式K0000+000" style="width: 10rem" clearable />
+          <el-input
+            v-model="trafficForm.stakeStart"
+            placeholder="格式K0000+000"
+            style="width: 10rem"
+            clearable
+          />
           <span style="margin: 0 5px; color: #ffffff">-</span>
-          <el-input v-model="trafficForm.stakeEnd" placeholder="格式K0000+000" style="width: 9.5rem" clearable />
+          <el-input
+            v-model="trafficForm.stakeEnd"
+            placeholder="格式K0000+000"
+            style="width: 9.5rem"
+            clearable
+          />
         </el-form-item>
         <el-form-item class="form-item" label="时间筛选" prop="dateTime">
-
+          <el-date-picker
-          <el-date-picker v-model="dateTime" type="daterange" range-separator="至" start-placeholder="开始日期"
+            v-model="dateTime"
-            end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" clearable
+            type="daterange"
-            popper-class="traffic-log-date-time">
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            clearable
+            popper-class="traffic-log-date-time"
+          >
           </el-date-picker>
         </el-form-item>
         <el-form-item class="form-item" label="病害类型" prop="defectType">
-          <el-select v-model="trafficForm.defectType" :popper-append-to-body="false" placeholder="请选择病害类型" clearable>
+          <el-select
-            <el-option v-for="item in eventType" :key="item.value" :label="item.label" :value="item.value" />
+            v-model="trafficForm.defectType"
+            :popper-append-to-body="false"
+            placeholder="请选择病害类型"
+            clearable
+          >
+            <el-option
+              v-for="item in eventType"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
         <el-form-item class="form-item" label="病害状态" prop="state">
-          <el-select v-model="trafficForm.state" :popper-append-to-body="false" placeholder="请选择病害状态" clearable>
+          <el-select
-            <el-option v-for="item in defectStatus" :key="item.value" :label="item.label" :value="item.value" />
+            v-model="trafficForm.state"
+            :popper-append-to-body="false"
+            placeholder="请选择病害状态"
+            clearable
+          >
+            <el-option
+              v-for="item in defectStatus"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
       </el-form>
     </div>
     <div class="form-btn">
-      <el-button class="btn-submit" size="mini" @click="handleQuery">搜索</el-button>
+      <el-button class="btn-submit" size="mini" @click="handleQuery"
-      <el-button class="btn-cancel" size="mini" @click="resetQuery">重置</el-button>
+        >搜索</el-button
+      >
+      <el-button class="btn-cancel" size="mini" @click="resetQuery"
+        >重置</el-button
+      >
     </div>
     <div class="traffic-table">
-      <el-table :data="emergencyList" header-row-class-name="headerRow" row-class-name="bodayRow"
+      <el-table
-        style="width: 100%; background: none" height="85%">
+        :data="emergencyList"
+        header-row-class-name="headerRow"
+        row-class-name="bodayRow"
+        style="width: 100%; background: none"
+        height="85%"
+      >
         <el-table-column prop="defectType" label="病害类型"> </el-table-column>
-        <el-table-column prop="segmentName" width="180" :show-overflow-tooltip="true" label="路段名称">
+        <el-table-column
+          prop="segmentName"
+          show-overflow-tooltip
+          label="路段名称"
+        >
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="companyName"
+          label="所属公司"
+        >
         </el-table-column>
         <el-table-column prop="state" label="病害状态">
           <template slot-scope="scope">
@@ -72,16 +159,28 @@
         </el-table-column>
         <el-table-column prop="pci" label="操作">
           <template slot-scope="scope">
-            <el-button slot="reference" size="mini" type="text" @click="detailDefect(scope.row)">详情
+            <el-button
+              slot="reference"
+              size="mini"
+              type="text"
+              @click="detailDefect(scope.row)"
+              >详情
             </el-button>
           </template>
         </el-table-column>
       </el-table>
       <!-- 分页组件 -->
       <div class="pagination-part">
-        <el-pagination background :pager-count="5" :current-page.sync="pagination.page"
+        <el-pagination
-          @current-change="handleCurrentChange" :page-sizes="[10, 20, 30, 40]" :page-size.sync="pagination.size"
+          background
-          layout="prev, pager, next" :total="tableTotal">
+          :pager-count="5"
+          :current-page.sync="pagination.page"
+          @current-change="handleCurrentChange"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size.sync="pagination.size"
+          layout="prev, pager, next"
+          :total="tableTotal"
+        >
         </el-pagination>
       </div>
     </div>
@@ -360,7 +459,6 @@ export default {
       ::v-deep .el-input__inner .el-range-separator {
         color: #ffffff;
       }
-
     }
 
     ::v-deep .el-input__inner {
@@ -505,7 +603,7 @@ export default {
       }
 
       // 去除鼠标移动高亮
-      &:hover>td {
+      &:hover > td {
         background-color: transparent;
       }
 
@@ -568,29 +666,28 @@ export default {
 </style>
 <style lang="scss">
 .traffic-log-date-time {
-
   // 修改弹出的日历背景色
-  .el-picker-panel__body{
+  .el-picker-panel__body {
     background-color: #102649;
   }
 
   // 修改中间那条线
-  .el-date-range-picker__content.is-left{
+  .el-date-range-picker__content.is-left {
     border-right: 1px solid #374985;
   }
 
   // 修改日期样式
-  .el-date-table td span{
+  .el-date-table td span {
     color: #c0c0c0;
   }
 
   // 修改星期样式
-  .el-date-table th{
+  .el-date-table th {
     color: #c0c0c0;
   }
 
   // 修改日期选择器头部样式
-  .el-date-range-picker__header{
+  .el-date-range-picker__header {
     color: #c0c0c0;
   }
 

src/views/big-screen/overview-components/inspection-vehicles.vue

@@ -2,7 +2,7 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2024-11-08 09:40:18
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2024-12-05 13:37:00
+ * @LastEditTime: 2024-12-06 15:53:55
  * @FilePath: \znxjxt-ui\src\views\big-screen\overview-components\inspection-vehicles.vue
  * @Description: 总览大屏-巡检车辆
 -->
@@ -43,8 +43,15 @@
         height="85%"
       >
         <el-table-column prop="plateNo" label="车牌号码"> </el-table-column>
-        <el-table-column prop="status" label="状态"> </el-table-column>
+        <el-table-column width="60" prop="status" label="状态">
-        <el-table-column prop="pci" label="操作">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="companyName"
+          label="所属公司"
+        >
+        </el-table-column>
+        <el-table-column width="130" prop="pci" label="操作">
           <template slot-scope="scope">
             <el-popover
               popper-class="scope-popover"
@@ -78,7 +85,7 @@
                 slot="reference"
                 size="mini"
                 type="text"
-                style="margin-right: 0.6rem"
+                style="margin-right: 0.5rem"
                 >详情
               </el-button>
             </el-popover>