From cc71d0661ab65e38b670f7bcf67bfec631c5fd4c Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Mon, 12 Aug 2024 11:54:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/kc/wjxCswj/WjxCywjV2List.vue        | 39 ++++++++++++------
 .../components/WjxWjxxTmlbDjjgForm.vue        | 41 ++++++++++++-------
 .../components/WjxWjxxTmlbDjjgModal.vue       |  2 +-
 3 files changed, 54 insertions(+), 28 deletions(-)

diff --git a/src/views/kc/wjxCswj/WjxCywjV2List.vue b/src/views/kc/wjxCswj/WjxCywjV2List.vue
index 6d96716..51123f4 100644
--- a/src/views/kc/wjxCswj/WjxCywjV2List.vue
+++ b/src/views/kc/wjxCswj/WjxCywjV2List.vue
@@ -52,7 +52,7 @@
           <div style="text-align: center">
             <a-button class="buttonClass" @click="handleBatchAdd"><Icon icon="ant-design:save-outlined" />保存</a-button>
             <a-divider type="vertical" />
-            <a-button class="buttonClass" @click="reloadZy"><Icon icon="ant-design:export-outlined" />返回</a-button>
+            <a-button class="buttonClass" @click="reloadZy"><Icon icon="ant-design:export-outlined" style="margin-right:10px" />返回</a-button>
           </div>
         </a-col>
       </a-row>
@@ -449,7 +449,7 @@
             <a-col :span="24" v-for="(item, index) in tiganData" :key="index">
               <div style="width: 100%">
                 <!-- 单选题 -->
-                <div style="width: 100%" v-if="item.wjType == 3">
+                <div style="width:98%; margin:0 auto" v-if="item.wjType == 3">
                   <!-- <span style="text-align: left;width: 50%;font-weight: bold;font-size: 18px;padding: 20px;">单选题</span> -->
                   <!-- <span class="tjfx-zql">正确率：15%</span> -->
                   <a-card>
@@ -457,13 +457,13 @@
                       <span>{{ index + 1 }}、</span><span v-html="item.wjTitle" style="white-space: pre-wrap; word-wrap: break-word"></span>
                     </template>
                     <template #extra v-if="zyInfo.atype == 6">
-                      <span style="margin-left: 40px">[单选题]</span>
+                      <span  class="question-type" style="margin-left: 40px">单选题</span>
                       <span style="margin-left: 40px">题目分值： {{ item.wjScore }} 分</span>
                     </template>
-                    <a-radio-group v-model:value="item.itemSelected" style="width: 100%" size="default" disabled>
+                    <a-radio-group v-model:value="item.itemSelected" style="width:100%;" size="default" disabled>
                       <div style="width: 100%" v-for="(tmxx, index2) in item.wjxWjxxTmxxList" :key="index2">
-                        <a-radio :value="tmxx.itemIndex + ``" style="width: 100%; margin-bottom: 5px">
-                              <span v-html="tmxx.itemTitle" style="width: 80%; font-size: 16px; color: #000"></span>
+                        <a-radio :value="tmxx.itemIndex + ``" style="width:100%; margin-bottom: 5px;">
+                              <span v-html="tmxx.itemTitle" style="font-size: 16px; color: #000"></span>
                               <span v-if="tmxx.itemSelected == 'true'" style="color: #9e9e9e; margin-left: 30px; font-size: 12px">(正确答案)</span>
                               <span class="tjfx-xzrs">选择人数：{{ tmxx.num }}人</span>
                         </a-radio>
@@ -472,7 +472,7 @@
                   </a-card>
                 </div>
                 <!-- 多选题 -->
-                <div style="width: 100%" v-else-if="item.wjType == 4">
+                <div style="width:98%; margin:0 auto" v-else-if="item.wjType == 4">
                   <!-- <span style="text-align: left;width: 50%;font-weight: bold;font-size: 18px;padding: 20px;">多选题</span> -->
                   <!-- <span class="tjfx-zql">正确率：15%</span> -->
                   <a-card>
@@ -480,7 +480,7 @@
                       <span>{{ index + 1 }}、</span><span v-html="item.wjTitle" style="white-space: pre-wrap; word-wrap: break-word" />
                     </template>
                     <template #extra v-if="zyInfo.atype == 6">
-                      <span style="margin-left: 40px">[多选题]</span>
+                      <span class="question-type" style="margin-left: 40px">多选题</span>
                       <span style="margin-left: 40px">题目分值： {{ item.wjScore }} 分</span>
                     </template>
                     <a-checkbox-group v-model:value="item.itemSelected" style="width: 100%" size="default" disabled>
