修改打包报错问题

2025-10-21 10:21:15 +08:00
parent 4bd192dabc
commit f252422f65
63 changed files with 6694 additions and 3992 deletions
--- a/src/views/govern/mxgraph/graphList/index.vue
+++ b/src/views/govern/mxgraph/graphList/index.vue
@@ -107,8 +107,8 @@ const editd = (e: any) => {
 }
 // 设计
 const Aclick = (e: any) => {
-    // window.open(window.location.origin + `/zutai/?id=${e.id}&&name=${e.name}&&preview=false`)
-    window.open('http://192.168.1.128:4001' + `/zutai/?id=${e.id}&&name=${e.name}&&preview=false`)
+    // window.open(window.location.origin + `/zutai/?id=${e.id}&&name=${e.name}&&preview=false&&graphicDisplay=zl`)
+    window.open('http://192.168.1.128:4001' + `/zutai/?id=${e.id}&&name=${e.name}&&preview=false&&graphicDisplay=zl`)
 
 }
 // 删除
@@ -143,8 +143,8 @@ const deleted = (e: any) => {
 }

 const imgData = (e: any) => {
-    // window.open(window.location.origin + `/zutai/?id=${e.id}&&name=${e.name}&&preview=true#/preview`)
-     window.open('http://192.168.1.128:4001' + `/zutai/?id=${e.id}&&name=${e.name}&&preview=true#/preview`)
+    // window.open(window.location.origin + `/zutai/?id=${e.id}&&name=${e.name}&&preview=true&&graphicDisplay=zl#/preview`)
+     window.open('http://192.168.1.128:4001' + `/zutai/?id=${e.id}&&name=${e.name}&&preview=true&&graphicDisplay=zl#/preview`)
  
 }

--- a/src/views/pqs/cockpit/homePage/index.vue
+++ b/src/views/pqs/cockpit/homePage/index.vue
@@ -1,48 +1,63 @@
 <template>
-    <GridLayout
-        class="default-main"
-        v-model:layout="layout"
-        :row-height="rowHeight"
-        :is-resizable="false"
-        :is-draggable="false"
-        :responsive="false"
-        :vertical-compact="false"
-        prevent-collision
-        :col-num="12"
-    >
-        <template #item="{ item }">
-            <div class="box">
-                <div class="title">
-                    <div style="display: flex; align-items: center">
-                        <Icon class="HelpFilled" :name="item.icon" />
-                        {{ item.name }}
+    <div class="default-main">
+        <TableHeader :showSearch="false">
+            <template v-slot:select>
+                <el-form-item label="日期">
+                    <DatePicker ref="datePickerRef" :nextFlag="false" :theCurrentTime="true"></DatePicker>
+                </el-form-item>
+            </template>
+        </TableHeader>
+        <GridLayout
+            v-model:layout="layout"
+            :row-height="rowHeight"
+            :is-resizable="false"
+            :is-draggable="false"
+            :responsive="false"
+            :vertical-compact="false"
+            prevent-collision
+            :col-num="12"
+        >
+            <template #item="{ item }">
+                <div class="box">
+                    <div class="title">
+                        <div style="display: flex; align-items: center">
+                            <Icon class="HelpFilled" :name="item.icon" />
+                            {{ item.name }}
+                        </div>
+                        <!-- <FullScreen class="HelpFilled" style="cursor: pointer" @click="zoom(item)" /> -->
+                        <img :src="flag ? img : img1" style="cursor: pointer; height: 16px" @click="zoom(item)" />
+                    </div>
+                    <div>
+                        <component
+                            :is="item.component"
+                            v-if="item.component"
+                            class="pd10"
+                            :key="key"
+                            :timeValue="datePickerRef.timeValue"
+                            :height="rowHeight * item.h - seRowHeight(item.h) + 'px'"
+                            :width="rowWidth * item.w - 30 + 'px'"
+                            :timeKey="item.timeKey"
+                        />
+                        <div v-else class="pd10">组件加载失败...</div>
                    </div>
-                    <!-- <FullScreen class="HelpFilled" style="cursor: pointer" @click="zoom(item)" /> -->
-                    <img :src="flag ? img : img1" style="cursor: pointer; height: 16px" @click="zoom(item)" />
                </div>
-                <div>
-                    <component
-                        :is="item.component"
-                        v-if="item.component"
-                        class="pd10"
-                        :key="key"
-                        :height="rowHeight * item.h - (item.h == 6 ? -20 : item.h == 2 ? 20 : 5) + 'px'"
-                        :width="rowWidth * item.w - 5 + 'px'"
-                        :timeKey="item.timeKey"
-                    />
-                    <div v-else class="pd10">组件加载失败...</div>
-                </div>
-            </div>
-        </template>
-    </GridLayout>
+            </template>
+        </GridLayout>
+    </div>
 </template>

 <script setup lang="ts">
 import { ref, reactive, onMounted, markRaw, onUnmounted, defineAsyncComponent, type Component } from 'vue'
+import TableHeader from '@/components/table/header/index.vue'
 import { GridLayout } from 'grid-layout-plus'
+import DatePicker from '@/components/form/datePicker/index.vue'
 import { useDebounceFn } from '@vueuse/core'
-import { queryActivatePage } from '@/api/system-boot/csstatisticalset'
+import { queryActivatePage, queryByPagePath } from '@/api/system-boot/csstatisticalset'
 import { HelpFilled, FullScreen } from '@element-plus/icons-vue'
+import { useRouter } from 'vue-router'
+const datePickerRef = ref()
+const router = useRouter()
+
 // defineOptions({
 //     name: 'cockpit/homePage'
 // })
