Merge remote-tracking branch 'origin/test' into test

linwei

2025-11-05 c48eafe8411adad734b57b424f5440284dbc85e3

 src/views/device/components/firmwareManage.vue

@@ -25,12 +25,12 @@
        </el-button>
      </template>
    </avue-crud>
    <el-dialog title="固件上传" append-to-body v-model="firmwareUploadBox" width="40%" height="60%">
    <el-dialog title="固件上传" class="ztzf-dialog-mange" append-to-body v-model="firmwareUploadBox" width="40%" height="60%">
      <el-form
        ref="form"
        class="ztzf-form-search"
        :model="importForm"
        v-loading="loadingForm"
        label-width="80px"
        style="width: 80%; margin-left: 10%"
        :rules="rules"
      >
@@ -39,7 +39,7 @@
        </el-form-item>

        <!-- 上传 -->
        <el-form-item label="固件文件" label-width="80px" prop="file">
        <el-form-item label="固件文件" prop="file">
          <el-upload
            class="upload-demo"
            action="#"
@@ -50,7 +50,7 @@
            :before-upload="beforeUploadFile"
          >
            <i class="el-icon-upload"></i>
            <div class="el-upload__text" style="height: 50px"><em>点击上传</em></div>
            <div class="el-upload__text" style="height: 50px"> <el-button>点击上传</el-button></div>
          </el-upload>
        </el-form-item>
        <el-form-item label="是否可用" prop="status">
@@ -59,14 +59,16 @@
            <el-option label="否" value="0"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="说明" label-width="80px" prop="release_note">
        <el-form-item label="说明" prop="release_note">
          <el-input type="textarea" v-model="importForm.release_note" clearable></el-input>
        </el-form-item>
        <el-form-item>
          <el-button type="primary" @click="onConfirm">确定</el-button>
          <el-button @click="onCancel">取消</el-button>
        </el-form-item>
      </el-form>
      <template #footer>
        <div class="dialog-footer">
        <el-button type="primary" @click="onConfirm" icon="el-icon-circle-check">确定</el-button>
        <el-button @click="onCancel" icon="el-icon-circle-close">取消</el-button>
        </div>
      </template>
    </el-dialog>
  </basic-container>
</template>
@@ -104,7 +106,9 @@
        dialogWidth: 950,
        tip: false,
        searchShow: true,
        searchMenuSpan: 6,
        searchGutter: 30,
        searchMenuPosition: 'left',
        searchMenuSpan: 4,
        border: true,
        index: true,
        viewBtn: true,
@@ -120,7 +124,6 @@
          {
            label: '设备名称',
            prop: 'device_name',
            editDisabled: true,
            // search: true,
            // searchSpan: 5,
            labelWidth: 130,
@@ -135,12 +138,12 @@
            ],
          },
          {
            label: '固件文件名称',
            label: '文件名称',
            prop: 'file_name',
            labelWidth: 130,
            search: true,
            searchSpan: 8,
            searchLabelWidth: 120,
            searchSpan: 4,
            // searchLabelWidth: 120,
            editDisabled: true,
            rules: [
              {
@@ -432,4 +435,8 @@
  /* color: aqua; */
}
</style>
<style scoped lang="scss"></style>
<style scoped lang="scss">
.upload-demo {
  height: 30px;
}
</style>