From 98fb3e963d12b058b3d177097d31ce7f6399bff8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=99=93=E9=B8=BD?= <lixg@dongwu-inc.com>
Date: Tue, 27 Sep 2022 10:23:02 +0800
Subject: [PATCH 1/2] =?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 cdf3830ed30c18842f53e877b026ccf9e03c4c0c Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Tue, 27 Sep 2022 18:29:28 +0800
Subject: [PATCH 2/2] =?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 @@
                     </div>
 
                     <!-- 循环遍历生成判断题的问题和选项 -->
-                    <!-- <div class="questions"
-                            v-for="(q,index) in j_questions"
+                    <div class="questions"
+                            v-for="(q,index) in questions"
                             :key="index">
                         <div class="questiontitle"                            >
                             {{q.text}}
                         </div>
-                        <div class="btnswitch" v-for="(j,index) in j_options"
-                        :key="index">
-                            <div class="checkoutbtn"></div>
+                        <div class="btnswitch" v-for="(j,index) in q.options"
+                        :key="index"
+                        @click="selectBtn(j)"
+                        >
+                            <div class="checkoutbtn"
+                            :style="{
+                                backgroundImage:
+                                'url('+( j.selected === true? Images.checkboxImg : Images.checkbox2Img )+')'
+                            }"
+                            ></div>
                             <div class="select">{{j.text}}</div>
                         </div>
-                    </div> -->
+                    </div>
 
-                    <div class="questions">
+                    <!-- <div class="questions">
                         <div class="questiontitle">
                             1、控制计划是由工艺部门完成 （4分）
                         </div>
@@ -69,7 +76,7 @@
                             <div class="checkoutbtn"></div>
                             <div class="select">错误</div>
                         </div>
-                    </div>
+                    </div> -->
                     
 
                     <div class="questiontype clearfix">
@@ -79,7 +86,7 @@
                     </div>
 
                     <!-- 循环遍历生成选择题的问题和选项 -->
-                    <!-- <div class="questions"
+                    <div class="questions"
                             v-for="(q,index) in s_questions"
                             :key="index">
                         <div class="questiontitle">
@@ -87,21 +94,19 @@
                         </div>
                         <div class="btnswitch" v-for="(s,index) in s_options"
                         :key="index"
-                        @click="selectBtn(value)"
+                        @click="selectBtn2(s)"
                         >
                             <div class="checkoutbtn"
                             :style="{
                                 backgroundImage:
-                                value.selected === true
-                                ? 'url( ../../assets/image/checkbox.png )'
-                                : 'url( ../../assets/image/checkbox2.png )'
+                                'url('+( s.selected === true? Images.checkboxImg : Images.checkbox2Img )+')'
                             }"
                             ></div>
                             <div class="select">{{s.text}}</div>
                         </div>
-                    </div> -->
+                    </div>
                     
-                    <div class="questions">
+                    <!-- <div class="questions">
                         <div class="questiontitle">
                             4、.FMEA 是一种（ ）工具（4分）
                         </div>
@@ -121,7 +126,7 @@
                             <div class="checkoutbtn"></div>
                             <div class="select">风险分析</div>
                         </div>
-                    </div>
+                    </div> -->
 
                     <div class="btnbox">
                         <div class="submitbtn">
@@ -136,88 +141,164 @@
 </template>
 
 <script>