@@ -497,17 +497,17 @@
                   </a-card>
                 </div>
                 <!-- 填空题 -->
-                <div style="width: 100%" v-else-if="item.wjType == 5">
+                <div style="width:98%; margin:0 auto" v-else-if="item.wjType == 5">
                   <!-- <span style="text-align: left;width: 50%;font-weight: bold;font-size: 18px;padding: 20px;">填空题</span> -->
                   <!-- <span class="tjfx-zql">正确率：15%</span> -->
                   <a-card>
                     <template #title>
                       <span>{{ index + 1 }}、</span><span v-html="item.wjTitle" style="white-space: pre-wrap; word-wrap: break-word" />
                       <span v-if="item.wjAnswer" style="color: #9e9e9e; margin-left: 30px; font-size: 12px">(正确答案:{{ item.wjAnswer }})</span>
-                      <span class="tjfx-xzrs" style="color: #9e9e9e">选择人数：{{ item.num }}人</span>
+                      <span class="tjfx-xzrs1" style="color: #9e9e9e">选择人数：{{ item.num }}人</span>
                     </template>
                     <template #extra v-if="zyInfo.atype == 6">
-                      <span style="margin-left: 40px">[填空题]</span>
+                      <span class="question-type" style="margin-left: 40px">填空题</span>
                       <span style="margin-left: 40px">题目分值： {{ item.wjScore }} 分</span>
                     </template>
                   </a-card>
