From 56a2365899d770298ae4fa809e20788e3d964181 Mon Sep 17 00:00:00 2001
From: "BOOL\\25024" <http://192.168.2.2:8099/jsowell/jsowell-uniapp.git>
Date: Thu, 21 Nov 2024 15:01:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=93=9D=E7=89=99=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=9B=BA=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/views/pile/firmware/index.vue | 658 +++++++++++--------
 1 file changed, 375 insertions(+), 283 deletions(-)

diff --git a/jsowell-ui/src/views/pile/firmware/index.vue b/jsowell-ui/src/views/pile/firmware/index.vue
index 554291632..c52833344 100644
--- a/jsowell-ui/src/views/pile/firmware/index.vue
+++ b/jsowell-ui/src/views/pile/firmware/index.vue
@@ -1,307 +1,399 @@
 <template>
-    <div class="app-container">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
-            <el-form-item label="固件名称" prop="name">
-                <el-input
-                    v-model="queryParams.name"
-                    placeholder="请输入固件名称"
-                    clearable
-                    @keyup.enter.native="handleQuery"
-                />
-            </el-form-item>
-            <el-form-item>
-                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            </el-form-item>
-        </el-form>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+      @submit.native.prevent
+    >
+      <el-form-item label="固件名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入固件名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
 
