临港巴士系统

liujun001
1 parent 24fb111f
Showing 12 changed files with 85 additions and 90 deletions
.env.devTest
.env.development
.env.production
.env.staging
index.html
package.json
src/api/system/dict/data.js
src/layout/components/Sidebar/Logo.vue
src/views/equipment/equipment_keyinfo/keyInfo.vue
src/views/home/index.vue
src/views/login.vue
src/views/register.vue
+# 页面标题
+VITE_APP_TITLE = 临港巴士岗前检测系统
+
+# 测试
+VITE_APP_ENV = 'devTest'
+
+# 签到机系统/测试
+VITE_APP_BASE_API = 'http://192.168.169.100:8100'
+# VITE_APP_BASE_API = 'http://101.95.136.202:8100'
+
+# 是否在打包时开启压缩，支持 gzip 和 brotli
+VITE_BUILD_COMPRESS = gzip
 # 页面标题
-VITE_APP_TITLE = 青浦巴士岗前检测系统
+VITE_APP_TITLE = 临港巴士岗前检测系统
 # 开发环境配置
 VITE_APP_ENV = 'development'
 # 页面标题
-VITE_APP_TITLE = "青浦巴士岗前检测系统"
+VITE_APP_TITLE = "临港巴士岗前检测系统"
 # 生产环境配置
 VITE_APP_ENV = 'production'
 # 页面标题
-VITE_APP_TITLE = 青浦巴士岗前检测系统
+VITE_APP_TITLE = 临港巴士岗前检测系统
 # 测试
 VITE_APP_ENV = 'staging'
@@ -9,7 +9,7 @@
       content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
     />
     <link rel="icon" href="public/favicon.ico" />
-    <title>青浦巴士岗前检测系统</title>
+    <title>临港巴士岗前检测系统</title>
     <!--[if lt IE 11
       ]><script>
         window.location.href = "/html/ie.html";
 {
   "name": "bsth",
   "version": "3.8.5",
-  "description": "青浦巴士岗前检测系统",
+  "description": "临港巴士岗前检测系统",
   "author": "bsth",
   "license": "MIT",
   "scripts": {
     "dev": "vite",
+    "dev:devTest": "vite --mode devTest",
     "build:prod": "vite build --mode production",
     "build:stage": "vite build --mode staging",
+    "build:devTest": "vite build --mode devTest",
     "preview": "vite preview"
   },
   "repository": {
@@ -25,6 +25,13 @@ export function getDicts(dictType) {
   })
 }
