@@ -246,16 +257,20 @@
+ >
+
+ >
+
+
+
+
+ style="width: 20%">
+
+
+
+
@@ -296,6 +319,9 @@ import { useUserStore } from '@/store/modules/user'
import type { WorkplaceTotal, Project, Notice, Shortcut } from './types'
import { pieOptions, barOptions } from './echarts-data'
import {DataInfoApi, DataInfoVO} from "@/api/home/datainfo";
+import {pjApi, pjVO} from "@/api/home/homepj";
+import {dateFormatter} from "@/utils/formatTime";
+import {DICT_TYPE} from "@/utils/dict";
defineOptions({ name: 'Home' })
@@ -303,12 +329,14 @@ defineOptions({ name: 'Home' })
const { t } = useI18n()
const userStore = useUserStore()
// const { setWatermark } = useWatermark()
-const loading = ref(true)
+const loading = ref(false)
const list = ref
([]) // 列表的数据
+const list2 = ref([]) // 列表的数据
const total = ref(0) // 列表的总页数
const avatar = userStore.getUser.avatar
const username = userStore.getUser.nickname
const allData = ref({});
+const allData2 = ref({});
const pieOptionsData = reactive(pieOptions) as EChartsOption
// 获取统计数
let totalSate = reactive({
@@ -316,31 +344,31 @@ let totalSate = reactive({
access: 0,
todo: 0
})
+const queryParams2 = reactive({
+ pageNo: 1,
+ pageSize: 50,
+ pjName: undefined,
+ pjDone: undefined,
+ pjDescribe: undefined,
+ pjContent: undefined,
+ pjType: undefined,
+ pjEtime: [],
+ pjVtime: [],
+ pjDept: undefined,
+ pjNumber: undefined,
+ createTime: [],
+})
+const tableRowClassName = ({ row }) => {
+ return row.pjDone === 1 ? 'warning-row' : '';
+};
+const tableRowClassName2 = ({ row }) => {
+ return row.pjDone === 0 ? 'warning-row' : '';
+};
const image = [
{id: 1, src: mn2, name: '02'},
{id: 2, src: mn3, name: '03'},
{id: 3, src: mn4, name: '04'},
]
-const pjList = [
- {pjEtime: '2002-03-10',pjName: '优化产线',pjType: '环境',pjDept: '技术部',pjNumber: 778899},
- {pjEtime: '2005-05-20',pjName: '保护环境',pjType: '社会',pjDept: '艺术部',pjNumber: 998877},
- {pjEtime: '2002-03-10',pjName: '优化产线',pjType: '环境',pjDept: '技术部',pjNumber: 778899},
- {pjEtime: '2005-05-20',pjName: '保护环境',pjType: '社会',pjDept: '艺术部',pjNumber: 998877},
- {pjEtime: '2002-03-10',pjName: '优化产线',pjType: '环境',pjDept: '技术部',pjNumber: 778899},
- {pjEtime: '2005-05-20',pjName: '保护环境',pjType: '社会',pjDept: '艺术部',pjNumber: 998877},
- {pjEtime: '2002-03-10',pjName: '优化产线',pjType: '环境',pjDept: '技术部',pjNumber: 778899},
- {pjEtime: '2005-05-20',pjName: '保护环境',pjType: '社会',pjDept: '艺术部',pjNumber: 998877},
- {pjEtime: '2002-03-10',pjName: '优化产线',pjType: '环境',pjDept: '技术部',pjNumber: 778899},
- {pjEtime: '2005-05-20',pjName: '保护环境',pjType: '社会',pjDept: '艺术部',pjNumber: 998877},
- {pjEtime: '2002-03-10',pjName: '优化产线',pjType: '环境',pjDept: '技术部',pjNumber: 778899},
- {pjEtime: '2005-05-20',pjName: '保护环境',pjType: '社会',pjDept: '艺术部',pjNumber: 998877},
- {pjEtime: '2002-03-10',pjName: '优化产线',pjType: '环境',pjDept: '技术部',pjNumber: 778899},
- {pjEtime: '2005-05-20',pjName: '保护环境',pjType: '社会',pjDept: '艺术部',pjNumber: 998877},
- {pjEtime: '2002-03-10',pjName: '优化产线',pjType: '环境',pjDept: '技术部',pjNumber: 778899},
- {pjEtime: '2005-05-20',pjName: '保护环境',pjType: '社会',pjDept: '艺术部',pjNumber: 998877},
- {pjEtime: '2002-03-10',pjName: '优化产线',pjType: '环境',pjDept: '技术部',pjNumber: 778899},
- {pjEtime: '2005-05-20',pjName: '保护环境',pjType: '社会',pjDept: '艺术部',pjNumber: 998877},
-]
const dataList = computed(() => [
{ name: '碳排放', infoCo2e: allData.value.infoCo2e, dAn: '吨', time: '2024-07-05', color: '#e6eae3' },
{ name: '用水量', infoCo2e: allData.value.infoWater, dAn: '吨', time: '2024-07-05', color: '#ecf5ff' },
@@ -349,24 +377,32 @@ const dataList = computed(() => [
{ name: '污染物质', infoCo2e: allData.value.infoPollution, dAn: '吨', time: '2024-07-05', color: '#c0c4cc' },
{ name: '研发费用', infoCo2e: allData.value.infoRd, dAn: '万元', time: '2024-07-05', color: '#fdf6ec' }
]);
+const dataList2 = computed(() => [
+ {E: allData2.value[0].infoEnvironment, S: allData2.value[0].infoSociety, G: allData2.value[0].infoGovern},
+ {E: allData2.value[1].infoEnvironment, S: allData2.value[1].infoSociety, G: allData2.value[1].infoGovern},
+ {E: allData2.value[2].infoEnvironment, S: allData2.value[2].infoSociety, G: allData2.value[2].infoGovern},
+]);
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await DataInfoApi.getDataInfoPage(queryParams)
+ const data2 = await pjApi.getpjPage(queryParams2)
allData.value=data.list[0]
- // await getAllData()
+ allData2.value=data.list
list.value = data.list
+ list2.value = data2.list
total.value = data.total
+
+ await getWeeklyUserActivity()
} finally {
loading.value = false
}
}
const queryParams = reactive({
pageNo: 1,
- pageSize: 1,
+ pageSize: 3,
infoYear: undefined,
- infoYear: [],
infoCo2e: undefined,
infoWater: undefined,
infoPollution: undefined,
@@ -514,12 +550,13 @@ const getShortcut = async () => {
// 用户来源
const getUserAccessSource = async () => {
+ // const data = [
+ // { value: 335, name: 'analysis.directAccess' },
+ // ]
const data = [
- { value: 335, name: 'analysis.directAccess' },
- { value: 310, name: 'analysis.mailMarketing' },
- { value: 234, name: 'analysis.allianceAdvertising' },
- { value: 135, name: 'analysis.videoAdvertising' },
- { value: 1548, name: 'analysis.searchEngines' }
+ { value: 335, name: '社会' },
+ { value: 310, name: '环境' },
+ { value: 234, name: '治理' },
]
set(
pieOptionsData,
@@ -537,24 +574,34 @@ const barOptionsData = reactive(barOptions) as EChartsOption
// 周活跃量
const getWeeklyUserActivity = async () => {
+ // const data = [
+ // { value: 13253, name: 'analysis.monday' },
+ // ]
const data = [
- { value: 13253, name: 'analysis.monday' },
- { value: 34235, name: 'analysis.tuesday' },
- { value: 26321, name: 'analysis.wednesday' },
- { value: 12340, name: 'analysis.thursday' },
- { value: 24643, name: 'analysis.friday' },
- { value: 1322, name: 'analysis.saturday' },
- { value: 1324, name: 'analysis.sunday' }
+ { name: '环境评分' },
+ { name: '社会评分' },
+ { name: '治理评分' },
]
set(
barOptionsData,
'xAxis.data',
data.map((v) => t(v.name))
)
+ console.log("dataList2.value",dataList2.value)
set(barOptionsData, 'series', [
{
- name: t('analysis.activeQuantity'),
- data: data.map((v) => v.value),
+ name: '2022',
+ data: [dataList2.value[0].E, dataList2.value[0].E, dataList2.value[0].E],
+ type: 'bar'
+ },
+ {
+ name: '2023',
+ data: [dataList2.value[1].S, dataList2.value[1].S, dataList2.value[1].S],
+ type: 'bar'
+ },
+ {
+ name: '2024',
+ data: [dataList2.value[2].G, dataList2.value[2].G, dataList2.value[2].G],
type: 'bar'
}
])
@@ -588,3 +635,10 @@ onMounted(() => {
text-align: center;
}
+
+
diff --git a/src/views/Home/datainfo/DataInfoForm.vue b/src/views/Home/datainfo/DataInfoForm.vue
index c0cc3ed..04073a5 100644
--- a/src/views/Home/datainfo/DataInfoForm.vue
+++ b/src/views/Home/datainfo/DataInfoForm.vue
@@ -1,5 +1,5 @@
-
+
+
diff --git a/src/views/Home/homepj/pjForm.vue b/src/views/Home/homepj/pjForm.vue
new file mode 100644
index 0000000..9066993
--- /dev/null
+++ b/src/views/Home/homepj/pjForm.vue
@@ -0,0 +1,187 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确 定
+ 取 消
+
+
+
+
diff --git a/src/views/Home/mychart/MyAChart.vue b/src/views/Home/mychart/MyAChart.vue
new file mode 100644
index 0000000..3d852f9
--- /dev/null
+++ b/src/views/Home/mychart/MyAChart.vue
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
diff --git a/src/views/Home/mychart/MyBChart.vue b/src/views/Home/mychart/MyBChart.vue
new file mode 100644
index 0000000..f935079
--- /dev/null
+++ b/src/views/Home/mychart/MyBChart.vue
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+
+