Merge pull request 'master' (#204) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/204
This commit is contained in:
@@ -51,7 +51,7 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
</el-scrollbar>
|
</el-scrollbar>
|
||||||
<fvFormDialog ref="formDialogRef" width="400" :title="dialogTitle"
|
<fvFormDialog ref="formDialogRef" width="550" :title="dialogTitle"
|
||||||
:form-schema="formSchema" :form-rules="formRules"
|
:form-schema="formSchema" :form-rules="formRules"
|
||||||
@dialogSubmit="handleSubmitAddressBook"></fvFormDialog>
|
@dialogSubmit="handleSubmitAddressBook"></fvFormDialog>
|
||||||
</div>
|
</div>
|
||||||
@@ -78,16 +78,16 @@ const props = defineProps({
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
const formDialogRef = ref()
|
const formDialogRef = ref()
|
||||||
const dialogTitle = ref("添加问题答案");
|
const dialogTitle = ref("训练知识库");
|
||||||
const formRules = reactive({
|
const formRules = reactive({
|
||||||
answer: [
|
answer: [
|
||||||
{required: true, message: "答案不能为空", trigger: "blur"},
|
{required: true, message: "知识校准不能为空", trigger: "blur"},
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
const formSchema = computed(() => {
|
const formSchema = computed(() => {
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
label: '问题',
|
label: '知识内容',
|
||||||
prop: 'query',
|
prop: 'query',
|
||||||
component: 'el-input',
|
component: 'el-input',
|
||||||
colProps: {
|
colProps: {
|
||||||
@@ -95,16 +95,18 @@ const formSchema = computed(() => {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '答案',
|
label: '知识校准',
|
||||||
prop: 'answer',
|
prop: 'answer',
|
||||||
component: 'el-input',
|
component: 'el-input',
|
||||||
colProps: {
|
colProps: {
|
||||||
span: 24
|
span: 24
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
placeholder: '请输入答案',
|
placeholder: '请输入知识校准',
|
||||||
clearable: true,
|
clearable: true,
|
||||||
}
|
type: 'textarea',
|
||||||
|
rows: 4,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,13 +1,15 @@
|
|||||||
import { defineStore } from "pinia";
|
import {defineStore} from "pinia";
|
||||||
import { ref } from "vue";
|
import {ref} from "vue";
|
||||||
import { getRouters } from "@/api/system/menu";
|
import {getRouters} from "@/api/system/menu";
|
||||||
import Layout from '@/layout/index.vue'
|
import Layout from '@/layout/index.vue'
|
||||||
import ParentView from '@/components/ParentView.vue'
|
import ParentView from '@/components/ParentView.vue'
|
||||||
import router from "../router";
|
import router from "../router";
|
||||||
const VueComUrl = import.meta.glob('../views/**/*.vue')
|
import {getUserInfo} from "@/api/login";
|
||||||
|
|
||||||
|
const VueComUrl = import.meta.glob('../views/**/*.vue')
|
||||||
export const usePermisstionStroe = defineStore('permisstion', () => {
|
export const usePermisstionStroe = defineStore('permisstion', () => {
|
||||||
const asyncRouters = ref([])
|
const asyncRouters = ref([])
|
||||||
|
const userinfo = ref()
|
||||||
//定义是否加载路由变量
|
//定义是否加载路由变量
|
||||||
const isLoadRoutes = ref(false)
|
const isLoadRoutes = ref(false)
|
||||||
const menuList = ref([{
|
const menuList = ref([{
|
||||||
@@ -23,13 +25,24 @@ export const usePermisstionStroe = defineStore('permisstion', () => {
|
|||||||
const setIsLoadRoutes = (status) => {
|
const setIsLoadRoutes = (status) => {
|
||||||
return isLoadRoutes.value = status
|
return isLoadRoutes.value = status
|
||||||
}
|
}
|
||||||
|
const getUser=async ()=>{
|
||||||
|
let {data}= await getUserInfo()
|
||||||
|
return data.user.roles[0].roleKey == 'voice';
|
||||||
|
}
|
||||||
const setAsyncRouters = async () => {
|
const setAsyncRouters = async () => {
|
||||||
await getRouters().then(res => {
|
await getRouters().then(async res => {
|
||||||
if (res.code === 1000) {
|
if (res.code === 1000) {
|
||||||
const sRouter = JSON.parse(JSON.stringify(res.data))
|
const sRouter = JSON.parse(JSON.stringify(res.data))
|
||||||
const mData = JSON.parse(JSON.stringify(res.data))
|
const mData = JSON.parse(JSON.stringify(res.data))
|
||||||
asyncRouters.value = formatAsyncRouters(sRouter)
|
asyncRouters.value = formatAsyncRouters(sRouter)
|
||||||
// menuList.value = generateMenu(mData)
|
let role = await getUser()
|
||||||
|
if(role){
|
||||||
|
generateMenu(mData).map(item => {
|
||||||
|
if (item.path == '/voice/management') {
|
||||||
|
item.children = item.children.filter(item => item.name !== "Speech")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
menuList.value = [...menuList.value, ...generateMenu(mData)]
|
menuList.value = [...menuList.value, ...generateMenu(mData)]
|
||||||
addAsyncRouters(asyncRouters.value)
|
addAsyncRouters(asyncRouters.value)
|
||||||
isLoadRoutes.value = false
|
isLoadRoutes.value = false
|
||||||
@@ -47,8 +60,7 @@ export const usePermisstionStroe = defineStore('permisstion', () => {
|
|||||||
route.component = Layout
|
route.component = Layout
|
||||||
} else if (route.component === 'ParentView') {
|
} else if (route.component === 'ParentView') {
|
||||||
route.component = ParentView
|
route.component = ParentView
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
route.component = loadView(route.component)
|
route.component = loadView(route.component)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -86,8 +98,8 @@ export const usePermisstionStroe = defineStore('permisstion', () => {
|
|||||||
for (const key in query) {
|
for (const key in query) {
|
||||||
queryArr.push({label: key, value: query[key]})
|
queryArr.push({label: key, value: query[key]})
|
||||||
}
|
}
|
||||||
queryArr.forEach((item, index)=>{
|
queryArr.forEach((item, index) => {
|
||||||
if(!index) {
|
if (!index) {
|
||||||
newPath += `?${item.label}=${item.value}`
|
newPath += `?${item.label}=${item.value}`
|
||||||
} else {
|
} else {
|
||||||
newPath += `&${item.label}=${item.value}`
|
newPath += `&${item.label}=${item.value}`
|
||||||
|
|||||||
Reference in New Issue
Block a user