Merge branch 'master' of https://gitee.com/js-yhsec/energy_storage

web/src/utils/btnList.js

@@ -7,16 +7,18 @@ const btnList = [
 ]
 
 function getBtns(arr) {
-  const curPermission =
+  // console.log(this.$route, JSON.parse(localStorage.getItem('permission')), 'this.$route')
-    JSON.parse(localStorage.getItem('permission')).find(
+  // const curPermission =
-      (item) => item.route == this.$route.fullPath
+  //   JSON.parse(localStorage.getItem('permission')).find(
-    ) || {}
+  //     (item) => item.route == '/' + this.$route.name
+  //   ) || {}
 
   // console.log(this.$route, curPermission, localStorage.getItem('permission'), 'curPermission')
   const btns = []
+  // console.log(curPermission, 'curPermission')
   btnList.forEach((item) => {
     if (arr.includes(item.label)) {
-      // item.disabled = !Boolean(curPermission[item.disFlag])
+      // item.disabled = !Boolean(+curPermission[item.disFlag])
       btns.push(item)
     }
   })

web/src/views/system/alarmLog.vue

@@ -133,7 +133,7 @@ export default {
     //  删除操作
     async handleDelete(id, callback) {
       const that = this
-      Modal.confirm({
+      this.$Modal.confirm({
         title: '你确认删除数据吗?',
         icon: createVNode(ExclamationCircleOutlined),
 

web/src/views/system/device.vue

@@ -224,7 +224,7 @@ export default {
 <style lang="scss" scoped>
 .device {
   height: 100%;
-  padding: 0 10px;
+  padding: 0 20px;
 
   .content-table {
     width: 100%;

web/src/views/system/permission.vue

@@ -58,6 +58,8 @@ export default {
   props: {},
   data() {
     return {
+      tableData:[],
+
       formModal: false,
       formState: {},
       formStatus: 'add', //表单状态辑状态 add:新增 edit:编辑
@@ -145,7 +147,7 @@ export default {
     //  删除操作
     async handleDelete(id, callback) {
       const that = this
-      Modal.confirm({
+      this.$Modal.confirm({
         title: '你确认删除数据吗?',
         icon: createVNode(ExclamationCircleOutlined),
 

web/src/views/system/policy.vue

@@ -232,7 +232,7 @@ export default {
 .policy {
   // width: 100%;
   height: 100%;
-  padding: 0 10px;
+  padding: 0 20px;
   .content-table {
     width: 100%;
     height: calc(100% - 90px);

web/src/views/system/role.vue

@@ -67,6 +67,8 @@ export default {
   props: {},
   data() {
     return {
+      tableData:[],
+
       formModal: false,
       formState: {},
       formStatus: 'add', //表单状态辑状态 add:新增 edit:编辑
@@ -279,7 +281,7 @@ export default {
     //  删除操作
     async handleDelete(id, callback) {
       const that = this
-      Modal.confirm({
+      this.$Modal.confirm({
         title: '你确认删除数据吗?',
         icon: createVNode(ExclamationCircleOutlined),
 

web/src/views/system/service.vue

@@ -58,6 +58,8 @@ export default {
   props: {},
   data() {
     return {
+      tableData:[],
+
       tableOption: {
         select: false
       },
@@ -184,7 +186,7 @@ export default {
     //  删除操作
     async handleDelete(id, callback) {
       const that = this
-      Modal.confirm({
+      this.$Modal.confirm({
         title: '你确认删除数据吗?',
         icon: createVNode(ExclamationCircleOutlined),
 

web/src/views/system/station.vue

@@ -62,6 +62,7 @@ export default {
   props: {},
   data() {
     return {
+      tableData:[],
       tableOption: {
         select: false
       },
@@ -196,7 +197,7 @@ export default {
     //  删除操作
     async handleDelete(id, callback) {
       const that = this
-      Modal.confirm({
+      this.$Modal.confirm({
         title: '你确认删除数据吗?',
         icon: createVNode(ExclamationCircleOutlined),
 

web/src/views/system/user.vue

@@ -54,6 +54,7 @@ export default {
   props: {},
   data() {
     return {
+      tableData:[],
       tableOption: {
         select: false
       },