From 221be28fff3f8518886b577bd132eaaf535a544a Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Fri, 22 Mar 2024 14:34:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Sidebar.vue                    | 13 ++++------
 src/components/passwordDialog.vue             | 22 +++++++++++-----
 src/store/index.js                            |  9 ++++---
 src/utils/api/index.js                        |  3 ++-
 src/utils/request.js                          |  2 +-
 src/views/login/index.vue                     |  7 +-----
 .../components/parameterSetDialog.vue         |  5 ++++
 src/views/system/deviceUpgrade/index.vue      | 25 +++++++++++++++++--
 src/views/system/menuManagement/index.vue     |  4 +--
 .../roleManagement/components/addRole.vue     | 11 ++++++--
 src/views/system/roleManagement/index.vue     |  8 ++++--
 src/views/system/user/components/addUser.vue  | 13 ++++++++--
 src/views/system/user/userManagement.vue      |  7 +++---
 vue.config.js                                 |  2 +-
 14 files changed, 92 insertions(+), 39 deletions(-)

diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index cb9c69e..dfb5ad4 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -63,7 +63,6 @@ export default {
           index: "/realTimeMonitor",
           title: "实时监控",
         },
-
         {
           icon: "el-icon-film",
           index: "/pictureRotation",
@@ -74,7 +73,6 @@ export default {
           index: "/photoAlarm",
           title: "告警处理",
         },
-
         {
           icon: "el-icon-search",
           index: "/realTimeSearch",
@@ -289,6 +287,7 @@ export default {
         },
       ],
       role: "",
+      menuList: [],
     };
   },
 
@@ -309,25 +308,23 @@ export default {
     this.role = localStorage.getItem("role");
     console.log("用户管理");
     console.log(this.role);
-
     // if (this.role == 0) {
     //   this.items = this.items;
     // } else {
-    //   this.items = this.items1;
+    //   this.menuList = JSON.parse(localStorage.getItem("menuPermission"));
+    //   this.items = this.menuList;
     // }
+
     if (this.role == 0) {
-      console.log("ssssssssssssssssssssssssssssssssssssssss");
       this.items = this.items;
     } else if (this.role == 1) {
       this.items = this.items1;
     } else if (this.role == 2) {
       this.items = this.items2;
     } else if (this.role == 4) {
-      console.log("ssssssssssssssssssssssssssssssssssssssss");
       this.items = this.hnjcitems;
-      console.log("ssssssssssssssssssssssssssssssssssssssss", this.items);
     }
-
+    this.activeIndex = this.items[0].index;
     console.log(this.items);
     console.log(this.activeIndex);
   },
diff --git a/src/components/passwordDialog.vue b/src/components/passwordDialog.vue
index e67fe9b..fe7be77 100644
--- a/src/components/passwordDialog.vue
+++ b/src/components/passwordDialog.vue
@@ -6,9 +6,19 @@
     :close-on-click-modal="false"
     width="420px"
   >
-    <el-form :model="psdForm" :rules="rules" ref="formInfo" label-position="left" label-width="80px">
+    <el-form
+      :model="psdForm"
+      :rules="rules"
+      ref="formInfo"
+      label-position="left"
+      label-width="80px"
+    >
       <el-form-item label="用户名:">
-        <el-input v-model="psdForm.userName" autocomplete="off" :disabled="true"></el-input>
+        <el-input
+          v-model="psdForm.userName"
+          autocomplete="off"
+          :disabled="true"
+        ></el-input>
       </el-form-item>
       <!-- <el-form-item label="原密码:">
         <el-input v-model="psdForm.originalPsd" autocomplete="off"></el-input>
