diff --git a/src/assets/projectLarge/leftarrow.png b/src/assets/projectLarge/leftarrow.png deleted file mode 100644 index 55c4b79..0000000 Binary files a/src/assets/projectLarge/leftarrow.png and /dev/null differ diff --git a/src/assets/projectLarge/rightarrow.png b/src/assets/projectLarge/rightarrow.png deleted file mode 100644 index 723df81..0000000 Binary files a/src/assets/projectLarge/rightarrow.png and /dev/null differ diff --git a/src/assets/projectLarge/swiper.png b/src/assets/projectLarge/swiper.png deleted file mode 100644 index 32520bd..0000000 Binary files a/src/assets/projectLarge/swiper.png and /dev/null differ diff --git a/src/views/ProjectScreen/components/centerPage.vue b/src/views/ProjectScreen/components/centerPage.vue index 53d8c41..21224b8 100644 --- a/src/views/ProjectScreen/components/centerPage.vue +++ b/src/views/ProjectScreen/components/centerPage.vue @@ -3,9 +3,11 @@
-
- - <div class="swiper"> + <div class="endPage" :class="{ 'slide-out-down': isHide }"> + <Title title="AI安全巡检"> + <img src="@/assets/projectLarge/robot.svg" alt="" height="20px" width="20px"> + +
@@ -13,7 +15,7 @@
- 安全巡检图片 + 安全巡检
{{ item.createTime.slice(5) }}
{{ item.label }}
@@ -38,10 +40,6 @@ const { proxy } = getCurrentInstance(); const { violation_level_type } = toRefs(proxy?.useDict('violation_level_type')); const props = defineProps({ - hideFooter: { - type: Boolean, - default: false - }, isHide: { type: Boolean, default: false diff --git a/src/views/ProjectScreen/components/header.vue b/src/views/ProjectScreen/components/header.vue index cc7b81a..5450f69 100644 --- a/src/views/ProjectScreen/components/header.vue +++ b/src/views/ProjectScreen/components/header.vue @@ -16,10 +16,6 @@
- -
- -
@@ -41,6 +37,20 @@ 设置图标 管理系统
+ +
+
+
+
+ +
+ + + + + + +
@@ -63,6 +73,10 @@ const props = defineProps({ projectId: { type: String, default: '' + }, + isFull: { + type: Boolean, + default: false } }) @@ -120,7 +134,7 @@ function startScroll() { } function requestPause() { - if(timer.value) { + if (timer.value) { clearInterval(timer.value) timer.value = null } @@ -302,4 +316,11 @@ onUnmounted(() => { margin-right: 6px; /* 图标与文字间距 */ } + +.change { + display: grid; + place-items: center; + margin-right: 10px; + cursor: pointer; +} diff --git a/src/views/ProjectScreen/components/leftPage.vue b/src/views/ProjectScreen/components/leftPage.vue index 9d0dd40..3130984 100644 --- a/src/views/ProjectScreen/components/leftPage.vue +++ b/src/views/ProjectScreen/components/leftPage.vue @@ -29,7 +29,7 @@
-
出勤人数
+
出勤人
{{ attendanceCount }} @@ -37,7 +37,7 @@
-
在岗人数
+
在岗人
{{ peopleCount }} diff --git a/src/views/ProjectScreen/components/optionList.ts b/src/views/ProjectScreen/components/optionList.ts index 4a37930..bcdf958 100644 --- a/src/views/ProjectScreen/components/optionList.ts +++ b/src/views/ProjectScreen/components/optionList.ts @@ -6,6 +6,7 @@ export let pieOption = { left: 'center', top: '40%', style: { + // 需要从接口替换 text: '70%', fontSize: 24, fontWeight: 'bold', diff --git a/src/views/ProjectScreen/components/title.vue b/src/views/ProjectScreen/components/title.vue index 04b607c..361f557 100644 --- a/src/views/ProjectScreen/components/title.vue +++ b/src/views/ProjectScreen/components/title.vue @@ -4,8 +4,8 @@
-
- +
+
{{ title }}
diff --git a/src/views/ProjectScreen/index.vue b/src/views/ProjectScreen/index.vue index 4bccf68..f58a18f 100644 --- a/src/views/ProjectScreen/index.vue +++ b/src/views/ProjectScreen/index.vue @@ -1,12 +1,12 @@