+export function getDictsDelFlag(){
+  return request({
+    url: '/system/dict/data/type/del/flag',
+    method: 'get'
+  })
+}
+
 // 新增字典数据
 export function addData(data) {
   return request({
@@ -30,7 +30,7 @@ defineProps({
   }
 })
-const title = ref('青浦巴士岗前检测系统');
+const title = ref('临港巴士岗前检测系统');
 const settingsStore = useSettingsStore();
 const sideTheme = computed(() => settingsStore.sideTheme);
 </script>
@@ -2,21 +2,17 @@
     <div class="app-container">
         <div class="query-from">
             <el-form :inline="true" :queryOfKeyInfo="queryOfKeyInfo" :model="queryParamsOfKeyInfo" class="demo-form-inline">
-                     <el-form-item label="名称" props="name">
-                         <el-input style="width: 120px;" v-model="queryParamsOfKeyInfo.name" placeholder="请输入名称（如：XX车的钥匙）" clearable
-                                   @keyup.enter="handleQueryOfKeyInfo" />
+                <el-form-item label="钥匙编码" props="keyCode">
+                     <el-form-item label="钥匙编码" props="keyCode">
+                         <el-input style="width: 120px;" v-model="queryParamsOfKeyInfo.keyCode" placeholder="请输入钥匙编码" clearable  @keyup.enter="handleQueryOfKeyInfo" />
                      </el-form-item>
+                </el-form-item>
+
+                <el-form-item label="车牌号" props="plateNum">
                      <el-form-item label="车牌号" props="plateNum">
-                        <el-select  v-model="queryParamsOfKeyInfo.plateNum" value-on-clear>
-                            <el-option v-for="item in carNos"  :key="item.plateNum"  :label="item.plateNum"  :value="item.plateNum"  />
-                        </el-select>
+                         <el-input style="width: 120px;" v-model="queryParamsOfKeyInfo.plateNum" placeholder="请输入车牌号" clearable  @keyup.enter="handleQueryOfKeyInfo" />
                      </el-form-item>
-
-                    <el-form-item label="所在设备" prop="deviceId">
-                        <el-select v-model="queryParamsOfKeyInfo.deviceId" value-on-clear>
-                            <el-option v-for="item in deviceIds"  :key="item.id"  :label="item.siteName"  :value="item.id"  />
-                        </el-select>
-                    </el-form-item>
+                </el-form-item>
                 <el-form-item>
                     <el-button type="primary" icon="Search" @click="handleQueryOfKeyInfo">搜索</el-button>
@@ -33,31 +29,27 @@
                     <el-button type="success" plain icon="Edit" :disabled="singleKeyInfo" @click="handleUpdateOfKeyInfo"  v-hasPermi="['key:info:update']">修改</el-button>
                 </el-col>
-                <el-col :span="1.5">
-                    <el-button type="danger" plain icon="Delete" :disabled=multipleKeyInfo @click="handleDeleteOfKeyInfo"  v-hasPermi="['key:info:del']">删除</el-button>
-
-                </el-col>
-                <el-col :span="1.5">
-                    <el-button type="warning" plain icon="Download" @click="handleExportOfKeyInfo"  v-hasPermi="['key:info:export']">导出</el-button>
-
-                </el-col>
+              
+        
                 <right-toolbar v-model:showSearch="showSearchOfKeyInfo" @queryTable="getListOfKeyInfo"></right-toolbar>
             </el-row>
         </div>
         <el-table v-loading="loadingOfKeyInfo" :data="listOfKeyInfo" @selection-change="handleSelectionChangeOfKeyInfo" border max-height="600"
-                  :default-expand-all="false" :row-class-name="tableRowClassName" @sort-change="sortChangeFunction">
+                  :default-expand-all="false" :row-class-name="tableRowClassName" @sort-change="sortChangeOfKeyInfo">
             <el-table-column type="selection" width="50" align="center" />
             <el-table-column label="序号" type="index" width="60" align="center">
                 <template #default="scope">
                     {{ (queryParamsOfKeyInfo.pageNum - 1) * queryParamsOfKeyInfo.pageSize + scope.$index + 1 }}
                 </template>
             </el-table-column>
-            <el-table-column label="名称" align="center" prop="name" sortable />
-            <el-table-column label="状态" align="center" prop="status" sortable />
-            <el-table-column label="车牌号" align="center" prop="plateNum" sortable />
-            <el-table-column label="所在设备" align="center" prop="deviceLabel" sortable />
+            <el-table-column label="钥匙编码" align="center" prop="keyCode" sortable />
+            <el-table-column label="车牌号" align="center" prop="plateNum" sortable />
+            <el-table-column label="名称" align="center" prop="name" sortable />
+            <el-table-column label="是否删除" align="center" prop="delFlagStr" sortable >
+                
+            </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="160">
                 <template #default="scope">
                     <el-button type="success" plain icon="Edit" :disabled="singleKeyInfo" @click="handleUpdateOfKeyInfo(scope.row)"  v-hasPermi="['key:info:update']">修改</el-button>
@@ -71,22 +63,23 @@
         <el-dialog :title="titleOfKeyInfo" v-model="openOfKeyInfo" width="500px" append-to-body>
             <el-form  :model="formOfKeyInfo" ref="rulesOfKeyInfo" label-width="80px"   :rules="checkRulesOfKeyInfo">
-                    
+                <el-form-item label="钥匙编码" prop="keyCode">
+                    <el-input el-input="input" v-model="formOfKeyInfo.keyCode" placeholder="请输入钥匙编码" />
+                </el-form-item>
+
+                <el-form-item label="车牌号" prop="plateNum">
+                    <el-input el-input="input" v-model="formOfKeyInfo.plateNum" placeholder="请输入车牌号" />
+                </el-form-item>
+
                 <el-form-item label="名称" prop="name">
                     <el-input el-input="input" v-model="formOfKeyInfo.name" placeholder="请输入名称（如：XX车的钥匙）" />
                 </el-form-item>
-                <el-form-item label="车牌号" props="plateNum">
-                    <el-select  v-model="formOfKeyInfo.plateNum" >
-                        <el-option v-for="item in carNos"  :key="item.plateNum"  :label="item.plateNum"  :value="item.plateNum"  />
+                
+                <el-form-item label="是否删除" prop="delFlag">
+                    <el-select v-model="formOfKeyInfo.delFlag" placeholder="请选择" style="width: 380px;">
+                        <el-option v-for="dict in deleteFlags" :key="dict.value" :label="dict.dictLabel"   :value="dict.dictValue"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="所在设备" prop="deviceId">{{formOfKeyInfo.deviceId}}
-                    <el-select v-model="formOfKeyInfo.deviceId" >
-                        <el-option v-for="item in deviceIds"  :key="item.id"  :label="item.siteName"  :value="item.id"  />
-                    </el-select>
-                </el-form-item>
-
-
             </el-form>
             <template #footer>
@@ -101,10 +94,8 @@
 <script setup name="KeyInfo">
+    import { getDicts,getDictsDelFlag } from '@/api/system/dict/data';
     import { listLimitOfKeyInfo, viewOfKeyInfo, addOfKeyInfo, updateOfKeyInfo,updateStatusOfKeyInfo,deleteOfKeyInfo } from "@/api/keyInfo/keyInfo";
-     import { selectListOfCarInfo } from "@/api/carInfo/carInfo";
-    import {  selectList } from "@/api/equipment/equipment";
-
     const { proxy } = getCurrentInstance();
     const listOfKeyInfo = ref([]);
@@ -115,8 +106,6 @@
     const idsOfKeyInfo = ref([]);
     const singleKeyInfo = ref(true);
     const multipleKeyInfo = ref(true);
-    const deviceIds=ref([]);
-    const carNos=ref([]);
     const pageOfKeyInfo = ref(1) //第几页
@@ -125,8 +114,10 @@
     const pageSizesOfKeyInfo = [5, 10, 20, 50]; //每页显示多少条
     const currentPageOfKeyInfo = ref(1) // 当前页
     const globalRowOfKeyInfo = ref(null) // 当前行数据
-    
+
     const changeFlagOfKeyInfo = ref(true)
+    const deleteFlags = ref([])
+
     const dataOfKeyInfo = reactive({
         formOfKeyInfo: {},
@@ -141,9 +132,8 @@
             createTime : null,
             updateby : null,
             updateTime : null,
-            yardId : null,
-            deviceId : null,
-            cabinetno : null,
+            plateNum : null,
+            keyCode : null,
         },
         checkRulesOfKeyInfo: {
@@ -159,26 +149,11 @@
             delFlag : [
                 { required: true, message: "是否删除", trigger: "blur" }
             ],
-            createBy : [
-                { required: true, message: "创建人员", trigger: "blur" }
+            plateNum : [
+                { required: true, message: "车牌号", trigger: "blur" }
             ],
-            createTime : [
-                { required: true, message: "创建时间", trigger: "blur" }
-            ],
-            updateby : [
-                { required: true, message: "修改人员", trigger: "blur" }
-            ],
-            updateTime : [
-                { required: true, message: "修改时间", trigger: "blur" }
-            ],
-            yardId : [
-                { required: true, message: "钥匙所在场站ID", trigger: "blur" }
-            ],
-            deviceId : [
-                { required: true, message: "钥匙锁在的设备ID", trigger: "blur" }
-            ],
-            cabinetno : [
-                { required: true, message: "钥匙所在的位置", trigger: "blur" }
+            keyCode : [
+                { required: true, message: "钥匙编码", trigger: "blur" }
             ],
         }
     });
@@ -191,17 +166,25 @@
         listLimitOfKeyInfo(queryParamsOfKeyInfo.value,queryParamsOfKeyInfo.value.pageNum,queryParamsOfKeyInfo.value.pageSize).then(response => {
             listOfKeyInfo.value = response.records;
             totalOfKeyInfo.value = response.total;
-            loadingOfKeyInfo.value = false;
+            deleteFlagsFunction(function(res){
+                loadingOfKeyInfo.value = false;
+            });
+            
         });
     }
-    function getSelectListOfCarInfo(){
-        selectListOfCarInfo({"status":1}).then(response=>{
-            carNos.value=response.data;
+    function deleteFlagsFunction(fun){
+        getDictsDelFlag().then(response=>{
+            deleteFlags.value =  response.data;
+          
+
+            if(fun){
+                fun(response);
+            }
         });
     }
-
-    function sortChangeFunction(data){
+    /**排序*/
+    function sortChangeOfKeyInfo(data){
         queryParamsOfKeyInfo.value.order=data.order;
         queryParamsOfKeyInfo.value.prop=data.prop;
         getListOfKeyInfo();
@@ -233,9 +216,8 @@
             createTime  : null,
             updateby  : null,
             updateTime  : null,
-            yardId  : null,
-            deviceId  : null,
-            cabinetno  : null,
+            plateNum  : null,
+            keyCode  : null,
         };
         proxy.resetForm("rulesOfKeyInfo");
     }
@@ -317,14 +299,6 @@
         }, `KeyInfo_${new Date().getTime()}.xlsx`)
     }
-    function selectEquipment(){
-        selectList({"promise":4}).then(res=>{
-       
-        deviceIds.value=res.data;
-    })
-    }
     getListOfKeyInfo();
-    selectEquipment();
-    getSelectListOfCarInfo();
 </script>
 \ No newline at end of file
@@ -7,7 +7,7 @@
       <div class="big-view-container-title">
         <!-- 标题 -->
         <div class="big-view-container-box">
-          青浦巴士岗前检查
+          临港巴士岗前检查
         </div>
         <div class="big-view-container-time">
           <text>
 <template>
   <div class="login">
     <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">青浦巴士岗前检测系统</h3>
+      <h3 class="title">临港巴士岗前检测系统</h3>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" size="large" auto-complete="off" placeholder="账号">
           <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
 <template>
   <div class="register">
     <el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">青浦巴士岗前检测系统</h3>
+      <h3 class="title">临港巴士岗前检测系统</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" size="large" auto-complete="off" placeholder="账号">
           <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>