旅客查验信息

src/views/guest-basic-info/detail.vue

@@ -132,7 +132,6 @@
 </template>
 <script lang="ts" setup>
 import { SuccessResultCode } from '@cacp/ui'
-import { ElMessage } from 'element-plus'
 import { onMounted, reactive } from 'vue'
 import DoubleImg from '@/components/double-img.vue'
 import { passengerinfoDetail } from '@/apis/lvke'

src/views/guest-basic-info/index.vue

@@ -92,16 +92,16 @@
           </el-form-item>
           <el-form-item label="采集时间" prop="operateTimeStart">
             <el-date-picker
-              type="date"
-              value-format="YYYY-MM-DD"
+              type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
               v-model="state.query.form.operateTimeStart"
               placeholder=""
             />
           </el-form-item>
           <el-form-item label="到" prop="operateTimeEnd">
             <el-date-picker
-              type="date"
-              value-format="YYYY-MM-DD"
+              type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
               v-model="state.query.form.operateTimeEnd"
               placeholder=""
             />
@@ -120,7 +120,6 @@
         @on-page-change="onPageChange"
         @on-size-change="onSizeChange"
         :secondaryColSpan="24"
-        @selection-change="onSelectionChange"
       >
         <el-table-column type="selection" width="36" fixed="left" />
         <el-table-column type="index" label="序号" width="50" fixed="left" />
@@ -130,7 +129,7 @@
         </el-table-column>
         <el-table-column property="age" label="年龄" min-width="100" />
         <el-table-column property="personIdNumber" label="证件号码" min-width="160" />
-        <el-table-column property="personIdType" label="证件类型" min-width="120">
+        <el-table-column property="personIdType" label="证件类型" min-width="160">
           <template #default="scope">{{
             AppStore.getDict('lvke_personIdType').map.get(scope.row.personIdType)
           }}</template>
@@ -216,10 +215,6 @@ const onQuery = async () => {
   }
   setLoading(false)
 }