@@ -1584,7 +1584,7 @@ onMounted(() => {
 }
 .ant-card {
   box-sizing: border-box;
-  margin: 0;
+  margin: 2px 0;
   padding: 0;
   color: rgb(0 0 0);
   font-size: 14px;
@@ -1595,7 +1595,7 @@ onMounted(() => {
   position: relative;
   border-radius: 5px;
   border: 1px solid #dadada;
-  background: #f7f7f7;
+  background: #fff;
 }
 .ant-card-head {
   min-height: 48px;
@@ -1711,6 +1711,7 @@ onMounted(() => {
   padding: 8px 20px;
   border-left: 5px solid #029c88;
   margin-bottom: 20px;
+  background: #fff;
 }
 .tjfx-col {
   font-size: 16px;
@@ -1728,6 +1729,12 @@ onMounted(() => {
 .tjfx-xzrs {
   margin-left: 30px;
   font-size: 12px;
+  position: absolute;
+  right:15px;
+}
+.tjfx-xzrs1 {
+  margin-left: 30px;
+  font-size: 12px;
 }
 .tjfx-zql {
   text-align: right;
@@ -1735,4 +1742,10 @@ onMounted(() => {
   font-size: 16px;
   padding: 20px;
 }
+.question-type{
+  background: #353535;
+  color: #fff;
+  padding:0 5px;
+  border-radius: 3px;
+}
 </style>
diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgForm.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgForm.vue
index cdbd403..ea5fc7f 100644
--- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgForm.vue
+++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgForm.vue
@@ -5,23 +5,23 @@
       <a-col :span="24" style="overflow-y: scroll;height: calc(80vh);">
         <div style="text-align: center;width: 100%;font-weight: bold;font-size: 20px;padding: 20px;">{{ djxxData.title }}</div>
         <div style="text-align: right;font-size: 16px;padding-right: 20px;">
-          <span style="text-decoration: underline;margin-right: 15px;">答卷人：{{ djxxData.userName }} </span>
-          <span v-if="djxxData.atype == 6" style="text-decoration: underline;margin-right: 15px;">总分：{{ djxxData.totalScore }} </span>
-          <span v-if="djxxData.atype == 6" style="text-decoration: underline;margin-right: 15px;">得分：{{ djxxData.score }} </span>
-          <span style="text-decoration: underline;margin-right: 15px;">用时：{{djxxData.answerSfm}} </span>
+          <span class="answer-title">答卷人：</span><span class="answer-info">{{ djxxData.userName }} </span>
+          <span v-if="djxxData.atype == 6" class="answer-title">总分：</span><span class="answer-info">{{ djxxData.totalScore }} </span>
+          <span v-if="djxxData.atype == 6" class="answer-title">得分：</span><span class="answer-info">{{ djxxData.score }} </span>
+          <span class="answer-title">用时：</span><span class="answer-info">{{djxxData.answerSfm}} </span>
         </div>
         <!-- 题干信息 -->
         <div style="width:100%;" v-for="(item,index) in tiganData" :key="index">
           <!-- 单选题 -->
-          <div style="width: 100%;" v-if="item.wjType==3">
+          <div style="width:92%; margin:0 auto" v-if="item.wjType==3">
             <div style="text-align: left;width: 100%;font-weight: bold;font-size: 18px;padding: 20px;">单选题</div>
-            <a-card >
+            <a-card>
               <template #title>
                 <span>{{index+1}}、</span><span v-html:value="item.wjTitle" style="white-space:pre-wrap;word-wrap : break-word"></span>
               </template>
               <template #extra v-if="djxxData.atype == 6">
-                <div style="margin-left: 40px;">题目分值： {{item.wjScore}} 分</div>
-                <div style="margin-left: 40px;">所得分值： {{item.itemScore}} 分</div>
+                <div style="margin-left: 40px;">题目分值：<span class="answer-word"> {{item.wjScore}}</span> 分</div>
+                <div style="margin-left: 40px;">所得分值：<span class="answer-word"> {{item.itemScore}}</span> 分</div>
               </template>
               <a-radio-group v-model:value="item.itemSelected" style="width: 100%" size="default" disabled>
                 <div style="width: 100%" v-for="(tmxx,index) in item.wjxWjxxTmxxList">
@@ -34,15 +34,15 @@
             </a-card>
           </div>
           <!-- 多选题 -->
-          <div style="width: 100%;" v-else-if="item.wjType==4">
+          <div style="width:92%; margin:0 auto" v-else-if="item.wjType==4">
             <div style="text-align: left;width: 100%;font-weight: bold;font-size: 18px;padding: 20px;">多选题</div>
             <a-card >
               <template #title>
                 <span>{{index+1}}、</span><span v-html:value="item.wjTitle" style="white-space:pre-wrap;word-wrap : break-word"/>
               </template>
               <template #extra v-if="djxxData.atype == 6">
-                <div style="margin-left: 40px;">题目分值： {{item.wjScore}} 分</div>
-                <div style="margin-left: 40px;">所得分值： {{item.itemScore}} 分</div>
+                <div style="margin-left: 40px;">题目分值：<span class="answer-word"> {{item.wjScore}} </span> 分</div>
+                <div style="margin-left: 40px;">所得分值：<span class="answer-word"> {{item.itemScore}}</span> 分</div>
               </template>
                     <!-- -{{item.itemSelected}}- -->
               <a-checkbox-group v-model:value="item.itemSelected" style="width: 100%" size="default" disabled>
@@ -59,7 +59,7 @@
             </a-card>
           </div>
           <!-- 填空题 -->
-          <div style="width: 100%;" v-else-if="item.wjType==5">
+          <div style="width:92%; margin:0 auto" v-else-if="item.wjType==5">
             <div style="text-align: left;width: 100%;font-weight: bold;font-size: 18px;padding: 20px;">填空题</div>
             <a-card >
               <template #title>
@@ -67,8 +67,8 @@
                 <span v-if="item.tktda" style="color:#9e9e9e;margin-left:30px;font-size:12px;">(正确答案:{{item.tktda}})</span>
               </template>
               <template #extra v-if="djxxData.atype == 6">
-                <div style="margin-left: 40px;">题目分值： {{item.wjScore}} 分</div>
-                <div style="margin-left: 40px;">所得分值： {{item.itemScore}} 分</div>
+                <div style="margin-left: 40px;">题目分值：<span class="answer-word">{{item.wjScore}}</span> 分</div>
+                <div style="margin-left: 40px;">所得分值：<span class="answer-word">{{item.itemScore}}</span> 分</div>
               </template>
               <a-row>
                 <a-col :span="24">
@@ -170,4 +170,17 @@ async function submitForm(){
   color: rgb(2, 2, 2); /* 例如，将文本颜色设置为灰色 */
   cursor: not-allowed; /* 将鼠标指针设置为禁用状态 */
 }
+.answer-title{
+  font-size: 14px;
+  color: #333;
+}
+.answer-info{
+  font-size: 14px;
+  color: #666;
+  text-decoration: underline;
+  margin-right: 15px;
+}
+.answer-word{
+  color: #ff8710;
+}
 </style>
diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgModal.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgModal.vue
index f54211a..f73f275 100644
--- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgModal.vue
+++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgModal.vue
@@ -9,7 +9,7 @@
   import WjxWjxxTmlbDjjgForm from './WjxWjxxTmlbDjjgForm.vue'
 
   const title = ref<string>('');
-  const width = ref<string>('80%');
+  const width = ref<number>(1024);
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   const registerForm = ref();