From 8ac555cff89b54bbba3ebd9b4e0e59adf2c9e054 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Tue, 22 Oct 2024 21:49:01 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/model.js          |  8 ++++++
 src/views/index.vue              |  6 ++--
 src/views/system/flow/index.vue  |  8 +++---
 src/views/system/map/index.vue   | 22 +++++++++------
 src/views/system/order/index.vue |  4 ++-
 src/views/system/user/index.vue  | 48 +++++++++++++++++++++++---------
 6 files changed, 68 insertions(+), 28 deletions(-)

diff --git a/src/api/system/model.js b/src/api/system/model.js
index acae5fa..8575565 100644
--- a/src/api/system/model.js
+++ b/src/api/system/model.js
@@ -9,6 +9,14 @@ export function listModel(query) {
   })
 }
 
+// 查询所有车辆型号列表
+export function listAllModel() {
+  return request({
+    url: '/system/model/allList',
+    method: 'get'
+  })
+}
+
 // 查询车辆型号详细
 export function getModel(modelId) {
   return request({
diff --git a/src/views/index.vue b/src/views/index.vue
index 278dc27..ba69d87 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -431,9 +431,11 @@ export default {
   created() {},
   mounted() {
     this.userName = this.$store.state.user.name;
-    this.AdminStatistics();
+    if(this.userName === 'admin'){
+      this.AdminStatistics();
+      this.getlibord();
+    }
     window.addEventListener("resize", this.handleResize);
-    this.getlibord();
   },
   beforeDestroy() {
     window.removeEventListener("resize", this.handleResize);
diff --git a/src/views/system/flow/index.vue b/src/views/system/flow/index.vue
index 66092bc..ef7900f 100644
--- a/src/views/system/flow/index.vue
+++ b/src/views/system/flow/index.vue
@@ -231,7 +231,7 @@
 <script>
 import { listFlow, getFlow, delFlow, addFlow, updateFlow } from "@/api/system/flow";
 import { optionselect as getAreaOptionselect } from '@/api/system/area'
-import { listModel } from '@/api/system/model'
+import { listAllModel, listModel } from '@/api/system/model'
 
 export default {
   name: "Flow",
@@ -294,9 +294,9 @@ export default {
     this.getModelList();
   },
   methods: {
-    getModelList() { //   getAreaOptionselect()
-      listModel(this.queryParams).then(response => {
-        this.modelOptions = response.rows;
+    getModelList() {
+      listAllModel().then(response => {
+        this.modelOptions = response.data;
       });
     },
     /** 查询字典类型列表 */
diff --git a/src/views/system/map/index.vue b/src/views/system/map/index.vue
index 75ba3a7..117880f 100644
--- a/src/views/system/map/index.vue
+++ b/src/views/system/map/index.vue
@@ -103,7 +103,7 @@
 import AMapLoader from "@amap/amap-jsapi-loader";
 import globalConfig from "@/utils/config/globalConfig";
 import { getDevice, getDeviceLists ,listDevice} from '@/api/system/device'
-import { listArea, optionselect as getAreaOptionselect } from '@/api/system/area'
+import { getArealist, listArea, optionselect as getAreaOptionselect } from '@/api/system/area'
 import { listParking } from '@/api/system/parking'
 import LocationMap from '@/components/Map/location/LocationMap'
 import OrderRecord from '@/views/system/device/components/orderRecord'
@@ -179,7 +179,6 @@ export default {
   mounted() {
     console.log("当前用户信息：", this.$store.state.user.name)
     this.userName = this.$store.state.user.name;
-    this.getAreaList(this.areaId);
     this.getAreaOptions();
   },
   unmounted() {
@@ -203,13 +202,20 @@ export default {
         this.cluster = null;
       }
 
-      await this.getAreaList(this.areaId);
+      this.getAreaList(this.areaId);
     },
 
     getAreaOptions() {
-      getAreaOptionselect().then(response => {
+      getArealist().then(response => {
         this.areaOptions = response.data;
+        this.areaId = response.data[0].areaId;
+        console.log("this.areaId===================", this.areaId)
         console.log("areaOptions", this.areaOptions)
+        if(this.userName == 'admin'){
+          this.getAreaList(14);
+        }else{
+          this.getAreaList(this.areaId);
+        }
       });
     },
 
@@ -263,7 +269,7 @@ export default {
       });
     },
 
-    async getAreaList(areaId) {
+    getAreaList(areaId) {
       listArea({ areaId: areaId }).then(response => {
         this.areaList = response.rows;
         if (this.areaList.length > 0) {
@@ -582,8 +588,8 @@ export default {
       listDevice({ pageNum: 1, pageSize: 999, areaId: areaId }).then(response => {
       // getDeviceLists(areaId).then(response => {
         this.deviceList = response.rows
-        
-        
+
+
         ;
         this.deviceList.forEach(device => {
           if (device.longitude !== null && device.latitude !== null &&
@@ -608,7 +614,7 @@ export default {
     },
 
     addMarker(lng, lat, status, onlineStatus, title) {
-      
+
      let marker = new AMap.Marker({
         map: this.map,
         icon: new AMap.Icon({
diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index d47a9d5..4c85654 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -678,7 +678,9 @@ export default {
     this.reset2();
     this.getList();
     this.getAreaList();
-    this.getDeptList();
+    if(this.userName === 'admin'){
+      this.getDeptList();
+    }
   },
   watch: {
     open(val) {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 589e9d2..dbee239 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -174,6 +174,13 @@
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope" v-if="scope.row.userId !== 1">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-copy"
+                @click="copy(scope.row)"
+                v-hasPermi="['system:user:edit']"
+              >复制</el-button>
               <el-button
                 size="mini"
                 type="text"
@@ -188,15 +195,6 @@
                 @click="handleDelete(scope.row)"
                 v-hasPermi="['system:user:remove']"
               >删除</el-button>
-              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
-                <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
-                    v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
-                  <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
-                    v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
             </template>
           </el-table-column>
         </el-table>
@@ -247,7 +245,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="角色">
+            <el-form-item label="角色" prop="roleIds">
               <el-select v-model="form.roleIds" placeholder="请选择角色">
                 <el-option
                   v-for="item in roleOptions"
@@ -497,6 +495,9 @@ export default {
         ],
         deptId: [
           { required: true, message: "所属代理商不能为空", trigger: "blur" }
+        ],
+        roleIds: [
+          { required: true, message: "用户角色不能为空", trigger: "blur" }
         ]
       }
     };
@@ -519,11 +520,27 @@ export default {
     }
     this.getList();
     this.getDeptTree();
-    this.getConfigKey("sys.user.initPassword").then(response => {
-      this.initPassword = response.msg;
-    });
+    // 随机生成8位数的字符串
+    this.initPassword = Math.random().toString(36).slice(-8);
+    console.log("initPassword---------"+this.initPassword)
   },
   methods: {
+    copy(row) {
+      const account = `账号：${row.userName}`; // 获取账号
+      const password = `密码：${row.initPassword}`; // 获取密码
+      const fixedUrl = "https://dche.ccttiot.com/"; // 固定网址
+
+      // 组合要复制的内容
+      const textToCopy = `${fixedUrl}\n${account}\n${password}`;
+
+      // 使用 Clipboard API 复制内容
+      navigator.clipboard.writeText(textToCopy).then(() => {
+        this.$modal.msgSuccess("已复制到剪贴板"); // 复制成功提示
+      }).catch(err => {
+        console.error("复制失败：", err);
+        this.$modal.msgError("复制失败，请手动复制"); // 复制失败提示
+      });
+    },
     getAreaListByDeptId(deptId){
       if(deptId) {
         selectAreaListByDeptId(deptId).then(response => {
@@ -766,6 +783,11 @@ export default {
     submitForm: function() {
       this.form.userName = this.form.phonenumber;
       this.form.userType = '00';
+      // 判空检查
+      if (!this.form.roleIds || this.form.roleIds.length === 0) {
+        this.$modal.msgError("请选择角色"); // 弹窗提示
+        return; // 退出方法
+      }
       this.form.roleIds = [this.form.roleIds];
       console.log("roleIds"+this.form.roleIds)
       this.$refs["form"].validate(valid => {