From 721f6ec69e796fd5c9807eaf68ec25df2bcf4e66 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期四, 29 二月 2024 11:53:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/daoAnOffice/index.vue | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/views/daoAnOffice/index.vue b/src/views/daoAnOffice/index.vue
index 56e75c5..80fcc67 100644
--- a/src/views/daoAnOffice/index.vue
+++ b/src/views/daoAnOffice/index.vue
@@ -1,6 +1,6 @@
<script setup lang="ts">
import ItemWrap from "@/components/item-wrap";
-import MenuHeader from "@/components/menu-header.vue";
+// import MenuHeader from "@/components/menu-header.vue";
import LeftTop from "./left-top.vue";
import LeftCenter from "./left-center.vue";
import LeftBottom from "./left-bottom.vue";
@@ -17,6 +17,8 @@
import Analysis from './right/analysis/index.vue';
import Danger from './right/danger/index.vue';
import Publicize from './right/publicize/index.vue';
+import Chartgd from "@/views/index/chartgd.vue";
+import {ref} from "vue";
const config = {
header: ['<span style="color:#42C3E8;font-size: 16px">鎺掑悕</span>', '<span style="color:#42C3E8;font-size: 16px">琛屾斂鍖哄垝</span>', '<span style="color:#42C3E8;font-size: 16px">鏁板��</span>'],
@@ -75,10 +77,15 @@
title: '澶栧崗婧簮琚煡鑾锋暟',
length: 9,
}]
+const dtFig=ref(0)
+const handlechan=()=>{
+
+}
</script>
<template>
<div class="index-box">
+<!-- <chartgd @changeDt="handlechan" v-if="dtFig ==0" class="gddt"></chartgd>-->
<div class="contetn_left">
<ItemWrap class="contetn_left-top contetn_lr-item" title="杩�3骞翠氦閫氫簨鏁呮寚鏁�">
<LeftTop />
@@ -243,6 +250,12 @@
</template>
<style scoped lang="scss">
+.gddt{
+ position: absolute;
+ z-index: 0;
+ width: 3840px;
+ height: 1080px;
+}
.index-box {
width: 100%;
display: flex;
@@ -279,11 +292,11 @@
}
.contetn_lr-item_right {
- flex: auto;
+ width: 48%;
}
.contetn_lr-item_left {
- flex: 1;
+ width: 50%;
}
.contetn_lr-item_contetn {
@@ -350,6 +363,8 @@
.item_title_content {
//height: $item_title_content-height;
margin: 20px 0;
+ border: 1px solid #29466A;
+ //background: #11223A;
}
.item_title_content_def {
--
Gitblit v1.8.0