-// import { reactive,toRefs } from "vue";
+import { reactive, toRefs } from "vue";
+import Images from '../../assets/image/index'
 import TitleHead from "@/components/TitleHead.vue";
 export default {
     name: "ReadyExamination",
     components: {
         TitleHead,
     },
-    // setup() {
-    //     const state = reactive({
-    //         j_questions: [
-    //             {
-    //                 type: "judge",
-    //                 id: 1,
-    //                 text: "1、控制计划是由工艺部门完成 （4分）",
-    //             },
-    //             {
-    //                 type: "judge",
-    //                 id: 2,
-    //                 text: "2、.PFMEA假定所设计的产品能满足设计要求",
-    //             },
-    //             {
-    //                 type: "judge",
-    //                 id: 3,
-    //                 text: "3、PFMEA假定所设计的产品能满足设计要求 （4分）",
-    //             },
-    //         ],
-    //         s_questions: [
-    //             {
-    //                 type: "choice",
-    //                 id: 1,
-    //                 text: "4、.FMEA 是一种（ ）工具（4分）",
-    //             },
-    //         ],
-    //         j_options: [
-    //             {
-    //                 id: 1,
-    //                 text: "正确",
-    //                 selected: false,
-    //             },
-    //             {
-    //                 id: 2,
-    //                 text: "错误",
-    //                 selected: false,
-    //             },
-    //         ],
-    //         s_options: [
-    //             {
-    //                 id: 1,
-    //                 text: "问题解决",
-    //                 selected: false,
-    //             },
-    //             {
-    //                 id: 2,
-    //                 text: "项目策划",
-    //                 selected: false,
-    //             },
-    //             {
-    //                 id: 3,
-    //                 text: "过程分析",
-    //                 selected: false,
-    //             },
-    //             {
-    //                 id: 4,
-    //                 text: "风险分析",
-    //                 selected: false,
-    //             },
-    //         ]
-    //     });
-    //     const selectBtn = (value) => {
-    //         let arr = state.s_options;
-    //         arr.map((i) => {
-    //             if (i.id === value.id) {
-    //                 i.selected = !i.selected;
-    //             }
-    //         });
-    //         state.s_options = arr;
-    //     };
-    //     return {
-    //         ...toRefs(state),
-    //         selectBtn,
-    //     };
-    // }
+    setup() {
+        const state = reactive({
+            questions: [
+                {
+                    id: 1,
+                    text: "1、控制计划是由工艺部门完成 （4分）",
+                    options: [
+                        {
+                            text: "正确",
+                            select:"flase",
+                        },
+                        {
+                            text: "错误",
+                            select:"flase",
+                        },
+                    ]
+                },
+                {
+                    id: 2,
+                    text: "2、.PFMEA假定所设计的产品能满足设计要求",
+                    options: [
+                        {
+                            text: "正确",
+                            select:"flase",
+                        },
+                        {
+                            text: "错误",
+                            select:"flase",
+                        },
+                    ]
+                },
+                {
+                    id: 3,
+                    text: "3、控制计划是由工艺部门完成 （4分）",
+                    options: [
+                        {
+                            text: "正确",
+                            select:"flase",
+                        },
+                        {
+                            text: "错误",
+                            select:"flase",
+                        },
+                    ]
+                },
+                {
+                    id: 4,
+                    text: "4、.PFMEA假定所设计的产品能满足设计要求",
+                    options: [
+                        {
+                            text: "正确",
+                            select:"flase",
+                        },
+                        {
+                            text: "错误",
+                            select:"flase",
+                        },
+                    ]
+                },
+            ],
+            // j_questions: [
+            //     {
+            //         type: "judge",
+            //         id: 1,
+            //         text: "1、控制计划是由工艺部门完成 （4分）",
+            //     },
+            //     {
+            //         type: "judge",
+            //         id: 2,
+            //         text: "2、.PFMEA假定所设计的产品能满足设计要求",
+            //     },
+            //     {
+            //         type: "judge",
+            //         id: 3,
+            //         text: "3、PFMEA假定所设计的产品能满足设计要求 （4分）",
+            //     },
+            // ],
+            s_questions: [
+                {
+                    type: "choice",
+                    id: 1,
+                    text: "4、.FMEA 是一种（ ）工具（4分）",
+                },
+            ],
+            // j_options: [
+            //     {
+            //         id: 1,
+            //         text: "正确",
+            //         selected: false,
+            //     },
+            //     {
+            //         id: 2,
+            //         text: "错误",
+            //         selected: false,
+            //     },
+            // ],
+            s_options: [
+                {
+                    id: 1,
+                    text: "问题解决",
+                    selected: false,
+                },
+                {
+                    id: 2,
+                    text: "项目策划",
+                    selected: false,
+                },
+                {
+                    id: 3,
+                    text: "过程分析",
+                    selected: false,
+                },
+                {
+                    id: 4,
+                    text: "风险分析",
+                    selected: false,
+                },
+            ]
+        });
+        const selectBtn = (value) => {
+            // let arr = state.questions;
+            const arry = []
+            state.questions.map((item) => {
+                arry.push(item.options)
+            })
+            console.log(arry)
+            console.log(value)
+            // arry.map((i) => {
+            //     if (i.id === value.id) {
+            //         i.selected = !i.selected;
+            //     }
+            // });
+            // state.questions = arry;
+        };
+        const selectBtn2 = (value) => {
+            let arr = state.s_options;
+            arr.map((i) => {
+                if (i.id === value.id) {
+                    i.selected = !i.selected;
+                }
+            });
+            state.s_options = arr;
+        };
+        return {
+            ...toRefs(state),
+            selectBtn,
+            selectBtn2,
+            Images,
+        };
+    }
 };
 </script>
 <style lang="scss" scoped>