@@ -31,9 +41,9 @@ import { updateUserApi } from "@/utils/api/index";
 export default {
   data() {
     return {
-      isShow:false,
+      isShow: false,
       psdForm: {
-        userName: localStorage.getItem('userName'),
+        userName: localStorage.getItem("userName"),
         originalPsd: "",
         newPsd: "",
         password: "",
@@ -54,12 +64,12 @@ export default {
     submitForm() {
       this.$refs.formInfo.validate((valid) => {
         if (valid) {
-          this.$set(this.psdForm,'userId',localStorage.getItem('userid'))
+          this.$set(this.psdForm, "uid", localStorage.getItem("uid"));
           updateUserApi(this.psdForm)
             .then((res) => {
               if (res.code == 200) {
                 this.$message.success("修改成功,请重新登录");
-                this.isShow = false
+                this.isShow = false;
                 this.$store.commit("REMOVE_INFO");
                 this.$router.push("/login");
               } else {
diff --git a/src/store/index.js b/src/store/index.js
index 7b7c696..7320d97 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -8,7 +8,7 @@ export default new Vuex.Store({
     //用户登录token 存储
     token: "",
     userName: "",
-    userid: "",
+    uid: "",
     role: "",
     currentData: "",
     channelId: "",
@@ -22,6 +22,7 @@ export default new Vuex.Store({
     token: (state) => state.token,
     userName: (state) => state.userName,
     role: (state) => state.role,
+    menuPermission: (state) => state.resources,
   },
   mutations: {
     //点击获取的左侧列表
@@ -64,11 +65,13 @@ export default new Vuex.Store({
     },
     SET_USERINFO(state, val) {
       state.userName = val.userName;
-      state.userid = val.id;
+      state.uid = val.uid;
       state.role = val.role;
+      state.resources = val.resources;
       localStorage.setItem("userName", state.userName);
-      localStorage.setItem("userid", state.userid);
+      localStorage.setItem("uid", state.uid);
       localStorage.setItem("role", state.role);
+      localStorage.setItem("menuPermission", JSON.stringify(state.resources));
     },
     //退出清除locastorge
     REMOVE_INFO(state) {
diff --git a/src/utils/api/index.js b/src/utils/api/index.js
index 527e28b..a441fdf 100644
--- a/src/utils/api/index.js
+++ b/src/utils/api/index.js
@@ -872,7 +872,7 @@ export function listApk(data) {
 }
 
 //上传apk
-export function uploadApk(data) {
+export function uploadApk(data, onUploadProgress) {
   return request({
     url: "/xymanager/uploadApk",
     method: "post",
@@ -880,6 +880,7 @@ export function uploadApk(data) {
     headers: {
       "Content-Type": "multipart/form-data", // set the content type to multipart/form-data
     },
+    onUploadProgress: onUploadProgress, // 允许外部传递进度回调函数
   });
 }
 
diff --git a/src/utils/request.js b/src/utils/request.js
index 22584aa..a0b6cfb 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,7 +13,7 @@ const service = axios.create({
 
 service.interceptors.request.use((config) => {
   if (localStorage.getItem("token")) {
-    console.log("aaaaaaaaaaaaaa", localStorage.getItem("token"));
+    // console.log("aaaaaaaaaaaaaa", localStorage.getItem("token"));
     config.headers.Authorization = localStorage.getItem("token");
   }
   return config;
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 6bdb596..f95ac52 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -81,12 +81,7 @@ export default {
                 this.$store.commit("SET_TOKEN", res.data.token); //将token保存在vuex中
                 this.$store.commit("SET_USERINFO", res.data); //将用户信息保存在vuex中
                 console.log(res.data);
-                if (res.data.role == 5) {
-                  this.$router.push("/weather");
-                } else {
-                  this.$router.push("/stritl");
-                }
-
+                this.$router.push("/stritl");
                 this.$message({
                   duration: 1500,
                   showClose: true,
diff --git a/src/views/photographicDevice/components/parameterSetDialog.vue b/src/views/photographicDevice/components/parameterSetDialog.vue
index bad4234..626dfa7 100644
--- a/src/views/photographicDevice/components/parameterSetDialog.vue
+++ b/src/views/photographicDevice/components/parameterSetDialog.vue
@@ -1927,6 +1927,7 @@ export default {
     //升级确定阿
     handleupgradation() {
       console.log(this.upgradationform.upVal);
+      console.log(this.selectUpObj.name);
       this.$refs.upgradationRuleForm.validate((valid) => {
         if (valid) {
           this.ugradLoading = true;
@@ -1939,6 +1940,10 @@ export default {
               name: "file",
               value: this.upgradationform.upVal,
             },
+            {
+              name: "name",
+              value: this.selectUpObj.name,
+            },
           ];
           this.setTermFn(params);
         }
diff --git a/src/views/system/deviceUpgrade/index.vue b/src/views/system/deviceUpgrade/index.vue
index fb761b0..12d5cc2 100644
--- a/src/views/system/deviceUpgrade/index.vue
+++ b/src/views/system/deviceUpgrade/index.vue
@@ -7,6 +7,7 @@
           class="upload-demo"
           ref="upload"
           action="#"
+          :before-upload="beforeUpload"
           :http-request="customUpload"
           :limit="1"
           :file-list="fileList"
@@ -190,6 +191,14 @@ export default {
       // 显示上传进度
       console.log(this.progress); // 或者你可以使用其他方式来显示进度，比如使用进度条组件等。
     },
+    beforeUpload(file) {
+      const fileName = file.name;
+      if (fileName.length > 19) {
+        this.$message.error("文件名长度不能超过 19 个字符！");
+        return false; // 阻止文件自动上传
+      }
+      return true; // 允许文件继续上传
+    },
     // //点击升级确定
     // beforeAvatarUpload(file) {
     //   console.log(this.reportData.title);
@@ -206,7 +215,19 @@ export default {
       formData.append("file", options.file);
       formData.append("title", this.reportData.title); // 假设后端需要这个字段
       console.log(formData);
-      uploadApk(formData)
+      uploadApk(formData, (progressEvent) => {
+        // 计算上传进度百分比
+        const percentCompleted = Math.round(
+          (progressEvent.loaded * 100) / progressEvent.total
+        );
+        this.progressLoading = true;
+        // 更新UI或执行其他逻辑，比如显示进度条
+        console.log(`上传进度: ${percentCompleted}%`);
+        this.progress = Math.round(percentCompleted);
+
+        // 你可以通过其他方式将进度信息传递给组件或Vue实例
+        // this.uploadProgress = percentCompleted; // 假设你有一个data属性来存储进度
+      })
         .then((res) => {
           console.log(res);
           // this.progressLoading = true;
@@ -220,7 +241,7 @@ export default {
             this.reportData.title = "";
             this.$refs.upload.clearFiles();
             this.getUpgradeList();
-            // this.progressLoading = false;
+            this.progressLoading = false;
           } else {
             this.$message({
               duration: 1500,
diff --git a/src/views/system/menuManagement/index.vue b/src/views/system/menuManagement/index.vue
index 55ab4e0..b3fde90 100644
--- a/src/views/system/menuManagement/index.vue
+++ b/src/views/system/menuManagement/index.vue
@@ -26,12 +26,12 @@
             prop="id"
           ></el-table-column>
           <el-table-column
-            label="key"
+            label="路由名称"
             show-overflow-tooltip
             prop="key"
           ></el-table-column>
           <el-table-column
-            label="desc"
+            label="菜单名称"
             show-overflow-tooltip
             prop="desc"
           ></el-table-column>
diff --git a/src/views/system/roleManagement/components/addRole.vue b/src/views/system/roleManagement/components/addRole.vue
index 861142c..009f25b 100644
--- a/src/views/system/roleManagement/components/addRole.vue
+++ b/src/views/system/roleManagement/components/addRole.vue
@@ -21,6 +21,13 @@
           autocomplete="off"
         ></el-input>
       </el-form-item>
+      <el-form-item label="备注：" prop="desc">
+        <el-input
+          placeholder="请输入备注"
+          v-model="formdata.desc"
+          autocomplete="off"
+        ></el-input>
+      </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button @click="isShow = false">取 消</el-button>
@@ -41,10 +48,10 @@ export default {
 
       formdata: {},
       rules: {
-        name: [{ required: true, message: "请输入用户名", trigger: "blur" }],
+        name: [{ required: true, message: "请输入角色名", trigger: "blur" }],
       },
       xgrules: {
-        name: [{ required: true, message: "请输入用户名", trigger: "blur" }],
+        name: [{ required: true, message: "请输入角色名", trigger: "blur" }],
       },
     };
   },
diff --git a/src/views/system/roleManagement/index.vue b/src/views/system/roleManagement/index.vue
index 166c338..56421c5 100644
--- a/src/views/system/roleManagement/index.vue
+++ b/src/views/system/roleManagement/index.vue
@@ -30,7 +30,11 @@
             show-overflow-tooltip
             prop="name"
           ></el-table-column>
-
+          <el-table-column
+            label="备注"
+            show-overflow-tooltip
+            prop="desc"
+          ></el-table-column>
           <el-table-column
             label="创建时间"
             show-overflow-tooltip
@@ -106,7 +110,7 @@ export default {
     this.roleListAll();
   },
   methods: {
-    //获取线路列表数据
+    //获取角色数据
     roleListAll() {
       getRoleList()
         .then((res) => {
diff --git a/src/views/system/user/components/addUser.vue b/src/views/system/user/components/addUser.vue
index e1d8f42..a52a067 100644
--- a/src/views/system/user/components/addUser.vue
+++ b/src/views/system/user/components/addUser.vue
@@ -105,14 +105,23 @@ export default {
       //this.formdata = val;
       this.formdata = JSON.parse(JSON.stringify(val));
     },
+    //获取角色列表
     getRoleListAll() {
       getRoleList()
         .then((res) => {
-          //只展示去除超管的列表
+          console.log("获取角色列表", res.data);
           this.roleoptions = res.data.filter((role) => role.id !== 0);
         })
         .catch((err) => {});
     },
+    // getRoleListAll() {
+    //   getRoleList()
+    //     .then((res) => {
+    //       //只展示去除超管的列表
+    //       this.roleoptions = res.data.filter((role) => role.id !== 0);
+    //     })
+    //     .catch((err) => {});
+    // },
     // 保存确定操作
     submitForm() {
       this.$refs.formInfo.validate((valid) => {
@@ -154,7 +163,7 @@ export default {
     display() {
       this.isShow = true;
       this.roleUser = localStorage.getItem("role");
-      //this.getRoleListAll();
+      this.getRoleListAll();
     },
     hide() {
       this.isShow = false;
diff --git a/src/views/system/user/userManagement.vue b/src/views/system/user/userManagement.vue
index 1f7e6fa..d2c4750 100644
--- a/src/views/system/user/userManagement.vue
+++ b/src/views/system/user/userManagement.vue
@@ -31,13 +31,13 @@
           <!-- <el-table-column label="角色" show-overflow-tooltip prop="roleName">
             <template slot-scope="scope">{{ scope.row.roleName }}</template>
           </el-table-column> -->
-          <el-table-column label="角色" show-overflow-tooltip prop="role">
-            <template slot-scope="scope">
+          <el-table-column label="角色" show-overflow-tooltip prop="roleName">
+            <!-- <template slot-scope="scope">
               <span v-if="scope.row.role == 0">超级管理员</span>
               <span v-else-if="scope.row.role == 1">管理员</span>
               <span v-else-if="scope.row.role == 2">用户</span>
               <span v-else>{{ scope.row.role }}</span>
-            </template>
+            </template> -->
           </el-table-column>
           <el-table-column
             label="备注"
@@ -129,6 +129,7 @@ export default {
         })
         .catch((err) => {});
     },
+
     //点击行选中
     handleRowClick(row, column, event) {
       this.$refs.multipleTable.toggleRowSelection(row);
diff --git a/vue.config.js b/vue.config.js
index c75cefc..6211b20 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -23,7 +23,7 @@ module.exports = defineConfig({
         //表示拦截以/api开头的请求路径
         //target: "http://47.96.238.157:8093", //阿里云服务器环境
         target: "http://180.166.218.222:40080", //dell
-        //target: "http://192.168.1.190:8080", //liu 本机ip
+        //target: "http://192.168.1.190:8080", //liu 本机ip  需要去掉/Api
         // target: "http://192.168.50.42:81", //东视
         changOrigin: true, //是否开启跨域
         pathRewrite: {