From e426ee93a2553550766e25958dcb70a6f7339b9c Mon Sep 17 00:00:00 2001
From: zhangxiao <898441624@qq.com>
Date: 星期二, 27 八月 2024 17:13:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web
---
src/views/authority/role/index.vue | 11 +++
src/views/dmx/knowledgeLib/components/excel.vue | 57 +++++++++---------
src/views/dmx/knowledgeLib/components/docx.vue | 56 +++++++++---------
src/views/dmx/knowledgeLib/components/txtPdf.vue | 52 ++++++++--------
src/views/agent/resource/index.vue | 2
5 files changed, 94 insertions(+), 84 deletions(-)
diff --git a/src/views/agent/resource/index.vue b/src/views/agent/resource/index.vue
index 7e9e62b..e29d89e 100644
--- a/src/views/agent/resource/index.vue
+++ b/src/views/agent/resource/index.vue
@@ -17,7 +17,7 @@
onBeforeMount(() => {
url.value = `${
defaultSettings.RAGFlowUrl ? defaultSettings.RAGFlowUrl : window.location.origin
- }/rag/flow?${localStorage.Authorization}`;
+ }/flow?${localStorage.Authorization}`;
});
</script>
diff --git a/src/views/authority/role/index.vue b/src/views/authority/role/index.vue
index a3b1cc1..ea318ca 100644
--- a/src/views/authority/role/index.vue
+++ b/src/views/authority/role/index.vue
@@ -87,6 +87,9 @@
</template>
<template #operations="{ record }">
<a-space>
+ <a-button type="outline" @click="operation(2, record)"
+ >缂栬緫</a-button
+ >
<a-button
type="dashed"
status="warning"
@@ -581,6 +584,14 @@
editform.value.remark = "";
}
+ if (t == 2) {
+ visible.value = true;
+ formRef.value?.resetFields();
+ save.value = '缂栬緫';
+ editform.value.roleId=record.roleId
+ editform.value.roleName = record.roleName;
+ }
+
//鍒犻櫎
if (t == 3) {
await RoleDelete(record.roleId).then((res) => {
diff --git a/src/views/dmx/knowledgeLib/components/docx.vue b/src/views/dmx/knowledgeLib/components/docx.vue
index 175880c..396e03e 100644
--- a/src/views/dmx/knowledgeLib/components/docx.vue
+++ b/src/views/dmx/knowledgeLib/components/docx.vue
@@ -1,42 +1,42 @@
<template>
- <!-- <vue-office-docx
+ <vue-office-docx
:src="previewSrc"
:style="comStyle"
@rendered="renderedHandler"
@error="errorHandler"
- /> -->
+ />
</template>
<script setup>
-// 鑾峰彇鐖剁粍浠朵紶閫掔殑璧勬簮url
-// const props = defineProps({
-// previewSrc: {
-// type: String,
-// required: false,
-// default: () => '',
-// },
-// });
-// //寮曞叆VueOfficeDocx缁勪欢鐩稿叧
-// import VueOfficeDocx from '@vue-office/docx';
-// import '@vue-office/docx/lib/index.css';
+ // 鑾峰彇鐖剁粍浠朵紶閫掔殑璧勬簮url
+ const props = defineProps({
+ previewSrc: {
+ type: String,
+ required: false,
+ default: () => '',
+ },
+ });
+ //寮曞叆VueOfficeDocx缁勪欢鐩稿叧
+ import VueOfficeDocx from '@vue-office/docx';
+ import '@vue-office/docx/lib/index.css';
-// const comStyle = {
-// width: '100%',
-// height: '100%',
-// };
+ const comStyle = {
+ width: '100%',
+ height: '100%',
+ };
-// const renderedHandler = () => {
-// console.log('rendered');
-// };
-// const errorHandler = (err) => {
-// console.log('error', err);
-// };
+ const renderedHandler = () => {
+ console.log('rendered');
+ };
+ const errorHandler = (err) => {
+ console.log('error', err);
+ };
</script>
<style scoped lang="less">
-.aUpload {
- position: absolute;
- top: 0;
- left: 0;
-}
+ .aUpload {
+ position: absolute;
+ top: 0;
+ left: 0;
+ }
</style>
diff --git a/src/views/dmx/knowledgeLib/components/excel.vue b/src/views/dmx/knowledgeLib/components/excel.vue
index d75bf8f..8735164 100644
--- a/src/views/dmx/knowledgeLib/components/excel.vue
+++ b/src/views/dmx/knowledgeLib/components/excel.vue
@@ -1,43 +1,42 @@
<template>
- <!-- <vue-office-excel
+ <vue-office-excel
:src="previewSrc"
:style="comStyle"
@rendered="renderedHandler"
@error="errorHandler"
- /> -->
+ />
</template>
<script setup>
-// 鑾峰彇鐖剁粍浠朵紶閫掔殑璧勬簮url
-// 寮曞叆VueOfficeExcel缁勪欢鐩稿叧
-// import VueOfficeExcel from "@vue-office/excel";
-// import "@vue-office/excel/lib/index.css";
+ // 鑾峰彇鐖剁粍浠朵紶閫掔殑璧勬簮url
+ const props = defineProps({
+ previewSrc: {
+ type: String,
+ required: false,
+ default: () => '',
+ },
+ });
+ //寮曞叆VueOfficeExcel缁勪欢鐩稿叧
+ import VueOfficeExcel from '@vue-office/excel';
+ import '@vue-office/excel/lib/index.css';
-// const props = defineProps({
-// previewSrc: {
-// type: String,
-// required: false,
-// default: () => "",
-// },
-// });
+ const comStyle = {
+ width: '100%',
+ height: '100%',
+ };
-// const comStyle = {
-// width: "100%",
-// height: "100%",
-// };
-
-// const renderedHandler = () => {
-// console.log("rendered");
-// };
-// const errorHandler = (err) => {
-// console.log("error", err);
-// };
+ const renderedHandler = () => {
+ console.log('rendered');
+ };
+ const errorHandler = (err) => {
+ console.log('error', err);
+ };
</script>
<style scoped lang="less">
-.aUpload {
- position: absolute;
- top: 0;
- left: 0;
-}
+ .aUpload {
+ position: absolute;
+ top: 0;
+ left: 0;
+ }
</style>
diff --git a/src/views/dmx/knowledgeLib/components/txtPdf.vue b/src/views/dmx/knowledgeLib/components/txtPdf.vue
index b71a025..a76003a 100644
--- a/src/views/dmx/knowledgeLib/components/txtPdf.vue
+++ b/src/views/dmx/knowledgeLib/components/txtPdf.vue
@@ -3,35 +3,35 @@
</template>
<script setup>
-// 鑾峰彇鐖剁粍浠朵紶閫掔殑璧勬簮url
-// const props = defineProps({
-// previewSrc: {
-// type: String,
-// required: false,
-// default: () => '',
-// },
-// });
-// //寮曞叆VueOfficeExcel缁勪欢鐩稿叧
-// import VueOfficeExcel from '@vue-office/excel';
-// import '@vue-office/excel/lib/index.css';
+ // 鑾峰彇鐖剁粍浠朵紶閫掔殑璧勬簮url
+ const props = defineProps({
+ previewSrc: {
+ type: String,
+ required: false,
+ default: () => '',
+ },
+ });
+ //寮曞叆VueOfficeExcel缁勪欢鐩稿叧
+ import VueOfficeExcel from '@vue-office/excel';
+ import '@vue-office/excel/lib/index.css';
-// const comStyle = {
-// width: '100%',
-// height: '100%',
-// };
+ const comStyle = {
+ width: '100%',
+ height: '100%',
+ };
-// const renderedHandler = () => {
-// console.log('rendered');
-// };
-// const errorHandler = (err) => {
-// console.log('error', err);
-// };
+ const renderedHandler = () => {
+ console.log('rendered');
+ };
+ const errorHandler = (err) => {
+ console.log('error', err);
+ };
</script>
<style scoped lang="less">
-.aUpload {
- position: absolute;
- top: 0;
- left: 0;
-}
+ .aUpload {
+ position: absolute;
+ top: 0;
+ left: 0;
+ }
</style>
--
Gitblit v1.8.0