From 33b28e1cae2ae13fe39df721c01c6791db17a123 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Tue, 22 Jul 2025 11:11:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81=E5=9C=B0?=
 =?UTF-8?q?=E5=8C=BA=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home.vue                   | 51 -----------------------------
 src/views/permissions/permission.vue | 62 ++++++++++++++++++++++++------------
 2 files changed, 42 insertions(+), 71 deletions(-)

diff --git a/src/views/home.vue b/src/views/home.vue
index 04abba9..1a3e1dd 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -123,24 +123,6 @@ const exportList = ref([])
 // 导出列表加载状态
 const exportListLoading = ref(false)
 
-// 获取导出列表
-const getExportList = async () => {
-  exportListLoading.value = true
-  try {
-    const result = await API({ url: '/export/export' })
-    if (result.code === 200) {
-      exportList.value = result.data
-    } else {
-      ElMessage.error(result.msg || '获取导出列表失败')
-    }
-  } catch (error) {
-    console.error('获取导出列表出错:', error)
-    ElMessage.error('获取导出列表失败，请稍后重试')
-  } finally {
-    exportListLoading.value = false
-  }
-}
-
 //根据状态返回对应的标签类型
 const getTagType = (state) => {
   switch (state) {
@@ -353,39 +335,6 @@ const openChangePassword = () => {
       </template>
     </el-dialog>
 
-    <!-- 导出列表弹窗 -->
-    <el-dialog v-model="exportListVisible" title="导出列表" width="80%">
-      <el-table :data="exportList" style="width: 100%" :loading="exportListLoading">
-        <el-table-column prop="fileName" label="文件名"/>
-        <el-table-column prop="state" label="状态">
-          <template #default="scope">
-            <el-tag :type="getTagType(scope.row.state)"
-                    :effect="scope.row.state === 3 ? 'light' : 'plain'">
-              {{ getTagText(scope.row.state) }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="createTime" label="创建时间">
-          <template #default="scope">
-            {{ moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作">
-          <template #default="scope">
-            <el-button type="primary" size="small" @click="downloadExportFile(scope.row)"
-                       :disabled="scope.row.state !== 2">
-              下载
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button text @click="exportListVisible = false">关闭</el-button>
-        </div>
-      </template>
-    </el-dialog>
-
     <!-- 自定义密码修改弹窗组件 -->
     <el-dialog
         v-model="showPasswordDialog"
diff --git a/src/views/permissions/permission.vue b/src/views/permissions/permission.vue
index 543a460..b9519e9 100644
--- a/src/views/permissions/permission.vue
+++ b/src/views/permissions/permission.vue
@@ -724,30 +724,52 @@ const showMenuTree = (treeData, roleName) => {
   currentRoleName.value = roleName || '权限详情';
   menuTreeVisible.value = true;
 };
-//用户密码重置
-const resetPassword = async function (row) {
-  try {
 
-    await ElMessageBox.confirm(
-      `确认重置该账号密码？`,
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: "warning",
-        lockScroll: false
+//用户密码重置
+const resetPassword = function (row) {
+  console.log('adminData.value.markets', adminData.value.markets);
+  
+  // 处理markets数据
+  if (typeof adminData.value.markets === 'string' && adminData.value.markets) {
+    adminData.value.markets = adminData.value.markets.split(',');
+  } else {
+    adminData.value.markets = [];
+  }
+  
+  if (adminData.value.markets.includes(row.market)||adminData.value.markets=='总部') {
+    console.log('符合条件，可以操作');
+     // 用then处理确认，catch处理取消和错误
+  ElMessageBox.confirm(
+    `确认重置该账号密码？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: "warning",
+      lockScroll: false
+    }
+  ).then(async () => {
+    // 仅当用户确认时执行
+    try {
+      const res = await API({
+        url: '/admin/reset',
+        data: { account: row.account }
+      });
+      if (res.code === 200) {
+        ElMessage.success(res.data);
       }
-    );
-    const res = await API({
-      url: '/admin/reset',
-      data: { account: row.account }
-    })
-    if (res.code == 200) {
-      ElMessage.success(res.data)
+    } catch (error) {
+      ElMessage.error('请求失败: ' + (error.message || error));
     }
-  } catch (error) {
-    ElMessage.error('请求失败', error)
+  }).catch(() => {
+    // 取消操作，可选择性添加日志
+    console.log('用户取消了重置密码操作');
+  });
+  }else{
+    ElMessage.error('您没有修改'+row.market+'地区的用户密码的权限')
   }
+  
+ 
 }