gemercheung 9 місяців тому
батько
коміт
e1b3a99d63
2 змінених файлів з 14 додано та 5 видалено
  1. 2 1
      src/request/users.ts
  2. 12 4
      src/view/scene.vue

+ 2 - 1
src/request/users.ts

@@ -58,7 +58,7 @@ export const updateUserStatusFetch = (params: Pick<UserType, 'userId' | 'status'
         body: JSON.stringify(params),
     });
 
-export type ChangePasswordParam = Pick<UserType, 'confirmPwd' | 'msgAuthCode' | 'password' | 'phoneNum'>
+export type ChangePasswordParam = Pick<UserType, 'confirmPwd' | 'msgAuthCode' | 'password' | 'phoneNum' | "oldPassword">
 export const changePassword = async (params: ChangePasswordParam) => {
 
     const ent = encodePwd(params.password)
@@ -71,6 +71,7 @@ export const changePassword = async (params: ChangePasswordParam) => {
             body: JSON.stringify({
                 confirmPwd: ent,
                 password: ent,
+                oldPassword: encodePwd(params.oldPassword),
                 msgAuthCode: params.msgAuthCode,
                 phoneNum: params.phoneNum
             }),

+ 12 - 4
src/view/scene.vue

@@ -28,7 +28,7 @@
                 placeholder="请输入"
               />
             </el-form-item>
-            <el-form-item label="设备类型:">
+            <!-- <el-form-item label="设备类型:">
               <el-select
                 style="width: 250px"
                 v-model="pageProps.cameraType"
@@ -42,7 +42,7 @@
                   />
                 </template>
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="拍摄时间:">
               <el-date-picker
                 clearable
@@ -103,13 +103,13 @@
           <TexToolTip :text="row.snCode" />
         </el-table-column>
 
-        <el-table-column
+        <!-- <el-table-column
           label="设备类型"
           prop="snCode"
           v-slot:default="{ row }"
         >
           <TexToolTip :text="DeviceTypeDesc[row.cameraType as DeviceType]" />
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column
           label="拍摄时间"
           prop="algorithmTime"
@@ -119,6 +119,14 @@
         </el-table-column>
 
         <el-table-column
+          label="上传人"
+          prop="uploadUser"
+          v-slot:default="{ row }"
+        >
+          <TexToolTip :text="row.uploadUser" />
+        </el-table-column>
+
+        <el-table-column
           label="计算完成时间"
           prop="createTime"
           v-slot:default="{ row }"