123

src/views/largeScreen/home/components/dialog/grouListJmll.vue

@@ -4,31 +4,21 @@
       <div class="header">
         <span class="title">{{ title }}</span>
         <span class="close" @click="closeDialog">
-          <el-icon :size="22"><CircleClose /></el-icon>
+          <el-icon :size="22">
+            <CircleClose />
+          </el-icon>
         </span>
       </div>
       <div class="search">
         <el-form ref="formRef" :model="listQuery">
           <el-form-item label="所属部门">
-            <MOSTY.Department
+            <MOSTY.Department width="200px" clearable v-model="listQuery.ssbmdm" />
-              width="200px"
-              clearable
-              v-model="listQuery.ssbmdm"
-            />
           </el-form-item>
           &nbsp;&nbsp;
           <el-form-item label=" 时间段">
-            <el-date-picker
+            <el-date-picker v-model="timeRange" popper-class="jl-time" type="datetimerange" start-placeholder="开始时间"
-              v-model="timeRange"
+              end-placeholder="结束时间" range-separator="至" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-              popper-class="jl-time"
+              placeholder="请选择开始时间"></el-date-picker>
-              type="datetimerange"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-              range-separator="至"
-              format="YYYY-MM-DD HH:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="请选择开始时间"
-            ></el-date-picker>
           </el-form-item>
           <el-form-item>
             <el-button class="serchBtn" @click="handleFilter"> 查询 </el-button>
@@ -37,67 +27,25 @@
         </el-form>
       </div>
       <div class="datalist">
-        <el-table
+        <el-table ref="multipleUserRef" :data="list.tableData" border width="100%" height="100%">
-          ref="multipleUserRef"
+          <el-table-column label="序号" type="index" align="center" width="80" />
-          :data="list.tableData"
+          <el-table-column prop="jlxm" show-overflow-tooltip align="center" label="姓名">
-          border
-          width="100%"
-          height="100%"
-        >
-          <el-table-column
-            label="序号"
-            type="index"
-            align="center"
-            width="80"
-          />
-          <el-table-column
-            prop="jlxm"
-            show-overflow-tooltip
-            align="center"
-            label="姓名"
-          >
           </el-table-column>
-          <el-table-column
+          <el-table-column prop="xbdm" show-overflow-tooltip align="center" label="性别">
-            prop="xbdm"
-            show-overflow-tooltip
-            align="center"
-            label="性别"
-          >
             <template #default="{ row }">
               {{ row.sfzh.charAt(16) % 2 ? "男" : "女" }}
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column prop="sfzh" show-overflow-tooltip align="center" label="身份证号码">
-            prop="sfzh"
-            show-overflow-tooltip
-            align="center"
-            label="身份证号码"
-          >
           </el-table-column>
-          <el-table-column
+          <el-table-column prop="ssbm" label="所属部门" show-overflow-tooltip align="center"></el-table-column>
-            prop="ssbm"
+          <el-table-column prop="lxdh" label="联系电话" align="center"></el-table-column>
-            label="所属部门"
-            show-overflow-tooltip
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="lxdh"
-            label="联系电话"
-            align="center"
-          ></el-table-column>
         </el-table>
       </div>
       <div class="fenye">
-        <el-pagination
+        <el-pagination class="pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange"
-          class="pagination"
+          :current-page="listQuery.pageCurrent" :page-sizes="[10, 20, 50, 100]" :page-size="listQuery.pageSize"
-          @size-change="handleSizeChange"
+          layout="total, sizes, prev, pager, next, jumper" :total="total">
-          @current-change="handleCurrentChange"
-          :current-page="listQuery.pageCurrent"
-          :page-sizes="[10, 20, 50, 100]"
-          :page-size="listQuery.pageSize"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total"
-        >
         </el-pagination>
       </div>
     </div>
@@ -195,6 +143,7 @@ function getList() {
   right: 0;
   background: rgba(0, 0, 0, 0.7);
   z-index: 99;
+
   .container {
     position: absolute;
     top: 0;
@@ -244,9 +193,11 @@ function getList() {
 
 @import "~@/assets/css/layout.scss";
 @import "~@/assets/css/element-plus.scss";
+
 ::v-deep .el-form-item {
   align-items: center;
 }
+
 ::v-deep .el-input__inner {
   margin: 0 !important;
 }

src/views/largeScreen/home/components/dialog/grouListJmxz.vue

@@ -1,13 +1,12 @@
 <template>
   <div class="bigBox" v-if="modelValue">
-    <div
+    <div class="container" :class="title == '街面巡组-实际列表' ? 'container1' : ''">
-      class="container"
-      :class="title == '街面巡组-实际列表' ? 'container1' : ''"
-    >
       <div class="header">
         <span class="title">{{ title }}</span>
         <span class="close" @click="closeDialog">
-          <el-icon :size="22"><CircleClose /></el-icon>
+          <el-icon :size="22">
+            <CircleClose />
+          </el-icon>
         </span>
       </div>
       <div class="search">
@@ -19,17 +18,9 @@
             <el-input v-model="listQuery.fzrXm" placeholder="请输入负责人" />
           </el-form-item> &nbsp;&nbsp;
           <el-form-item label=" 时间段">
-            <el-date-picker
+            <el-date-picker v-model="timeRange" popper-class="jl-time" type="datetimerange" start-placeholder="开始时间"
-              v-model="timeRange"
+              end-placeholder="结束时间" range-separator="至" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-              popper-class="jl-time"
+              placeholder="请选择开始时间"></el-date-picker>
-              type="datetimerange"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-              range-separator="至"
-              format="YYYY-MM-DD HH:mm:ss"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="请选择开始时间"
-            ></el-date-picker>
           </el-form-item>
           <el-form-item>
             <el-button class="serchBtn" @click="handleFilter"> 查询 </el-button>
@@ -76,16 +67,9 @@
         </el-table>
       </div>
       <div class="fenye">
-        <el-pagination
+        <el-pagination class="pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange"
-          class="pagination"
+          :current-page="listQuery.pageCurrent" :page-sizes="[10, 20, 50, 100]" :page-size="listQuery.pageSize"
-          @size-change="handleSizeChange"
+          layout="total, sizes, prev, pager, next, jumper" :total="total">
-          @current-change="handleCurrentChange"
-          :current-page="listQuery.pageCurrent"
-          :page-sizes="[10, 20, 50, 100]"
-          :page-size="listQuery.pageSize"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total"
-        >
         </el-pagination>
       </div>
     </div>
@@ -249,6 +233,7 @@ function getList() {
       height: 60px;
     }
   }
+
   .container1 {
     width: 82%;
   }
@@ -261,11 +246,14 @@ function getList() {
 .serchBtn {
   margin-left: 20px;
 }
+
 @import "~@/assets/css/layout.scss";
 @import "~@/assets/css/element-plus.scss";
+
 ::v-deep .el-form-item {
   align-items: center;
 }
+
 ::v-deep .el-input__inner {
   margin: 0 !important;
 }

src/views/largeScreen/home/components/dialog/grouListXllsclc.vue

@@ -60,9 +60,7 @@
               <span v-show="row.bblx != '02'">{{ row.kssj + "至" + row.jssj }}</span>
             </template>
           </el-table-column>
-          
           <el-table-column label="实际巡逻时间" align="center" prop="bbkssj" />
-
           <el-table-column label="巡逻车辆" align="center" prop="">
             <template #default="{ row }">
               <el-tag v-for="(item, index) in row.pbcl" :key="index">