From c2b68cf5aaec80041ed978b04b71409fed9b3686 Mon Sep 17 00:00:00 2001
From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com>
Date: Mon, 14 Nov 2022 09:42:40 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=8A=95=E7=A5=A8=E9=A2=98=E5=B9=B2?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=92=8C=E9=80=89=E9=A1=B9=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?\=E5=88=9B=E5=BB=BA=E5=88=A0=E9=99=A4=E9=A2=98=E5=B9=B2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddVote.vue |  41 +++++-----
 src/components/drawers/CreVote.vue | 120 +++++++++++++++--------------
 vue.config.js                      |   1 +
 3 files changed, 83 insertions(+), 79 deletions(-)

diff --git a/src/components/drawers/AddVote.vue b/src/components/drawers/AddVote.vue
index 57195b43..01647cc1 100644
--- a/src/components/drawers/AddVote.vue
+++ b/src/components/drawers/AddVote.vue
@@ -66,7 +66,7 @@
               <div :style="{ display: creVote ? 'block' : 'none' }">
                 <div class="fileTigan">
                   <span style="color: #388be1">{{voteStemName}}</span>
-                  <div class="delBox" @click="delBox()"></div>
+                  <div class="delBox" @click="dleVoteStem()"></div>
                 </div>
               </div>
             </div>
@@ -74,7 +74,8 @@
             <div>
               <cre-vote
                 v-model:crevoteVisible="crevotevisible"
-                @getData="changeVData"
+                @getData="getStemId"
+                v-model:voteStemId="voteStemId"
               />
             </div>
             <!-- 创建投票侧弹窗 -->
@@ -195,7 +196,7 @@ export default {
       endTimes: "",
       startTimes: "",
       ascriptionId: "",
-      voteStemId: "",
+      voteStemId: null,
       voteId:"",
       voteStemName:"",
     });