@@ -94,7 +109,7 @@ const getMainWidth = () => {

 // 初始化行高
 const initRowHeight = () => {
-    rowHeight.value = Math.max(0, (getMainHeight() - 20) / 6)
+     rowHeight.value = Math.max(0, (getMainHeight() - 72) / 6)
    rowWidth.value = Math.max(0, getMainWidth() / 12)
 }

@@ -147,10 +162,21 @@ const zoom = (value: any) => {
    flag.value = !flag.value
    key.value += 1
 }
+// 计算组件高度
+const seRowHeight = (value: any) => {
+    if (value == 6) return 0
+    if (value == 5) return 12
+    if (value == 4) return 20
+    if (value == 3) return 30
+    if (value == 2) return 40
+    if (value == 1) return 50
+    return 0
+}
+
 // 获取布局数据
 const fetchLayoutData = async () => {
    try {
-        const { data } = await queryActivatePage()
+        const { data } = await queryByPagePath({ pagePath: router.currentRoute.value.name })
        const parsedLayout = JSON.parse(data.containerConfig || '[]') as LayoutItem[]
        // 处理布局数据
        layout.value = parsedLayout.map((item, index) => ({
--- a/src/views/pqs/cockpit/realTimeData/index.vue
+++ b/src/views/pqs/cockpit/realTimeData/index.vue
@@ -1,11 +1,8 @@
 <template>
-<!-- 实时数据 -->
-    <div> </div>
-
+    <!-- 实时数据 -->
+    <div>123</div>
 </template>
-<script setup lang='ts'>
+<script setup lang="ts">
 import { ref, reactive } from 'vue'
 </script>
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>
--- a/src/views/pqs/cockpit/setUp/components/popup.vue
+++ b/src/views/pqs/cockpit/setUp/components/popup.vue
@@ -19,9 +19,13 @@
                        :min="0"
                        :step="1"
                        step-strictly
-                        style="width: 100%"
                    />
                </el-form-item>
+                <el-form-item label="绑定页面">
+                    <el-select v-model="form.pagePath" filterable placeholder="请选择绑定页面" style="width: 100%" clearable>
+                        <el-option v-for="item in pageList" :key="item.path" :label="item.name" :value="item.path" />
+                    </el-select>
+                </el-form-item>

                <el-form-item label="备注" class="top">
                    <el-input
@@ -131,14 +135,17 @@ import { Tools, CloseBold } from '@element-plus/icons-vue'
 import { addDashboard, updateDashboard, queryById } from '@/api/system-boot/csstatisticalset'
 import html2canvas from 'html2canvas'
 import { useRoute } from 'vue-router'
+
 // defineOptions({
 //     name: 'cockpit/popup'
 // })
 const { go } = useRouter()
 const { query } = useRoute()
+const router = useRouter()
 const height = mainHeight(108)
 const indicatorHeight = mainHeight(128)
 const rowHeight = ref(0)
+const pageList: any = ref([])
 const GridHeight = ref(0)
 const position = ref<CollapseIconPositionType>('left')
 const form: any = reactive({
@@ -147,6 +154,8 @@ const form: any = reactive({
    containerConfig: [],
    sort: '100',
    id: '',
+    pagePath: '',
+    pathName: '',
    remark: ''
 })
 const activeNames = ref([])
@@ -171,6 +180,13 @@ const layout: any = ref([
 const treeComponents: any = ref([]) //组件树
 const treeComponentsCopy: any = ref([]) //组件树
 const info = () => {
+    pageList.value = router
+        .getRoutes()
+        .filter(item => item?.meta?.component == '/src/views/pqs/cockpit/homePage/index.vue')
+        .map(item => {
+            return { name: item?.meta?.title, path: item?.meta?.path }
+        })
+
    activeNames.value = []
    activeNames1.value = []
    componentTree().then(res => {
@@ -188,6 +204,8 @@ const info = () => {
        queryById({ id: query.id }).then(res => {
            layout.value = JSON.parse(res.data.containerConfig)
            form.pageName = res.data.pageName
+            form.pagePath = res.data.pagePath
+            form.pathName = res.data.pathName
            form.sort = res.data.sort
            form.remark = res.data.remark
            form.id = res.data.id
@@ -343,6 +361,8 @@ const onSubmit = () => {
        }).then(canvas => {
            url = canvas.toDataURL('image/png')
        })
+        form.pagePath = form.pagePath || ''
+        form.pathName = pageList.value.filter((item: any) => item.path == form.pagePath)?.[0]?.name || ''

        if (valid) {
            if (form.id == '') {
--- a/src/views/pqs/cockpit/setUp/components/view.vue
+++ b/src/views/pqs/cockpit/setUp/components/view.vue
@@ -189,6 +189,7 @@ const fetchLayoutData = async () => {
        // 可以添加错误提示逻辑
    }
 }
+// 计算组件高度
 const seRowHeight = (value: any) => {
    if (value == 6) return 0
    if (value == 5) return 12
--- a/src/views/pqs/cockpit/setUp/index.vue
+++ b/src/views/pqs/cockpit/setUp/index.vue
@@ -31,8 +31,15 @@
                            >
                                {{ item.pageName }}
                            </span>
+                            <div style="display: flex; align-items: center; font-weight: 550">
+                                <div v-if="item.pathName" :style="{ color: `var(--el-color-primary)` }">
+                                    绑定页面：{{ item.pathName }}
+                                </div>
+                                <div v-else>暂未绑定</div>
+                            </div>
+
                            <div style="display: flex; justify-content: end">
-                                <el-button
+                                <!-- <el-button
                                    class="color"
                                    icon="el-icon-Position"
                                    style="padding: 3px 0"
@@ -41,7 +48,7 @@
                                    @click="activation(item)"
                                >
                                    激活
-                                </el-button>
+                                </el-button> -->
                                <el-button
                                    class="color"
                                    icon="el-icon-View"