From 8fb7c91ba98fd5f3af049f6a43dfa6c32f9353ba Mon Sep 17 00:00:00 2001
From: lijing1 <lijing1@honeycombtech.com>
Date: Fri, 14 Nov 2025 13:50:50 +0800
Subject: [PATCH] merge

---
 src/views/index/approvalPreview/index.vue | 52 +++++++++++++++++++++++
 yarn.lock                                 | 37 +++++++++++++---
 2 files changed, 83 insertions(+), 6 deletions(-)
 create mode 100644 src/views/index/approvalPreview/index.vue

diff --git a/src/views/index/approvalPreview/index.vue b/src/views/index/approvalPreview/index.vue
new file mode 100644
index 00000000..2df7bfff
--- /dev/null
+++ b/src/views/index/approvalPreview/index.vue
@@ -0,0 +1,52 @@
+<template>
+  <div class="gl-page-content">
+    {{ route.query.processId }}
+    <div class="content">
+      <Knowledge v-if="data.approveType === 2" :data="data" />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted, watch } from 'vue';
+import { useRoute } from 'vue-router';
+import { systemQueryApproveInstanceApi } from '@/api/system/systemApprove';
+import Knowledge from './components/knowledge.vue';
+
+const route = useRoute();
+const data = ref<any>({});
+
+watch(() => route.query, () => {
+  console.log('kkkkk', route.query.processId);
+}, { deep: true, immediate: true });
+
+onMounted(() => {
+  if (route.query.processId) {
+    getDetailDataFun();
+  }
+});
+
+const getDetailDataFun = () => {
+  if (!route.query.processId) {
+    return;
+  }
+  const params = {
+    flowId: route.query.processId,
+  };
+  systemQueryApproveInstanceApi(params).then((res: any) => {
+    if (res.code === 200) {
+      console.log(9999, route.query.processId, res.data);
+      data.value = res.data;
+    }
+  });
+};
+</script>
+
+<style lang="scss" scoped>
+.gl-page-content {
+  border: 0;
+  .content {
+    height: 3000px;
+  }
+}
+</style>
diff --git a/yarn.lock b/yarn.lock
index 0357963a..3f6b3e40 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1694,6 +1694,11 @@ dom-zindex@^1.0.6:
   resolved "https://registry.npmjs.org/dom-zindex/-/dom-zindex-1.0.6.tgz"
   integrity sha512-FKWIhiU96bi3xpP9ewRMgANsoVmMUBnMnmpCT6dPMZOunVYJQmJhSRruoI0XSPoHeIif3kyEuiHbFrOJwEJaEA==
 
+dompurify@3.1.7:
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.1.7.tgz#711a8c96479fb6ced93453732c160c3c72418a6a"
+  integrity sha512-VaTstWtsneJY8xzy7DekmYWEOZcmzIe3Qb3zPd4STve1OBTa+e+WmS1ITQec1fZYXI3HCsOZZiSMpG6oxoWMWQ==
+
 dompurify@^3.2.4:
   version "3.3.0"
   resolved "https://registry.npmmirror.com/dompurify/-/dompurify-3.3.0.tgz"
@@ -2397,16 +2402,11 @@ locate-path@^6.0.0:
   dependencies:
     p-locate "^5.0.0"
 
-lodash-es@^4.17.15:
+lodash-es@^4.17.15, lodash-es@^4.17.21:
   version "4.17.21"
   resolved "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz"
   integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
 
-lodash-es@^4.17.21:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
-  integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
-
 lodash-unified@^1.0.3:
   version "1.0.3"
   resolved "https://registry.npmjs.org/lodash-unified/-/lodash-unified-1.0.3.tgz"
@@ -2436,6 +2436,11 @@ magic-string@^0.30.17, magic-string@^0.30.4:
   dependencies:
     "@jridgewell/sourcemap-codec" "^1.5.0"
 
+marked@14.0.0:
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-14.0.0.tgz#79a1477358a59e0660276f8fec76de2c33f35d83"
+  integrity sha512-uIj4+faQ+MgHgwUW1l2PsPglZLOLOT1uErt06dAPtx2kjteLAkbsd/0FiYg/MGS+i7ZKLb7w2WClxHkzOOuryQ==
+
 math-intrinsics@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz"
@@ -2500,6 +2505,14 @@ moment@^2.30.1:
   resolved "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz"
   integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==
 
+monaco-editor@^0.54.0:
+  version "0.54.0"
+  resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.54.0.tgz#c0d6ebb46b83f1bef6f67f6aa471e38ba7ef8231"
+  integrity sha512-hx45SEUoLatgWxHKCmlLJH81xBo0uXP4sRkESUpmDQevfi+e7K1VuiSprK6UpQ8u4zOcKNiH0pMvHvlMWA/4cw==
+  dependencies:
+    dompurify "3.1.7"
+    marked "14.0.0"
+
 mousetrap@^1.6.5:
   version "1.6.5"
   resolved "https://registry.npmmirror.com/mousetrap/-/mousetrap-1.6.5.tgz"
@@ -3056,6 +3069,11 @@ sirv@^3.0.1:
     mrmime "^2.0.0"
     totalist "^3.0.0"
 
+sortablejs@1.14.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.14.0.tgz#6d2e17ccbdb25f464734df621d4f35d4ab35b3d8"
+  integrity sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==
+
 "source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2, source-map-js@^1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz"
@@ -3415,6 +3433,13 @@ vue@^3.5.18:
     "@vue/server-renderer" "3.5.18"
     "@vue/shared" "3.5.18"
 
+vuedraggable@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/vuedraggable/-/vuedraggable-4.1.0.tgz#edece68adb8a4d9e06accff9dfc9040e66852270"
+  integrity sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==
+  dependencies:
+    sortablejs "1.14.0"
+
 vuex@^4.1.0:
   version "4.1.0"
   resolved "https://registry.npmjs.org/vuex/-/vuex-4.1.0.tgz"