revert(修复应用管理 && 背景图丢失): feat(grafana): url

dgiot · Jun 9, 2022 · 91a1c4a · 91a1c4a
1 parent 2e94f01
commit 91a1c4a
Show file tree

Hide file tree

Showing 9 changed files with 129 additions and 15 deletions.
diff --git a/src/api/License/index.js b/src/api/License/index.js
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
@@ -138,6 +138,7 @@ import { queryMenu } from '@/api/Menu/index'
 import { clearCookie, getToken, removeToken, setToken } from '@/utils/vue'
 import { resetRouter } from '@/router'
 
+import { license } from '@/api/License'
 import { isJson } from '@/utils/data/validate'
 import { tickTime } from '@/utils/time/index'
 const defaultTheme = {

diff --git a/src/views/DeviceCloud/manage/application/application.vue b/src/views/DeviceCloud/manage/application/application.vue
@@ -549,21 +549,20 @@
           keys: 'tag,name,desc,count(*)',
           order: 'updatedAt', // -updatedAt  updatedAt
         }
-        queryRole(params)
-          .then((res) => {
-            this.appdata = res.results
-            this.appdata.map((item) => {
-              // dgiotlog.log(item)
-              if (item.tag.appconfig.secret) {
-                item.isshow = false
-              }
-            })
-            this.total = res.count
-            // dgiotlog.log(this.appdata, "appdata");
-          })
-          .catch((e) => {
-            dgiotlog.log(e)
-          })
+        const { results } = await queryRole(params)
+        this.appdata = results
+        this.appdata.map((item) => {
+          // dgiotlog.log(item)
+          _.merge(item.tag, { appconfig: { secret: '' } })
+          if (item?.tag?.appconfig?.secret) {
+            item.isshow = false
+          } else {
+            item.tag.appconfig.secret = '暂未配置'
+            item.isshow = true
+          }
+        })
+        this.total = results.length
+        console.log(this.appdata, 'appdata')
       },
       handleClickRefresh() {
         this.randomSecret()

diff --git a/src/views/DeviceCloud/manage/application/applicationManagement.vue b/src/views/DeviceCloud/manage/application/applicationManagement.vue
@@ -130,6 +130,7 @@
   import { queryDevice } from '@/api/Device/index'
   import { delProduct, getProduct } from '@/api/Product'
   import { utc2beijing } from '@/utils'
+  import { getProject, handleZero, setUpLictool } from '@/api/License/index'
 
   export default {
     data() {

diff --git a/src/views/MultiTenant/user/admin/index.vue b/src/views/MultiTenant/user/admin/index.vue
@@ -123,6 +123,7 @@
   import backgroundImage from '../../../../../public/assets/images/platform/assets/login_images/background.jpg'
   import { mapActions, mapGetters, mapMutations } from 'vuex'
   import { isPassword } from '@/utils/data/validate'
+  import { SiteDefault } from '@/api/License'
   export default {
     name: 'Admin',
     directives: {

diff --git a/src/views/MultiTenant/user/dev/index.vue b/src/views/MultiTenant/user/dev/index.vue
@@ -123,6 +123,7 @@
   import backgroundImage from '../../../../../public/assets/images/platform/assets/login_images/background.jpg'
   import { mapActions, mapGetters, mapMutations } from 'vuex'
   import { isPassword } from '@/utils/data/validate'
+  import { SiteDefault } from '@/api/License'
   export default {
     name: 'Dev',
     directives: {

diff --git a/src/views/MultiTenant/user/jwtlogin/index.vue b/src/views/MultiTenant/user/jwtlogin/index.vue
@@ -123,6 +123,7 @@
   import backgroundImage from '../../../../../public/assets/images/platform/assets/login_images/background.jpg'
   import { mapActions, mapGetters, mapMutations } from 'vuex'
   import { isPassword } from '@/utils/data/validate'
+  import { SiteDefault } from '@/api/License'
   export default {
     name: 'JwtLogin',
     directives: {

diff --git a/src/views/MultiTenant/user/login/index.vue b/src/views/MultiTenant/user/login/index.vue
@@ -123,6 +123,7 @@
   import backgroundImage from '../../../../../public/assets/images/platform/assets/login_images/background.jpg'
   import { mapActions, mapGetters, mapMutations } from 'vuex'
   import { isPassword } from '@/utils/data/validate'
+  import { SiteDefault } from '@/api/License'
   import { Roletree } from '@/api/Menu'
 
   export default {

diff --git a/src/views/MultiTenant/user/quick/index.vue b/src/views/MultiTenant/user/quick/index.vue
@@ -123,6 +123,7 @@
   import backgroundImage from '../../../../../public/assets/images/platform/assets/login_images/background.jpg'
   import { mapActions, mapGetters, mapMutations } from 'vuex'
   import { isPassword } from '@/utils/data/validate'
+  import { SiteDefault } from '@/api/License'
   export default {
     name: 'Quick',
     directives: {