1.海川开心-BI大屏展示修改

gaoluyang

2025-12-12 681970ff2cc3f937d96943bdcfba3789fc3b0a25

1.海川开心-BI大屏展示修改

 src/views/equipmentManagement/inspectionManagement/components/formDia.vue

@@ -5,8 +5,15 @@
      <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
        <el-row>
          <el-col :span="12">
            <el-form-item label="巡检任务" prop="taskName">
                            <el-input v-model="form.taskName" placeholder="请输入巡检任务" />
                        <el-form-item label="设备名称" prop="taskId">
                            <el-select v-model="form.taskId" @change="setDeviceModel" filterable>
                                <el-option
                                    v-for="(item, index) in deviceOptions"
                                    :key="index"
                                    :label="item.deviceName"
                                    :value="item.id"
                                ></el-option>
                            </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
@@ -121,7 +128,7 @@
const deviceOptions = ref([]);
const data = reactive({
  form: {
        taskName: undefined,
        taskId: undefined,
    taskName: undefined,
    inspector: '',
    inspectorIds: '',
@@ -133,7 +140,7 @@
        dateStr: ''
  },
  rules: {
        taskName: [{ required: true, message: "请选择设备", trigger: "blur" },],
        taskId: [{ required: true, message: "请选择设备", trigger: "change" },],
    inspector: [{ required: true, message: "请输入巡检人", trigger: "blur" },],
        dateStr: [{ required: true, message: "请选择登记时间", trigger: "change" }]
  }
@@ -172,6 +179,11 @@
  if (type === 'edit' && row) {
    form.value = {...row}
    form.value.inspector = form.value.inspectorIds.split(',').map(Number)
		
        // 如果有设备ID，自动设置设备信息
        if (form.value.taskId) {
            setDeviceModel(form.value.taskId);
        }
  }
}

@@ -189,15 +201,15 @@
  }
  // 重置表单数据确保设备信息正确重置
  form.value = {
        taskName: '',
        taskId: undefined,
        taskName: undefined,
    inspector: '',
    inspectorIds: '',
    remarks: '',
    frequencyType: '',
    frequencyDetail: '',
    week: '',
    time: '',
        dateStr: ''
        time: ''
  }
}

@@ -206,27 +218,19 @@
  proxy.$refs["formRef"].validate(async valid => {
    if (valid) {
      try {
        // 创建提交数据的副本
        const submitData = {...form.value}
                form.value.inspectorIds = form.value.inspector.join(',')
                delete form.value.inspector
        
        submitData.inspectorIds = submitData.inspector.join(',')
        delete submitData.inspector
        
        // 编辑模式下不传递登记时间
        if (operationType.value === 'edit') {
          delete submitData.createTime
        }
        
        if (submitData.frequencyType === 'WEEKLY') {
                if (form.value.frequencyType === 'WEEKLY') {
          let frequencyDetail = ''
          frequencyDetail = submitData.week + ',' + submitData.time
          submitData.frequencyDetail = frequencyDetail
                    frequencyDetail = form.value.week + ',' + form.value.time
                    form.value.frequencyDetail = frequencyDetail
        }
        
        let res = await userStore.getInfo()
        submitData.registrantId = res.user.userId
                form.value.registrantId = res.user.userId
        
        await addOrEditTimingTask(submitData)
                await addOrEditTimingTask(form.value)
        cancel()
        proxy.$modal.msgSuccess('提交成功')
      } catch (error) {

 src/views/equipmentManagement/inspectionManagement/index.vue

 src/views/reportAnalysis/dataDashboard/index.vue

@@ -54,7 +54,7 @@

        <!-- 质量统计 -->
                <div class="panel-header">
                    <span class="panel-title">本周质量统计</span>
                    <span class="panel-title">近4月质量统计</span>
                </div>
                <div class="main-panel">
                    <div class="panel-item-customers">
@@ -174,7 +174,7 @@
        </div>
                
                <div class="financial-header">
                    <span class="financial-title">本周财务分析</span>
                    <span class="financial-title">近4月财务分析</span>
                </div>
                <div class="main-panel">
                    <div class="panel-item-customers">
@@ -412,7 +412,7 @@
const barLegend = {
    show: true,
    textStyle: { color: '#B8C8E0' },
    data: ['原材料不合格数', '过程不合格数', '出厂不合格数']
    data: ['原材料合格数', '过程合格数', '出不合格数']
}
const barLegend1 = {
    show: true,
@@ -487,7 +487,7 @@
])
const barSeries1 = ref([
    {
        name: '原材料不合格数',
        name: '原材料合格数',
        type: 'bar',
        barGap: 0,
        emphasis: {
@@ -509,7 +509,7 @@
        data: []
    },
    {
        name: '过程不合格数',
        name: '过程合格数',
        type: 'bar',
        emphasis: {
            focus: 'series'
@@ -530,7 +530,7 @@
        data: []
    },
    {
        name: '出厂不合格数',
        name: '出厂合格数',
        type: 'bar',
        emphasis: {
            focus: 'series'