Browse Source

人脸照片+系统参数bug

huzhe 6 days ago
parent
commit
c503ed6183

+ 3 - 2
src/views/basics/basicParameter/ptWorkstation/DetailForm.vue

@@ -102,12 +102,13 @@ const formData = ref<PtWorkstationForm>({
102
 const formRules = reactive({
102
 const formRules = reactive({
103
   stationId: [{ required: true, message: '工作站id不能为空', trigger: 'blur' }],
103
   stationId: [{ required: true, message: '工作站id不能为空', trigger: 'blur' }],
104
   stationName: [{ required: true, message: '工作站名称不能为空', trigger: 'blur' }],
104
   stationName: [{ required: true, message: '工作站名称不能为空', trigger: 'blur' }],
105
-  stationNumb: [{ required: true, message: '工作站编号不能为空', trigger: 'blur' }],
105
+  stationNumb: [{ required: true, message: '工作站编号不能为空', trigger: 'blur' },
106
+  ],
106
   stationType: [{ required: true, message: '工作站类型不能为空', trigger: 'change' }],
107
   stationType: [{ required: true, message: '工作站类型不能为空', trigger: 'change' }],
107
   ip: [{ required: true, message: 'IP地址不能为空', trigger: 'blur' }],
108
   ip: [{ required: true, message: 'IP地址不能为空', trigger: 'blur' }],
108
   usablePort: [{ required: true, message: '可用串口不能为空', trigger: 'blur' }],
109
   usablePort: [{ required: true, message: '可用串口不能为空', trigger: 'blur' }],
109
   commPort: [{ required: true, message: '服务端口不能为空', trigger: 'blur' }],
110
   commPort: [{ required: true, message: '服务端口不能为空', trigger: 'blur' }],
110
-  serverPort: [{ required: true, message: '服务器端口不能为空', trigger: 'blur' }],
111
+  serverPort: [{ required: true, message: '服务器端口不能为空', trigger: 'blur' }]
111
 });
112
 });
112
 /** 当前组件方法 */
113
 /** 当前组件方法 */
113
 /** 窗体打开事件 */
114
 /** 窗体打开事件 */

+ 8 - 4
src/views/payment/account/facePhoto.vue

@@ -30,9 +30,9 @@
30
                 <el-form-item label="学/工号" prop="userNumb">
30
                 <el-form-item label="学/工号" prop="userNumb">
31
                   <el-input v-model="queryParams.userNumb" placeholder="请输入学/工号" clearable @keyup.enter="handleQuery" />
31
                   <el-input v-model="queryParams.userNumb" placeholder="请输入学/工号" clearable @keyup.enter="handleQuery" />
32
                 </el-form-item>
32
                 </el-form-item>
33
-                <el-form-item label="手机号码" prop="phone">
33
+                <!-- <el-form-item label="手机号码" prop="phone">
34
                   <el-input v-model="queryParams.phone" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
34
                   <el-input v-model="queryParams.phone" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
35
-                </el-form-item>
35
+                </el-form-item> -->
36
                 <el-form-item>
36
                 <el-form-item>
37
                   <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
37
                   <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
38
                   <el-button icon="Refresh" @click="resetQuery">重置</el-button>
38
                   <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -46,6 +46,9 @@
46
             <el-button v-has-permi="['payment:ptUserAccount:edit']" type="primary" plain @click="dialogVisible = true">批量上传照片</el-button>
46
             <el-button v-has-permi="['payment:ptUserAccount:edit']" type="primary" plain @click="dialogVisible = true">批量上传照片</el-button>
47
           </template>
47
           </template>
48
           <div class="list-image" style="height: 52vh; overflow-y: auto">
48
           <div class="list-image" style="height: 52vh; overflow-y: auto">
49
+            <template v-if="total == 0">
50
+              <p style="color: dimgray;">暂无数据</p> 
51
+            </template>
49
             <div v-for="user in ptUserAccountList" :key="user.userNumb" class="block">
52
             <div v-for="user in ptUserAccountList" :key="user.userNumb" class="block">
50
               <span>姓名:{{ user.realName }}</span>
53
               <span>姓名:{{ user.realName }}</span>
51
               <span class="demonstration">学号:{{ user.userNumb }}</span>
54
               <span class="demonstration">学号:{{ user.userNumb }}</span>
@@ -64,6 +67,7 @@
64
                 <el-icon v-else class="avatar-uploader-icon-2"><Plus /></el-icon>
67
                 <el-icon v-else class="avatar-uploader-icon-2"><Plus /></el-icon>
65
               </el-upload>
68
               </el-upload>
66
             </div>
69
             </div>
70
+            
67
           </div>
71
           </div>
68
         </el-card>
72
         </el-card>
69
         <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
73
         <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
@@ -134,7 +138,7 @@ const initFormData: PtUserAccountForm = {
134
   userNumb: '',
138
   userNumb: '',
135
   realName: '',
139
   realName: '',
136
   category: '',
140
   category: '',
137
-  phone: undefined,
141
+  phone: '',
138
   accountStatus: '1',
142
   accountStatus: '1',
139
   freezeStatus: 'N',
143
   freezeStatus: 'N',
140
   consumePwd: undefined,
144
   consumePwd: undefined,
@@ -185,9 +189,9 @@ const getTreeSelect = async () => {
185
 const getList = async () => {
189
 const getList = async () => {
186
   loading.value = true;
190
   loading.value = true;
187
   const res = await api.listPtUserAccount4Select(proxy?.addDateRange(queryParams.value, dateRange.value));
191
   const res = await api.listPtUserAccount4Select(proxy?.addDateRange(queryParams.value, dateRange.value));
188
-  loading.value = false;
189
   ptUserAccountList.value = res.rows;
192
   ptUserAccountList.value = res.rows;
190
   total.value = res.total;
193
   total.value = res.total;
194
+  loading.value = false;
191
 };
195
 };
192
 
196
 
193
 /** 节点单击事件 */
197
 /** 节点单击事件 */

+ 5 - 5
src/views/system/user/index.vue

@@ -28,7 +28,7 @@
28
                   <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
28
                   <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
29
                 </el-form-item>
29
                 </el-form-item>
30
                 <el-form-item label="手机号码" prop="phonenumber">
30
                 <el-form-item label="手机号码" prop="phonenumber">
31
-                  <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
31
+                  <el-input v-model="queryParams.phone" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
32
                 </el-form-item>
32
                 </el-form-item>
33
 
33
 
34
                 <el-form-item label="状态" prop="status">
34
                 <el-form-item label="状态" prop="status">
@@ -165,8 +165,8 @@
165
         </el-row>
165
         </el-row>
166
         <el-row>
166
         <el-row>
167
           <el-col :span="12">
167
           <el-col :span="12">
168
-            <el-form-item label="手机号码" prop="phonenumber">
169
-              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
168
+            <el-form-item label="手机号码" prop="phone">
169
+              <el-input v-model="form.phone" placeholder="请输入手机号码" maxlength="11" />
170
             </el-form-item>
170
             </el-form-item>
171
           </el-col>
171
           </el-col>
172
           <el-col :span="12">
172
           <el-col :span="12">
@@ -353,7 +353,7 @@ const initFormData: UserForm = {
353
   userName: '',
353
   userName: '',
354
   nickName: undefined,
354
   nickName: undefined,
355
   password: '',
355
   password: '',
356
-  phonenumber: undefined,
356
+  phone: undefined,
357
   email: undefined,
357
   email: undefined,
358
   sex: undefined,
358
   sex: undefined,
359
   status: '0',
359
   status: '0',
@@ -368,7 +368,7 @@ const initData: PageData<UserForm, UserQuery> = {
368
     pageNum: 1,
368
     pageNum: 1,
369
     pageSize: 10,
369
     pageSize: 10,
370
     userName: '',
370
     userName: '',
371
-    phonenumber: '',
371
+    phone: '',
372
     status: '',
372
     status: '',
373
     deptId: '',
373
     deptId: '',
374
     roleId: ''
374
     roleId: ''