From 806e1b8bf4b5e85bb14c09b141afe55184aad034 Mon Sep 17 00:00:00 2001
From: lpq <lpq@ultron-soft.com>
Date: Fri, 24 Feb 2023 23:11:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E7=BC=96=E8=BE=91=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddTest.vue | 45 +++++++++++++++++-------------
 src/views/DownLoad.vue             |  7 +++--
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 2f38e378..d94cfdd0 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -10,13 +10,23 @@
           @click="closeDrawer" />
       </div>
       <div style="display: flex; flex-direction: row; padding-top: 0px; margin-top: 20px; margin-left: 32px;">
-        <div>
-          <button style="width: 100px; cursor: pointer;" @click="changeOuter(1)"
-            :class="formData.examType === 1 ? 'outer' : 'notOuter'">
+        <div v-if="taskIndex >= 0">
+          <button v-show="formData.examType === 1" style="width: 100px; cursor: pointer;"
+                  :class="formData.examType === 1 ? 'outer' : 'notOuter'">
             系统考试
           </button>
-          <button :disabled="taskIndex >= 0" style="width: 100px; cursor: pointer;" @click="changeOuter(2)"
-            :class="formData.examType === 2 ? 'outer' : 'notOuter'">
+          <button v-show="formData.examType === 2" style="width: 100px; cursor: pointer;"
+                  :class="formData.examType === 2 ? 'outer' : 'notOuter'">
+            外部考试
+          </button>
+        </div>
+        <div  v-else>
+          <button style="width: 100px; cursor: pointer;" @click="changeOuter(1)"
+                  :class="formData.examType === 1 ? 'outer' : 'notOuter'">
+            系统考试
+          </button>
+          <button  style="width: 100px; cursor: pointer;" @click="changeOuter(2)"
+                  :class="formData.examType === 2 ? 'outer' : 'notOuter'">
             外部考试
           </button>
         </div>
@@ -44,18 +54,18 @@
               </div>
               <span style="margin-right: 3px">选择试卷：</span>
             </div>
-            <s-test v-model:id="formData.examinationPaperId" v-model:name="formData.examinationTestName">
-              <div class="btnbox">
-                <button class="xkbtn" style="margin:0" :disabled="taskIndex >= 0">
-                  {{ formData.examinationPaperId ? "重选" : "选择" }}试卷
-                </button>
-              </div>
-            </s-test>
             <div v-if="formData.examinationPaperId">
               <a-tag closable color="processing" @close="delTag" :closeIcon="true">
                 <span style="font-size: 14px; line-height: 33px">{{ formData.examinationTestName }}</span>
               </a-tag>
             </div>
+            <s-test v-else v-model:id="formData.examinationPaperId" v-model:name="formData.examinationTestName">
+              <div class="btnbox">
+                <button class="xkbtn" style="margin:0" >
+                  {{ formData.examinationPaperId ? "重选" : "选择" }}试卷
+                </button>
+              </div>
+            </s-test>
           </div>
 
           <div class="main_item">
@@ -189,7 +199,7 @@
               <span style="margin-right: 3px">考试名称：</span>
             </div>
             <div class="btnbox">
-              <a-input v-model:value="formData.examinationName" style="width: 400px; height: 40px; border-radius: 8px"
+              <a-input v-model:value="formData.examinationName" style="width: 400px; height: 40px; border-radius: 8px" :disabled="taskIndex >= 0"
                 placeholder="请输入考试名称" :maxlength="20" />
             </div>
           </div>
@@ -201,7 +211,7 @@
               <span style="margin-right: 3px">数据来源：</span>
             </div>
             <div class="btnbox">
-              <a-input v-model:value="formData.source" style="width: 400px; height: 40px; border-radius: 8px"
+              <a-input v-model:value="formData.source" style="width: 400px; height: 40px; border-radius: 8px" :disabled="taskIndex >= 0"
                 placeholder="请输入数据来源" :maxlength="20" />
             </div>
           </div>
@@ -210,7 +220,7 @@
               <span style="margin-right: 3px">考试说明：</span>
             </div>
             <div class="textarea">
-              <a-textarea v-model:value="formData.externalExplain" placeholder="请输入考试说明" allow-clear show-count
+              <a-textarea v-model:value="formData.externalExplain" placeholder="请输入考试说明" allow-clear show-count :disabled="taskIndex >= 0"
                 :maxlength="200" :rows="6" />
             </div>
           </div>
@@ -355,7 +365,7 @@ async function confirm() {
   }).catch(err => {
     console.log(err)
   })
-  
+
   emit('update:taskList', [...props.taskList])
   closeDrawer()
 }
@@ -374,9 +384,6 @@ const delTag = () => {
 }
 
 function changeOuter(v) {
-  if (taskIndex.value >= 0) {
-    return message.warn("编辑状态不允许切换。")
-  }
   formData.value.examType = v;
 }
 
diff --git a/src/views/DownLoad.vue b/src/views/DownLoad.vue
index 382a00d6..b8fc3990 100644
--- a/src/views/DownLoad.vue
+++ b/src/views/DownLoad.vue
@@ -165,7 +165,8 @@ export default {
     function formatCapacity(data) {
       let num = Number(data);
       let CMB = (num / 1048576).toFixed(2);
-      let countCMB = (num / 1048576*1024).toFixed(2);
+      let total = Number(1048576*1024);
+      let countCMB = (num / total).toFixed(2);
       state.countCMB = countCMB;
       if(CMB%1024>1){
         CMB = (CMB/1024).toFixed(2) + 'GB';
@@ -177,9 +178,9 @@ export default {
     }
 
     function formatCapacityGB(data) {
-      debugger
       let num = Number(data);
-      let CMB = (num / (1048576*1024)).toFixed(2);
+      let total = Number(1048576*1024);
+      let CMB = (num / total).toFixed(2);
       return CMB
     }