"src/page/main/system-admin/log/userAccount/index.vue" did not exist on "e7452102467dcb48358a04c6bd012e7293b18d4d"
Commit 865102e6 authored by 赵伟庚's avatar 赵伟庚

update: 对接部分能力推荐接口

parent 609aa0c2
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<!-- 测试结果弹窗 --> <!-- 测试结果弹窗 -->
<el-dialog <el-dialog
custom-class="dialog_box result_box" class="dialog_box result_box"
title="提示" title="提示"
v-model="showDialog" v-model="showDialog"
width="400px" width="400px"
......
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<!-- 测试结果弹窗 --> <!-- 测试结果弹窗 -->
<el-dialog <el-dialog
custom-class="dialog_box result_box" class="dialog_box result_box"
title="提示" title="提示"
v-model="showDialog" v-model="showDialog"
width="400px" width="400px"
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<!-- 测试结果弹窗 --> <!-- 测试结果弹窗 -->
<el-dialog <el-dialog
custom-class="dialog_box result_box" class="dialog_box result_box"
title="提示" title="提示"
v-model="showDialog" v-model="showDialog"
width="400px" width="400px"
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<!-- 测试结果弹窗 --> <!-- 测试结果弹窗 -->
<el-dialog <el-dialog
custom-class="dialog_box result_box" class="dialog_box result_box"
title="提示" title="提示"
v-model="showDialog" v-model="showDialog"
width="400px" width="400px"
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<!-- 测试结果弹窗 --> <!-- 测试结果弹窗 -->
<el-dialog <el-dialog
custom-class="dialog_box result_box" class="dialog_box result_box"
title="提示" title="提示"
v-model="showDialog" v-model="showDialog"
width="400px" width="400px"
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<!-- 测试结果弹窗 --> <!-- 测试结果弹窗 -->
<el-dialog <el-dialog
custom-class="dialog_box result_box" class="dialog_box result_box"
title="提示" title="提示"
v-model="showDialog" v-model="showDialog"
width="400px" width="400px"
......
<template> <template>
<div class="msg-container-bdx12" @click.stop> <div class="msg-container-bdx12" @click.stop>
<el-dialog title="详情" v-model="dialogVisible" width="640px" custom-class="dialog_box1"> <el-dialog title="详情" v-model="dialogVisible" width="640px" class="dialog_box1">
<div> <div>
<detail-table2 :list="detailData"> <detail-table2 :list="detailData">
<template v-slot:action="{data}"> <template v-slot:action="{data}">
......
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
</div> </div>
<!-- 新建/编辑弹窗 --> <!-- 新建/编辑弹窗 -->
<el-dialog <el-dialog
custom-class="dialog_box" class="dialog_box"
:title=" addType == 1 ? '新建' : '编辑'" :title=" addType == 1 ? '新建' : '编辑'"
v-model="addDialog" v-model="addDialog"
width="758px" width="758px"
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
</el-dialog> </el-dialog>
<!-- 删除弹窗 --> <!-- 删除弹窗 -->
<el-dialog <el-dialog
custom-class="dialog_box" class="dialog_box"
title="提示" title="提示"
v-model="dialogDelete" v-model="dialogDelete"
width="400px" width="400px"
......
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
</div> </div>
<!-- 删除弹窗 --> <!-- 删除弹窗 -->
<el-dialog <el-dialog
custom-class="dialog_box" class="dialog_box"
title="提示" title="提示"
v-model="delDialog" v-model="delDialog"
width="400px" width="400px"
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</div> </div>
<!-- 删除弹窗 --> <!-- 删除弹窗 -->
<el-dialog <el-dialog
custom-class="dialog_box" class="dialog_box"
title="提示" title="提示"
v-model="dialogDelete" v-model="dialogDelete"
width="400px" width="400px"
...@@ -202,7 +202,6 @@ const moveRow = (row,type) => { ...@@ -202,7 +202,6 @@ const moveRow = (row,type) => {
sort: row.sort sort: row.sort
} }
] ]
console.log(params)
axios axios
.post(`/apaas/system/v5/banner/sort`,[...params]) .post(`/apaas/system/v5/banner/sort`,[...params])
.then((res) => { .then((res) => {
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
class="form" class="form"
> >
<el-form-item label="能力类型" prop="business_type_id"> <el-form-item label="能力类型" prop="business_type_id">
<el-select v-model="formData.business_type_id" placeholder="请选择能力类型" style="width: 100%" @change="changeType"> <el-select v-model="formData.business_type_id" placeholder="请选择能力类型" style="width: 100%" @change="changeType" :disabled="route.query.id">
<el-option <el-option
v-for="item in TypeList" v-for="item in props.businessList"
:key="item.dict_id" :key="item.dict_id"
:label="item.name" :label="item.name"
:value="item.dict_id" :value="item.id"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -30,6 +30,12 @@ import { useRoute, useRouter } from 'vue-router' ...@@ -30,6 +30,12 @@ import { useRoute, useRouter } from 'vue-router'
const router = useRouter() const router = useRouter()
const route = useRoute() const route = useRoute()
const form = ref(null) const form = ref(null)
const props = defineProps({
businessList: {
type: Array,
default: []
}
})
const state = reactive({ const state = reactive({
formData: { formData: {
business_type_id: "", business_type_id: "",
...@@ -43,7 +49,6 @@ const state = reactive({ ...@@ -43,7 +49,6 @@ const state = reactive({
{ required: true, message: '请上传图标', trigger: 'change' }, { required: true, message: '请上传图标', trigger: 'change' },
], ],
}, },
TypeList: [],
}) })
const emit = defineEmits(['action','changeType']) const emit = defineEmits(['action','changeType'])
...@@ -73,31 +78,13 @@ const setForm = (data) => { ...@@ -73,31 +78,13 @@ const setForm = (data) => {
Object.assign(state.formData, data); Object.assign(state.formData, data);
} }
const getTypeList = () => {
axios
.get("/apaas/system/v5/dictionary/alllist")
.then((res) => {
if (res.data.code == 200) {
let data = res.data.data || []
data.forEach(e => {
if (e.classify_id == "eb9c7d70-c123-42b7-8e61-dde1b022b669") {
state.TypeList = e.list || [];
}
})
}else {
ElMessage.error(res.data.data)
}
})
}
onBeforeMount(() => { onBeforeMount(() => {
getTypeList()
}) })
const { const {
formData, formData,
formRules, formRules,
TypeList,
} = toRefs(state) } = toRefs(state)
defineExpose({ submitForm, clearForm, setForm }) defineExpose({ submitForm, clearForm, setForm })
......
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
:isIndex="true" :isIndex="true"
:stripe="true" :stripe="true"
> >
<template v-slot:state="{ row }"> <template v-slot:recommend_state="{ row }">
<bg-switch @click="changeUseRow(row)" :labels="['否','是']" :values="[0,1]" v-model="row.state"></bg-switch> <bg-switch @click="changeUseRow(row)" :labels="['否','是']" :values="[0,1]" v-model="row.recommend_state"></bg-switch>
</template> </template>
<template v-slot:action="{ row }"> <template v-slot:action="{ row }">
<bg-table-btns :operations="getOperations(row)" /> <bg-table-btns :operations="getOperations(row)" />
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</div> </div>
<!-- 删除弹窗 --> <!-- 删除弹窗 -->
<el-dialog <el-dialog
custom-class="dialog_box" class="dialog_box"
title="提示" title="提示"
v-model="dialogDelete" v-model="dialogDelete"
width="400px" width="400px"
...@@ -69,7 +69,7 @@ const state = reactive({ ...@@ -69,7 +69,7 @@ const state = reactive({
headers: [ headers: [
{ {
label: "能力类型", label: "能力类型",
prop: "ability_type", prop: "business_type_name",
}, },
{ {
label: "创建人", label: "创建人",
...@@ -77,11 +77,11 @@ const state = reactive({ ...@@ -77,11 +77,11 @@ const state = reactive({
}, },
{ {
label: "更新时间", label: "更新时间",
prop: "update_time", prop: "created_time",
}, },
{ {
label: "是否启用", label: "是否启用",
prop: "state", prop: "recommend_state",
}, },
{ {
label: "操作", label: "操作",
...@@ -96,48 +96,11 @@ const state = reactive({ ...@@ -96,48 +96,11 @@ const state = reactive({
}) })
const getRoleRows = () => { const getRoleRows = () => {
state.tableRows = [ axios
{ .get(`/apaas/system/v5/recommend/ability/classify/list`)
id: 1, .then((res) => {
ability_type: "数据服务", if (res.data.code == 200) {
created_user: "admin", state.tableRows = res.data.data || []
update_time: "2022-11-29 14:30:34",
state: 1,
sort: 1,
},
{
id: 2,
ability_type: "视频服务",
created_user: "admin",
update_time: "2022-11-29 14:30:34",
state: 0,
sort: 2,
},
{
id: 3,
ability_type: "综合服务",
created_user: "admin",
update_time: "2022-11-29 14:30:34",
state: 1,
sort: 3,
},
{
id: 4,
ability_type: "融合服务",
created_user: "admin",
update_time: "2022-11-29 14:30:34",
state: 0,
sort: 4,
},
{
id: 5,
ability_type: "时空服务",
created_user: "admin",
update_time: "2022-11-29 14:30:34",
state: 1,
sort: 5,
},
]
if (state.tableRows.length > 0) { if (state.tableRows.length > 0) {
state.tableRows.forEach(e => { state.tableRows.forEach(e => {
e.canMoveUp = true e.canMoveUp = true
...@@ -146,23 +109,10 @@ const getRoleRows = () => { ...@@ -146,23 +109,10 @@ const getRoleRows = () => {
state.tableRows[0].canMoveUp = false state.tableRows[0].canMoveUp = false
state.tableRows[state.tableRows.length - 1].canMoveDown = false state.tableRows[state.tableRows.length - 1].canMoveDown = false
} }
// axios }else {
// .get(`/apaas/service/v5/ability/query/list`,) ElMessage.error(res.data.data)
// .then((res) => { }
// if (res.data.code == 200) { })
// state.tableRows = res.data.data || []
// if (state.tableRows.length > 0) {
// state.tableRows.forEach(e => {
// e.canMoveUp = true
// e.canMoveDown = true
// })
// state.tableRows[0].canMoveUp = false
// state.tableRows[state.tableRows.length - 1].canMoveDown = false
// }
// }else {
// ElMessage.error(res.data.data)
// }
// })
} // 获取列表 } // 获取列表
const getOperations = (row) => { const getOperations = (row) => {
...@@ -170,12 +120,12 @@ const getOperations = (row) => { ...@@ -170,12 +120,12 @@ const getOperations = (row) => {
{ {
name: "编辑", name: "编辑",
callback: () => edit_row(row), callback: () => edit_row(row),
disabled: row.state == 1, disabled: row.recommend_state == 1,
}, },
{ {
name: "删除", name: "删除",
callback: () => delete_row(row), callback: () => delete_row(row),
disabled: row.state == 1, disabled: row.recommend_state == 1,
}, },
{ {
name: "上移", name: "上移",
...@@ -197,17 +147,34 @@ const addBanner = () => { ...@@ -197,17 +147,34 @@ const addBanner = () => {
const edit_row = (row) => { const edit_row = (row) => {
console.log("去编辑") console.log("去编辑")
router.push({
path: "/home-config/recommend/edit",
query: {
id: row.id
}
})
} }
const delete_row = (row) => { const delete_row = (row) => {
state.actionRow = row state.actionRow = row
state.dialogDelete = true state.dialogDelete = true
console.log("删除")
} }
const deleteData = () => { const deleteData = () => {
console.log("确定删除",state.actionRow) let params = {
id: state.actionRow.id
}
axios
.delete(`/apaas/system/v5/recommend/ability/delete`,{data: params})
.then(res => {
if (res.data.code == 200) {
ElMessage.success(res.data.msg)
state.dialogDelete = false state.dialogDelete = false
getRoleRows()
}else {
ElMessage.error(res.data.data)
}
})
} }
const moveRow = (row,type) => { const moveRow = (row,type) => {
...@@ -233,24 +200,33 @@ const moveRow = (row,type) => { ...@@ -233,24 +200,33 @@ const moveRow = (row,type) => {
sort: row.sort sort: row.sort
} }
] ]
console.log(params) axios
// axios .post(`/apaas/system/v5/recommend/ability/sort`,[...params])
// .put(``,[...params]) .then((res) => {
// .then((res) => { if (res.data.code == 200) {
// if (res.data.code == 200) { ElMessage.success(res.data.msg)
// ElMessage.success(res.data.msg) getRoleRows()
// getRoleRows() }else {
// }else { ElMessage.error(res.data.data)
// ElMessage.error(res.data.data) }
// } })
// }) .catch((err) => {
// .catch((err) => { console.log(err)
// console.log(err) })
// })
} }
const changeUseRow = (row) => { const changeUseRow = (row) => {
console.log(row) axios
.get(`/apaas/system/v5/recommend/ability/state/${row.id}/${row.recommend_state}`)
.then(res => {
if (res.data.code == 200) {
ElMessage.success(res.data.msg)
getRoleRows()
}else {
ElMessage.error(res.data.data)
row.recommend_state = row.recommend_state == 0 ? 1 : 0
}
})
} }
onBeforeMount(() => { onBeforeMount(() => {
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</div> </div>
<!-- 删除弹窗 --> <!-- 删除弹窗 -->
<el-dialog <el-dialog
custom-class="dialog_box" class="dialog_box"
title="提示" title="提示"
v-model="delDialog" v-model="delDialog"
width="400px" width="400px"
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
</el-dialog> </el-dialog>
<!-- 分配用户 --> <!-- 分配用户 -->
<el-dialog <el-dialog
custom-class="distribute_dialog" class="distribute_dialog"
title="分配用户" title="分配用户"
v-model="distributeDialog" v-model="distributeDialog"
width="1062px" width="1062px"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment