package.json

@@ -16,6 +16,7 @@
     "ant-design-vue": "^1.7.8",
     "axios": "^0.24.0",
     "core-js": "^3.19.2",
+    "crypto-js": "^4.1.1",
     "default-passive-events": "^2.0.0",
     "echarts": "^5.4.3",
     "echarts-gl": "^2.0.9",

src/views/clw/checkRegister/index.vue

@@ -5,12 +5,23 @@
       <div class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="48">
-            <a-col :md="8" :sm="24">
+            <a-col :span="6">
               <a-form-item label="车牌号" prop="plateNumber">
                 <a-input v-model="queryParam.plateNumber" placeholder="请输入车牌号" allow-clear />
               </a-form-item>
             </a-col>
-            <a-col :md="(!advanced && 8) || 24" :sm="24">
+            <a-col :span="6" >
+              <a-form-item label="检查日期">
+                <!-- <a-date-picker style="width: 100%" v-model="queryParam.insuranceTime" format="YYYY-MM-DD HH:mm:ss" allow-clear/> -->
+                <a-range-picker
+                  v-model="insuranceTime"
+                  format="YYYY-MM-DD"
+                  :placeholder="['开始时间', '结束时间']"
+                  @change="onChangeTime"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
               <span
                 class="table-page-search-submitButtons"
                 :style="(advanced && { float: 'right', overflow: 'hidden' }) || {}"
@@ -124,9 +135,9 @@ export default {
       total: 0,
       // 查询参数
       queryParam: {
-        checkTime: null,
         userId: null,
         plateNumber: null,
+        params:{},
         pageNum: 1,
         pageSize: 10,
       },
@@ -177,7 +188,10 @@ export default {
         },
       ],
       checkIds: [],
-      showOpen:''
+      showOpen:'',
+      insuranceTime: [],
+      beginRemindTime: null,
+      endRemindTime: null,
     }
   },
   filters: {},
