修正页面参数

src/types/components.d.ts

@@ -18,46 +18,65 @@ declare module '@vue/runtime-core' {
     CopyerDrawer: typeof import('./../components/workflow/drwer/copyerDrawer.vue')['default']
     DiyIconfont: typeof import('./../components/DesignForm/public/expand/diy-iconfont.vue')['default']
     DragControl: typeof import('./../components/DesignForm/dragControl.vue')['default']
+    ElAlert: typeof import('element-plus/es')['ElAlert']
+    ElAside: typeof import('element-plus/es')['ElAside']
     ElAvatar: typeof import('element-plus/es')['ElAvatar']
     ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
     ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
     ElButton: typeof import('element-plus/es')['ElButton']
+    ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup']
     ElCard: typeof import('element-plus/es')['ElCard']
+    ElCarousel: typeof import('element-plus/es')['ElCarousel']
+    ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
+    ElCascader: typeof import('element-plus/es')['ElCascader']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElCollapse: typeof import('element-plus/es')['ElCollapse']
     ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
+    ElContainer: typeof import('element-plus/es')['ElContainer']
+    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
+    ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
+    ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
+    ElDrawer: typeof import('element-plus/es')['ElDrawer']
     ElDropdown: typeof import('element-plus/es')['ElDropdown']
     ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
     ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElIcon: typeof import('element-plus/es')['ElIcon']
+    ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
+    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElLink: typeof import('element-plus/es')['ElLink']
+    ElMain: typeof import('element-plus/es')['ElMain']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElRadio: typeof import('element-plus/es')['ElRadio']
+    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
+    ElSpace: typeof import('element-plus/es')['ElSpace']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
     ElTabs: typeof import('element-plus/es')['ElTabs']
+    ElTag: typeof import('element-plus/es')['ElTag']
+    ElText: typeof import('element-plus/es')['ElText']
     ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
+    ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
     ElUpload: typeof import('element-plus/es')['ElUpload']
     EmployeesDialog: typeof import('./../components/workflow/dialog/employeesDialog.vue')['default']
     EmployeesRoleDialog: typeof import('./../components/workflow/dialog/employeesRoleDialog.vue')['default']
@@ -78,8 +97,26 @@ declare module '@vue/runtime-core' {
     HeadToolsNew: typeof import('./../components/DesignForm/public/headToolsNew.vue')['default']
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
     IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
+    IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
     IEpClose: typeof import('~icons/ep/close')['default']
+    IEpCollection: typeof import('~icons/ep/collection')['default']
+    IEpDelete: typeof import('~icons/ep/delete')['default']
+    IEpDownload: typeof import('~icons/ep/download')['default']
+    IEpEdit: typeof import('~icons/ep/edit')['default']
+    IEpMessageBox: typeof import('~icons/ep/message-box')['default']
+    IEpMinus: typeof import('~icons/ep/minus')['default']
+    IEpOperation: typeof import('~icons/ep/operation')['default']
+    IEpPicture: typeof import('~icons/ep/picture')['default']
+    IEpPlus: typeof import('~icons/ep/plus')['default']
+    IEpPosition: typeof import('~icons/ep/position')['default']
+    IEpRefresh: typeof import('~icons/ep/refresh')['default']
+    IEpRefreshLeft: typeof import('~icons/ep/refresh-left')['default']
+    IEpSearch: typeof import('~icons/ep/search')['default']
     IEpSetting: typeof import('~icons/ep/setting')['default']
+    IEpTop: typeof import('~icons/ep/top')['default']
+    IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
+    IEpUser: typeof import('~icons/ep/user')['default']
+    IEpView: typeof import('~icons/ep/view')['default']
     LangSelect: typeof import('./../components/LangSelect/index.vue')['default']
     List: typeof import('./../components/DesignForm/public/form/components/list.vue')['default']
     ListTreeSide: typeof import('./../components/DesignForm/public/form/components/listTreeSide.vue')['default']

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'

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;
 							}
 						  },

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>

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{