Просмотр исходного кода

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

移动端:修改设备作业记录
余思翰 2 дней назад
Родитель
Сommit
97ff0411d4

+ 2
- 2
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceLogMapper.xml Просмотреть файл

128
             <if test="dryTemperature != null">dry_temperature = #{dryTemperature},</if>
128
             <if test="dryTemperature != null">dry_temperature = #{dryTemperature},</if>
129
             <if test="wetTemperature != null">wet_temperature = #{wetTemperature},</if>
129
             <if test="wetTemperature != null">wet_temperature = #{wetTemperature},</if>
130
             <if test="airPressure != null">air_pressure = #{airPressure},</if>
130
             <if test="airPressure != null">air_pressure = #{airPressure},</if>
131
-            <if test="powerOn != null">power_on = #{powerOn},</if>
132
-            <if test="powerOff != null">power_off = #{powerOff},</if>
131
+            power_on = #{powerOn},
132
+            power_off = #{powerOff},
133
             <if test="userId != null">user_id = #{userId},</if>
133
             <if test="userId != null">user_id = #{userId},</if>
134
         </trim>
134
         </trim>
135
         where log_id = #{logId}
135
         where log_id = #{logId}

+ 14
- 11
oa-ui-app/pages/oa/device/deviceLog.vue Просмотреть файл

2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2025-06-10 09:34:55
3
  * @Date: 2025-06-10 09:34:55
4
  * @LastEditors: Please set LastEditors
4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2025-06-11 16:29:46
5
+ * @LastEditTime: 2025-06-12 14:51:18
6
 -->
6
 -->
7
 <template>
7
 <template>
8
   <view>
8
   <view>
186
           <view class="form-item" v-if="formData.usageType !== '全站仪'">
186
           <view class="form-item" v-if="formData.usageType !== '全站仪'">
187
             <text class="label">开机时间</text>
187
             <text class="label">开机时间</text>
188
             <view class="datetime-picker" @click="openPowerOnPicker">
188
             <view class="datetime-picker" @click="openPowerOnPicker">
189
-              <text v-if="formData.powerOn">{{ formatDateTime(formData.powerOn) }}</text>
189
+              <view style="flex: 8;" v-if="formData.powerOn">{{ formatDateTime(formData.powerOn) }}</view>
190
+              <view style="flex: 1;text-align: right;" v-if="formData.powerOn" @click="formData.powerOn = ''">
191
+                <uv-icon name="close-circle-fill" size="16"></uv-icon>
192
+              </view>
190
               <text v-else class="placeholder">请选择开机时间</text>
193
               <text v-else class="placeholder">请选择开机时间</text>
191
             </view>
194
             </view>
192
           </view>
195
           </view>
193
           <view class="form-item" v-if="formData.usageType !== '全站仪'">
196
           <view class="form-item" v-if="formData.usageType !== '全站仪'">
194
             <text class="label">关机时间</text>
197
             <text class="label">关机时间</text>
195
             <view class="datetime-picker" @click="openPowerOffPicker">
198
             <view class="datetime-picker" @click="openPowerOffPicker">
196
-              <text v-if="formData.powerOff">{{ formatDateTime(formData.powerOff) }}</text>
199
+              <view style="flex: 8;" v-if="formData.powerOff">{{ formatDateTime(formData.powerOff) }}</view>
200
+              <view style="flex: 1;text-align: right;" v-if="formData.powerOff" @click="formData.powerOff = ''">
201
+                <uv-icon name="close-circle-fill" size="16"></uv-icon>
202
+              </view>
197
               <text v-else class="placeholder">请选择关机时间</text>
203
               <text v-else class="placeholder">请选择关机时间</text>
198
             </view>
204
             </view>
199
           </view>
205
           </view>
238
         pageNum: 1,
244
         pageNum: 1,
239
         pageSize: 10,
245
         pageSize: 10,
240
         userId: null,
246
         userId: null,
241
-        projectNumber: ''
247
+        projectNumber: '',
248
+        useDate: ''
242
       },
