From ae7d0af5f43d564afc7165485b7968f9e7289d2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Tue, 15 Apr 2025 18:17:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                                 |  8 ++++----
 src/views/bst/area/index.vue                         |  4 ++++
 .../bst/areaJoin/components/AreaJoinEditDialog.vue   | 12 ++++++++++--
 src/views/bst/areaJoin/index.vue                     | 12 ++++++++----
 src/views/system/role/index.vue                      |  6 +++++-
 5 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 8e5b0b6..0152527 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,10 +1,10 @@
-import axios from 'axios'
-import { Loading, Message, MessageBox, Notification } from 'element-ui'
+import cache from '@/plugins/cache'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 import { blobValidate, tansParams } from '@/utils/ruoyi'
-import cache from '@/plugins/cache'
+import axios from 'axios'
+import { Loading, Message, MessageBox } from 'element-ui'
 import { saveAs } from 'file-saver'
 
 let downloadLoadingInstance;
@@ -101,7 +101,7 @@ service.interceptors.response.use(res => {
       Message({ message: msg, type: 'warning' })
       return Promise.reject('error')
     } else if (code !== 200) {
-      Notification.error({ title: msg })
+      Message({ message: msg, type: 'error' })
       return Promise.reject('error')
     } else {
       return res.data
diff --git a/src/views/bst/area/index.vue b/src/views/bst/area/index.vue
index 714a874..8650c61 100644
--- a/src/views/bst/area/index.vue
+++ b/src/views/bst/area/index.vue
@@ -107,6 +107,9 @@
               {{d.row.name}}
               <dict-tag :options="dict.type.area_status" :value="d.row.status" size="mini"/>
             </template>
+            <template v-else-if="column.key === 'areaTimeStart'">
+              {{d.row.areaTimeStart | dv}} - {{d.row.areaTimeEnd | dv}}
+            </template>
             <template v-else-if="column.key === 'subArea'">
               <el-button type="text" size="mini" @click="handleSubArea(d.row)">
                 停车区({{d.row.parkingAreaCount | dv}})
@@ -205,6 +208,7 @@ export default {
       columns: [
         {key: 'id', visible: false, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: "80"},
         {key: 'name', visible: true, label: '名称', minWidth: "200", sortable: true, overflow: false, align: 'left', width: null},
+        {key: 'areaTimeStart', visible: true, label: '运营时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'subArea', visible: true, label: '电子围栏', minWidth: "200", sortable: true, overflow: false, align: 'center', width: null},
         {key: 'userName', visible: true, label: '运营商', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'createName', visible: true, label: '创建人', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
diff --git a/src/views/bst/areaJoin/components/AreaJoinEditDialog.vue b/src/views/bst/areaJoin/components/AreaJoinEditDialog.vue
index c451a9b..0d59571 100644
--- a/src/views/bst/areaJoin/components/AreaJoinEditDialog.vue
+++ b/src/views/bst/areaJoin/components/AreaJoinEditDialog.vue
@@ -33,6 +33,11 @@
         <form-col :span="span" label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" maxlength="30" show-word-limit/>
         </form-col>
+        <form-col :span="span" label="权限" prop="permissions">
+          <el-checkbox-group v-model="form.permissions">
+            <el-checkbox v-for="dict in dict.type.area_join_permission" :key="dict.value" :label="dict.value">{{dict.label}}</el-checkbox>
+          </el-checkbox-group>
+        </form-col>
       </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -52,7 +57,7 @@ import UserInput from '@/components/Business/User/UserInput.vue';
 export default {
   name: 'AreaJoinEditDialog',
   components: { FormCol, AreaRemoteSelect, UserInput },
-  dicts: ['area_join_type'],
+  dicts: ['area_join_type', 'area_join_permission'],
   props: {
     visible: {
       type: Boolean,
@@ -72,7 +77,9 @@ export default {
       AreaJoinType,
       span: 24,
       title: '',
-      form: {},
+      form: {
+        permissions: []
+      },
       loading: false,
       rules: {
         type: [
@@ -123,6 +130,7 @@ export default {
         createTime: null,
         remark: null,
         createId: null,
+        permissions: [],
         ...this.initData
       };
       this.$nextTick(() => {
diff --git a/src/views/bst/areaJoin/index.vue b/src/views/bst/areaJoin/index.vue
index 9f56be2..97fc135 100644
--- a/src/views/bst/areaJoin/index.vue
+++ b/src/views/bst/areaJoin/index.vue
@@ -102,13 +102,16 @@
             <template v-else-if="column.key === 'point'">
               <span>{{d.row[column.key] | fix2 | dv}} %</span>
             </template>
+            <template v-else-if="column.key === 'permissions'">
+              <dict-tag :options="dict.type.area_join_permission" :value="d.row[column.key]" size="mini"/>  
+            </template>
             <template v-else>
               {{d.row[column.key]}}
             </template>
           </template>
         </el-table-column>
       </template>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -160,7 +163,7 @@ const defaultSort = {
 export default {
   name: "AreaJoin",
   mixins: [$showColumns],
-  dicts: ['area_join_type'],
+  dicts: ['area_join_type', 'area_join_permission'],
   components: { AreaJoinEditDialog },
   data() {
     return {
@@ -169,9 +172,10 @@ export default {
         {key: 'id', visible: false, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: "80"},
         {key: 'userName', visible: true, label: '用户', minWidth: null, sortable: true, overflow: false, align: 'left', width: null},
         {key: 'areaName', visible: true, label: '运营区', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'point', visible: true, label: '分成比例', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'point', visible: true, label: '分成比例', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
+        {key: 'permissions', visible: true, label: '权限', minWidth: null, sortable: false, overflow: false, align: 'center', width: null},
         {key: 'createName', visible: true, label: '创建人', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'createTime', visible: true, label: '创建时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'createTime', visible: true, label: '创建时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: "180"},
       ],
       // 排序方式
       orderSorts: ['ascending', 'descending', null],
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 5bfb2ed..d2fe69f 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -322,7 +322,11 @@ export default {
         {
           value: "7",
           label: "本部门及本人数据权限"
-        }
+        },
+        {
+          value: "8",
+          label: "本人及加盟运营区数据权限"
+        },
       ],
       // 菜单列表
       menuOptions: [],