@@ -190,13 +204,20 @@ export default {
     /** 查询年检登记列表 */
     getList() {
       this.loading = true
+      if (this.insuranceTime.length>0) {
+        this.queryParam.params.endTime = this.endRemindTime
+        this.queryParam.params.startTime = this.beginRemindTime
+      }
       listCheckRegister(this.queryParam).then((response) => {
         this.list = response.rows
         this.total = response.total
         this.loading = false
       })
     },
-
+    onChangeTime(val) {
+      this.beginRemindTime = val[0].format('YYYY-MM-DD 00:00:00')
+      this.endRemindTime = val[1].format('YYYY-MM-DD 23:59:59')
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParam.pageNum = 1
@@ -205,11 +226,12 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.queryParam = {
-        checkTime: undefined,
         userId: undefined,
+        parpms:{},
         pageNum: 1,
         pageSize: 10,
       }
+    this.insuranceTime=[]
       this.handleQuery()
     },
     onShowSizeChange(current, pageSize) {

src/views/clw/fuelConsumptionLog/index.vue

@@ -5,29 +5,50 @@
       <div class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="48">
-            <a-col :md="8" :sm="24">
-              <a-form-item label="日期" prop="createTime">
-                <a-input v-model="queryParam.createTime" placeholder="请输入日期" allow-clear />
+            <a-col :span="6" >
+              <a-form-item label="交易时间">
+                <!-- <a-date-picker style="width: 100%" v-model="queryParam.insuranceTime" format="YYYY-MM-DD HH:mm:ss" allow-clear/> -->
+                <a-range-picker
+                  v-model="insuranceTime"
+                  format="YYYY-MM-DD"
+                  :placeholder="['开始时间', '结束时间']"
+                  @change="onChangeTime"
+                />
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col :md="8" :sm="24">
+            <template>
+              <a-col :span="6">
                 <a-form-item label="车牌号码" prop="plateNumber">
                   <a-input v-model="queryParam.plateNumber" placeholder="请输入车牌号码" allow-clear />
                 </a-form-item>
               </a-col>
             </template>
-            <a-col :md="(!advanced && 8) || 24" :sm="24">
+            <a-col :span="5">
+              <a-form-item label="部门名称" prop="deptName">
+                <a-input v-model="queryParam.deptName" placeholder="请输入部门名称关键字" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item label="申请人" prop="applyUserName">
+                <a-input v-model="queryParam.applyUserName" placeholder="请输入申请人关键字" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item label="油卡类型" prop="gasCardType">
+                <a-select placeholder="请选择操作类型" v-model="queryParam.gasCardType" style="width: 100%" allow-clear  showSearch>
+                  <a-select-option v-for="(d1, index1) in dict.type.gas_car_type" :key="index1" :value="d1.value">{{
+                    d1.label
+                  }}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
               <span
                 class="table-page-search-submitButtons"
                 :style="(advanced && { float: 'right', overflow: 'hidden' }) || {}"
               >
                 <a-button type="primary" @click="handleQuery"><a-icon type="search" />查询</a-button>
                 <a-button style="margin-left: 8px" @click="resetQuery"><a-icon type="redo" />重置</a-button>
-                <a @click="toggleAdvanced" style="margin-left: 8px">
-                  {{ advanced ? '收起' : '展开' }}
-                  <a-icon :type="advanced ? 'up' : 'down'" />
-                </a>
               </span>
             </a-col>
           </a-row>
@@ -118,25 +139,16 @@ export default {
         gasCardType: null,
         categoryId: null,
         plateNumber: null,
+        applyUserName:null,
+        params:{},
         pageNum: 1,
         pageSize: 10,
       },
+      insuranceTime: [],
+      beginRemindTime: null,
+      endRemindTime: null,
       columns: [
         { title: '序号', scopedSlots: { customRender: 'num' }, width: '50px', align: 'center' },
-        // {
-        //   title: '日期',
-        //   dataIndex: 'createTime',
-        //   ellipsis: true,
-        //   align: 'center',
-        //   width:'130px'
-        // },
-        // {
-        //   title: '票据',
-        //   dataIndex: 'invoiceUrl',
-        //   ellipsis: true,
-        //   align: 'center',
-        //   width:'120px'
-        // },
         {
           title: '油卡类型',
           dataIndex: 'gasCardType',
@@ -166,20 +178,6 @@ export default {
           align: 'center',
           width: '130px',
         },
-        // {
-        //   title: '交易ID',
-        //   dataIndex: 'tradingId',
-        //   ellipsis: true,
-        //   align: 'center',
-        //   width:'80px'
-        // },
-        // {
-        //   title: '加油卡号',
-        //   dataIndex: 'gasCode',
-        //   ellipsis: true,
-        //   align: 'center',
-        //   width:'120px'
-        // },
         {
           title: '加油升数（升）',
           dataIndex: 'litres',
@@ -244,6 +242,10 @@ export default {
     /** 查询油耗登记信息列表 */
     getList() {
       this.loading = true
+      if (this.insuranceTime.length>0) {
+        this.queryParam.params.endTime = this.endRemindTime
+        this.queryParam.params.startTime = this.beginRemindTime
+      }
       listFuelConsumptionLog(this.queryParam).then((response) => {
         this.list = response.rows
         this.total = response.total
@@ -263,9 +265,12 @@ export default {
         gasCardType: undefined,
         categoryId: undefined,
         plateNumber: undefined,
+        applyUserName:undefined,
+        params:{},
         pageNum: 1,
         pageSize: 10,
       }
+      this.insuranceTime=[]
       this.handleQuery()
     },
     onShowSizeChange(current, pageSize) {
@@ -287,6 +292,10 @@ export default {
     toggleAdvanced() {
       this.advanced = !this.advanced
     },
+    onChangeTime(val) {
+      this.beginRemindTime = val[0].format('YYYY-MM-DD 00:00:00')
+      this.endRemindTime = val[1].format('YYYY-MM-DD 23:59:59')
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       var that = this

src/views/clw/gas/index.vue

@@ -5,12 +5,44 @@
       <div class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="48">
-            <a-col :md="8" :sm="24">
+            <a-col :span="6">
               <a-form-item label="油卡号" prop="gasCode">
                 <a-input v-model="queryParam.gasCode" placeholder="请输入油卡号" allow-clear />
               </a-form-item>
             </a-col>
-            <a-col :md="(!advanced && 8) || 24" :sm="24">
+            <a-col :span="6">
+              <a-form-item label="机构名称" prop="deptName">
+                <a-input v-model="queryParam.deptName" placeholder="请输入机构名称" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="5">
+              <a-form-item label="油品" prop="gasType">
+                <a-select placeholder="请选择油品类型" v-model="queryParam.gasType" style="width: 100%" allow-clear>
+                  <a-select-option v-for="(d, index) in dict.type.gas_type" :key="index" :value="d.value">{{
+                    d.label
+                  }}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span="5">
+              <a-form-item label="状态" prop="status">
+                <a-select placeholder="请选择" v-model="queryParam.status" style="width: 100%" allow-clear>
+                  <a-select-option v-for="(d, index) in dict.type.gas_status" :key="index" :value="d.value">{{
+                    d.label
+                  }}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span="5">
+              <a-form-item label="加油卡类型" prop="gasCardType">
+                <a-select placeholder="请选择加油卡类型" v-model="queryParam.gasCardType" style="width: 100%" allow-clear>
+                  <a-select-option v-for="(d, index) in dict.type.gas_car_type" :key="index" :value="d.value">{{
+                    d.label
+                  }}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
               <span
                 class="table-page-search-submitButtons"
                 :style="(advanced && { float: 'right', overflow: 'hidden' }) || {}"
@@ -38,13 +70,9 @@
         <a-button type="danger" :disabled="multiple" @click="handleDelete" v-hasPermi="['clw:gas:remove']">
           <a-icon type="delete" />删除
         </a-button>
-        <a-button
-              type="dashed"
-              @click="$refs.importExcel.importExcelHandleOpen()"
-              v-hasPermi="['system:user:import']"
-            >
-              <a-icon type="import" />导入
-            </a-button>
+        <a-button type="dashed" @click="$refs.importExcel.importExcelHandleOpen()" v-hasPermi="['system:user:import']">
+          <a-icon type="import" />导入
+        </a-button>
         <a-button type="primary" @click="handleExport" v-hasPermi="['clw:gas:export']">
           <a-icon type="download" />导出
         </a-button>
@@ -135,10 +163,10 @@ export default {
     CreateForm,
     singOut,
     OpenModul,
-    ImportExcel
+    ImportExcel,
   },
   mixins: [tableMixin],
-  dicts: ['gas_car_type', 'gas_status','gas_type'],
+  dicts: ['gas_car_type', 'gas_status', 'gas_type'],
   data() {
     return {
       list: [],
@@ -157,9 +185,44 @@ export default {
       queryParam: {
         plateNumber: null,
         gasCode: null,
+        deptName: null,
+        gasType: null,
+        status:null,
+        gasCardType:null,
         pageNum: 1,
         pageSize: 10,
       },
+      //机构
+      deptIdList: [
+        {
+          id: 100,
+          lable: '两江新区消防救援支队',
+        },
+        {
+          id: 173,
+          lable: '两江新区支队鸳鸯消防救援站',
+        },
+        {
+          id: 141,
+          lable: '两江新区支队翠云消防救援站',
+        },
+        {
+          id: 142,
+          lable: '两江新区支队龙头寺消防救援站',
+        },
+        {
+          id: 140,
+          lable: '两江新区支队大竹林特勤站',
+        },
+        {
+          id: 139,
+          lable: '两江新区支队礼嘉消防救援站',
+        },
+        {
+          id: 129,
+          lable: '两江新区支队奥园消防救援站',
+        },
+      ],
       columns: [
         {
           title: '加油卡类型',
@@ -263,6 +326,10 @@ export default {
       this.queryParam = {
         plateNumber: undefined,
         gasCode: undefined,
+        deptName: undefined,
+        gasType: undefined,
+        status:undefined,
+        gasCardType:undefined,
         pageNum: 1,
         pageSize: 10,
       }

src/views/clw/oilSkimmingLog/index.vue

@@ -5,7 +5,7 @@
       <div class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="48">
-            <a-col :md="8" :sm="14">
+            <a-col :span="6">
               <a-form-item label="日期" prop="createTime">
                 <a-date-picker
                   style="width: 100%"
@@ -15,11 +15,36 @@
                 />
               </a-form-item>
             </a-col>
-            <a-col :md="8" :sm="14">
+
+            <a-col :span="6">
               <a-form-item label="车牌号" prop="plateNumber">
                 <a-input v-model="queryParam.plateNumber" placeholder="请输入车牌号" allow-clear />
               </a-form-item>
             </a-col>
+            <a-col :span="5">
+              <a-form-item label="部门名称" prop="deptName">
+                <a-input v-model="queryParam.deptName" placeholder="请输入部门名称关键字" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="5">
+              <a-form-item label="申请人" prop="applyUserName">
+                <a-input v-model="queryParam.applyUserName" placeholder="请输入申请人关键字" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="5">
+              <a-form-item label="加油卡号" prop="gasCode">
+                <a-input v-model="queryParam.gasCode" placeholder="请输入加油卡号关键字" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="5">
+              <a-form-item label="审核状态" prop="applyStatus">
+                <a-select placeholder="请选择提醒类型" v-model="queryParam.applyStatus" style="width: 100%" allow-clear>
+                  <a-select-option v-for="(d, index) in dict.type.apply_status" :key="index" :value="d.value">{{
+                    d.label
+                  }}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
             <template v-if="advanced"> </template>
             <a-col :md="(!advanced && 8) || 24" :sm="24">
               <span
@@ -28,10 +53,6 @@
               >
                 <a-button type="primary" @click="handleQuery"><a-icon type="search" />查询</a-button>
                 <a-button style="margin-left: 8px" @click="resetQuery"><a-icon type="redo" />重置</a-button>
-                <!-- <a @click="toggleAdvanced" style="margin-left: 8px">
-                  {{ advanced ? '收起' : '展开' }}
-                  <a-icon :type="advanced ? 'up' : 'down'"/>
-                </a> -->
               </span>
             </a-col>
           </a-row>
@@ -39,15 +60,6 @@
       </div>
       <!-- 操作 -->
       <div class="table-operations">
-        <!-- <a-button type="primary" @click="$refs.createForm.handleAdd()" v-hasPermi="['clw:oilSkimmingLog:add']">
-          <a-icon type="plus" />新增
-        </a-button>
-        <a-button type="primary" :disabled="single" @click="$refs.createForm.handleUpdate(undefined, ids)" v-hasPermi="['clw:oilSkimmingLog:edit']">
-          <a-icon type="edit" />修改
-        </a-button>
-        <a-button type="danger" :disabled="multiple" @click="handleDelete" v-hasPermi="['clw:oilSkimmingLog:remove']">
-          <a-icon type="delete" />删除
-        </a-button> -->
         <a-button :disabled="selectedRowKeys.length==0" type="primary" @click="handleExport" v-hasPermi="['clw:oilSkimmingLog:export']">
           <a-icon type="download" />导出
         </a-button>
@@ -139,6 +151,9 @@ export default {
         createTime: null,
         plateNumber: null,
         applyStatus: null,
+        deptName:null,
+        applyUserName:null,
+        gasCode:null,
         pageNum: 1,
         pageSize: 10,
       },
@@ -256,6 +271,9 @@ export default {
         createTime: undefined,
         plateNumber: undefined,
         applyStatus: undefined,
+        deptName:undefined,
+        applyUserName:undefined,
+        gasCode:undefined,
         pageNum: 1,
         pageSize: 10,
       }

src/views/clw/records/index.vue

@@ -330,7 +330,7 @@ export default {
     },
     onChangeTime(val) {
       this.beginRemindTime = val[0].format('YYYY-MM-DD 00:00:00')
-      this.endRemindTime = val[1].format('YYYY-MM-DD 00:00:00')
+      this.endRemindTime = val[1].format('YYYY-MM-DD 23:59:59')
     },
   },
 }

src/views/clw/register/index.vue

@@ -5,12 +5,27 @@
       <div class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="48">
-            <a-col :md="8" :sm="24">
+            <a-col :span="5">
               <a-form-item label="车牌号" prop="plateNumber">
                 <a-input v-model="queryParam.plateNumber" placeholder="请输入车牌号" allow-clear />
               </a-form-item>
             </a-col>
-            <a-col :md="8" :sm="24">
+            <a-col :span="5">
+              <a-form-item label="经办人" prop="username">
+                <a-input v-model="queryParam.username" placeholder="请输入经办人" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="5">
+              <a-form-item label="保险单号" prop="warrantyCode">
+                <a-input v-model="queryParam.warrantyCode" placeholder="请输入保险单号" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="5">
+              <a-form-item label="保险公司" prop="insuranceCompany">
+                <a-input v-model="queryParam.insuranceCompany" placeholder="请输入保险公司" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
               <a-form-item label="投保日期">
                 <!-- <a-date-picker style="width: 100%" v-model="queryParam.insuranceTime" format="YYYY-MM-DD HH:mm:ss" allow-clear/> -->
                 <a-range-picker
@@ -21,8 +36,8 @@
                 />
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col :md="8" :sm="24">
+            <template>
+              <a-col :span="6">
                 <a-form-item label="到期日期" prop="dueTime">
                   <a-range-picker
                     v-model="query.endTime"
@@ -33,17 +48,13 @@
                 </a-form-item>
               </a-col>
             </template>
-            <a-col :md="(!advanced && 8) || 24" :sm="24">
+            <a-col :span="6">
               <span
                 class="table-page-search-submitButtons"
                 :style="(advanced && { float: 'right', overflow: 'hidden' }) || {}"
               >
                 <a-button type="primary" @click="handleQuery"><a-icon type="search" />查询</a-button>
                 <a-button style="margin-left: 8px" @click="resetQuery"><a-icon type="redo" />重置</a-button>
-                <a @click="toggleAdvanced" style="margin-left: 8px">
-                  {{ advanced ? '收起' : '展开' }}
-                  <a-icon :type="advanced ? 'up' : 'down'" />
-                </a>
               </span>
             </a-col>
           </a-row>
@@ -338,12 +349,12 @@ export default {
     //投保时间选择
     onChangeTime(val) {
       this.queryParam.startInsuranceTime = val[0].format('YYYY-MM-DD 00:00:00')
-      this.queryParam.endInsuranceTime = val[1].format('YYYY-MM-DD 00:00:00')
+      this.queryParam.endInsuranceTime = val[1].format('YYYY-MM-DD 23:59:59')
     },
     //到期时间
     onChangeEnTime(node) {
       this.queryParam.startDueTime = node[0].format('YYYY-MM-DD 00:00:00')
-      this.queryParam.endDueTime = node[1].format('YYYY-MM-DD 00:00:00')
+      this.queryParam.endDueTime = node[1].format('YYYY-MM-DD 23:59:59')
     },
   },
 }

src/views/clw/upkeepRegister/index.vue

@@ -5,11 +5,22 @@
       <div class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="48">
-            <a-col :md="8" :sm="24">
+            <a-col :span="6">
               <a-form-item label="车牌号" prop="plateNumber">
                 <a-input v-model="queryParam.plateNumber" placeholder="请输入车牌号" allow-clear />
               </a-form-item>
             </a-col>
+            <a-col :span="7" style="margin: 0 20px">
+              <a-form-item label="登记日期">
+                <!-- <a-date-picker style="width: 100%" v-model="queryParam.insuranceTime" format="YYYY-MM-DD HH:mm:ss" allow-clear/> -->
+                <a-range-picker
+                  v-model="insuranceTime"
+                  format="YYYY-MM-DD"
+                  :placeholder="['开始时间', '结束时间']"
+                  @change="onChangeTime"
+                />
+              </a-form-item>
+            </a-col>
             <a-col :md="(!advanced && 8) || 24" :sm="24">
               <span
                 class="table-page-search-submitButtons"
@@ -134,6 +145,7 @@ export default {
       queryParam: {
         categoryId: null,
         plateNumber: null,
+        params:{},
         pageNum: 1,
         pageSize: 10,
       },
@@ -187,6 +199,9 @@ export default {
         },
       ],
       showOpen: '',
+      endRemindTime: null,
+      beginRemindTime: null,
+      insuranceTime: [],
     }
   },
   filters: {},
@@ -200,6 +215,12 @@ export default {
     /** 查询保养登记列表 */
     getList() {
       this.loading = true
+      if (this.insuranceTime.length>0) {
+        // this.beginRemindTime = val[0].format('YYYY-MM-DD 00:00:00')
+        // this.endRemindTime = val[1].format('YYYY-MM-DD 00:00:00')
+        this.queryParam.params.endTime = this.endRemindTime
+        this.queryParam.params.startTime = this.beginRemindTime
+      }
       listUpkeepRegister(this.queryParam).then((response) => {
         this.list = response.rows
         this.total = response.total
@@ -217,9 +238,11 @@ export default {
       this.queryParam = {
         categoryId: undefined,
         plateNumber: undefined,
+        params:{},
         pageNum: 1,
         pageSize: 10,
       }
+      this.insuranceTime = []
       this.handleQuery()
     },
     onShowSizeChange(current, pageSize) {
@@ -265,6 +288,10 @@ export default {
       this.$refs.modules.title = '是否确认删除'
       this.$refs.modules.visible = true
     },
+    onChangeTime(val) {
+      this.beginRemindTime = val[0].format('YYYY-MM-DD 00:00:00')
+      this.endRemindTime = val[1].format('YYYY-MM-DD 23:59:59')
+    },
     // 确认删除
     handleDeletes() {
       if (this.showOpen == '删除') {

src/views/system/user/index.vue

@@ -54,10 +54,6 @@
                   >
                     <a-button type="primary" @click="handleQuery"><a-icon type="search" />查询</a-button>
                     <a-button style="margin-left: 8px" @click="resetQuery"><a-icon type="redo" />重置</a-button>
-                    <!-- <a @click="toggleAdvanced" style="margin-left: 8px">
-                      {{ advanced ? '收起' : '展开' }}
-                      <a-icon :type="advanced ? 'up' : 'down'" />
-                    </a> -->
                   </span>
                 </a-col>
               </a-row>
@@ -65,22 +61,6 @@
           </div>
           <!-- 操作 -->
           <div class="table-operations">
-            <!-- <a-button type="primary" @click="$refs.createForm.handleAdd()" v-hasPermi="['system:user:add']">
-              <a-icon type="plus" />新增
-            </a-button>
-            <a-button type="primary" :disabled="single" @click="$refs.createForm.handleUpdate(undefined,ids)" v-hasPermi="['system:user:edit']">
-              <a-icon type="edit" />修改
-            </a-button>
-            <a-button type="danger" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:user:remove']">
-              <a-icon type="delete" />删除
-            </a-button> -->
-            <!-- <a-button
-              type="dashed"
-              @click="$refs.importExcel.importExcelHandleOpen()"
-              v-hasPermi="['system:user:import']"
-            >
-              <a-icon type="import" />导1入
-            </a-button> -->
             <a-button type="primary" @click="handleExport" v-hasPermi="['system:user:export']">
               <a-icon type="download" />导出
             </a-button>

src/views/system/user/modules/CreateForm.vue

@@ -126,25 +126,41 @@
       <a-row>
         <a-col :span="10">
           <a-form-model-item label="驾驶证号码">
-            <a-input v-model="drivingLicense.drivingLicenseCode" placeholder="暂无信息" />
+            <a-input
+              :disabled="formTitle == '用户详情'"
+              v-model="drivingLicense.drivingLicenseCode"
+              placeholder="暂无信息"
+            />
           </a-form-model-item>
         </a-col>
         <a-col :span="10">
           <a-form-model-item label="准驾车辆分类" prop="password">
-            <a-input v-model="drivingLicense.drivingLicenseType" placeholder="暂无信息" :maxLength="20" />
+            <a-input
+              :disabled="formTitle == '用户详情'"
+              v-model="drivingLicense.drivingLicenseType"
+              placeholder="暂无信息"
+              :maxLength="20"
+            />
           </a-form-model-item>
         </a-col>
       </a-row>
       <a-row>
         <a-col :span="10">
           <a-form-model-item label="初次申领日期">
-            <a-date-picker style="width: 100%" v-model="drivingLicense.firstTime" format="YYYY-MM-DD" allow-clear />
+            <a-date-picker
+              :disabled="formTitle == '用户详情'"
+              style="width: 100%"
+              v-model="drivingLicense.firstTime"
+              format="YYYY-MM-DD"
+              allow-clear
+            />
             <!-- <a-input v-model="drivingLicense.firstTime" placeholder="暂无信息" /> -->
           </a-form-model-item>
         </a-col>
         <a-col :span="10">
           <a-form-model-item label="驾驶证有效期">
             <a-date-picker
+              :disabled="formTitle == '用户详情'"
               style="width: 100%"
               v-model="drivingLicense.expirationTime"
               format="YYYY-MM-DD"
@@ -155,8 +171,22 @@
         </a-col>
       </a-row>
       <a-form-model-item label="驾驶证照片" prop="photo">
-        <file-upload v-model="photoUrl" type="image" module="car" @UpdateImg="UpdateImgs"></file-upload>
+        <file-upload
+          v-if="formTitle != '用户详情'"
+          v-model="photoUrl"
+          type="image"
+          module="car"
+          @UpdateImg="UpdateImgs"
+        ></file-upload>
       </a-form-model-item>
+      <!-- <a-image :width="200" v-if="formTitle == '用户详情'" :src="photoUrl" /> -->
+      <el-image
+        v-if="formTitle == '用户详情'"
+        style="width: 100px; height: 100px"
+        :src="photoUrl"
+        :preview-src-list="srcList"
+      >
+      </el-image>
       <!-- <a-row>
         <a-col :span="10">
           <a-form-model-item label="性别" prop="sex">
@@ -182,7 +212,9 @@
       </a-form-model-item> -->
       <div class="bottom-control">
         <a-space>
-          <a-button type="primary" :loading="submitLoading" @click="submitForm"> 保存 </a-button>
+          <a-button type="primary" :loading="submitLoading" @click="submitForm" v-if="formTitle != '用户详情'">
+            保存
+          </a-button>
           <a-button type="dashed" @click="cancel"> 取消 </a-button>
         </a-space>
       </div>
@@ -216,6 +248,7 @@ export default {
       replaceFields: { children: 'children', title: 'label', key: 'id', value: 'id' },
       // 岗位选项
       postOptions: [],
+      srcList: [],
       // 角色选项
       roleOptions: [],
       // 默认密码
@@ -344,6 +377,7 @@ export default {
         if (response.data.drivingLicense) {
           this.drivingLicense = response.data.drivingLicense
           this.photoUrl = '/api' + response.data.drivingLicense.drivingLicenseImageUrl
+          this.srcList = [this.photoUrl]
         }
         this.open = true
         this.formTitle = '用户详情'
@@ -352,11 +386,11 @@ export default {
     },
     /** 修改按钮操作 */
     handleEdit(row, ids) {
-      console.log(row);
+      console.log(row)
       this.reset()
       this.formType = 2
       const userId = row ? row.userId : ids
-      getUser(userId).then((response) => {      
+      getUser(userId).then((response) => {
         this.form = response.data
         this.postOptions = response.posts
         this.roleOptions = response.roles

src/views/user/Login.vue

@@ -62,7 +62,7 @@ import { timeFix } from '@/utils/util'
 import { getCodeImg } from '@/api/login'
 import { LOGIN_USERNAME, LOGIN_PASSWORD, LOGIN_REMEMBERME } from '@/store/mutation-types'
 import storage from 'store'
-
+import CryptoJS from 'crypto-js'
 export default {
   components: {},
   data () {
@@ -121,15 +121,20 @@ export default {
       this.$refs.form.validate((valid) => {
         if (valid) {
           if (this.form.rememberMe) {
-            storage.set(LOGIN_USERNAME, this.form.username)
-            storage.set(LOGIN_PASSWORD, this.form.password)
+            storage.set(LOGIN_USERNAME, this.loginPwd(this.form.username))
+            storage.set(LOGIN_PASSWORD, this.loginPwd(this.form.password))
             storage.set(LOGIN_REMEMBERME, this.form.rememberMe)
           } else {
             storage.remove(LOGIN_USERNAME)
             storage.remove(LOGIN_PASSWORD)
             storage.remove(LOGIN_REMEMBERME)
           }
-          this.Login(this.form)
+          const params={
+            ...this.form,
+            username:this.loginPwd(this.form.username),
+            password:this.loginPwd(this.form.password)
+          }
+          this.Login(params)
             .then((res) => this.loginSuccess(res))
             .catch((err) => this.requestFailed(err))
             .finally(() => {
@@ -166,7 +171,20 @@ export default {
     handleCloseLoginError () {
       this.isLoginError = false
       this.loginErrorInfo = ''
-    }
+    },
+    loginPwd(content){
+      let key = '1ef9722d760feabac49d26936e108b27';
+     // key格式化处理
+     key = CryptoJS.enc.Utf8.parse(key)
+     let iv = CryptoJS.enc.Utf8.parse("rqw6WscFpxJoTySE");
+     // 加密方法
+     let a = CryptoJS.AES.encrypt(content, key, {
+         iv: iv,
+         mode: CryptoJS.mode.CBC,  
+         padding: CryptoJS.pad.Pkcs7
+     });
+     return a.ciphertext.toString();
+    },
   }
 }
 </script>

src/views/vehicle/components/VehicleCarAllocation.vue

@@ -66,7 +66,7 @@ export default {
           type: 'value',
           // 设置x轴显示几段
           // min: 0,
-          // max: 100,
+          max: () => Math.max(...this.allocationList.map(item =>  item.value)),
           interval: 0,
           axisTick: { show: false },
           axisLine: {

src/views/vehicle/components/cardDistribution.vue

@@ -66,7 +66,7 @@ export default {
           type: 'value',
           // 设置x轴显示几段
           // min: 0,
-          // max: 100,
+          max: () => Math.max(...this.yCardList.map(item =>  item.value)),
           interval: 0,
           axisTick: { show: false },
           axisLine: {

src/views/vehicle/index.vue

@@ -20,7 +20,7 @@
           </div>
         </div>
         <div class="selt">
-          <a-select style="width: 160px" placeholder="请选择" v-model="selt">
+          <a-select style="width: 160px" placeholder="请选择" v-model="selt" size="small" >
             <a-select-option v-for="(d, index) in typeList" :key="index" :value="d.value">{{
               d.lable
             }}</a-select-option>
@@ -356,21 +356,24 @@ export default {
     top: 11%;
     z-index: 999999;
     /deep/.ant-select-selection--single {
-      width: 180px;
+      width: 150px;
       stroke-width: 1px;
       background: rgba(0, 163, 255, 0.3);
       height: 45px;
       color: #70fffd;
       font-size: 20px;
       text-align: center;
+      font-size: 18px;
+      letter-spacing: 4px;
     }
     /deep/.ant-select-arrow .ant-select-arrow-icon {
       font-size: 18px;
       color: #70fffd;
+      font-size: 14px;
     }
     /deep/.ant-select-selection__rendered {
-      left: 55px;
-      line-height: 39px;
+      left: 24px;
+      line-height: 43px;
     }
   }
   .yh-info {

src/views/vehicle/unit3Ds.vue

@@ -304,15 +304,15 @@
           //此处是修改样式的重点
           grid3D: {
             show: false,
-            boxHeight: boxHeight, //圆环的高度
+            boxHeight: boxHeight *4, //圆环的高度
             //这是饼图的位置
-            top: '29%',
+            top: '24%',
             left:'1%',
   
             viewControl: {
               //3d效果可以放大、旋转等，请自己去查看官方配置
               alpha: 8, //角度(这个很重要 调节角度的)
-              distance: 260, //调整视角到主体的距离，类似调整zoom(这是整体大小)
+              distance: 240, //调整视角到主体的距离，类似调整zoom(这是整体大小)
               rotateSensitivity: 1, //设置为0无法旋转
               zoomSensitivity: 0, //设置为0无法缩放
               panSensitivity: 0, //设置为0无法平移