bug second

This commit is contained in:
helloDy
2024-03-01 20:39:52 +08:00
parent 7c8c584837
commit 48e7612a78
10 changed files with 604 additions and 35 deletions

View File

@@ -160,6 +160,7 @@ import Editor from "@/components/Editor";
import { getDictDatas } from "@/utils/dict";
import { parseTime } from '@/utils/ruoyi'
import { getDictDataLabel } from '@/utils/dict';
import tupleImg from '@/assets/images/tuple.png';
const uploadedFile = {
name: 'UploadedFile',

View File

@@ -29,7 +29,7 @@
</el-col>
<!-- 产线名 -->
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item label="产线名" prop="lineId">
<el-select
v-model="formFilters.lineId"
@@ -45,10 +45,10 @@
:value="opt.value" />
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<!-- 工段名 -->
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item label="工段名" prop="sectionId">
<el-select
v-model="formFilters.sectionId"
@@ -64,7 +64,7 @@
:value="opt.value" />
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<!-- 设备名称 -->
<el-col :span="8">
@@ -234,7 +234,7 @@
v-for="opt in workerOptions"
:key="opt.value"
:label="opt.label"
:value="opt.value" />
:value="opt.label" />
</el-select>
</el-form-item>
</el-col>
@@ -597,9 +597,9 @@ export default {
/** 设置默认维修工为用户自己 */
setInitWorker() {
/** 获取用户自身id */
const userId = this.$store.getters.userId;
const nickname = this.$store.getters.nickname;
this.$nextTick(() => {
this.form.repairman = [userId];
this.form.repairman = [nickname];
});
},
@@ -630,8 +630,8 @@ export default {
/** 获取设备 */
async initEquipment() {
const response = await this.$axios('/base/core-equipment/listAll');
this.equipmentList = response.data || [];
this.equipmentOptions = response.data || [];
this.equipmentList = response.data.filter(item => item.special === false) || [];
this.equipmentOptions = response.data.filter(item => item.special === false) || [];
// this.allSpeicalEquipments = equipmentOptions;
},
/** 获取维修工 - 同时从用户表和员工表拉取数据 */
@@ -737,6 +737,7 @@ export default {
fileType: prop == 'files' ? 2 : 1,
});
this.$modal.msgSuccess('上传成功');
console.log('为我', this.form.files)
this.$emit('update', this.form);
},