Merge branch 'master' into jiangwu

shuishen

2025-05-19 2dfc8dc4bcd3d3cd4aed1b6054e073e140eba9c8

 src/views/device/components/firmwareManage.vue

@@ -17,6 +17,7 @@
      @current-change="currentChange"
      @size-change="sizeChange"
      @refresh-change="refreshChange"
       @on-load="onLoad"
    >
      <template #menu-left>
        <el-button type="primary" icon="el-icon-plus" plain @click="openFirmwareUpload"
@@ -34,7 +35,7 @@
        :rules="rules"
      >
        <el-form-item label="设备名称" prop="device_name">
          <el-input v-model="importForm.device_name" clearable disabled></el-input>
          <el-input v-model="importForm.device_name" clearable></el-input>
        </el-form-item>

        <!-- 上传 -->
@@ -88,7 +89,7 @@
      firmwareUploadBox: false,
      form: {},
      query: {},
      workspaceId: '',
      workspaceId: '4a574d68-4ad3-48f7-9f16-3edbcd8056e1',
      deviceName: '',
      loading: true,
      page: {
@@ -225,6 +226,7 @@
            label: '上传状态',
            prop: 'upload_status',
            addDisplay: false,
            editDisplay: false,
            labelWidth: 130,
            type: 'select',
            width: 100,
@@ -315,8 +317,8 @@
    },
    // 初始化数据
    init(data) {
      this.workspaceId = data.workspace_id;
      // this.workspaceId = '4a574d68-4ad3-48f7-9f16-3edbcd8056e1';
      // this.workspaceId = data.workspace_id;
      this.workspaceId = '4a574d68-4ad3-48f7-9f16-3edbcd8056e1';
      this.deviceName = data.device_name;
      this.onLoad(this.page);
    },