From 628e654a3ef83bd42f9ec8da515b321d80353a75 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Mon, 9 Jan 2023 11:25:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E9=87=91=E6=8A=A5=E8=A1=A8=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
back/src/views/main.vue | 1 +
.../ability/IntegratedServices-add.vue | 31 +++++++----
back/src/views/modules/assetReport/index.vue | 53 +++++++++----------
3 files changed, 49 insertions(+), 36 deletions(-)
diff --git a/back/src/views/main.vue b/back/src/views/main.vue
index 4a4c390d..da93162e 100644
--- a/back/src/views/main.vue
+++ b/back/src/views/main.vue
@@ -114,6 +114,7 @@ export default {
}
this.$store.state.user.id = res.data.id
this.$store.state.user.name = res.data.realName
+ this.$store.state.user.deptId = res.data.deptId
this.$store.state.user.superAdmin = res.data.superAdmin
this.$store.state.user.roleIdList = []
if (res.data.roleIdList) {
diff --git a/back/src/views/modules/ability/IntegratedServices-add.vue b/back/src/views/modules/ability/IntegratedServices-add.vue
index 15d9c049..b10199df 100644
--- a/back/src/views/modules/ability/IntegratedServices-add.vue
+++ b/back/src/views/modules/ability/IntegratedServices-add.vue
@@ -65,10 +65,23 @@
组合能力
-
@@ -103,7 +116,7 @@ import { getFuseResourceList, getListParams } from './assignedScene/add-update-s
import qs from 'qs'
// import SceneUseStep from './components/scene-use-step.vue'
// import SceneOneInput from './components/scene-one-input.vue'
-// import AbilityAdd from './components/ability-add.vue'
+import AbilityAdd from '@/views/modules/ability/assignedScene/components/ability-add.vue'
// import CombineAbility from '../components/combine-ability.vue'
// import CommonQuestion from '../components/common-question.vue'
// import InfrastructureModal from './components/infrastructure-modal.vue'
@@ -127,15 +140,15 @@ export const modalTypeText = {
export default {
components: {
- CombineAbility,
- InfrastructureModal
+ // CombineAbility,
+ // InfrastructureModal,
+ AbilityAdd
// SceneUseStep,
// CombineAbility,
// SceneOneInput,
// upload,
// CommonQuestion,
// InfrastructureModal,
- // AbilityAdd
},
watch: {
diff --git a/back/src/views/modules/assetReport/index.vue b/back/src/views/modules/assetReport/index.vue
index 5b8c84ad..691f765c 100644
--- a/back/src/views/modules/assetReport/index.vue
+++ b/back/src/views/modules/assetReport/index.vue
@@ -1,7 +1,7 @@
@@ -74,7 +74,6 @@
-
提供部门：
{
- this.dataForm.provideDept = res.data.data.deptId
- this.init()
- if (res.data.data.superAdmin == 1) {
- this.disabled = false
- this.dataForm.provideDept = ''
- this.init()
- return
- }
- if (res.data.data.roleIdList) {
- res.data.data.roleIdList.map(val => {
- this.$http.get('/sys/role/' + val).then(res1 => {
- if (res1.data.data.name === '运维管理员') {
- this.disabled = false
- this.dataForm.provideDept = ''
- this.init()
- }
- })
- })
- }
- })
+ this.init()
+ // this.$http.get('/sys/user/info').then(res => {
+ // this.dataForm.provideDept = res.data.data.deptId
+ // if (res.data.data.superAdmin == 1) {
+ // this.disabled = false
+ // this.dataForm.provideDept = ''
+ // this.init()
+ // return
+ // }
+ // if (res.data.data.roleIdList) {
+ // res.data.data.roleIdList.map(val => {
+ // this.$http.get('/sys/role/' + val).then(res1 => {
+ // if (res1.data.data.name === '运维管理员') {
+ // this.disabled = false
+ // this.dataForm.provideDept = ''
+ // this.init()
+ // }
+ // })
+ // })
+ // }
+ // })
}
}