From 98fb3e963d12b058b3d177097d31ce7f6399bff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=99=93=E9=B8=BD?= Date: Tue, 27 Sep 2022 10:23:02 +0800 Subject: [PATCH 1/9] =?UTF-8?q?feat:=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 1 + src/views/ballotpage/BallotPage.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 897ffe3..c430b25 100644 --- a/src/App.vue +++ b/src/App.vue @@ -53,6 +53,7 @@ export default defineComponent({ #container { display: flex; + flex-direction: column; width: 100%; min-height: 100%; background-color: rgba(242, 245, 247, 1); diff --git a/src/views/ballotpage/BallotPage.vue b/src/views/ballotpage/BallotPage.vue index e0c8148..e653deb 100644 --- a/src/views/ballotpage/BallotPage.vue +++ b/src/views/ballotpage/BallotPage.vue @@ -127,12 +127,12 @@ export default { margin-top: 10px; .noticebox { width: 90%; - background: #fff; border-radius: 4px; position: relative; display: flex; justify-content: center; + margin-bottom: 20px; .mani { width: 90%; margin-top: 20px; From 9e6c2a5aa1bcfd4f84126f622da3c8a7729fcbf1 Mon Sep 17 00:00:00 2001 From: dongwug Date: Tue, 27 Sep 2022 12:30:53 +0800 Subject: [PATCH 2/9] =?UTF-8?q?feat:readyexamination=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=81=8D=E5=8E=86=E5=92=8C=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/examination/ReadyExamination.vue | 137 +++++++++++++++++++-- src/views/investigat/InvestigatPage.vue | 4 +- 2 files changed, 128 insertions(+), 13 deletions(-) diff --git a/src/views/examination/ReadyExamination.vue b/src/views/examination/ReadyExamination.vue index ec49014..386c491 100644 --- a/src/views/examination/ReadyExamination.vue +++ b/src/views/examination/ReadyExamination.vue @@ -16,6 +16,21 @@ 判断题 + + + +
1、控制计划是由工艺部门完成 (4分) @@ -55,11 +70,37 @@
错误
+ +
选择题
+ + + +
4、.FMEA 是一种( )工具(4分) @@ -81,11 +122,13 @@
风险分析
+
提交试卷
+ @@ -93,15 +136,88 @@ \ No newline at end of file diff --git a/src/views/pathmap/pathmap.vue b/src/views/pathmap/pathmap.vue new file mode 100644 index 0000000..2d0bbbc --- /dev/null +++ b/src/views/pathmap/pathmap.vue @@ -0,0 +1,436 @@ + + + + + From cdf3830ed30c18842f53e877b026ccf9e03c4c0c Mon Sep 17 00:00:00 2001 From: dongwug Date: Tue, 27 Sep 2022 18:29:28 +0800 Subject: [PATCH 4/9] =?UTF-8?q?feat:=E6=95=B0=E7=BB=84=E9=81=8D=E5=8E=86?= =?UTF-8?q?=E5=92=8C=E7=82=B9=E5=87=BB=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/image/index.js | 6 + src/views/examination/ReadyExamination.vue | 265 ++++++++++++++------- 2 files changed, 179 insertions(+), 92 deletions(-) create mode 100644 src/assets/image/index.js diff --git a/src/assets/image/index.js b/src/assets/image/index.js new file mode 100644 index 0000000..7ca6200 --- /dev/null +++ b/src/assets/image/index.js @@ -0,0 +1,6 @@ +const Images = { + //选择按钮 + checkboxImg: require('./checkbox.png'), + checkbox2Img: require('./checkbox2.png') +} +export default Images \ No newline at end of file diff --git a/src/views/examination/ReadyExamination.vue b/src/views/examination/ReadyExamination.vue index 386c491..e371851 100644 --- a/src/views/examination/ReadyExamination.vue +++ b/src/views/examination/ReadyExamination.vue @@ -18,20 +18,27 @@ - + -
+
@@ -79,7 +86,7 @@
- +
-
+
@@ -136,88 +141,164 @@ diff --git a/src/views/pathmap/pathmap.vue b/src/views/pathmap/pathmap.vue deleted file mode 100644 index 2d0bbbc..0000000 --- a/src/views/pathmap/pathmap.vue +++ /dev/null @@ -1,436 +0,0 @@ - - - - - From 76b6b14747cef5a2df44c670471ea40812a8c340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Wed, 28 Sep 2022 16:29:29 +0800 Subject: [PATCH 7/9] =?UTF-8?q?feat:=E8=A7=A3=E5=86=B3=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=85=AC=E5=91=8A=E9=A1=B5=E9=9D=A2=E5=81=8F=E7=A6=BB=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/activities/ActivitiesPage.vue | 20 +++++++++++++------- src/views/pathmap/PathmapPage.vue | 2 +- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/views/activities/ActivitiesPage.vue b/src/views/activities/ActivitiesPage.vue index e243ba0..e65cdf0 100644 --- a/src/views/activities/ActivitiesPage.vue +++ b/src/views/activities/ActivitiesPage.vue @@ -1,12 +1,12 @@ diff --git a/src/views/examination/ExaminationScore.vue b/src/views/examination/ExaminationScore.vue index ee42ccb..f0e789e 100644 --- a/src/views/examination/ExaminationScore.vue +++ b/src/views/examination/ExaminationScore.vue @@ -1,6 +1,6 @@