-
-const onSelectionChange = (arr: any) => {
-  console.log(arr)
-}
 const onExport = async () => {
   const res: any = await passengerinfoExport({
     ...state.query.form,

src/views/guest-check-info-manage/guest-check-info/detail.vue

@@ -169,10 +169,12 @@
 </template>
 <script lang="ts" setup>
 import { SuccessResultCode } from '@cacp/ui'
-import { ElMessage } from 'element-plus'
 import { onMounted, reactive } from 'vue'
 import DoubleImg from '@/components/double-img.vue'
+import { passengerinfoDetail } from '@/apis/lvke'
+import { useAppStore } from '@/stores'
 
+const AppStore = useAppStore()
 const props = defineProps({
   transfer: {}
 })
@@ -181,8 +183,15 @@ const state = reactive<any>({
   loading: false,
   tableData: []
 })
-
-onMounted(() => {})
+const initData = async () => {
+  const res: any = await passengerinfoDetail({ id: props.transfer.id, queryType: 2 })
+  if (res.code === SuccessResultCode) {
+    state.form = res.data
+  }
+}
+onMounted(() => {
+  initData()
+})
 </script>
 <style scoped lang="less">
 .detail {

src/views/guest-check-info-manage/guest-check-info/index.vue

@@ -13,10 +13,10 @@
           <el-form-item label="姓名" prop="name">
             <el-input v-model="state.query.form.name"></el-input>
           </el-form-item>
-          <el-form-item label="性别" prop="sex">
-            <el-select v-model="state.query.form.sex" placeholder="请选择" clearable>
+          <el-form-item label="性别" prop="gender">
+            <el-select v-model="state.query.form.gender" placeholder="请选择" clearable>
               <el-option
-                v-for="item in state.options.sex"
+                v-for="item in AppStore.getDict('lvke_sex').list"
                 :key="item.dictValue"
                 :label="item.dictLabel"
                 :value="item.dictValue"
@@ -26,27 +26,27 @@
           <el-form-item label="证件号码" prop="idNo">
             <el-input v-model="state.query.form.idNo"></el-input>
           </el-form-item>
-          <el-form-item label="证件类型" prop="certType">
-            <el-select
-              v-model="state.query.form.certType"
-              placeholder="请选择"
-              clearable
-              multiple
-              collapse-tags
-              collapse-tags-tooltip
-            >
-              <el-option
-                v-for="item in state.options.certType"
-                :key="item.dictValue"
-                :label="item.dictLabel"
-                :value="item.dictValue"
-              />
-            </el-select>
+          <el-form-item label="证件类型" prop="xxx">
+            <!--            <el-select-->
+            <!--              v-model="state.query.form.xxx"-->
+            <!--              placeholder="请选择"-->
+            <!--              clearable-->
+            <!--              multiple-->
+            <!--              collapse-tags-->
+            <!--              collapse-tags-tooltip-->
+            <!--            >-->
+            <!--              <el-option-->
+            <!--                v-for="item in state.options.certType"-->
+            <!--                :key="item.dictValue"-->
+            <!--                :label="item.dictLabel"-->
+            <!--                :value="item.dictValue"-->
+            <!--              />-->
+            <!--            </el-select>-->
           </el-form-item>
           <el-form-item label="国籍" prop="nationality">
             <el-select v-model="state.query.form.nationality" placeholder="请选择" clearable>
               <el-option
-                v-for="item in state.options.nationality"
+                v-for="item in AppStore.getDict('lvke_city').list"
                 :key="item.dictValue"
                 :label="item.dictLabel"
                 :value="item.dictValue"
@@ -56,12 +56,12 @@
           <el-form-item label="居住地" prop="address">
             <el-input v-model="state.query.form.address"></el-input>
           </el-form-item>
-          <el-form-item label="车次/航班号" prop="idNo">
-            <el-input v-model="state.query.form.address"></el-input>
+          <el-form-item label="车次/航班号" prop="travelNo">
+            <el-input v-model="state.query.form.travelNo"></el-input>
           </el-form-item>
-          <el-form-item label="出发港口" prop="port">
+          <el-form-item label="出发港口" prop="fromPort">
             <el-select
-              v-model="state.query.form.port"
+              v-model="state.query.form.fromPort"
               placeholder="请选择"
               clearable
               multiple
@@ -69,16 +69,16 @@
               collapse-tags-tooltip
             >
               <el-option
-                v-for="item in state.options.port"
+                v-for="item in AppStore.getDict('lvke_departurePort').list"
                 :key="item.dictValue"
                 :label="item.dictLabel"
                 :value="item.dictValue"
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="到达港口" prop="port">
+          <el-form-item label="到达港口" prop="toPort">
             <el-select
-              v-model="state.query.form.port"
+              v-model="state.query.form.toPort"
               placeholder="请选择"
               clearable
               multiple
@@ -86,28 +86,38 @@
               collapse-tags-tooltip
             >
               <el-option
-                v-for="item in state.options.port"
+                v-for="item in AppStore.getDict('lvke_arrivingPort').list"
                 :key="item.dictValue"
                 :label="item.dictLabel"
                 :value="item.dictValue"
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="查验状态" prop="bayonetType" multiple collapse-tags collapse-tags-tooltip>
-            <el-select v-model="state.query.form.bayonetType" placeholder="请选择" clearable>
+          <el-form-item label="查验状态" prop="checkStatus" multiple collapse-tags collapse-tags-tooltip>
+            <el-select v-model="state.query.form.checkStatus" placeholder="请选择" clearable>
               <el-option
-                v-for="item in state.options.status"
+                v-for="item in AppStore.getDict('lvke_checkStatus').list"
                 :key="item.dictValue"
                 :label="item.dictLabel"
                 :value="item.dictValue"
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="航/车次(班)日期" prop="startTime">
-            <el-date-picker type="date" value-format="YYYY-MM-DD" v-model="state.query.form.startTime" placeholder="" />
+          <el-form-item label="航/车次(班)日期" prop="travelTimeStart">
+            <el-date-picker
+              type="date"
+              value-format="YYYY-MM-DD"
+              v-model="state.query.form.travelTimeStart"
+              placeholder=""
+            />
           </el-form-item>
-          <el-form-item label="到" prop="endTime">
-            <el-date-picker type="date" value-format="YYYY-MM-DD" v-model="state.query.form.endTime" placeholder="" />
+          <el-form-item label="到" prop="travelTimeEnd">
+            <el-date-picker
+              type="date"
+              value-format="YYYY-MM-DD"
+              v-model="state.query.form.travelTimeEnd"
+              placeholder=""
+            />
           </el-form-item>
           <template #buttonGroup>
             <el-button type="primary" @click="onSearch">查询</el-button>
@@ -123,25 +133,38 @@
         @on-page-change="onPageChange"
         @on-size-change="onSizeChange"
         :secondaryColSpan="24"
-        @selection-change="onSelectionChange"
       >
-        <el-table-column type="index" label="序号" width="50" />
         <el-table-column type="selection" width="36" fixed="left" />
-        <el-table-column property="areaCode" label="姓名" width="230" />
-        <el-table-column property="code" label="性别" min-width="100" />
-        <el-table-column property="funcType" label="年龄" min-width="100" />
-        <el-table-column property="operator" label="证件号码" min-width="100" />
-        <el-table-column property="operator" label="证件类型" min-width="100" />
-        <el-table-column property="operator" label="国籍" min-width="100" />
-        <el-table-column property="operator" label="居住地" min-width="100" />
-        <el-table-column property="operator" label="车次/航班号" min-width="100" />
-        <el-table-column property="createTime" label="航/车次(班)日期" min-width="160">
-          <template #default="scope">{{ scope.row.createTime.toLocaleString() }}</template>
+        <el-table-column type="index" label="序号" width="50" fixed="left" />
+        <el-table-column property="name" label="姓名" width="100" fixed="left" />
+        <el-table-column property="gender" label="性别" min-width="100">
+          <template #default="scope">{{ AppStore.getDict('lvke_sex').map.get(scope.row.gender) }}</template>
+        </el-table-column>
+        <el-table-column property="age" label="年龄" min-width="100" />
+        <el-table-column property="idNo" label="证件号码" min-width="160" />
+        <el-table-column property="xxx" label="证件类型" min-width="160">
+          <!--          <template #default="scope">{{ AppStore.getDict('lvke_sex').map.get(scope.row.gender) }}</template>-->
+        </el-table-column>
+        <el-table-column property="nationality" label="国籍" min-width="100">
+          <template #default="scope">{{ AppStore.getDict('lvke_city').map.get(scope.row.nationality) }}</template>
+        </el-table-column>
+        <el-table-column property="address" label="居住地" min-width="160" />
+        <el-table-column property="travelNo" label="车次/航班号" min-width="100" />
+        <el-table-column property="travelTime" label="航/车次(班)日期" min-width="160" />
+        <el-table-column property="fromPort" label="出发港口" min-width="160">
+          <template #default="scope">{{ AppStore.getDict('lvke_departurePort').map.get(scope.row.fromPort) }}</template>
+        </el-table-column>
+        <el-table-column property="toPort" label="到达港口" min-width="160">
+          <template #default="scope">{{ AppStore.getDict('lvke_arrivingPort').map.get(scope.row.toPort) }}</template>
+        </el-table-column>
+        <el-table-column property="xxx" label="布控类型" min-width="100">
+          <!--          <template #default="scope">{{ AppStore.getDict('lvke_sex').map.get(scope.row.gender) }}</template>-->
+        </el-table-column>
+        <el-table-column property="checkStatus" label="查验状态" min-width="100">
+          <template #default="scope">{{
+            AppStore.getDict('lvke_checkStatus').map.get(scope.row.checkStatus)
+          }}</template>
         </el-table-column>
-        <el-table-column property="operator" label="出发港口" min-width="100" />
-        <el-table-column property="operator" label="到达港口" min-width="100" />
-        <el-table-column property="operator" label="布控类型" min-width="100" />
-        <el-table-column property="operator" label="查验状态" min-width="100" />
       </cacp-complex-table>
     </cacp-search-layout>
   </template>
@@ -155,7 +178,10 @@ import { ElMessage } from 'element-plus'
 import { SuccessResultCode, useLoading, type TableAction, useComplexTable } from '@cacp/ui'
 import config from '@/config'
 import detail from './detail.vue'
+import { useAppStore } from '@/stores'
+import { passengerinfoExport, passengerinfoPage } from '@/apis/lvke'
 
+const AppStore = useAppStore()
 const { loading, setLoading } = useLoading()
 const { tableData, tablePagination, setPagination, setPageIndex, setPageSizes } = useComplexTable(config)
 const state = reactive<any>({
@@ -201,47 +227,35 @@ function onPageChange(currentPage: number) {
 }
 const onQuery = async () => {
   setLoading(true)
-  // const res = await typicalOneQuery({
-  //   ...state.query.form,
-  //   pageIndex: tablePagination.currentPage,
-  //   pageSize: tablePagination.pageSize
-  // })
-  const res = {
-    code: '0',
-    data: {
-      pageNum: 1,
-      pageSize: 20,
-      size: 20,
-      pages: 3,
-      total: 56,
-      list: [
-        {
-          id: '460000200103174428',
-          status: 1,
-          areaCode: '上海 上海市 510000',
-          code: 3643,
-          funcType: '创建',
-          operator: '常磊',
-          createTime: '1974-06-02 15:53:23',
-          lastModified: '1988-07-20 05:47:55'
-        }
-      ]
-    }
-  }
+  const res: any = await passengerinfoPage({
+    ...state.query.form,
+    pageIndex: tablePagination.currentPage,
+    pageSize: tablePagination.pageSize,
+    queryType: 2
+  })
   if (res.code === SuccessResultCode) {
     setPagination(res.data)
   }
   setLoading(false)
 }
 
-const onSelectionChange = (arr) => {
-  console.log(arr)
-}
-const onExport = () => {
+const onExport = async () => {
+  const res: any = await passengerinfoExport({
+    ...state.query.form,
+    pageIndex: tablePagination.currentPage,
+    pageSize: tablePagination.pageSize,
+    queryType: 2
+  })
+  const blob = new Blob([res])
+  const url = URL.createObjectURL(blob)
+  const a = document.createElement('a')
+  a.href = url
+  a.download = '旅客查验信息.xlsx'
+  a.click()
   ElMessage.success('导出成功！')
 }
 const onView = (row: any) => {
-  state.detail.transfer.row = row
+  state.detail.transfer = { id: row.id }
   state.detail.show = true
 }
 const actions: TableAction[] = [
@@ -251,7 +265,7 @@ const actions: TableAction[] = [
     type: 'primary',
     plain: true,
     onclick: onExport,
-    limit: 'more',
+    limit: 'none',
     position: 'right'
   },
   {

src/views/guest-check-info-manage/guest-check-pass-no/index.vue

@@ -77,16 +77,36 @@
             </el-select>
           </el-form-item>
           <el-form-item label="航/车次(班)日期" prop="startTime">
-            <el-date-picker type="date" value-format="YYYY-MM-DD" v-model="state.query.form.startTime" placeholder="" />
+            <el-date-picker
+              type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              v-model="state.query.form.startTime"
+              placeholder=""
+            />
           </el-form-item>
           <el-form-item label="到" prop="endTime">
-            <el-date-picker type="date" value-format="YYYY-MM-DD" v-model="state.query.form.endTime" placeholder="" />
+            <el-date-picker
+              type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              v-model="state.query.form.endTime"
+              placeholder=""
+            />
           </el-form-item>
           <el-form-item label="查验日期" prop="startTime">
-            <el-date-picker type="date" value-format="YYYY-MM-DD" v-model="state.query.form.startTime" placeholder="" />
+            <el-date-picker
+              type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              v-model="state.query.form.startTime"
+              placeholder=""
+            />
           </el-form-item>
           <el-form-item label="到" prop="endTime">
-            <el-date-picker type="date" value-format="YYYY-MM-DD" v-model="state.query.form.endTime" placeholder="" />
+            <el-date-picker
+              type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              v-model="state.query.form.endTime"
+              placeholder=""
+            />
           </el-form-item>
           <el-form-item label="未查验通过原因" prop="port">
             <el-select
@@ -129,20 +149,20 @@
         <el-table-column property="areaCode" label="姓名" width="230" />
         <el-table-column property="code" label="性别" min-width="100" />
         <el-table-column property="funcType" label="年龄" min-width="100" />
-        <el-table-column property="operator" label="证件号码" min-width="100" />
-        <el-table-column property="operator" label="证件类型" min-width="100" />
-        <el-table-column property="operator" label="国籍" min-width="100" />
-        <el-table-column property="operator" label="居住地" min-width="100" />
-        <el-table-column property="operator" label="车次/航班号" min-width="100" />
+        <el-table-column property="xxx" label="证件号码" min-width="100" />
+        <el-table-column property="xxx" label="证件类型" min-width="100" />
+        <el-table-column property="xxx" label="国籍" min-width="100" />
+        <el-table-column property="xxx" label="居住地" min-width="100" />
+        <el-table-column property="xxx" label="车次/航班号" min-width="100" />
         <el-table-column property="createTime" label="航/车次(班)日期" min-width="160">
           <template #default="scope">{{ scope.row.createTime.toLocaleString() }}</template>
         </el-table-column>
         <el-table-column property="createTime" label="查验时间" min-width="160">
           <template #default="scope">{{ scope.row.createTime.toLocaleString() }}</template>
         </el-table-column>
-        <el-table-column property="operator" label="查验地点" min-width="100" />
-        <el-table-column property="operator" label="未查验通过原因" min-width="100" />
-        <el-table-column property="operator" label="查验人" min-width="100" />
+        <el-table-column property="xxx" label="查验地点" min-width="100" />
+        <el-table-column property="xxx" label="未查验通过原因" min-width="100" />
+        <el-table-column property="xxx" label="查验人" min-width="100" />
       </cacp-complex-table>
     </cacp-search-layout>
   </template>
@@ -222,7 +242,7 @@ const onQuery = async () => {
           areaCode: '上海 上海市 510000',
           code: 3643,
           funcType: '创建',
-          operator: '常磊',
+          xxx: '常磊',
           createTime: '1974-06-02 15:53:23',
           lastModified: '1988-07-20 05:47:55'
         }
@@ -252,7 +272,7 @@ const actions: TableAction[] = [
     type: 'primary',
     plain: true,
     onclick: onExport,
-    limit: 'more',
+    limit: 'none',
     position: 'right'
   },
   {

src/views/guest-check-info-manage/guest-check-pass/index.vue

@@ -77,16 +77,36 @@
             </el-select>
           </el-form-item>
           <el-form-item label="航/车次(班)日期" prop="startTime">
-            <el-date-picker type="date" value-format="YYYY-MM-DD" v-model="state.query.form.startTime" placeholder="" />
+            <el-date-picker
+              type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              v-model="state.query.form.startTime"
+              placeholder=""
+            />
           </el-form-item>
           <el-form-item label="到" prop="endTime">
-            <el-date-picker type="date" value-format="YYYY-MM-DD" v-model="state.query.form.endTime" placeholder="" />
+            <el-date-picker
+              type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              v-model="state.query.form.endTime"
+              placeholder=""
+            />
           </el-form-item>
           <el-form-item label="查验日期" prop="startTime">
-            <el-date-picker type="date" value-format="YYYY-MM-DD" v-model="state.query.form.startTime" placeholder="" />
+            <el-date-picker
+              type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              v-model="state.query.form.startTime"
+              placeholder=""
+            />
           </el-form-item>
           <el-form-item label="到" prop="endTime">
-            <el-date-picker type="date" value-format="YYYY-MM-DD" v-model="state.query.form.endTime" placeholder="" />
+            <el-date-picker
+              type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              v-model="state.query.form.endTime"
+              placeholder=""
+            />
           </el-form-item>
           <template #buttonGroup>
             <el-button type="primary" @click="onSearch">查询</el-button>
@@ -109,19 +129,19 @@
         <el-table-column property="areaCode" label="姓名" width="230" />
         <el-table-column property="code" label="性别" min-width="100" />
         <el-table-column property="funcType" label="年龄" min-width="100" />
-        <el-table-column property="operator" label="证件号码" min-width="100" />
-        <el-table-column property="operator" label="证件类型" min-width="100" />
-        <el-table-column property="operator" label="国籍" min-width="100" />
-        <el-table-column property="operator" label="居住地" min-width="100" />
-        <el-table-column property="operator" label="车次/航班号" min-width="100" />
+        <el-table-column property="xxx" label="证件号码" min-width="100" />
+        <el-table-column property="xxx" label="证件类型" min-width="100" />
+        <el-table-column property="xxx" label="国籍" min-width="100" />
+        <el-table-column property="xxx" label="居住地" min-width="100" />
+        <el-table-column property="xxx" label="车次/航班号" min-width="100" />
         <el-table-column property="createTime" label="航/车次(班)日期" min-width="160">
           <template #default="scope">{{ scope.row.createTime.toLocaleString() }}</template>
         </el-table-column>
         <el-table-column property="createTime" label="查验时间" min-width="160">
           <template #default="scope">{{ scope.row.createTime.toLocaleString() }}</template>
         </el-table-column>
-        <el-table-column property="operator" label="查验地点" min-width="100" />
-        <el-table-column property="operator" label="查验人" min-width="100" />
+        <el-table-column property="xxx" label="查验地点" min-width="100" />
+        <el-table-column property="xxx" label="查验人" min-width="100" />
       </cacp-complex-table>
     </cacp-search-layout>
   </template>
@@ -201,7 +221,7 @@ const onQuery = async () => {
           areaCode: '上海 上海市 510000',
           code: 3643,
           funcType: '创建',
-          operator: '常磊',
+          xxx: '常磊',
           createTime: '1974-06-02 15:53:23',
           lastModified: '1988-07-20 05:47:55'
         }
@@ -231,7 +251,7 @@ const actions: TableAction[] = [
     type: 'primary',
     plain: true,
     onclick: onExport,
-    limit: 'more',
+    limit: 'none',
     position: 'right'
   },
   {

src/views/guest-release-info/index.vue

@@ -57,16 +57,36 @@
             <el-input v-model="state.query.form.idNo"></el-input>
           </el-form-item>
           <el-form-item label="入场时间" prop="startTime">
-            <el-date-picker type="date" value-format="YYYY-MM-DD" v-model="state.query.form.startTime" placeholder="" />
+            <el-date-picker
+              type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              v-model="state.query.form.startTime"
+              placeholder=""
+            />
           </el-form-item>
           <el-form-item label="到" prop="endTime">
-            <el-date-picker type="date" value-format="YYYY-MM-DD" v-model="state.query.form.endTime" placeholder="" />
+            <el-date-picker
+              type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              v-model="state.query.form.endTime"
+              placeholder=""
+            />
           </el-form-item>
           <el-form-item label="放行时间" prop="startTime">
-            <el-date-picker type="date" value-format="YYYY-MM-DD" v-model="state.query.form.startTime" placeholder="" />
+            <el-date-picker
+              type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              v-model="state.query.form.startTime"
+              placeholder=""
+            />
           </el-form-item>
           <el-form-item label="到" prop="endTime">
-            <el-date-picker type="date" value-format="YYYY-MM-DD" v-model="state.query.form.endTime" placeholder="" />
+            <el-date-picker
+              type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              v-model="state.query.form.endTime"
+              placeholder=""
+            />
           </el-form-item>
           <el-form-item label="放行类型" prop="control" multiple collapse-tags collapse-tags-tooltip>
             <el-select v-model="state.query.form.control" placeholder="请选择" clearable>
@@ -99,15 +119,15 @@
         <el-table-column property="areaCode" label="姓名" width="230" />
         <el-table-column property="code" label="性别" min-width="100" />
         <el-table-column property="funcType" label="年龄" min-width="100" />
-        <el-table-column property="operator" label="证件号码" min-width="100" />
-        <el-table-column property="operator" label="证件类型" min-width="100" />
-        <el-table-column property="operator" label="国籍" min-width="100" />
-        <el-table-column property="operator" label="居住地" min-width="100" />
-        <el-table-column property="operator" label="车次/航班号" min-width="100" />
+        <el-table-column property="xxx" label="证件号码" min-width="100" />
+        <el-table-column property="xxx" label="证件类型" min-width="100" />
+        <el-table-column property="xxx" label="国籍" min-width="100" />
+        <el-table-column property="xxx" label="居住地" min-width="100" />
+        <el-table-column property="xxx" label="车次/航班号" min-width="100" />
         <el-table-column property="createTime" label="航/车次(班)日期" min-width="160">
           <template #default="scope">{{ scope.row.createTime.toLocaleString() }}</template>
         </el-table-column>
-        <el-table-column property="operator" label="放行类型" min-width="100" />
+        <el-table-column property="xxx" label="放行类型" min-width="100" />
         <el-table-column property="createTime" label="入场时间" min-width="160">
           <template #default="scope">{{ scope.row.createTime.toLocaleString() }}</template>
         </el-table-column>
@@ -193,7 +213,7 @@ const onQuery = async () => {
           areaCode: '上海 上海市 510000',
           code: 3643,
           funcType: '创建',
-          operator: '常磊',
+          xxx: '常磊',
           createTime: '1974-06-02 15:53:23',
           lastModified: '1988-07-20 05:47:55'
         }
@@ -223,7 +243,7 @@ const actions: TableAction[] = [
     type: 'primary',
     plain: true,
     onclick: onExport,
-    limit: 'more',
+    limit: 'none',
     position: 'right'
   },
   {

src/views/run-config-manage/log-manage/login-log/index.vue

@@ -46,10 +46,20 @@
           </el-select>
         </el-form-item>
         <el-form-item label="操作时间" prop="startTime">
-          <el-date-picker type="date" value-format="YYYY-MM-DD" v-model="state.query.form.startTime" placeholder="" />
+          <el-date-picker
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="state.query.form.startTime"
+            placeholder=""
+          />
         </el-form-item>
         <el-form-item label="到" prop="endTime">
-          <el-date-picker type="date" value-format="YYYY-MM-DD" v-model="state.query.form.endTime" placeholder="" />
+          <el-date-picker
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="state.query.form.endTime"
+            placeholder=""
+          />
         </el-form-item>
         <template #buttonGroup>
           <el-button type="primary" @click="onSearch">查询</el-button>
@@ -72,12 +82,12 @@
       <el-table-column property="areaCode" label="用户账号" width="230" />
       <el-table-column property="code" label="用户姓名" min-width="100" />
       <el-table-column property="funcType" label="操作类型" min-width="100" />
-      <el-table-column property="operator" label="系统模块" min-width="100" />
-      <el-table-column property="operator" label="ip地址" min-width="100" />
-      <el-table-column property="operator" label="操作状态" min-width="100" />
-      <el-table-column property="operator" label="请求方式" min-width="100" />
-      <el-table-column property="operator" label="操作时间" min-width="100" />
-      <el-table-column property="operator" label="消耗时间" min-width="100" />
+      <el-table-column property="xxx" label="系统模块" min-width="100" />
+      <el-table-column property="xxx" label="ip地址" min-width="100" />
+      <el-table-column property="xxx" label="操作状态" min-width="100" />
+      <el-table-column property="xxx" label="请求方式" min-width="100" />
+      <el-table-column property="xxx" label="操作时间" min-width="100" />
+      <el-table-column property="xxx" label="消耗时间" min-width="100" />
     </cacp-complex-table>
   </cacp-search-layout>
   <cacp-dialog
@@ -215,7 +225,7 @@ const onQuery = async () => {
           areaCode: '上海 上海市 510000',
           code: 3643,
           funcType: '创建',
-          operator: '常磊',
+          xxx: '常磊',
           createTime: '1974-06-02 15:53:23',
           lastModified: '1988-07-20 05:47:55'
         }
@@ -245,7 +255,7 @@ const actions: TableAction[] = [
     type: 'primary',
     plain: true,
     onclick: onExport,
-    limit: 'more',
+    limit: 'none',
     position: 'right'
   },
   {

src/views/run-config-manage/log-manage/operation-log/index.vue

@@ -29,10 +29,20 @@
           <el-input v-model="state.query.form.name"></el-input>
         </el-form-item>
         <el-form-item label="操作时间" prop="startTime">
-          <el-date-picker type="date" value-format="YYYY-MM-DD" v-model="state.query.form.startTime" placeholder="" />
+          <el-date-picker
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="state.query.form.startTime"
+            placeholder=""
+          />
         </el-form-item>
         <el-form-item label="到" prop="endTime">
-          <el-date-picker type="date" value-format="YYYY-MM-DD" v-model="state.query.form.endTime" placeholder="" />
+          <el-date-picker
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="state.query.form.endTime"
+            placeholder=""
+          />
         </el-form-item>
         <template #buttonGroup>
           <el-button type="primary" @click="onSearch">查询</el-button>
@@ -55,10 +65,10 @@
       <el-table-column property="areaCode" label="用户账号" width="230" />
       <el-table-column property="code" label="用户姓名" min-width="100" />
       <el-table-column property="funcType" label="操作类型" min-width="100" />
-      <el-table-column property="operator" label="ip地址" min-width="100" />
-      <el-table-column property="operator" label="操作状态" min-width="100" />
-      <el-table-column property="operator" label="操作时间" min-width="100" />
-      <el-table-column property="operator" label="消耗时间" min-width="100" />
+      <el-table-column property="xxx" label="ip地址" min-width="100" />
+      <el-table-column property="xxx" label="操作状态" min-width="100" />
+      <el-table-column property="xxx" label="操作时间" min-width="100" />
+      <el-table-column property="xxx" label="消耗时间" min-width="100" />
     </cacp-complex-table>
   </cacp-search-layout>
   <cacp-dialog
@@ -196,7 +206,7 @@ const onQuery = async () => {
           areaCode: '上海 上海市 510000',
           code: 3643,
           funcType: '创建',
-          operator: '常磊',
+          xxx: '常磊',
           createTime: '1974-06-02 15:53:23',
           lastModified: '1988-07-20 05:47:55'
         }
@@ -222,7 +232,7 @@ const actions: TableAction[] = [
     type: 'primary',
     plain: true,
     onclick: onExport,
-    limit: 'more',
+    limit: 'none',
     position: 'right'
   }
 ]

src/views/run-config-manage/monitor-analysis/error-warning/index.vue

@@ -49,16 +49,36 @@
           <el-input v-model="state.query.form.name"></el-input>
         </el-form-item>
         <el-form-item label="告警时间" prop="startTime">
-          <el-date-picker type="date" value-format="YYYY-MM-DD" v-model="state.query.form.startTime" placeholder="" />
+          <el-date-picker
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="state.query.form.startTime"
+            placeholder=""
+          />
         </el-form-item>
         <el-form-item label="到" prop="endTime">
-          <el-date-picker type="date" value-format="YYYY-MM-DD" v-model="state.query.form.endTime" placeholder="" />
+          <el-date-picker
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="state.query.form.endTime"
+            placeholder=""
+          />
         </el-form-item>
         <el-form-item label="处理时间" prop="startTime">
-          <el-date-picker type="date" value-format="YYYY-MM-DD" v-model="state.query.form.startTime" placeholder="" />
+          <el-date-picker
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="state.query.form.startTime"
+            placeholder=""
+          />
         </el-form-item>
         <el-form-item label="到" prop="endTime">
-          <el-date-picker type="date" value-format="YYYY-MM-DD" v-model="state.query.form.endTime" placeholder="" />
+          <el-date-picker
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="state.query.form.endTime"
+            placeholder=""
+          />
         </el-form-item>
         <template #buttonGroup>
           <el-button type="primary" @click="onSearch">查询</el-button>
@@ -80,11 +100,11 @@
       <el-table-column property="areaCode" label="任务编号" width="230" />
       <el-table-column property="code" label="告警内容" min-width="100" />
       <el-table-column property="funcType" label="监控对象" min-width="100" />
-      <el-table-column property="operator" label="告警等级" min-width="100" />
-      <el-table-column property="operator" label="告警时间" min-width="100" />
-      <el-table-column property="operator" label="处理状态" min-width="100" />
-      <el-table-column property="operator" label="处理人" min-width="100" />
-      <el-table-column property="operator" label="处理时间" min-width="100" />
+      <el-table-column property="xxx" label="告警等级" min-width="100" />
+      <el-table-column property="xxx" label="告警时间" min-width="100" />
+      <el-table-column property="xxx" label="处理状态" min-width="100" />
+      <el-table-column property="xxx" label="处理人" min-width="100" />
+      <el-table-column property="xxx" label="处理时间" min-width="100" />
     </cacp-complex-table>
   </cacp-search-layout>
   <cacp-dialog
@@ -182,7 +202,7 @@ const onQuery = async () => {
           areaCode: '上海 上海市 510000',
           code: 3643,
           funcType: '创建',
-          operator: '常磊',
+          xxx: '常磊',
           createTime: '1974-06-02 15:53:23',
           lastModified: '1988-07-20 05:47:55'
         },
@@ -192,7 +212,7 @@ const onQuery = async () => {
           areaCode: '上海 上海市 510000',
           code: 3643,
           funcType: '创建',
-          operator: '常磊',
+          xxx: '常磊',
           createTime: '1974-06-02 15:53:23',
           lastModified: '1988-07-20 05:47:55'
         }
@@ -235,7 +255,7 @@ const actions: TableAction[] = [
     type: 'primary',
     plain: true,
     onclick: onExport,
-    limit: 'more',
+    limit: 'none',
     position: 'right'
   },
   {

src/views/run-config-manage/monitor-analysis/error-warning/rules.vue

@@ -54,10 +54,10 @@
           <el-table-column property="areaCode" label="规则名称" width="230" />
           <el-table-column property="code" label="规则描述" min-width="100" />
           <el-table-column property="funcType" label="告警等级" min-width="100" />
-          <el-table-column property="operator" label="监控对象" min-width="100" />
-          <el-table-column property="operator" label="监控指标" min-width="100" />
-          <el-table-column property="operator" label="触发条件" min-width="100" />
-          <el-table-column property="operator" label="创建时间" min-width="100" />
+          <el-table-column property="xxx" label="监控对象" min-width="100" />
+          <el-table-column property="xxx" label="监控指标" min-width="100" />
+          <el-table-column property="xxx" label="触发条件" min-width="100" />
+          <el-table-column property="xxx" label="创建时间" min-width="100" />
         </cacp-complex-table>
       </cacp-search-layout>
     </div>
@@ -156,7 +156,7 @@ const onQuery = async () => {
           areaCode: '上海 上海市 510000',
           code: 3643,
           funcType: '创建',
-          operator: '常磊',
+          xxx: '常磊',
           createTime: '1974-06-02 15:53:23',
           lastModified: '1988-07-20 05:47:55'
         },
@@ -166,7 +166,7 @@ const onQuery = async () => {
           areaCode: '上海 上海市 510000',
           code: 3643,
           funcType: '创建',
-          operator: '常磊',
+          xxx: '常磊',
           createTime: '1974-06-02 15:53:23',
           lastModified: '1988-07-20 05:47:55'
         }