249
       },
243
       showPicker: false,
250
       showPicker: false,
244
       selectedProject: null,
251
       selectedProject: null,
406
         projectId: this.selectedProject ? this.selectedProject.projectId : null,
413
         projectId: this.selectedProject ? this.selectedProject.projectId : null,
407
         deviceId: this.selectDevice.deviceId,
414
         deviceId: this.selectDevice.deviceId,
408
         userId: this.$store.getters.userId,
415
         userId: this.$store.getters.userId,
409
-        powerOn: Number(this.formData.powerOn),
410
-        powerOff: Number(this.formData.powerOff)
416
+        powerOn: this.formData.powerOn,
417
+        powerOff: this.formData.powerOff
411
       }
418
       }
412
 
419
 
413
       try {
420
       try {
516
     },
523
     },
517
     async handleSearch() {
524
     async handleSearch() {
518
       this.queryParams.pageNum = 1
525
       this.queryParams.pageNum = 1
519
-      const res = await listProject({
520
-        pageNum: 1,
521
-        pageSize: 10,
522
-        projectNumber: this.queryParams.projectNumber
523
-      })
526
+      const res = await listProject(this.queryParams)
524
       let projectList = res.rows;
527
       let projectList = res.rows;
525
       if (projectList.length == 1) {
528
       if (projectList.length == 1) {
526
         this.queryParams.projectId = projectList[0].projectId
529
         this.queryParams.projectId = projectList[0].projectId

+ 1
- 2
oa-ui/src/views/oa/declare/log.vue Просмотреть файл

386
     /** 新增按钮操作 */
386
     /** 新增按钮操作 */
387
     handleAdd() {
387
     handleAdd() {
388
       this.reset();
388
       this.reset();
389
+      this.form.useDate = this.parseTime(new Date(), '{y}-{m}-{d}');
389
       this.open = true;
390
       this.open = true;
390
       this.title = "添加设备使用记录";
391
       this.title = "添加设备使用记录";
391
       this.isView = false;
392
       this.isView = false;
392
-      this.form.powerOn = new Date().toISOString().slice(0, 19).replace('T', ' ');
393
-      this.form.powerOff = new Date().toISOString().slice(0, 19).replace('T', ' ');
394
     },
393
     },
395
     handleView(row) {
394
     handleView(row) {
396
       const logId = row.logId || this.ids;
395
       const logId = row.logId || this.ids;

+ 8
- 8
oa-ui/src/views/oa/staff/index.vue Просмотреть файл

296
               <el-input type="textarea" v-model="form.titleProfession" placeholder="职称专业" />
296
               <el-input type="textarea" v-model="form.titleProfession" placeholder="职称专业" />
297
             </el-form-item>
297
             </el-form-item>
298
             <el-form-item label="职业资格">
298
             <el-form-item label="职业资格">
299
-              <el-select v-model="form.certificates" multiple placeholder="请输入职业资格" style="width:100%;">
299
+              <el-select v-model="form.certificates" clearable multiple placeholder="请输入职业资格" style="width:100%;">
300
                 <el-option v-for="dict in dict.type.sys_user_certificates" :key="dict.value" :label="dict.label"
300
                 <el-option v-for="dict in dict.type.sys_user_certificates" :key="dict.value" :label="dict.label"
301
                   :value="dict.value" />
301
                   :value="dict.value" />
302
               </el-select>
302
               </el-select>
303
             </el-form-item>
303
             </el-form-item>
304
             <el-form-item label="项目经理">
304
             <el-form-item label="项目经理">
305
-              <el-select v-model="form.pmLevel" placeholder="请输入项目经理等级" style="width:100%;">
305
+              <el-select v-model="form.pmLevel" clearable placeholder="请输入项目经理等级" style="width:100%;">
306
                 <el-option v-for="dict in dict.type.sys_user_pmlevel" :key="dict.value" :label="dict.label"
306
                 <el-option v-for="dict in dict.type.sys_user_pmlevel" :key="dict.value" :label="dict.label"
307
                   :value="dict.value" />
307
                   :value="dict.value" />
308
               </el-select>
308
               </el-select>
309
             </el-form-item>
309
             </el-form-item>
310
             <el-form-item label="工程师等级">
310
             <el-form-item label="工程师等级">
311
-              <el-select v-model="form.engineerLevel" placeholder="请输入工程师等级" style="width:100%;">
311
+              <el-select v-model="form.engineerLevel" clearable placeholder="请输入工程师等级" style="width:100%;">
312
                 <el-option v-for="dict in dict.type.sys_user_engineerlevel" :key="dict.value" :label="dict.label"
312
                 <el-option v-for="dict in dict.type.sys_user_engineerlevel" :key="dict.value" :label="dict.label"
313
                   :value="dict.value" />
313
                   :value="dict.value" />
314
               </el-select>
314
               </el-select>
315
             </el-form-item>
315
             </el-form-item>
316
             <el-form-item label="技工等级">
316
             <el-form-item label="技工等级">
317
-              <el-select v-model="form.operatorLevel" placeholder="请输入技工等级" style="width:100%;">
317
+              <el-select v-model="form.operatorLevel" clearable placeholder="请输入技工等级" style="width:100%;">
318
                 <el-option v-for="dict in dict.type.sys_user_operatorlevel" :key="dict.value" :label="dict.label"
318
                 <el-option v-for="dict in dict.type.sys_user_operatorlevel" :key="dict.value" :label="dict.label"
319
                   :value="dict.value" />
319
                   :value="dict.value" />
320
               </el-select>
320
               </el-select>
745
             //   this.form.certificates = this.form.certificates.join(',')
745
             //   this.form.certificates = this.form.certificates.join(',')
746
             // else
746
             // else
747
             //   this.form.certificates = '';
747
             //   this.form.certificates = '';
748
-            this.form.certificates = this.formatArrayToString(this.form.certificates, ',') == '' ? undefined : this.formatArrayToString(this.form.certificates, ',');
749
-            this.form.politicalAffiliation = this.formatArrayToString(this.form.politicalAffiliation, ',') ? this.formatArrayToString(this.form.politicalAffiliation, ',') : undefined;
748
+            this.form.certificates = this.formatArrayToString(this.form.certificates, ',') == '' ? '' : this.formatArrayToString(this.form.certificates, ',');
749
+            this.form.politicalAffiliation = this.formatArrayToString(this.form.politicalAffiliation, ',') ? this.formatArrayToString(this.form.politicalAffiliation, ',') : '';
750
             updateUser(this.form).then(response => {
750
             updateUser(this.form).then(response => {
751
               this.$modal.msgSuccess("修改成功");
751
               this.$modal.msgSuccess("修改成功");
752
               this.open = false;
752
               this.open = false;
753
               this.getList();
753
               this.getList();
754
             });
754
             });
755
           } else {
755
           } else {
756
-            this.form.certificates = this.formatArrayToString(this.form.certificates, ',') == '' ? undefined : this.formatArrayToString(this.form.certificates, ',');
757
-            this.form.politicalAffiliation = this.formatArrayToString(this.form.politicalAffiliation, ',') ? this.formatArrayToString(this.form.politicalAffiliation, ',') : undefined;
756
+            this.form.certificates = this.formatArrayToString(this.form.certificates, ',') == '' ? '' : this.formatArrayToString(this.form.certificates, ',');
757
+            this.form.politicalAffiliation = this.formatArrayToString(this.form.politicalAffiliation, ',') ? this.formatArrayToString(this.form.politicalAffiliation, ',') : '';
758
             addUser(this.form).then(response => {
758
             addUser(this.form).then(response => {
759
               this.$modal.msgSuccess("新增成功");
759
               this.$modal.msgSuccess("新增成功");
760
               this.open = false;
760
               this.open = false;

Загрузка…
Отмена
Сохранить