From c70d60ea60dabf709b2b2c1ecd90b87788802998 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Fri, 7 Jun 2024 10:20:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A6=86=E5=86=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/iceWeather/components/leftTree.vue |  2 +-
 src/views/photographicDevice/index.vue       |  8 +++-
 src/views/system/deviceUpgrade/index.vue     | 39 ++++++++++++++++++--
 vue.config.js                                |  2 +-
 4 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/src/views/iceWeather/components/leftTree.vue b/src/views/iceWeather/components/leftTree.vue
index 406ab14..a8a7cc7 100644
--- a/src/views/iceWeather/components/leftTree.vue
+++ b/src/views/iceWeather/components/leftTree.vue
@@ -151,7 +151,7 @@ export default {
       console.log(devtypeList);
       getICEdyTreeList({
         type: -1,
-        devtype: devtypeList,
+        // devtype: devtypeList,
       })
         .then((res) => {
           this.lineTreeData = [];
diff --git a/src/views/photographicDevice/index.vue b/src/views/photographicDevice/index.vue
index 9002ad5..1295301 100644
--- a/src/views/photographicDevice/index.vue
+++ b/src/views/photographicDevice/index.vue
@@ -230,7 +230,7 @@
             fixed="right"
             label="操作"
             width="320"
-            v-if="roleUser == 2"
+            v-if="roleUser == 0"
           >
             <template slot-scope="scope">
               <el-dropdown
@@ -296,6 +296,12 @@
                 @click.native.stop="handlepicture(scope.row)"
                 >图片标记</el-button
               >
+              <el-button
+                v-if="notes == '覆冰用户使用'"
+                @click.native.stop="handleParameterSet(scope.row)"
+                type="text"
+                >参数配置</el-button
+              >
               <el-button
                 type="text"
                 class="deleteText"
diff --git a/src/views/system/deviceUpgrade/index.vue b/src/views/system/deviceUpgrade/index.vue
index 4490d9c..fd5c8f0 100644
--- a/src/views/system/deviceUpgrade/index.vue
+++ b/src/views/system/deviceUpgrade/index.vue
@@ -139,6 +139,7 @@ export default {
       fileList: [],
       reportData: {
         title: "",
+        modifiedName: "",
       },
       fileData: [], //数据列表
       fileloading: false,
@@ -193,11 +194,40 @@ export default {
     },
     beforeUpload(file) {
       const fileName = file.name;
-      console.log(fileName);
-      if (fileName.length > 19) {
-        this.$message.error("文件名长度不能超过 19 个字符！");
-        return false; // 阻止文件自动上传
+
+      // 正则表达式检查文件名是否符合模式
+      const regex = /^(mpapp|MpMaster)_v\d+\.\d+(\.\d+)?_rel_\d{8}\.apk$/;
+
+      if (regex.test(fileName)) {
+        // 提取版本号（v后面的数字）
+        const versionMatch = fileName.match(/v(\d+\.\d+(\.\d+)?)/);
+        if (versionMatch && versionMatch[1]) {
+          // 构造新的文件名（去掉V和_rel_日期部分）
+          const baseName = fileName.startsWith("mpapp") ? "mpapp" : "mpmst"; // 注意：这里假设mpmaster应该改为mpmst
+          const version = versionMatch[1];
+          this.reportData.modifiedName = `${baseName}_${version}.apk`;
+        }
+      } else {
+        // 如果文件名不符合模式，则检查长度（这里假设长度超过某个值，比如20）
+        if (fileName.length > 19) {
+          // 文件名长度过长处理（这里只是一个示例，你可能想要做其他的处理）
+          console.log("文件名过长：", fileName);
+          this.$message.error("文件名长度不能超过 19 个字符！");
+          return false; // 阻止文件自动上传
+        }
+        // 如果文件名既不符合模式，长度也不超过阈值，那么就不做处理
+        this.reportData.modifiedName = fileName; // 或者保持原样，或者设置为空字符串等
       }
+
+      // console.log(fileName);
+      // this.reportData.modifiedName = fileName
+      //   .replace("V", "")
+      //   .replace(/_rel_[^.]*\./, ".");
+
+      // if (this.reportData.modifiedName.length > 20) {
+      //   this.$message.error("文件名长度不能超过 20 个字符！");
+      //   return false; // 阻止文件自动上传
+      // }
       return true; // 允许文件继续上传
     },
     // //点击升级确定
@@ -215,6 +245,7 @@ export default {
       const formData = new FormData();
       formData.append("file", options.file);
       formData.append("title", this.reportData.title); // 假设后端需要这个字段
+      formData.append("name", this.reportData.modifiedName); // 假设后端需要这个字段
       console.log(formData);
       uploadApk(formData, (progressEvent) => {
         // 计算上传进度百分比
diff --git a/vue.config.js b/vue.config.js
index 39debfb..84957d3 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -23,7 +23,7 @@ module.exports = defineConfig({
         //表示拦截以/api开头的请求路径
 
         //target: "http://192.168.1.190:8080", //190 需要去掉/Api
-        //target: "http://192.168.50.7:8093", //liu 本机ip  需要去掉/Api
+        // target: "http://61.169.135.146:9911/", //运维
         target: "http://61.169.135.146:40080/", //dell
         changOrigin: true, //是否开启跨域
         pathRewrite: {