网页端：修改设备作业记录、人员管理可清空值

移动端：修改设备作业记录

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceLogMapper.xml

@@ -128,8 +128,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dryTemperature != null">dry_temperature = #{dryTemperature},</if>
             <if test="wetTemperature != null">wet_temperature = #{wetTemperature},</if>
             <if test="airPressure != null">air_pressure = #{airPressure},</if>
-            <if test="powerOn != null">power_on = #{powerOn},</if>
-            <if test="powerOff != null">power_off = #{powerOff},</if>
+            power_on = #{powerOn},
+            power_off = #{powerOff},
             <if test="userId != null">user_id = #{userId},</if>
         </trim>
         where log_id = #{logId}

oa-ui-app/pages/oa/device/deviceLog.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-06-10 09:34:55
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-06-11 16:29:46
+ * @LastEditTime: 2025-06-12 14:51:18
 -->
 <template>
   <view>
@@ -186,14 +186,20 @@
           <view class="form-item" v-if="formData.usageType !== '全站仪'">
             <text class="label">开机时间</text>
             <view class="datetime-picker" @click="openPowerOnPicker">
-              <text v-if="formData.powerOn">{{ formatDateTime(formData.powerOn) }}</text>
+              <view style="flex: 8;" v-if="formData.powerOn">{{ formatDateTime(formData.powerOn) }}</view>
+              <view style="flex: 1;text-align: right;" v-if="formData.powerOn" @click="formData.powerOn = ''">
+                <uv-icon name="close-circle-fill" size="16"></uv-icon>
+              </view>
               <text v-else class="placeholder">请选择开机时间</text>
             </view>
           </view>
           <view class="form-item" v-if="formData.usageType !== '全站仪'">
             <text class="label">关机时间</text>
             <view class="datetime-picker" @click="openPowerOffPicker">
-              <text v-if="formData.powerOff">{{ formatDateTime(formData.powerOff) }}</text>
+              <view style="flex: 8;" v-if="formData.powerOff">{{ formatDateTime(formData.powerOff) }}</view>
+              <view style="flex: 1;text-align: right;" v-if="formData.powerOff" @click="formData.powerOff = ''">
+                <uv-icon name="close-circle-fill" size="16"></uv-icon>
+              </view>
               <text v-else class="placeholder">请选择关机时间</text>
             </view>
           </view>
@@ -238,7 +244,8 @@ export default {
         pageNum: 1,
         pageSize: 10,
         userId: null,
-        projectNumber: ''
+        projectNumber: '',
+        useDate: ''
       },
       showPicker: false,
       selectedProject: null,
@@ -406,8 +413,8 @@ export default {
         projectId: this.selectedProject ? this.selectedProject.projectId : null,
         deviceId: this.selectDevice.deviceId,
         userId: this.$store.getters.userId,
-        powerOn: Number(this.formData.powerOn),
-        powerOff: Number(this.formData.powerOff)
+        powerOn: this.formData.powerOn,
+        powerOff: this.formData.powerOff
       }
 
       try {
@@ -516,11 +523,7 @@ export default {
     },
     async handleSearch() {
       this.queryParams.pageNum = 1
-      const res = await listProject({
-        pageNum: 1,
-        pageSize: 10,
-        projectNumber: this.queryParams.projectNumber
-      })
+      const res = await listProject(this.queryParams)
       let projectList = res.rows;
       if (projectList.length == 1) {
         this.queryParams.projectId = projectList[0].projectId

oa-ui/src/views/oa/declare/log.vue

@@ -386,11 +386,10 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.form.useDate = this.parseTime(new Date(), '{y}-{m}-{d}');
       this.open = true;
       this.title = "添加设备使用记录";
       this.isView = false;
-      this.form.powerOn = new Date().toISOString().slice(0, 19).replace('T', ' ');
-      this.form.powerOff = new Date().toISOString().slice(0, 19).replace('T', ' ');
     },
     handleView(row) {
       const logId = row.logId || this.ids;

oa-ui/src/views/oa/staff/index.vue

@@ -296,25 +296,25 @@
               <el-input type="textarea" v-model="form.titleProfession" placeholder="职称专业" />
             </el-form-item>
             <el-form-item label="职业资格">
-              <el-select v-model="form.certificates" multiple placeholder="请输入职业资格" style="width:100%;">
+              <el-select v-model="form.certificates" clearable multiple placeholder="请输入职业资格" style="width:100%;">
                 <el-option v-for="dict in dict.type.sys_user_certificates" :key="dict.value" :label="dict.label"
                   :value="dict.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="项目经理">
-              <el-select v-model="form.pmLevel" placeholder="请输入项目经理等级" style="width:100%;">
+              <el-select v-model="form.pmLevel" clearable placeholder="请输入项目经理等级" style="width:100%;">
                 <el-option v-for="dict in dict.type.sys_user_pmlevel" :key="dict.value" :label="dict.label"
                   :value="dict.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="工程师等级">
-              <el-select v-model="form.engineerLevel" placeholder="请输入工程师等级" style="width:100%;">
+              <el-select v-model="form.engineerLevel" clearable placeholder="请输入工程师等级" style="width:100%;">
                 <el-option v-for="dict in dict.type.sys_user_engineerlevel" :key="dict.value" :label="dict.label"
                   :value="dict.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="技工等级">
-              <el-select v-model="form.operatorLevel" placeholder="请输入技工等级" style="width:100%;">
+              <el-select v-model="form.operatorLevel" clearable placeholder="请输入技工等级" style="width:100%;">
                 <el-option v-for="dict in dict.type.sys_user_operatorlevel" :key="dict.value" :label="dict.label"
                   :value="dict.value" />
               </el-select>
@@ -745,16 +745,16 @@ export default {
             //   this.form.certificates = this.form.certificates.join(',')
             // else
             //   this.form.certificates = '';
-            this.form.certificates = this.formatArrayToString(this.form.certificates, ',') == '' ? undefined : this.formatArrayToString(this.form.certificates, ',');
-            this.form.politicalAffiliation = this.formatArrayToString(this.form.politicalAffiliation, ',') ? this.formatArrayToString(this.form.politicalAffiliation, ',') : undefined;
+            this.form.certificates = this.formatArrayToString(this.form.certificates, ',') == '' ? '' : this.formatArrayToString(this.form.certificates, ',');
+            this.form.politicalAffiliation = this.formatArrayToString(this.form.politicalAffiliation, ',') ? this.formatArrayToString(this.form.politicalAffiliation, ',') : '';
             updateUser(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            this.form.certificates = this.formatArrayToString(this.form.certificates, ',') == '' ? undefined : this.formatArrayToString(this.form.certificates, ',');
-            this.form.politicalAffiliation = this.formatArrayToString(this.form.politicalAffiliation, ',') ? this.formatArrayToString(this.form.politicalAffiliation, ',') : undefined;
+            this.form.certificates = this.formatArrayToString(this.form.certificates, ',') == '' ? '' : this.formatArrayToString(this.form.certificates, ',');
+            this.form.politicalAffiliation = this.formatArrayToString(this.form.politicalAffiliation, ',') ? this.formatArrayToString(this.form.politicalAffiliation, ',') : '';
             addUser(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;