From ef6b9e9714b6c2621fe4c48ddb236ff84ae43511 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Fri, 10 Nov 2023 07:47:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/components/application.vue |  1 +
 src/views/dashboard/components/sanlianping.vue |  8 ++++----
 src/views/dashboard/components/userinfo.vue    | 10 +++++-----
 src/views/dashboard/index.vue                  |  9 ++++++++-
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/views/dashboard/components/application.vue b/src/views/dashboard/components/application.vue
index 4cb3d1f39..61690a986 100644
--- a/src/views/dashboard/components/application.vue
+++ b/src/views/dashboard/components/application.vue
@@ -4,6 +4,7 @@
 @ 备注: 应用
 -->
 <script lang='ts' setup>
+import { createOneClickLogin } from "@/api/system/roleapi/rolecont";
 import AppContent from '@/views/appstore/appmarket/content.vue'
 const appLoading = ref(false)
 const fits = 'fill'
diff --git a/src/views/dashboard/components/sanlianping.vue b/src/views/dashboard/components/sanlianping.vue
index 40f8b0459..dcfa061c6 100644
--- a/src/views/dashboard/components/sanlianping.vue
+++ b/src/views/dashboard/components/sanlianping.vue
@@ -15,15 +15,15 @@ const targetListAryes = ref<any[]>([])
 
 const targetXingListAry = ref<any[]>([])
 //定性同比环比分析
-const dingXingYear = ref<number>()
+const dingXingYear = ref<any>()
 const dingXingOrg = ref<any>()
 const dingXingTarget = ref<any>()
 //定量指标目标达成
-const dingLiangDaChengYear = ref<number>()
+const dingLiangDaChengYear = ref<any>()
 const dingLiangDaChengOrg = ref<any>()
 const dingLiangDaChengTarget = ref<any>()
 //定量同比环比分析
-const dingLiangYear = ref<number>()
+const dingLiangYear = ref<any>()
 const dingLiangOrg = ref<any>()
 const dingLiangTarget = ref<any>()
 //获取公司下的主部门
@@ -284,7 +284,7 @@ const bdBdtTsMubiao = () =>{
 						  type: data.data.series[2].type,
 						  yAxisIndex: 1,
 						  tooltip: {
-							valueFormatter: function (value) {
+							valueFormatter: function (value:any) {
 							  return value + data.data.series[2].tooltip;
 							}
 						  },
diff --git a/src/views/dashboard/components/userinfo.vue b/src/views/dashboard/components/userinfo.vue
index d58c28beb..46156ca93 100644
--- a/src/views/dashboard/components/userinfo.vue
+++ b/src/views/dashboard/components/userinfo.vue
@@ -56,19 +56,19 @@ const props = defineProps({
 				</el-col>
 			</el-row>
 			<el-row>
-				<el-col :xs="4" :sm="7" :md="6" :lg="5" :xl="4"><span class="fa fa-map-marker span_icon_left"></span>住址</el-col>
-				<el-col :xs="20" :sm="17" :md="18" :lg="19" :xl="20">{{ props.userStore.userInfoCont.currentresidence }}</el-col>
+				<el-col :xs="4" :sm="7" :md="6" :lg="5" :xl="5"><span class="fa fa-map-marker span_icon_left"></span>住址</el-col>
+				<el-col :xs="20" :sm="17" :md="18" :lg="19" :xl="19"><el-text>{{ props.userStore.userInfoCont.currentresidence }}</el-text></el-col>
 			</el-row>
 			<el-row>
-				<el-col :xs="4" :sm="7" :md="6" :lg="5" :xl="4"><span class="fa fa-podcast span_icon_left"></span>职务</el-col>
-				<el-col :xs="20" :sm="17" :md="18" :lg="19" :xl="20"><el-text v-for="(im,index) in props.userStore.userInfoCont.postlist" :key="index">{{im}}</el-text></el-col>
+				<el-col :xs="4" :sm="7" :md="6" :lg="5" :xl="5"><span class="fa fa-podcast span_icon_left"></span>职务</el-col>
+				<el-col :xs="20" :sm="17" :md="18" :lg="19" :xl="19"><el-text v-for="(im,index) in props.userStore.userInfoCont.postlist" :key="index">{{im}}</el-text></el-col>
 			</el-row>
 			
 	</el-card>
 </template>
 <style  lang='scss' scoped>
 .span_icon_left{
-	margin-right:10px;
+	margin-right:5px;
 	
 }
 </style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 5f1cd92be..243ad4436 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -55,7 +55,7 @@ onMounted(() => {
 })
 </script>
 <template>
-		<div ref="masterBody" class="app-container" style="margin-top:10px;">
+		<div ref="masterBody" class="app_container">
 			<el-row :gutter="10">
 				<el-col :xs="24" :sm="16" :md="16" :lg="18" :xl="19" class="readback">
 					<AllOrgYear  :org-list-cont="orgListCont" :education-org-id="educationOrgId" />
@@ -102,9 +102,16 @@ onMounted(() => {
 					
 				</el-col>
 			</el-row>
+			
 		</div>
 </template>
 <style  lang='scss' scoped>
+.app_container{
+	padding: 10px 20px 0px 20px;
+	height: calc(100vh - 90px);
+	overflow: hidden;
+	overflow-y: auto;
+}
 .readback{
 	// background-color:#FF0000;
 	.allOrgAxisCares{