黑名单添加月度报表

src/layout/index.vue

@@ -156,4 +156,21 @@ onBeforeMount(async () => {
     }
   }
 }
+
+*::-webkit-scrollbar-track {
+  background-color: #fff;
+}
+
+*::-webkit-scrollbar {
+  background-color: #57b2ff;
+  height: 0;
+  width: 0;
+}
+
+*::-webkit-scrollbar-thumb {
+  background: #57b2ff;
+  border-radius: 4px;
+  height: 0;
+  width: 0;
+}
 </style>

src/layout/sidebar/SidevarItem.vue

@@ -218,9 +218,14 @@ onBeforeMount(() => {
   width: 200px;
   // min-height: 400px;
 }
+.box-item {
+  // width: 220px !important;
+  height: calc(100vh);
+}
 .el-menu {
   width: 100%;
   height: 100%;
+  overflow: auto;
   background: linear-gradient(
     0deg,
     rgba(134, 132, 255, 1) 0%,

src/views/account/account.vue

@@ -555,8 +555,8 @@ onUnmounted(() => {
 
 <style scoped lang="scss">
 .content-box {
-  width: 97.5%;
-  height: 89%;
+  width: calc(100% - 40px);
+  height: calc(100% - 105px);
   margin: 20px auto;
   background-color: #fff;
   color: #fff;
@@ -564,7 +564,7 @@ onUnmounted(() => {
   flex-direction: column;
 
   .left {
-    // width: calc(100wh - 40px);
+    width: calc(100% - 60px);
     display: flex;
     align-items: center;
     height: 60px;
@@ -579,7 +579,7 @@ onUnmounted(() => {
     }
   }
   .middle {
-    width: 96%;
+    width: calc(100% - 60px);
     margin: 0 auto;
 
     color: #000;
@@ -636,9 +636,10 @@ onUnmounted(() => {
     }
   }
   .footer {
-    width: 96%;
-    height: 550px;
+    width: calc(100% - 60px);
+    flex:1;
     margin: 10px auto 10px;
+    overflow: auto;
     .el-table--fit {
       height: 100%;
       :deep(.el-table__header-wrapper) {
@@ -707,8 +708,9 @@ onUnmounted(() => {
   }
   .el-pagination {
     // width: 1600px;
-    width: 96%;
-    margin: 20px auto 18px;
+    width: calc(100% - 60px);
+    height: 60px;
+    margin: 0 30px;
     justify-content: flex-end;
     :deep(.el-pagination__total) {
       color: #000;

src/views/bus/bus.vue

@@ -546,8 +546,8 @@ onUnmounted(() => {
 
 <style scoped lang="scss">
 .content-box {
-  width: 97.5%;
-  height: 89%;
+  width: calc(100% - 40px);
+  height: calc(100% - 105px);
   margin: 20px auto;
   background-color: #fff;
   color: #fff;
@@ -555,7 +555,7 @@ onUnmounted(() => {
   flex-direction: column;
 
   .left {
-    // width: calc(100wh - 40px);
+    width: calc(100% - 40px);
     display: flex;
     align-items: center;
     height: 60px;
@@ -570,7 +570,7 @@ onUnmounted(() => {
     }
   }
   .middle {
-    width: 96%;
+    width: calc(100% - 60px);
     margin: 0 auto;
 
     color: #000;
@@ -627,9 +627,10 @@ onUnmounted(() => {
     }
   }
   .footer {
-    width: 96%;
-    height: 550px;
-    margin: 10px auto 30px;
+    width: calc(100% - 60px);
+    flex:1;
+    margin: 10px auto 10px;
+    overflow: auto;
     .el-table--fit {
       height: 100%;
       :deep(.el-table__header-wrapper) {
@@ -694,8 +695,9 @@ onUnmounted(() => {
   }
   .el-pagination {
     // width: 1600px;
-    width: 96%;
-    margin: 0 auto 18px;
+    width: calc(100% - 60px);
+    height: 60px;
+    margin: 0 30px;
     justify-content: flex-end;
     :deep(.el-pagination__total) {
       color: #000;

src/views/buspath/buspath.vue

@@ -683,8 +683,8 @@ onUnmounted(() => {
   border-radius: 32px;
 }
 .content-box {
-  width: 97.5%;
-  height: 89%;
+  width: calc(100% - 40px);
+  height: calc(100% - 105px);
   margin: 20px auto;
   background-color: #fff;
   color: #fff;
@@ -692,11 +692,10 @@ onUnmounted(() => {
   flex-direction: column;
 
   .left {
-    // width: calc(100wh - 40px);
+    width: calc(100% - 60px);
     display: flex;
     align-items: center;
     height: 60px;
-    padding: 10px 0;
     margin: 0 30px;
     border-bottom: 1px solid #ccc;
     color: #000;
@@ -708,16 +707,16 @@ onUnmounted(() => {
     }
   }
   .middles {
+    width: calc(100% - 60px);
+    margin: 0 auto;
     .middle {
-      width: 96%;
-      margin: 0 auto;
+      width: 100%;
       color: #000;
       // border-bottom: 1px solid rgb(231, 231, 231);
       .filter {
         // display: flex;
         // flex-wrap: wrap;
         // align-items: center;
-        margin: 10px 10px 0 10px;
         .route {
           display: flex;
           align-items: center;
@@ -783,12 +782,14 @@ onUnmounted(() => {
   }
 
   .gongneng {
-    margin: 20px 25px;
+    width: calc(100% - 60px);
+    margin: 15px auto;
   }
   .footer {
-    width: 96%;
-    height: 550px;
-    margin: 10px auto 30px;
+    width: calc(100% - 60px);
+    flex: 1;
+    margin: 10px auto 10px;
+    overflow: auto;
     .el-table--fit {
       height: 100%;
       :deep(.el-table__header-wrapper) {
@@ -878,8 +879,9 @@ onUnmounted(() => {
   }
   .el-pagination {
     // width: 1600px;
-    width: 96%;
-    margin: 0 auto 18px;
+    width: calc(100% - 60px);
+    height: 60px;
+    margin: 0 30px;
     justify-content: flex-end;
     :deep(.el-pagination__total) {
       color: #000;

src/views/busquery/busquery.vue

@@ -4,6 +4,211 @@
       <!-- <el-icon :size="23" class="camera"><UserFilled /></el-icon> -->
       <span class="cameratxt">车辆调度</span>
     </div>
+    <div class="filter">
+      <div class="condition">
+        <el-button
+          style="margin: 0 0 0 30px"
+          color="rgba(61, 81, 232, 1)"
+          type="primary"
+          class="search"
+          @click="addQuery"
+          ><el-icon><CirclePlus /></el-icon
+          ><span> &nbsp;&nbsp;新增调度</span></el-button
+        >
+      </div>
+      <div class="condition">
+        <span>发车日期 : </span>
+
+        <el-select
+          v-model="searchInput.startTime"
+          class="m-2"
+          placeholder="请选择发车日期"
+        >
+          <el-option
+            :label="dayjs().format('YYYY-MM-DD')"
+            :value="dayjs().format('YYYY-MM-DD')"
+          />
+          <el-option
+            :label="
+              dayjs(dayjs().format('YYYY-MM-DD'))
+                .add(1, 'day')
+                .format('YYYY-MM-DD')
+            "
+            :value="
+              dayjs(dayjs().format('YYYY-MM-DD'))
+                .add(1, 'day')
+                .format('YYYY-MM-DD')
+            "
+          />
+        </el-select>
+      </div>
+
+      <div class="condition">
+        <span>车牌号 : </span>
+        <el-select
+          v-model="searchInput.car_number"
+          class="m-2"
+          placeholder="请选择车牌号"
+          :clearable="true"
+          @clear="search"
+        >
+          <el-option
+            v-for="item in busNum.list"
+            :key="item.id"
+            :label="item.car_number"
+            :value="item.car_number"
+          />
+        </el-select>
+      </div>
+
+      <el-button
+        style="margin-left: 20px"
+        color="rgba(61, 81, 232, 1)"
+        type="primary"
+        class="search"
+        @click="search"
+        ><el-icon><Search /></el-icon><span>搜索</span></el-button
+      >
+    </div>
+    <div class="footer">
+      <el-table
+        :row-class-name="tableRowClassName"
+        :data="tableData.list"
+        style="width: 100%;"
+        :header-cell-style="{
+          background: 'rgba(240, 243, 247, 1)',
+          border: 0,
+        }"
+      >
+        <el-table-column
+          align="center"
+          width="150"
+          prop="s_date"
+          label="发车日期"
+        />
+        <el-table-column
+          align="center"
+          width="100"
+          prop="ci_time"
+          label="发车时间"
+        />
+        <el-table-column align="center" width="100" label="预约人数">
+          <template #default="props">
+            <span
+              v-if="props.row.yy_num == props.row.contain"
+              style="color: red"
+              >{{ props.row.yy_num }}</span
+            >
+            <span v-else>{{ props.row.yy_num }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          width="80"
+          prop="by_num"
+          label="乘车人数"
+        />
+        <el-table-column
+          align="center"
+          width="80"
+          prop="contain"
+          label="容量"
+        />
+        <el-table-column
+          align="center"
+          width="120"
+          prop="car_number"
+          label="车牌号"
+        />
+
+        <el-table-column align="center" prop="route" width="200" label="路线" />
+        <el-table-column align="center" prop="route_end" label="终点" />
+
+        <el-table-column
+          align="center"
+          prop="before_state"
+          width="100"
+          label="是否提前"
+        >
+          <template #default="scope">
+            <div>{{ scope.row.before_state == 1 ? "是" : "否" }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="状态" width="120">
+          <template #default="scope">
+            <div
+              v-if="scope.row.state == 1"
+              style="color: rgba(67, 207, 124, 1)"
+            >
+              预约中
+            </div>
+            <div
+              v-if="scope.row.state == 2"
+              style="color: rgba(212, 48, 48, 1)"
+            >
+              已截止
+            </div>
+            <div
+              v-if="scope.row.state == 3"
+              style="color: rgba(61, 81, 232, 1)"
+            >
+              候补中
+            </div>
+            <div v-if="scope.row.state == 4" style="color: rgba(77, 77, 77, 1)">
+              已分车
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作" width="220">
+          <template #default="scope">
+            <!-- <el-button
+                link
+                type="primary"
+                @click="sendBus(scope.row)"
+                v-if="scope.row.ci_time == 0"
+                ><div class="look">候补</div></el-button
+              > -->
+            <el-button
+              v-if="scope.row.state == 2"
+              color="#909399"
+              @click="sendBus(scope.row)"
+              plain
+              ><div class="look">调度</div></el-button
+            >
+            <el-button v-else color="#409EFF" plain @click="sendBus(scope.row)"
+              ><div class="look">调度</div></el-button
+            >
+            <el-button
+              v-if="scope.row.state == 2"
+              color="#909399"
+              plain
+              @click="mergeBus(scope.row)"
+              ><div class="lookcar">合车</div></el-button
+            >
+            <el-button v-else color="#E6A23C" plain @click="mergeBus(scope.row)"
+              ><div class="lookcar">合车</div></el-button
+            >
+            <el-button type="danger" plain @click="del(scope.row)"
+              ><div class="lookdel">删除</div></el-button
+            >
+            <!-- v-if="scope.row.state != 2" -->
+            <!-- <el-button link type="primary" v-else :disabled="true"
+                ><div class="look">删除</div></el-button
+              > -->
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <!-- 分页数据 -->
+    <el-pagination
+      background
+      :current-page="currentPage"
+      :page-size="pageSize"
+      layout="total, prev, pager, next, jumper, slot"
+      :total="total"
+      @update:current-page="handleCurrentChange"
+    />
     <!-- 新增车辆调度 -->
     <el-dialog
       class="sendBus"
@@ -556,230 +761,6 @@
         </div>
       </div>
     </el-dialog>
-
-    <div class="MingXi" style="height: 652px; margin: 10px 0 20px 0">
-      <div class="filter">
-        <div class="condition">
-          <el-button
-            style="margin: 0 0 0 30px"
-            color="rgba(61, 81, 232, 1)"
-            type="primary"
-            class="search"
-            @click="addQuery"
-            ><el-icon><CirclePlus /></el-icon
-            ><span> &nbsp;&nbsp;新增调度</span></el-button
-          >
-        </div>
-        <div class="condition">
-          <span>发车日期 : </span>
-
-          <el-select
-            v-model="searchInput.startTime"
-            class="m-2"
-            placeholder="请选择发车日期"
-          >
-            <el-option
-              :label="dayjs().format('YYYY-MM-DD')"
-              :value="dayjs().format('YYYY-MM-DD')"
-            />
-            <el-option
-              :label="
-                dayjs(dayjs().format('YYYY-MM-DD'))
-                  .add(1, 'day')
-                  .format('YYYY-MM-DD')
-              "
-              :value="
-                dayjs(dayjs().format('YYYY-MM-DD'))
-                  .add(1, 'day')
-                  .format('YYYY-MM-DD')
-              "
-            />
-          </el-select>
-        </div>
-
-        <div class="condition">
-          <span>车牌号 : </span>
-          <el-select
-            v-model="searchInput.car_number"
-            class="m-2"
-            placeholder="请选择车牌号"
-            :clearable="true"
-            @clear="search"
-          >
-            <el-option
-              v-for="item in busNum.list"
-              :key="item.id"
-              :label="item.car_number"
-              :value="item.car_number"
-            />
-          </el-select>
-        </div>
-
-        <el-button
-          style="margin-left: 20px"
-          color="rgba(61, 81, 232, 1)"
-          type="primary"
-          class="search"
-          @click="search"
-          ><el-icon><Search /></el-icon><span>搜索</span></el-button
-        >
-      </div>
-      <div class="footer">
-        <el-table
-          :row-class-name="tableRowClassName"
-          :data="tableData.list"
-          style="width: 100%; height: 580px"
-          :header-cell-style="{
-            background: 'rgba(240, 243, 247, 1)',
-            border: 0,
-          }"
-        >
-          <el-table-column
-            align="center"
-            width="150"
-            prop="s_date"
-            label="发车日期"
-          />
-          <el-table-column
-            align="center"
-            width="100"
-            prop="ci_time"
-            label="发车时间"
-          />
-          <el-table-column align="center" width="100" label="预约人数">
-            <template #default="props">
-              <span
-                v-if="props.row.yy_num == props.row.contain"
-                style="color: red"
-                >{{ props.row.yy_num }}</span
-              >
-              <span v-else>{{ props.row.yy_num }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            width="80"
-            prop="by_num"
-            label="乘车人数"
-          />
-          <el-table-column
-            align="center"
-            width="80"
-            prop="contain"
-            label="容量"
-          />
-          <el-table-column
-            align="center"
-            width="120"
-            prop="car_number"
-            label="车牌号"
-          />
-
-          <el-table-column
-            align="center"
-            prop="route"
-            width="200"
-            label="路线"
-          />
-          <el-table-column align="center" prop="route_end" label="终点" />
-
-          <el-table-column
-            align="center"
-            prop="before_state"
-            width="100"
-            label="是否提前"
-          >
-            <template #default="scope">
-              <div>{{ scope.row.before_state == 1 ? "是" : "否" }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="状态" width="120">
-            <template #default="scope">
-              <div
-                v-if="scope.row.state == 1"
-                style="color: rgba(67, 207, 124, 1)"
-              >
-                预约中
-              </div>
-              <div
-                v-if="scope.row.state == 2"
-                style="color: rgba(212, 48, 48, 1)"
-              >
-                已截止
-              </div>
-              <div
-                v-if="scope.row.state == 3"
-                style="color: rgba(61, 81, 232, 1)"
-              >
-                候补中
-              </div>
-              <div
-                v-if="scope.row.state == 4"
-                style="color: rgba(77, 77, 77, 1)"
-              >
-                已分车
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="操作" width="220">
-            <template #default="scope">
-              <!-- <el-button
-                link
-                type="primary"
-                @click="sendBus(scope.row)"
-                v-if="scope.row.ci_time == 0"
-                ><div class="look">候补</div></el-button
-              > -->
-              <el-button
-                v-if="scope.row.state == 2"
-                color="#909399"
-                @click="sendBus(scope.row)"
-                plain
-                ><div class="look">调度</div></el-button
-              >
-              <el-button
-                v-else
-                color="#409EFF"
-                plain
-                @click="sendBus(scope.row)"
-                ><div class="look">调度</div></el-button
-              >
-              <el-button
-                v-if="scope.row.state == 2"
-                color="#909399"
-                plain
-                @click="mergeBus(scope.row)"
-                ><div class="lookcar">合车</div></el-button
-              >
-              <el-button
-                v-else
-                color="#E6A23C"
-                plain
-                @click="mergeBus(scope.row)"
-                ><div class="lookcar">合车</div></el-button
-              >
-              <el-button type="danger" plain @click="del(scope.row)"
-                ><div class="lookdel">删除</div></el-button
-              >
-              <!-- v-if="scope.row.state != 2" -->
-              <!-- <el-button link type="primary" v-else :disabled="true"
-                ><div class="look">删除</div></el-button
-              > -->
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-
-    <!-- 分页数据 -->
-    <el-pagination
-      background
-      :current-page="currentPage"
-      :page-size="pageSize"
-      layout="total, prev, pager, next, jumper, slot"
-      :total="total"
-      @update:current-page="handleCurrentChange"
-    />
   </div>
 </template>
 
@@ -1826,8 +1807,8 @@ onMounted(() => {
 
 <style scoped lang="scss">
 .content-box {
-  width: 97.5%;
-  height: 89%;
+  width: calc(100% - 40px);
+  height: calc(100% - 105px);
   margin: 20px auto;
   background-color: #fff;
   color: #fff;
@@ -1851,239 +1832,27 @@ onMounted(() => {
       color: #4392f7;
     }
   }
-  .MingXi {
-    .filter {
-      display: flex;
-      flex-wrap: wrap;
-      align-items: center;
-      //   width: 100%;
-      .condition {
-        display: flex;
-        align-items: center;
-        margin: 10px 30px 10px 0;
-        color: #000;
-        :deep(.el-input .el-input__inner) {
-          font-size: 16px;
-        }
-        span {
-          margin: 0 10px 0 0;
-        }
-      }
-    }
-  }
-  :deep(.sendBus) {
-    //   height: 420px;
-    border-radius: 11px;
-    .el-dialog__header {
-      border-radius: 11px 11px 0 0;
-      background: rgba(237, 241, 245, 1);
-      font-weight: 600;
-      margin: 0;
-      .el-dialog__headerbtn {
-        outline: none;
-      }
-    }
-    .el-dialog__body {
-      padding: 30px 20px 10px 20px;
-      .el-form-item--feedback {
-        .el-input__validateIcon {
-          color: rgba(61, 81, 232, 1);
-        }
-      }
-      .el-form-item.is-error .el-input__validateIcon {
-        color: red;
-      }
-      .el-input {
-        width: 200px;
-      }
-
-      .options {
-        margin-left: 200px;
-      }
-    }
-  }
-
-  :deep(.mergeBus) {
-    //   height: 420px;
-    border-radius: 11px;
-    /* 去掉全选按钮 */
-
-    .el-dialog__header {
-      border-radius: 11px 11px 0 0;
-      background: rgba(237, 241, 245, 1);
-      font-weight: 600;
-      margin: 0;
 
-      .el-dialog__headerbtn {
-        outline: none;
-      }
-    }
-    .el-dialog__body {
-      padding: 30px 20px 10px 20px;
-      .el-table__header {
-        font-size: 17px;
-      }
-      .el-table__body-wrapper {
-        .el-table__row {
-          height: 48px;
-          font-size: 17px;
-          color: #000;
-          td {
-            padding: 0;
-          }
-        }
-      }
-
-      .el-table__inner-wrapper::before {
-        height: 0;
-      }
-      .el-table__inner-wrapper {
-        .el-table__header-wrapper {
-          .el-table__header {
-            .disabledsele .cell .el-checkbox__inner {
-              display: none !important;
-            }
-            .disabledsele .cell::before {
-              content: "操作";
-              text-align: center;
-              line-height: 37px;
-            }
-          }
-        }
-      }
-
-      .el-form-item--feedback {
-        .el-input__validateIcon {
-          color: rgba(61, 81, 232, 1);
-        }
-      }
-      .el-form-item.is-error .el-input__validateIcon {
-        color: red;
-      }
-      .el-input {
-        width: 200px;
-      }
-
-      .options {
-        margin-left: 200px;
-      }
-    }
-
-    .btn {
-      width: 100%;
-      height: 40px;
-      margin-bottom: 20px;
-      display: flex;
-      flex-direction: row-reverse;
-      align-items: center;
-      justify-content: space-between;
-      .txt {
-        font-size: 18px;
-        color: #000;
-      }
-    }
-  }
-
-  .middle {
-    width: 96%;
-    margin: 0 auto;
+  .filter {
     display: flex;
     flex-wrap: wrap;
     align-items: center;
-    justify-content: space-between;
-    color: #000;
-    border-bottom: 1px solid rgb(231, 231, 231);
-    padding: 10px 0;
-    // 添加员工弹窗样式
-
-    .filter {
+    //   width: 100%;
+    .condition {
       display: flex;
-      flex-wrap: wrap;
       align-items: center;
-      //   width: 100%;
-      .condition {
-        display: flex;
-        align-items: center;
-        margin: 10px 30px 10px 0;
-        span {
-          margin: 0 10px 0 0;
-        }
-      }
-    }
-    .import {
-      margin: 10px 0;
-    }
-    .gongneng {
-      margin: 10px 0;
-    }
-    :deep(.cont) {
-      width: 60%;
-      margin: 20px auto;
-    }
-    :deep(.download) {
-      display: flex;
-      align-items: center;
-      margin: 10px;
-    }
-    :deep(.download span) {
-      font-size: 16px;
-      margin-left: 20px;
-    }
-    :deep(.cont .el-button) {
-      margin-left: 60px;
-      margin-bottom: 30px;
-    }
-
-    :deep(.cont .accomplish) {
-      width: 100%;
-      display: flex;
-      justify-content: center;
-    }
-    :deep(.cont .accomplish .el-button) {
-      width: 50%;
-      margin: 0;
-    }
-  }
-  .footerMenu {
-    width: 96%;
-    margin: 10px auto 0;
-    display: flex;
-    align-items: center;
-    // height: 40px;
-    .menuList {
-      padding: 5px 12px;
-      border-bottom: 2px solid transparent;
-      //   color: rgba(61, 81, 232, 1);
-      color: rgba(128, 128, 128, 1);
-      cursor: pointer;
-      //   font-size: 16px;
-      font-weight: 600;
-    }
-    .menuListActive {
-      border-bottom: 2px solid rgba(61, 81, 232, 1);
-      color: rgba(61, 81, 232, 1);
-      font-size: 17px;
-    }
-  }
-  .footer.mingxi {
-    :deep(.el-table__header-wrapper) {
-      height: 50px;
-      .el-table__header {
-        height: 50px;
-      }
-    }
-    .el-table--fit {
-      height: 100%;
-
-      :deep(.el-table__row) {
-        height: 55px;
+      margin: 10px 20px 10px 0;
+      color: #000;
+      span {
+        margin: 0 10px 0 0;
       }
     }
   }
   .footer {
-    width: 96%;
-    height: 562px;
-    margin: 20px auto 20px;
+    width: calc(100% - 60px);
+    flex: 1;
+    margin: 0 auto;
+    overflow: auto;
     :deep(.el-table__header-wrapper) {
       height: 48px;
 
@@ -2171,9 +1940,8 @@ onMounted(() => {
     }
   }
   .el-pagination {
-    // width: 1600px;
-    width: 96%;
-    margin: 0 auto 18px;
+    width: calc(100% - 60px);
+    height: 60px;
     justify-content: flex-end;
     :deep(.el-pagination__total) {
       color: #000;
@@ -2211,6 +1979,118 @@ onMounted(() => {
       background-color: transparent;
     }
   }
+  :deep(.sendBus) {
+    //   height: 420px;
+    border-radius: 11px;
+    .el-dialog__header {
+      border-radius: 11px 11px 0 0;
+      background: rgba(237, 241, 245, 1);
+      font-weight: 600;
+      margin: 0;
+      .el-dialog__headerbtn {
+        outline: none;
+      }
+    }
+    .el-dialog__body {
+      padding: 30px 20px 10px 20px;
+      .el-form-item--feedback {
+        .el-input__validateIcon {
+          color: rgba(61, 81, 232, 1);
+        }
+      }
+      .el-form-item.is-error .el-input__validateIcon {
+        color: red;
+      }
+      .el-input {
+        width: 200px;
+      }
+
+      .options {
+        margin-left: 200px;
+      }
+    }
+  }
+
+  :deep(.mergeBus) {
+    //   height: 420px;
+    border-radius: 11px;
+    /* 去掉全选按钮 */
+
+    .el-dialog__header {
+      border-radius: 11px 11px 0 0;
+      background: rgba(237, 241, 245, 1);
+      font-weight: 600;
+      margin: 0;
+
+      .el-dialog__headerbtn {
+        outline: none;
+      }
+    }
+    .el-dialog__body {
+      padding: 30px 20px 10px 20px;
+      .el-table__header {
+        font-size: 17px;
+      }
+      .el-table__body-wrapper {
+        .el-table__row {
+          height: 48px;
+          font-size: 17px;
+          color: #000;
+          td {
+            padding: 0;
+          }
+        }
+      }
+
+      .el-table__inner-wrapper::before {
+        height: 0;
+      }
+      .el-table__inner-wrapper {
+        .el-table__header-wrapper {
+          .el-table__header {
+            .disabledsele .cell .el-checkbox__inner {
+              display: none !important;
+            }
+            .disabledsele .cell::before {
+              content: "操作";
+              text-align: center;
+              line-height: 37px;
+            }
+          }
+        }
+      }
+
+      .el-form-item--feedback {
+        .el-input__validateIcon {
+          color: rgba(61, 81, 232, 1);
+        }
+      }
+      .el-form-item.is-error .el-input__validateIcon {
+        color: red;
+      }
+      .el-input {
+        width: 200px;
+      }
+
+      .options {
+        margin-left: 200px;
+      }
+    }
+
+    .btn {
+      width: 100%;
+      height: 40px;
+      margin-bottom: 20px;
+      display: flex;
+      flex-direction: row-reverse;
+      align-items: center;
+      justify-content: space-between;
+      .txt {
+        font-size: 18px;
+        color: #000;
+      }
+    }
+  }
 }
 .el-input {
   width: 192px;

src/views/classes/classes.vue

@@ -1553,8 +1553,8 @@ onUnmounted(() => {});
 
 <style scoped lang="scss">
 .content-box {
-  width: 97.5%;
-  height: 89%;
+  width: calc(100% - 40px);
+  height: calc(100% - 105px);
   margin: 20px auto;
   background-color: #fff;
   color: #fff;
@@ -1562,7 +1562,7 @@ onUnmounted(() => {});
   flex-direction: column;
 
   .left {
-    // width: calc(100wh - 40px);
+    width: calc(100% - 60px);
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -1588,7 +1588,7 @@ onUnmounted(() => {});
     }
   }
   .middle {
-    width: 96%;
+    width: calc(100% - 60px);
     margin: 0 auto;
 
     color: #000;
@@ -1650,9 +1650,10 @@ onUnmounted(() => {});
     }
   }
   .footer {
-    width: 96%;
-    height: 550px;
-    margin: 10px auto 30px;
+    width: calc(100% - 60px);
+    flex:1;
+    margin: 10px auto 10px;
+    overflow: auto;
     .el-table--fit {
       height: 100%;
       :deep(.el-table__header-wrapper) {
@@ -1790,8 +1791,9 @@ onUnmounted(() => {});
   }
   .el-pagination {
     // width: 1600px;
-    width: 96%;
-    margin: 0 auto 18px;
+    width: calc(100% - 60px);
+    height: 60px;
+    margin: 0 30px;
     justify-content: flex-end;
     :deep(.el-pagination__total) {
       color: #000;

src/views/log/log.vue

@@ -5,35 +5,34 @@
       <span class="cameratxt">操作日志</span>
     </div>
 
-    <div class="MingXi" style="height: 652px; margin: 10px 0 20px 0">
-      <div class="filter">
-        <div class="condition">
-          <span>操作日期 : </span>
-          <el-date-picker
-            type="date"
-            placeholder="请选择日期"
-            format="YYYY-MM-DD"
-            value-format="YYYY-MM-DD"
-            v-model="searchInput.create_time"
-          />
-        </div>
+    <div class="filter">
+      <div class="condition">
+        <span>操作日期 : </span>
+        <el-date-picker
+          type="date"
+          placeholder="请选择日期"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          v-model="searchInput.create_time"
+        />
+      </div>
 
-        <div class="condition">
-          <span>车牌号 : </span>
-          <el-select
-            v-model="searchInput.car_number"
-            class="m-2"
-            placeholder="请选择车牌号"
-            :clearable="true"
-          >
-            <el-option
-              v-for="item in busNum.list"
-              :label="item.car_number"
-              :value="item.car_number"
-            />
-          </el-select>
-        </div>
-        <!-- <div class="condition">
+      <div class="condition">
+        <span>车牌号 : </span>
+        <el-select
+          v-model="searchInput.car_number"
+          class="m-2"
+          placeholder="请选择车牌号"
+          :clearable="true"
+        >
+          <el-option
+            v-for="item in busNum.list"
+            :label="item.car_number"
+            :value="item.car_number"
+          />
+        </el-select>
+      </div>
+      <!-- <div class="condition">
             <span>发车日期 : </span>
           
             <el-date-picker
@@ -44,54 +43,53 @@
               v-model="searchInput.s_date"
             />
           </div> -->
-        <el-button
-          style="margin-left: 20px"
-          color="rgba(61, 81, 232, 1)"
-          type="primary"
-          class="search"
-          @click="search"
-          ><el-icon><Search /></el-icon><span>搜索</span></el-button
-        >
-        <el-button
-          style="margin-left: 20px"
-          color="rgba(61, 81, 232, 1)"
-          type="primary"
-          class="search"
-          @click="resetSearch"
-          ><el-icon><Search /></el-icon><span>重置</span></el-button
-        >
-      </div>
-      <div class="footer">
-        <el-table
-          :row-class-name="tableRowClassName"
-          :data="tableData.list"
-          style="width: 100%; height: 580px"
-          :header-cell-style="{
-            background: 'rgba(240, 243, 247, 1)',
-            border: 0,
-          }"
-        >
-          <el-table-column
-            width="280"
-            align="center"
-            prop="create_time"
-            label="操作日期"
-          />
-          <el-table-column
-            align="center"
-            width="100"
-            prop="admin_name"
-            label="操作账号"
-          />
-          <el-table-column
-            align="center"
-            width="150"
-            prop="car_number"
-            label="车牌"
-          />
-          <el-table-column align="center" prop="record1" label="操作详情" />
-        </el-table>
-      </div>
+      <el-button
+        style="margin-left: 20px"
+        color="rgba(61, 81, 232, 1)"
+        type="primary"
+        class="search"
+        @click="search"
+        ><el-icon><Search /></el-icon><span>搜索</span></el-button
+      >
+      <el-button
+        style="margin-left: 20px"
+        color="rgba(61, 81, 232, 1)"
+        type="primary"
+        class="search"
+        @click="resetSearch"
+        ><el-icon><Search /></el-icon><span>重置</span></el-button
+      >
+    </div>
+    <div class="footer">
+      <el-table
+        :row-class-name="tableRowClassName"
+        :data="tableData.list"
+        style="width: 100%;"
+        :header-cell-style="{
+          background: 'rgba(240, 243, 247, 1)',
+          border: 0,
+        }"
+      >
+        <el-table-column
+          width="280"
+          align="center"
+          prop="create_time"
+          label="操作日期"
+        />
+        <el-table-column
+          align="center"
+          width="100"
+          prop="admin_name"
+          label="操作账号"
+        />
+        <el-table-column
+          align="center"
+          width="150"
+          prop="car_number"
+          label="车牌"
+        />
+        <el-table-column align="center" prop="record1" label="操作详情" />
+      </el-table>
     </div>
 
     <!-- 分页数据 -->
@@ -226,8 +224,8 @@ onMounted(() => {
 
 <style scoped lang="scss">
 .content-box {
-  width: 97.5%;
-  height: 89%;
+  width: calc(100% - 40px);
+  height: calc(100% - 105px);
   margin: 20px auto;
   background-color: #fff;
   color: #fff;
@@ -235,7 +233,7 @@ onMounted(() => {
   flex-direction: column;
 
   .left {
-    width: calc(100wh - 40px);
+    width: calc(100% - 60px);
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -246,29 +244,23 @@ onMounted(() => {
     color: #000;
     font-size: 18px;
     font-weight: 600;
-    .camera {
-      margin-right: 15px;
-      color: #4392f7;
-    }
   }
-  .MingXi {
-    .filter {
+  .filter {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+
+    //   width: 100%;
+    .condition {
       display: flex;
-      flex-wrap: wrap;
       align-items: center;
-
-      //   width: 100%;
-      .condition {
-        display: flex;
-        align-items: center;
-        margin: 15px 30px 10px 30px;
-        color: #000;
-        :deep(.el-input .el-input__inner) {
-          font-size: 16px;
-        }
-        span {
-          margin: 0 10px 0 0;
-        }
+      margin: 15px 30px 10px 30px;
+      color: #000;
+      :deep(.el-input .el-input__inner) {
+        font-size: 16px;
+      }
+      span {
+        margin: 0 10px 0 0;
       }
     }
   }
@@ -385,106 +377,11 @@ onMounted(() => {
     }
   }
 
-  .middle {
-    width: 96%;
-    margin: 0 auto;
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-    justify-content: space-between;
-    color: #000;
-    border-bottom: 1px solid rgb(231, 231, 231);
-    padding: 10px 0;
-    // 添加员工弹窗样式
-
-    .filter {
-      display: flex;
-      flex-wrap: wrap;
-      align-items: center;
-      //   width: 100%;
-      .condition {
-        display: flex;
-        align-items: center;
-        margin: 10px 30px 10px 0;
-        span {
-          margin: 0 10px 0 0;
-        }
-      }
-    }
-    .import {
-      margin: 10px 0;
-    }
-    .gongneng {
-      margin: 10px 0;
-    }
-    :deep(.cont) {
-      width: 60%;
-      margin: 20px auto;
-    }
-    :deep(.download) {
-      display: flex;
-      align-items: center;
-      margin: 10px;
-    }
-    :deep(.download span) {
-      font-size: 16px;
-      margin-left: 20px;
-    }
-    :deep(.cont .el-button) {
-      margin-left: 60px;
-      margin-bottom: 30px;
-    }
-
-    :deep(.cont .accomplish) {
-      width: 100%;
-      display: flex;
-      justify-content: center;
-    }
-    :deep(.cont .accomplish .el-button) {
-      width: 50%;
-      margin: 0;
-    }
-  }
-  .footerMenu {
-    width: 96%;
-    margin: 10px auto 0;
-    display: flex;
-    align-items: center;
-    // height: 40px;
-    .menuList {
-      padding: 5px 12px;
-      border-bottom: 2px solid transparent;
-      //   color: rgba(61, 81, 232, 1);
-      color: rgba(128, 128, 128, 1);
-      cursor: pointer;
-      //   font-size: 16px;
-      font-weight: 600;
-    }
-    .menuListActive {
-      border-bottom: 2px solid rgba(61, 81, 232, 1);
-      color: rgba(61, 81, 232, 1);
-      font-size: 17px;
-    }
-  }
-  .footer.mingxi {
-    :deep(.el-table__header-wrapper) {
-      height: 50px;
-      .el-table__header {
-        height: 50px;
-      }
-    }
-    .el-table--fit {
-      height: 100%;
-
-      :deep(.el-table__row) {
-        height: 55px;
-      }
-    }
-  }
   .footer {
-    width: 96%;
-    height: 562px;
-    margin: 20px auto 20px;
+    width: calc(100% - 60px);
+    flex:1;
+    margin: 10px auto 10px;
+    overflow: auto;
     :deep(.el-table__header-wrapper) {
       height: 48px;
 
@@ -573,8 +470,9 @@ onMounted(() => {
   }
   .el-pagination {
     // width: 1600px;
-    width: 96%;
-    margin: 0 auto 18px;
+    width: calc(100% - 60px);
+    height: 60px;
+    margin: 0 30px;
     justify-content: flex-end;
     :deep(.el-pagination__total) {
       color: #000;

src/views/report/report.vue

@@ -680,8 +680,8 @@ onUnmounted(() => {
 
 <style scoped lang="scss">
 .content-box {
-  width: 97.5%;
-  height: 89%;
+  width: calc(100% - 40px);
+  height: calc(100% - 105px);
   margin: 20px auto;
   background-color: #fff;
   color: #fff;
@@ -689,7 +689,7 @@ onUnmounted(() => {
   flex-direction: column;
 
   .left {
-    // width: calc(100wh - 40px);
+    width: calc(100% - 40px);
     display: flex;
     align-items: center;
     height: 60px;
@@ -704,7 +704,7 @@ onUnmounted(() => {
     }
   }
   .middle {
-    width: 96%;
+    width: calc(100% - 60px);
     margin: 0 auto;
 
     color: #000;
@@ -761,9 +761,10 @@ onUnmounted(() => {
     }
   }
   .footer {
-    width: 96%;
-    height: 550px;
-    margin: 10px auto 30px;
+    width: calc(100% - 60px);
+    flex:1;
+    margin: 10px auto;
+    overflow: auto;
     .el-table--fit {
       height: 100%;
       :deep(.el-table__header-wrapper) {
@@ -831,8 +832,9 @@ onUnmounted(() => {
   }
   .el-pagination {
     // width: 1600px;
-    width: 96%;
-    margin: 0 auto 18px;
+    width: calc(100% - 60px);
+    height: 60px;
+    margin: 0 30px;
     justify-content: flex-end;
     :deep(.el-pagination__total) {
       color: #000;

src/views/staff/staff.vue

@@ -601,8 +601,8 @@ onUnmounted(() => {
 
 <style scoped lang="scss">
 .content-box {
-  width: 97.5%;
-  height: 89%;
+  width: calc(100% - 40px);
+  height: calc(100% - 105px);
   margin: 20px auto;
   background-color: #fff;
   color: #fff;
@@ -610,7 +610,7 @@ onUnmounted(() => {
   flex-direction: column;
 
   .left {
-    // width: calc(100wh - 40px);
+    width: calc(100% - 60px);
     display: flex;
     align-items: center;
     height: 60px;
@@ -625,7 +625,7 @@ onUnmounted(() => {
     }
   }
   .middle {
-    width: 96%;
+    width: calc(100% - 60px);
     margin: 0 auto;
 
     color: #000;
@@ -682,9 +682,11 @@ onUnmounted(() => {
     }
   }
   .footer {
-    width: 96%;
-    height: 550px;
-    margin: 10px auto 30px;
+    width: calc(100% - 60px);
+    flex:1;
+    margin: 10px auto;
+    overflow: auto;
+    
     .el-table--fit {
       height: 100%;
       :deep(.el-table__header-wrapper) {
@@ -748,9 +750,9 @@ onUnmounted(() => {
     }
   }
   .el-pagination {
-    // width: 1600px;
-    width: 96%;
-    margin: 0 auto 18px;
+    width: calc(100% - 60px);
+    height: 60px;
+    margin: 0 auto;
     justify-content: flex-end;
     :deep(.el-pagination__total) {
       color: #000;

src/views/statement/statement.vue

@@ -297,7 +297,7 @@
         <el-table
           :row-class-name="tableRowClassName"
           :data="tableData.list"
-          style="width: 100%; height: 500px"
+          style="width: 100%"
           :header-cell-style="{
             background: 'rgba(240, 243, 247, 1)',
             border: 0,
@@ -376,7 +376,7 @@
           </el-table-column>
         </el-table>
       </div>
-      <div style="width: 100%; height: 34px">
+      <div class="pagination">
         <el-pagination
           background
           v-model:page-size="pageSize"
@@ -464,7 +464,7 @@
         <el-table
           :row-class-name="tableRowClassName"
           :data="tableData.list2"
-          style="width: 100%; height: 550px"
+          style="width: 100%"
           :header-cell-style="{
             background: 'rgba(240, 243, 247, 1)',
             border: 0,
@@ -1080,8 +1080,8 @@ onBeforeMount(() => {
 
 <style scoped lang="scss">
 .content-box {
-  width: 97.5%;
-  height: 89%;
+  width: calc(100% - 40px);
+  height: calc(100% - 105px);
   margin: 20px auto;
   background-color: #fff;
   color: #fff;
@@ -1089,7 +1089,7 @@ onBeforeMount(() => {
   flex-direction: column;
 
   .left {
-    width: calc(100wh - 40px);
+    width: calc(100% - 60px);
     display: flex;
     align-items: center;
     height: 60px !important;
@@ -1147,7 +1147,7 @@ onBeforeMount(() => {
   }
 
   .middle {
-    width: 96%;
+    width: calc(100% - 60px);
     margin: 0 auto;
     display: flex;
     flex-wrap: wrap;
@@ -1221,7 +1221,7 @@ onBeforeMount(() => {
   }
 
   .footerMenu {
-    width: 96%;
+    width: calc(100% - 60px);
     margin: 10px auto 0;
     display: flex;
     align-items: center;
@@ -1243,29 +1243,40 @@ onBeforeMount(() => {
       font-size: 17px;
     }
   }
-
-  .footer.mingxi {
-    :deep(.el-table__header-wrapper) {
-      height: 50px;
-
-      .el-table__header {
+  .MingXi {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    overflow: auto;
+    .mingxi {
+      flex: 1;
+      overflow: auto;
+      :deep(.el-table__header-wrapper) {
         height: 50px;
+
+        .el-table__header {
+          height: 50px;
+        }
       }
-    }
 
-    .el-table--fit {
-      height: 100%;
+      .el-table--fit {
+        height: 100%;
 
-      :deep(.el-table__row) {
-        height: 50px;
+        :deep(.el-table__row) {
+          height: 50px;
+        }
       }
     }
+    .pagination{
+      width: 100%;
+      height: 80px;
+    }
   }
 
   .footer {
-    width: 96%;
-    height: 510px;
-    margin: 20px auto 20px;
+    width:calc(100% - 60px);
+    // height: 510px;
+    margin: 20px auto 0;
 
     :deep(.el-table__header-wrapper) {
       height: 48px;
@@ -1436,8 +1447,9 @@ onBeforeMount(() => {
 
   .el-pagination {
     // width: 1600px;
-    width: 96%;
-    margin: 0 auto 18px;
+    width: calc(100% - 60px);
+    height: 60px;
+    margin: 0 30px;
     justify-content: flex-end;
 
     :deep(.el-pagination__total) {

src/views/waiting/waiting.vue

@@ -257,8 +257,8 @@ onUnmounted(() => {});
 
 <style scoped lang="scss">
 .content-box {
-  width: 97.5%;
-  height: 89%;
+  width: calc(100% - 40px);
+  height: calc(100% - 105px);
   margin: 20px auto;
   background-color: #fff;
   color: #fff;
@@ -271,7 +271,6 @@ onUnmounted(() => {});
     align-items: center;
     height: 60px;
     margin: 0 30px;
-    padding: 20px 0;
     border-bottom: 1px solid #ccc;
     color: #000;
     font-size: 18px;
@@ -282,16 +281,17 @@ onUnmounted(() => {});
     }
   }
   .middle {
-    width: 96%;
+    width: calc(100% - 60px);
+    height: calc(100% - 60px);
+    overflow: auto;
     margin: 0 auto;
-
     color: #000;
+
     // border-bottom: 1px solid rgb(231, 231, 231);
     .filter {
       display: flex;
       flex-wrap: wrap;
       flex-direction: column;
-      margin: 10px 0 0 0;
       .condition {
         display: flex;
         flex-direction: column;
@@ -334,64 +334,6 @@ onUnmounted(() => {});
       margin: 0;
     }
   }
-  .footer {
-    width: 96%;
-    height: 550px;
-    margin: 10px auto 30px;
-    .el-table--fit {
-      height: 100%;
-      :deep(.el-table__header-wrapper) {
-        background-color: #000;
-      }
-      :deep(.el-table__row) {
-        height: 50px;
-      }
-      :deep(.el-table__row td) {
-        padding: 0;
-        border: 0;
-      }
-
-      .el-button--primary {
-        margin-left: 5px;
-      }
-      :deep(.el-table__body .even) {
-        background-color: #fff;
-      }
-      :deep(.el-table__body .odd) {
-        background-color: #f7fafe;
-      }
-      :deep(.look) {
-        padding: 5px 14px;
-        border-radius: 45px;
-        border: 0.74px solid rgba(30, 125, 251, 1);
-      }
-    }
-  }
-  .el-pagination {
-    // width: 1600px;
-    width: 96%;
-    margin: 0 auto 18px;
-    justify-content: flex-end;
-    :deep(.el-pagination__total) {
-      color: #000;
-    }
-    :deep(.el-pagination__goto) {
-      color: #000;
-    }
-    :deep(.el-pagination__classifier) {
-      color: #000;
-    }
-
-    :deep(.el-pager li) {
-      margin: 0 3px;
-    }
-    :deep(.btn-prev) {
-      margin-right: 3px;
-    }
-    :deep(.btn-next) {
-      margin-left: 3px;
-    }
-  }
 }
 .el-input {
   width: 192px;