-        <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-                <el-button
-                    type="primary"
-                    plain
-                    icon="el-icon-plus"
-                    size="mini"
-                    @click="handleAdd"
-                    v-hasPermi="['pile:firmware:add']"
-                >新增</el-button>
-            </el-col>
-            <el-col :span="1.5">
-                <el-button
-                    type="success"
-                    plain
-                    icon="el-icon-edit"
-                    size="mini"
-                    :disabled="single"
-                    @click="handleUpdate"
-                    v-hasPermi="['pile:firmware:edit']"
-                >修改</el-button>
-            </el-col>
-            <el-col :span="1.5">
-                <el-button
-                    type="danger"
-                    plain
-                    icon="el-icon-delete"
-                    size="mini"
-                    :disabled="multiple"
-                    @click="handleDelete"
-                    v-hasPermi="['pile:firmware:remove']"
-                >删除</el-button>
-            </el-col>
-            <el-col :span="1.5">
-                <el-button
-                    type="warning"
-                    plain
-                    icon="el-icon-download"
-                    size="mini"
-                    @click="handleExport"
-                    v-hasPermi="['pile:firmware:export']"
-                >导出</el-button>
-            </el-col>
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['pile:firmware:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['pile:firmware:edit']"
+          >修改</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['pile:firmware:remove']"
+          >删除</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['pile:firmware:export']"
+          >导出</el-button
+        >
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
 
-        <el-table v-loading="loading" :data="firmwareList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" />
-<!--            <el-table-column label="主键id" align="center" prop="id" />-->
-            <el-table-column label="固件名称" align="center" prop="name" />
-            <el-table-column label="固件描述" align="center" prop="description" />
-            <el-table-column label="路径" align="center" prop="filePath" />
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-                <template slot-scope="scope">
-                    <!--<el-button
+    <el-table
+      v-loading="loading"
+      :data="firmwareList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <!--            <el-table-column label="主键id" align="center" prop="id" />-->
+      <el-table-column label="固件名称" align="center" prop="name" />
+      <el-table-column label="固件描述" align="center" prop="description" />
+      <el-table-column label="路径" align="center" prop="filePath" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <!--<el-button
                         size="mini"
                         type="text"
                         icon="el-icon-edit"
                         @click="handleUpdate(scope.row)"
                         v-hasPermi="['pile:firmware:edit']"
                     >修改</el-button>-->
-                    <el-button
-                        size="mini"
-                        type="text"
-                        icon="el-icon-delete"
-                        @click="handleDelete(scope.row)"
-                        v-hasPermi="['pile:firmware:remove']"
-                    >删除</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['pile:firmware:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
 
-        <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getList"
-        />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
-        <!-- 添加或修改充电桩固件信息对话框 -->
-        <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :before-close="cancel">
-            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-                <el-form-item label="固件名称" prop="name">
-                    <el-input v-model="form.name" placeholder="请输入固件名称" />
-                </el-form-item>
-                <el-form-item label="固件描述" prop="description">
-                    <el-input v-model="form.description" placeholder="请输入固件描述" />
-                </el-form-item>
-                <el-form-item label="固件描述" prop="applyType">
-                    <el-radio-group v-model="form.applyType" size="small">
-                        <el-radio label="1" border>直流</el-radio>
-                        <el-radio label="2" border>交流</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item label="路径" prop="filePath">
-                    <el-upload
-                        ref="upload"
-                        :limit="1"
-                        accept=".bin"
-                        :action="upload.url"
-                        :headers="upload.headers"
-                        :file-list="upload.fileList"
-                        :on-progress="handleFileUploadProgress"
-                        :on-success="handleFileSuccess"
-                        :auto-upload="false">
-                        <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
-                        <el-button style="margin-left: 10px;" size="small" type="success" :loading="upload.isUploading" @click="submitUpload">上传到服务器</el-button>
-                        <div slot="tip" class="el-upload__tip">只能上传bin文件，且不超过5000kb</div>
-                    </el-upload>
-                </el-form-item>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="submitForm">确 定</el-button>
-                <el-button @click="cancel">取 消</el-button>
-            </div>
-        </el-dialog>
-    </div>
+    <!-- 添加或修改充电桩固件信息对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="500px"
+      append-to-body
+      :before-close="cancel"
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="固件名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入固件名称" />
+        </el-form-item>
+        <el-form-item label="固件描述" prop="description">
+          <el-input v-model="form.description" placeholder="请输入固件描述" />
+        </el-form-item>
+        <el-form-item label="桩类型" prop="applyType">
+          <el-radio-group v-model="form.applyType" size="small">
+            <el-radio label="1" border>直流</el-radio>
+            <el-radio label="2" border>交流</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="固件类型" prop="useRange">
+          <el-radio-group v-model="form.useRange" size="small">
+            <el-radio label="1" border>4G</el-radio>
+            <el-radio label="2" border>蓝牙</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="路径" prop="filePath">
+          <el-upload
+            v-if="form.useRange == 1"
+            ref="upload"
+            :limit="1"
+            accept=".bin"
+            :action="upload.url"
+            :headers="upload.headers"
+            :file-list="upload.fileList"
+            :on-progress="handleFileUploadProgress"
+            :on-success="handleFileSuccess"
+            :auto-upload="false"
+          >
+            <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+            <el-button
+              style="margin-left: 10px"
+              size="small"
+              type="success"
+              :loading="upload.isUploading"
+              @click="submitUpload"
+              >上传到服务器</el-button
+            >
+            <div slot="tip" class="el-upload__tip">只能上传bin文件，且不超过5000kb</div>
+          </el-upload>
+          <el-upload
+            v-else-if="form.useRange == 2"
+            ref="uploadBluetooth"
+            :limit="1"
+            accept=".bin"
+            :action="uploadBluetooth.url"
+            :headers="uploadBluetooth.headers"
+            :file-list="uploadBluetooth.fileList"
+            :on-progress="handleFileUploadProgress"
+            :on-success="handleFileSuccess"
+            :auto-upload="false"
+          >
+            <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+            <el-button
+              style="margin-left: 10px"
+              size="small"
+              type="success"
+              :loading="upload.isUploading"
+              @click="submitUploadBluetooth"
+              >上传到服务器</el-button
+            >
+            <div slot="tip" class="el-upload__tip">只能上传bin文件，且不超过5000kb</div>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-import { listFirmware, getFirmware, delFirmware, addFirmware, updateFirmware } from "@/api/pile/firmware";
+import {
+  listFirmware,
+  getFirmware,
+  delFirmware,
+  addFirmware,
+  updateFirmware,
+} from "@/api/pile/firmware";
 import { getToken } from "@/utils/auth";
 
 export default {
-    name: "Firmware",
-    data() {
-        return {
-            // 遮罩层
-            loading: true,
-            // 选中数组
-            ids: [],
-            // 非单个禁用
-            single: true,
-            // 非多个禁用
-            multiple: true,
-            // 显示搜索条件
-            showSearch: true,
-            // 总条数
-            total: 0,
-            // 充电桩固件信息表格数据
-            firmwareList: [],
-            // 弹出层标题
-            title: "",
-            // 是否显示弹出层
-            open: false,
-            // 查询参数
-            queryParams: {
-                pageNum: 1,
-                pageSize: 10,
-                name: null,
-            },
-            // 表单参数
-            form: {},
-            // 表单校验
-            rules: {
-            },
-            // 上传参数
-            upload: {
-                // 是否禁用上传
-                isUploading: false,
-                // 设置上传的请求头部
-                headers: { Authorization: "Bearer " + getToken() },
-                // 上传的地址
-                url: process.env.VUE_APP_BASE_API + "/common/uploadFirmware",
-                // 上传的文件列表
-                fileList: []
-            },
-        };
+  name: "Firmware",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 充电桩固件信息表格数据
+      firmwareList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+      // 上传参数  4G
+      upload: {
+        // 是否禁用上传
+        isUploading: false,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/common/uploadFirmware",
+        // 上传的文件列表
+        fileList: [],
+      },
+      // 上传参数 蓝牙
+      uploadBluetooth: {
+        // 是否禁用上传
+        isUploading: false,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/common/uploadBlueToothFile2OSS",
+        // 上传的文件列表
+        fileList: [],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询充电桩固件信息列表 */
+    getList() {
+      this.loading = true;
+      listFirmware(this.queryParams).then((response) => {
+        this.firmwareList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
     },
-    created() {
-        this.getList();
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+      //   this.$refs.upload.clearFiles();
     },
-    methods: {
-        /** 查询充电桩固件信息列表 */
-        getList() {
-            this.loading = true;
-            listFirmware(this.queryParams).then(response => {
-                this.firmwareList = response.rows;
-                this.total = response.total;
-                this.loading = false;
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        name: null,
+        desc: null,
+        filePath: null,
+        applyType: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null,
+        delFlag: null,
+        useRange: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加充电桩固件信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getFirmware(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改充电桩固件信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateFirmware(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
             });
-        },
-        // 取消按钮
-        cancel() {
-            this.open = false;
-            this.reset();
-            this.$refs.upload.clearFiles();
-        },
-        // 表单重置
-        reset() {
-            this.form = {
-                id: null,
-                name: null,
-                desc: null,
-                filePath: null,
-                applyType: null,
-                createTime: null,
-                createBy: null,
-                updateTime: null,
-                updateBy: null,
-                delFlag: null
-            };
-            this.resetForm("form");
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-            this.queryParams.pageNum = 1;
-            this.getList();
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-            this.resetForm("queryForm");
-            this.handleQuery();
-        },
-        // 多选框选中数据
-        handleSelectionChange(selection) {
-            this.ids = selection.map(item => item.id)
-            this.single = selection.length!==1
-            this.multiple = !selection.length
-        },
-        /** 新增按钮操作 */
-        handleAdd() {
-            this.reset();
-            this.open = true;
-            this.title = "添加充电桩固件信息";
-        },
-        /** 修改按钮操作 */
-        handleUpdate(row) {
-            this.reset();
-            const id = row.id || this.ids
-            getFirmware(id).then(response => {
-                this.form = response.data;
-                this.open = true;
-                this.title = "修改充电桩固件信息";
+          } else {
+            addFirmware(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
             });
-        },
-        /** 提交按钮 */
-        submitForm() {
-            this.$refs["form"].validate(valid => {
-                if (valid) {
-                    if (this.form.id != null) {
-                        updateFirmware(this.form).then(response => {
-                            this.$modal.msgSuccess("修改成功");
-                            this.open = false;
-                            this.getList();
-                        });
-                    } else {
-                        addFirmware(this.form).then(response => {
-                            this.$modal.msgSuccess("新增成功");
-                            this.open = false;
-                            this.getList();
-                        });
-                    }
-                }
-            });
-        },
-        /** 删除按钮操作 */
-        handleDelete(row) {
-            const ids = row.id || this.ids;
-            this.$modal.confirm('是否确认删除充电桩固件信息编号为"' + ids + '"的数据项？').then(function() {
-                return delFirmware(ids);
-            }).then(() => {
-                this.getList();
-                this.$modal.msgSuccess("删除成功");
-            }).catch(() => {});
-        },
-        /** 导出按钮操作 */
-        handleExport() {
-            this.download('pile/firmware/export', {
-                ...this.queryParams
-            }, `firmware_${new Date().getTime()}.xlsx`)
-        },
-        // 文件提交处理
-        submitUpload() {
-            this.$refs.upload.submit();
-        },
-        // 文件上传中处理
-        handleFileUploadProgress(event, file, fileList) {
-            this.upload.isUploading = true;
-        },
-        // 文件上传成功处理
-        handleFileSuccess(response, file, fileList) {
-            this.upload.isUploading = false;
-            this.form.filePath = response.fileName;
-            this.msgSuccess(response.msg);
+          }
         }
-    }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除充电桩固件信息编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delFirmware(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "pile/firmware/export",
+        {
+          ...this.queryParams,
+        },
+        `firmware_${new Date().getTime()}.xlsx`
+      );
+    },
+    // 文件提交处理  4G
+    submitUpload() {
+      this.$refs.upload.submit();
+    },
+    submitUploadBluetooth() {
+      // 文件提交处理  蓝牙
+      this.$refs.uploadBluetooth.submit();
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.isUploading = false;
+      this.form.filePath = response.fileName;
+      this.msgSuccess(response.msg);
+    },
+  },
 };
 </script>

From c8430a8245cdd826299fde6da90cae0c25383969 Mon Sep 17 00:00:00 2001
From: "BOOL\\25024" <http://192.168.2.2:8099/jsowell/jsowell-uniapp.git>
Date: Thu, 21 Nov 2024 15:07:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?update=20=E8=93=9D=E7=89=99=E5=9B=BA?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/views/pile/firmware/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jsowell-ui/src/views/pile/firmware/index.vue b/jsowell-ui/src/views/pile/firmware/index.vue
index c52833344..f0d302e12 100644
--- a/jsowell-ui/src/views/pile/firmware/index.vue
+++ b/jsowell-ui/src/views/pile/firmware/index.vue
@@ -141,7 +141,7 @@
             <el-radio label="2" border>蓝牙</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="路径" prop="filePath">
+        <el-form-item label="路径" prop="filePath" v-if="form.useRange">
           <el-upload
             v-if="form.useRange == 1"
             ref="upload"