From 52ea0582b9f8ebc89c1f0db0e7f17b758f45a219 Mon Sep 17 00:00:00 2001
From: limengnan <420004014@qq.com>
Date: Tue, 17 Jun 2025 15:09:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/data-visualization/module.ts |  3 ++
 frontend/src/data-public/Dashboard.vue        |  4 +-
 .../src/data-public/FormCreateDesigner.vue    |  1 -
 .../indicator/DeIndicator.vue                 |  1 -
 .../PictureGroupDatasetSelect.vue             |  1 -
 frontend/src/router/index.ts                  | 21 ++++++--
 frontend/src/views/BuiltInPage/FormCreate.vue | 51 +++++++++++++++++++
 frontend/src/views/preview/index.vue          |  0
 8 files changed, 72 insertions(+), 10 deletions(-)
 create mode 100644 frontend/src/api/data-visualization/module.ts
 create mode 100644 frontend/src/views/BuiltInPage/FormCreate.vue
 delete mode 100644 frontend/src/views/preview/index.vue

diff --git a/frontend/src/api/data-visualization/module.ts b/frontend/src/api/data-visualization/module.ts
new file mode 100644
index 0000000..d4c6785
--- /dev/null
+++ b/frontend/src/api/data-visualization/module.ts
@@ -0,0 +1,3 @@
+import request from '@/data-visualization/config/axios'
+
+export const moduleById = id => request.get({ url: '/application/module/'+id })
diff --git a/frontend/src/data-public/Dashboard.vue b/frontend/src/data-public/Dashboard.vue
index fd8d4c9..cd11279 100644
--- a/frontend/src/data-public/Dashboard.vue
+++ b/frontend/src/data-public/Dashboard.vue
@@ -85,10 +85,10 @@
      <div class="quick-actions">
       <h2>快捷操作</h2>
       <div class="actions-grid">
-        <el-card class="action-card" @click="$router.push('/FormCreateDesigner')">
+        <el-card class="action-card" @click="$router.push('/FormCreate?appId=1927666485224894465')">
           <div class="action-content">
             <el-icon class="action-icon"><User /></el-icon>
-            <span>FormCreat 编辑面板</span>
+            <span>FormCreat</span>
           </div>
         </el-card>
         <el-card class="action-card" @click="$router.push('/visualization?id=1927640677370306561&busiFlag=dataV')">
diff --git a/frontend/src/data-public/FormCreateDesigner.vue b/frontend/src/data-public/FormCreateDesigner.vue
index af4730b..bb708cc 100644
--- a/frontend/src/data-public/FormCreateDesigner.vue
+++ b/frontend/src/data-public/FormCreateDesigner.vue
@@ -21,7 +21,6 @@ import { useRoute } from 'vue-router'
 
 const route = useRoute()
 const designerForm = formCreate.factory();
-debugger
 const appId:any = ref(route.query.appId)
 if(route.query.appId == null){
     appId.value = '00'
diff --git a/frontend/src/data-visualization/custom-component/indicator/DeIndicator.vue b/frontend/src/data-visualization/custom-component/indicator/DeIndicator.vue
index 2635fb2..06dfff4 100644
--- a/frontend/src/data-visualization/custom-component/indicator/DeIndicator.vue
+++ b/frontend/src/data-visualization/custom-component/indicator/DeIndicator.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { getData } from '@/api/data-visualization/chart'
-debugger
 import { ref, reactive, shallowRef, computed, CSSProperties, toRefs, PropType } from 'vue'
 import { dvMainStoreWithOut } from '@/data-visualization/store/modules/data-visualization/dvMain'
 import { customAttrTrans, customStyleTrans, recursionTransObj } from '@/data-visualization/utils/canvasStyle'
diff --git a/frontend/src/data-visualization/custom-component/picture-group/PictureGroupDatasetSelect.vue b/frontend/src/data-visualization/custom-component/picture-group/PictureGroupDatasetSelect.vue
index 9d8e03f..2d14ca9 100644
--- a/frontend/src/data-visualization/custom-component/picture-group/PictureGroupDatasetSelect.vue
+++ b/frontend/src/data-visualization/custom-component/picture-group/PictureGroupDatasetSelect.vue
@@ -32,7 +32,6 @@ const onDatasetUpdate = () => {
           res.quotaList.pop()
           view.value.xAxis.push(...res.dimensionList, ...res.quotaList)
           const viewTarget = view.value
-          debugger
           useEmitt().emitter.emit('calcData-' + viewTarget.id, viewTarget)
           snapshotStore.recordSnapshotCache('calc', view.value.id)
         })
diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
index 6c61d6f..a27ef83 100644
--- a/frontend/src/router/index.ts
+++ b/frontend/src/router/index.ts
@@ -62,15 +62,26 @@ const routes:any = [
       requiresAuth: true
     }
   },
+  // {
+  //   path: '/FormCreateDesigner',
+  //   name: 'FormCreateDesigner',
+  //   component: () => import('@/data-public/FormCreateDesigner.vue'),
+  //   meta: {
+  //     title: '字典管理',
+  //     requiresAuth: true
+  //   }
+  // }
   {
-    path: '/FormCreateDesigner',
-    name: 'FormCreateDesigner',
-    component: () => import('@/data-public/FormCreateDesigner.vue'),
+    path: '/FormCreate',
+    name: 'FormCreate',
+    component: () => import('@/views/BuiltInPage/FormCreate.vue'),
     meta: {
-      title: '字典管理',
+      title: '表单管理',
       requiresAuth: true
     }
-  },{
+  }
+  
+  ,{
     path: '/visualization',
     name: 'visualization',
     component: () => import('@/data-visualization/index.vue'),
diff --git a/frontend/src/views/BuiltInPage/FormCreate.vue b/frontend/src/views/BuiltInPage/FormCreate.vue
new file mode 100644
index 0000000..59a4d93
--- /dev/null
+++ b/frontend/src/views/BuiltInPage/FormCreate.vue
@@ -0,0 +1,51 @@
+<template>
+  <form-create
+    v-model="formData"
+    v-model:api="fapi"
+    :rule="rule"
+    :field="field"
+    :option="option"
+    @submit="onSubmit"
+  ></form-create>
+</template>
+
+<script lang="ts" setup>
+import {onMounted,ref,watch} from "vue";
+import { useRoute } from 'vue-router'
+
+
+// import formCreate from "@form-create/element-ui";
+import { moduleById } from '@/api/data-visualization/module'
+import formCreate  from '@/data-collect/render/element-plus/form-create.es.js'
+debugger
+const route = useRoute()
+const appId:any = ref(route.query.appId)
+const field = ref([]) 
+
+
+const  option :any = ref({});
+const  rule :any = ref([]);
+const fapi = ref(null);
+const formData = ref({});
+
+const onSubmit =  (formData:any) => {
+  //todo 提交表单
+console.log(formData);
+}
+function getInit(){
+  if(appId.value == null){
+    return
+  }
+  moduleById(appId.value ).then(res => {
+    if(res.code ==0){
+      if(res.data.data.canvas_style_data != null && res.data.data.canvas_style_data != ""){
+        option.value =  formCreate.parseJson(res.data.data.component_data)
+        rule.value =  formCreate.parseJson(res.data.data.canvas_style_data)
+      }
+    }
+  })
+}
+onMounted(() => {
+  getInit()
+});
+</script>
\ No newline at end of file
diff --git a/frontend/src/views/preview/index.vue b/frontend/src/views/preview/index.vue
deleted file mode 100644
index e69de29..0000000