@@ -194,6 +194,7 @@ import { listArea, delArea } from "@/api/bst/area";
import { $showColumns } from '@/utils/mixins';
import AreaCustomerServiceDialog from "@/views/bst/area/components/AreaCustomerServiceDialog.vue";
import UserLink from '@/components/Business/User/UserLink.vue';
+import AreaLink from '@/components/Business/Area/AreaLink.vue';
// 默认排序字段
const defaultSort = {
prop: "createTime",
@@ -206,7 +207,8 @@ export default {
dicts: ['area_status'],
components: {
AreaCustomerServiceDialog,
- UserLink
+ UserLink,
+ AreaLink
},
props: {
query: {
diff --git a/src/views/bst/area/view/view.vue b/src/views/bst/area/view/view.vue
index 50714d3..8a5e59c 100644
--- a/src/views/bst/area/view/view.vue
+++ b/src/views/bst/area/view/view.vue
@@ -43,6 +43,9 @@
+
+
+
@@ -55,9 +58,10 @@ import AreaSub from '@/views/bst/areaSub/index.vue';
import Device from '@/views/bst/device/index.vue';
import Order from '@/views/bst/order/index.vue';
import AreaJoin from '@/views/bst/areaJoin/index.vue';
-import { AreaJoinType } from '@/utils/enums';
+import { AreaJoinType, LogBizType } from '@/utils/enums';
import CustomerService from '@/views/bst/customerService/index.vue';
import Agreement from '@/views/bst/agreement/index.vue';
+import OperLog from '@/views/monitor/operlog/index.vue';
export default {
name: 'AreaView',
@@ -69,11 +73,13 @@ export default {
Order,
AreaJoin,
CustomerService,
- Agreement
+ Agreement,
+ OperLog
},
data() {
return {
AreaJoinType,
+ LogBizType,
detail: {},
loading: false,
id: null,
diff --git a/src/views/bst/areaSub/components/AreaMap.vue b/src/views/bst/areaSub/components/AreaMap.vue
index e01e167..5b1817f 100644
--- a/src/views/bst/areaSub/components/AreaMap.vue
+++ b/src/views/bst/areaSub/components/AreaMap.vue
@@ -9,8 +9,8 @@
- 子区域
- 电子围栏
+ 子区域
+ 电子围栏
全局查看
切换样式
{{ showLabels ? '隐藏' : '显示' }}标签
diff --git a/src/views/bst/areaSub/index.vue b/src/views/bst/areaSub/index.vue
index e826da2..51daaad 100644
--- a/src/views/bst/areaSub/index.vue
+++ b/src/views/bst/areaSub/index.vue
@@ -186,6 +186,7 @@ import { getArea, updateArea } from '@/api/bst/area';
import { AreaSubStatus, AreaSubType } from '@/utils/enums';
import AreaMap from '@/views/bst/areaSub/components/AreaMap.vue';
import AreaSubEditDialog from '@/views/bst/areaSub/components/AreaSubEditDialog.vue';
+import {startGuide} from "@/utils/guide"
// 默认排序字段
const defaultSort = {
@@ -284,6 +285,10 @@ export default {
}
this.getArea();
this.getList();
+
+ this.$nextTick(()=> {
+ startGuide("AreaSub");
+ });
},
methods: {
handleRowClick(row) {
diff --git a/src/views/bst/customerService/index.vue b/src/views/bst/customerService/index.vue
index 0ecdfe4..dea0d07 100644
--- a/src/views/bst/customerService/index.vue
+++ b/src/views/bst/customerService/index.vue
@@ -182,7 +182,7 @@ export default {
span: 24,
// 字段列表
columns: [
- {key: 'id', visible: true, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: "80"},
+ {key: 'id', visible: false, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: "80"},
{key: 'areaName', visible: true, label: '运营区', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'name', visible: true, label: '姓名', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'contact', visible: true, label: '联系方式', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
diff --git a/src/views/bst/index/MchIndex.vue b/src/views/bst/index/MchIndex.vue
index bf6f8be..f1f1c17 100644
--- a/src/views/bst/index/MchIndex.vue
+++ b/src/views/bst/index/MchIndex.vue
@@ -18,14 +18,14 @@
-
+
-
+
-
+
@@ -39,7 +39,7 @@
我的
-
+
@@ -64,6 +64,7 @@ import { listSimpleArea } from '@/api/bst/area'
import BalancePanel from '@/views/bst/index/components/BalancePanel'
import OrderStat from '@/views/bst/index/components/OrderStat'
import { mapGetters } from 'vuex'
+import {startGuide} from '@/utils/guide'
export default {
name: 'Index',
@@ -99,6 +100,9 @@ export default {
created() {
this.getUserInfo();
this.getAreaList();
+ this.$nextTick(()=> {
+ startGuide("MchIndex");
+ });
},
methods: {
getAreaList() {
diff --git a/src/views/bst/order/index.vue b/src/views/bst/order/index.vue
index 5bea195..1e3d05e 100644
--- a/src/views/bst/order/index.vue
+++ b/src/views/bst/order/index.vue
@@ -148,7 +148,7 @@