@@ -209,6 +210,14 @@ export default {
     const showDrawerCreVote = () => {
       state.crevotevisible = true;
     };
+    const getStemId = (data) => {
+      state.voteStemName = data.voteStemName;
+      state.voteStemId = Number(data.voteStemId);
+      state.creVote = data.creVote;
+      console.log('state.voteStemId', state.voteStemId);
+      console.log('state.voteStemId', state.creVote);
+    }
+    //暂时没用 之前给子用传参来着
     const changeVData = (data) => {
       console.log("111", data);
       state.creVote = data.creVote;
@@ -220,25 +229,11 @@ export default {
     };
     const delBox = () => {
       state.creVote = false;
-      dleVoteStem()
     };
 
-    //获取题干信息
-    // const getStemText = () => {
-    //   let objstem = {
-    //     stemId: state.ascriptionId,
-    //     ascriptionId: state.voteStemId,
-    //   }
-    //   api
-    //     .queryStemByStemId(objstem)
-    //     .then((res) => {
-    //       console.log("获取成功", res);
-    //       message.success("获取成功");
-    //     })
-    //     .catch((err) => {
-    //       console.log(err);
-    //     });
-    // }
+    const updateTableData = (data) => {
+      console.log(data, 'data');
+    }
 
     //删除题干信息接口
     const dleVoteStem = () => {
@@ -249,6 +244,7 @@ export default {
         .then((res) => {
           console.log('删除题干信息成功', res)
           message.success('删除题干信息成功')
+          delBox()
       })
     }
     //创建投票信息
@@ -273,9 +269,6 @@ export default {
         );
       }
 
-      // if (state.crevotevisible = false) {
-      //   changeVData()
-      // };
 
       let obj = {
         ascriptionId: state.ascriptionId,
@@ -342,12 +335,14 @@ export default {
       showDrawerCreVote,
       afterVisibleChange,
       closeDrawer,
+      getStemId,
       changeVData,
       rowSelection,
       options1,
       dleVoteStem,
       createVoteText,
       delBox,
+      updateTableData,
     };
   },
 };
diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue
index 826218f8..7ac4071e 100644
--- a/src/components/drawers/CreVote.vue
+++ b/src/components/drawers/CreVote.vue
@@ -111,7 +111,7 @@
     </div>
   </a-drawer>
 </template>
-  <script>
+<script>
 import { reactive, toRefs } from "vue";
 import * as api from "../../api/indexVote";
 import { message } from "ant-design-vue";
@@ -186,46 +186,69 @@ export default {
 
     //创建题干接口
     const createQueTit = () => {
-      if (state.inputV1 == "") {
+      if (!state.inputV1) {
         message.destroy();
         return message.info("请输入投票名称");
       }
-      // if (!state.questions.inputV) {
-      //   message.destroy();
-      //   return message.info("请输入题干");
-      // }
-      if (!state.questions.optins.opvalue) {
-        message.destroy();
-        return message.info("请输入选项");
+      for (let i = 0; i < state.questions.length; i++) {
+        if (!state.questions[i].inputV) {
+          message.destroy();
+          return message.info("请输入题干");
+        }
+      }
+      for (let i = 0; i < state.questions.length; i++) {
+        for (let k = 0; k < state.questions[i].options.length; k++) {
+          if (!state.questions[i].options[k].opvalue) {
+            message.destroy();
+            return message.info("请输入选项");
+          }
+        }
+      }
+      // for (let i = 0; i < state.questions.length; i++) {
+      //   for (let k = 0; k < state.questions[i].options.length; k++) {
+      //     // console.log('1111111111111111', state.questions);
+      //     // console.log('2222222222222222', state.questions[i].options);
+
+      //   }
+      // }
+      let obj = {
+        "ballotId": 0,
+        "ballotName": state.inputV1,
+        "createTime": "",
+        "createUser": 0,
+        "updateTime": "",
+        "updateUser": 0,
+        "voteStemDtoList": [
+          {
+            "ballotId": 0,
+            "createTime": "",
+            "createUser": 0,
+            "optionDetailList": [
+              {
+                "createTime": "",
+                "createUser": 0,
+                "optionFlag": "",
+                "optionId": 0,
+                // "optionName": state.questions[i].options[k].opvalue,
+                "optionName": "",
+                "optionOrderNum": "",
+                "optionPictureAddress": "",
+                "stem": "",
+                "updateTime": "",
+                "updateUser": 0,
+                "voteStemId": 0
+              }
+            ],
+            "orderNumber": "",
+            "updateTime": "",
+            "updateUser": 0,
+            "voteStemFlag": "",
+            "voteStemId": 0,
+            // "voteStemName": state.questions[i].inputV,
+            "voteStemName": "",
+          }
+        ]
       }
-      console.log("111111", state.questions);
-      // console.log('22222',state.questions.inputV);
-      // console.log('333333',state.questions.options);
-      let obj = [
-        {
-          ascriptionId: 0,
-          createUser: 0,
-          optionDetailList: [
-            {
-              createUser: 0,
-              optionId: 0,
-              optionName: state.questions[0].options[0].opvalue,
-              optionOrderNum: "",
-              optionPictureAddress: "",
-              stem: "",
-              updateTime: "",
-              updateUser: 0,
-              voteStemId: 0,
-            },
-          ],
-          orderNumber: "",
-          updateTime: "",
-          updateUser: 0,
-          voteStemFlag: "",
-          voteStemId: 0,
-          voteStemName: state.questions[0].inputV,
-        },
-      ];
       api
         .createOptionMessage(obj)
         .then((res) => {
@@ -234,27 +257,12 @@ export default {
           // console.log('res.data.data[0].voteStemId',res.data.data[0].voteStemId);
           // console.log('state.questions[0].inputV',state.questions[0].inputV);
           message.success("创建成功");
-          //获取题干信息
           let objstem = {
-            stemId: res.data.data[0].ascriptionId,
-            ascriptionId: res.data.data[0].voteStemId,
-          };
-          api
-            .queryStemByStemId(objstem)
-            .then((res) => {
-              console.log("获取成功", res);
-              message.success("获取成功");
-            })
-            .catch((err) => {
-              console.log(err);
-            });
-          let stemData = {
-            creVote: state.creVote,
-            ascriptionId: res.data.data[0].ascriptionId,
-            voteStemId: res.data.data[0].voteStemId,
             voteStemName: state.questions[0].inputV,
+            voteStemId: res.data.data.voteStemVoList[0].voteStemId,
+            creVote: true,
           };
-          ctx.emit("getData", stemData);
+          ctx.emit("getData", objstem);
           closeDrawer();
         })
         .catch((err) => {
@@ -274,7 +282,7 @@ export default {
   },
 };
 </script>
-  <style lang="scss">
+<style lang="scss">
 .ant-table-striped :deep(.table-striped) td {
   background-color: #fafafa !important;
 }
diff --git a/vue.config.js b/vue.config.js
index 00b489e9..83ff56c7 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,6 +2,7 @@ const { defineConfig } = require("@vue/cli-service");
 module.exports = defineConfig({
   // transpileDependencies: true,
   devServer: {
+    port:8080,
     proxy: {
       "/api": {
         target: "http://111.231.196.214:30001/", //这里后台的地址模拟的;应该填写你们真实的后台接口