From 88fdde0cd4706ca6f76db4bb4952216aa3f34ca5 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 23 Sep 2024 13:31:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=85=A5=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/downPath/stdrmb.xls                    | Bin 0 -> 22528 bytes
 .../components/BlTeacherMainModal.vue         |   2 +-
 src/views/kc/wjxCswj/WjxCywjV2List.vue        | 210 +++++++++++++++++-
 src/views/kc/wjxWjxx/WjxWjxx.api.ts           |   3 +
 .../components/WjxWjxxTmlbDjV2Form.vue        |  24 +-
 src/views/kc/wjxWjxxTmlb/TikuGongyouList.vue  |   1 +
 src/views/kc/wjxWjxxTmlb/TikuList.vue         |   1 +
 src/views/zy/zyInfo/ZyInfoV2List.vue          |   4 +-
 8 files changed, 232 insertions(+), 13 deletions(-)
 create mode 100644 public/downPath/stdrmb.xls

diff --git a/public/downPath/stdrmb.xls b/public/downPath/stdrmb.xls
new file mode 100644
index 0000000000000000000000000000000000000000..29c0675a73524dfc783bf2945a45fdf599c04477
GIT binary patch
literal 22528
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
SRt=AVkPiT<f3^?tz`p^G$;8<J

literal 0
HcmV?d00001

diff --git a/src/views/bl/blTeacherMain/components/BlTeacherMainModal.vue b/src/views/bl/blTeacherMain/components/BlTeacherMainModal.vue
index 4e9d5cb..ec3b5f6 100644
--- a/src/views/bl/blTeacherMain/components/BlTeacherMainModal.vue
+++ b/src/views/bl/blTeacherMain/components/BlTeacherMainModal.vue
@@ -1,6 +1,6 @@
 <template>
   <BasicModal v-bind="$attrs" @register="registerModal" :title="title" :width="800" @ok="handleSubmit">
-    <bl-teacher-main-form ref="formComponent" :formDisabled="formDisabled" :formBpm="false" @success="submitSuccess"></bl-teacher-main-form>
+    <BlTeacherMainForm ref="formComponent" :formDisabled="formDisabled" :formBpm="false" @success="submitSuccess"></BlTeacherMainForm>
   </BasicModal>
 </template>
 
diff --git a/src/views/kc/wjxCswj/WjxCywjV2List.vue b/src/views/kc/wjxCswj/WjxCywjV2List.vue
index 717f7d3..63a24be 100644
--- a/src/views/kc/wjxCswj/WjxCywjV2List.vue
+++ b/src/views/kc/wjxCswj/WjxCywjV2List.vue
@@ -170,6 +170,11 @@
                             >填空</a-button
                           ></p
                         >
+                        <!-- <p
+                          ><a-button type="primary" preIcon="ant-design:check-square-outlined" @click="addTigan(8)" :disabled="editDisabled"
+                            >文件</a-button
+                          ></p
+                        > -->
                       </a-card>
                       <a-card title="引用题库">
                         <p><a-button type="primary" @click="handleYylx('0')" :disabled="editDisabled">我的题库</a-button></p>
@@ -181,7 +186,7 @@
                         <template #item="{ index, element: item }">
                           <div>
                             <!-- 单选题 -->
-                            <div style="width: 100%" v-if="item.wjType == 3">
+                            <div style="width: 100%" v-if="item.wjType == 3 || item.wjType == '3'">
                               <a-card>
                                 <template #title>
                                   <span>{{ index + 1 }}、</span>
@@ -265,7 +270,7 @@
                               </a-card>
                             </div>
                             <!-- 多选题 -->
-                            <div style="width: 100%" v-else-if="item.wjType == 4">
+                            <div style="width: 100%" v-else-if="item.wjType == 4 || item.wjType == '4'">
                               <a-card>
                                 <template #title>
                                   <span>{{ index + 1 }}、</span
@@ -351,7 +356,7 @@
                               </a-card>
                             </div>
                             <!-- 填空题 -->
-                            <div style="width: 100%" v-else-if="item.wjType == 5">
+                            <div style="width: 100%" v-else-if="item.wjType == 5 || item.wjType == '5'">
                               <a-card>
                                 <template #title>
                                   <span>{{ index + 1 }}、</span
@@ -415,7 +420,63 @@
                                 </a-row>
                               </a-card>
                             </div>
-                            <div v-else> 无对应类型 </div>
+                            <!-- 文件上传 -->
+                            <div style="width: 100%" v-else-if="item.wjType == 8 || item.wjType == '8'">
+                              <a-card>
+                                <template #title>
+                                  <span>{{ index + 1 }}、</span>
+                                  <a-textarea
+                                    placeholder="请填写文件上传题题干"
+                                    v-model:value="item.wjTitle"
+                                    :bordered="false"
+                                    :style="{ width: handinpwei(item.wjTitle) }"
+                                    :auto-size="{ minRows: 1, maxRows: 5 }"
+                                    :disabled="editDisabled"
+                                  />
+                                  <span style="color: #c2bfbf">[文件上传]</span>
+                                </template>
+                                <template #extra>
+                                  <a-tooltip placement="topLeft" title="题目分数" v-if="isShow">
+                                    <a-select
+                                      style="width: 120px"
+                                      v-model:value="item.wjScore"
+                                      placeholder="请选择分数"
+                                      v-if="item.wjSfqh == '0'"
+                                      :disabled="editDisabled"
+                                    >
+                                      <a-select-option value="5">5</a-select-option>
+                                      <a-select-option value="4">4</a-select-option>
+                                      <a-select-option value="3">3</a-select-option>
+                                      <a-select-option value="2">2</a-select-option>
+                                      <a-select-option value="1">1</a-select-option>
+                                    </a-select>
+                                    <span v-if="item.wjSfqh == '0'" @click="handleQiehuan(item, '1')" style="color: #9e9e9e" :disabled="editDisabled"
+                                      >自定义分数</span
+                                    >
+                                    <a-input-number
+                                      v-model:value="item.wjScore"
+                                      style="width: 120px"
+                                      v-if="item.wjSfqh == '1'"
+                                      :disabled="editDisabled"
+                                    ></a-input-number>
+                                    <span v-if="item.wjSfqh == '1'" @click="handleQiehuan(item, '0')" style="color: #9e9e9e" :disabled="editDisabled"
+                                      >返回</span
+                                    >
+                                  </a-tooltip>
+                                  <a-tooltip placement="topRight" title="删除此题"
+                                    ><Icon
+                                      icon="ant-design:delete-outlined"
+                                      style="cursor: pointer; font-size: 20px; margin: 10px"
+                                      @click="handleDelTigan(item, index)"
+                                      v-if="!editDisabled"
+                                  /></a-tooltip>
+                                </template>
+                              </a-card>
+                            </div>
+
+
+
+                            <div v-else> 无对应类型 -{{item.wjType}}- </div>
                           </div>
                         </template>
                       </draggable>
@@ -567,7 +628,13 @@
         <a-col :span="24" style="text-align: right; margin-top: 5px">
           <a-button type="primary" @click="handleSzzycs(1)"><Icon icon="ant-design:edit-outlined" />修改课程测验次数</a-button>
           <a-divider type="vertical" />
-          <a-button type="primary" @click="handleAddOne" class="mar-right20"><Icon icon="ant-design:file-add-outlined" />新增测验</a-button>
+          <a-button type="primary" @click="handleAddOne"><Icon icon="ant-design:file-add-outlined" />新增测验</a-button>
+          <!-- <a-divider type="vertical" />
+          <a-button type="primary" @click="handleTiku('6')" style="margin-left: 8px">题库</a-button>
+          <a-divider type="vertical" />
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="importXls">导入试题</j-upload-button>
+          <a-divider type="vertical" />
+          <a-button type="primary" @click="downloadByUrl({url:'/downPath/stdrmb.xls',target: '_self',fileName:'试题导入模板.xls'})" class="mar-right20"><Icon icon="ant-design:file-add-outlined" />下载试题模板</a-button> -->
         </a-col>
         <a-col :span="24">
           <a-row style="padding: 10px">
@@ -840,6 +907,7 @@
 
     <YinyongTikuListModal ref="YinyongTikuListModalpage" @success="handleYytkSuccess" />
     <YinyongTikuDcListModal ref="YinyongTikuDcListModalpage" @success="handleYytkSuccess" />
+    <TikuListModal ref="TikuListModalPage"></TikuListModal>
   </div>
 </template>
 
@@ -863,15 +931,28 @@ import XxhbbksListModal from '/@/views/kc/xxhbbks/XxhbbksListModal.vue';
 import KcTeachingUnitContentOneListModal from '/@/views/zy/zyInfo/zyCheckZcjc/KcTeachingUnitContentOneListModal.vue';
 import YinyongTikuListModal from '/@/views/kc/wjxWjxxTmlb/YinyongTikuListModal.vue';
 import YinyongTikuDcListModal from '/@/views/kc/wjxWjxxTmlb/YinyongTikuDcListModal.vue';
+import TikuListModal from '/@/views/kc/wjxWjxxTmlb/TikuListModal.vue';
 import { create } from 'sortablejs';
+import { downloadByUrl } from '/@/utils/file/download';
 
+const glob = useGlobSetting();
 const globSetting = useGlobSetting();
 
+
+/**
+ * 导出文件xlsx的mime-type
+ */
+ const XLSX_MIME_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+/**
+ * 导出文件xlsx的文件后缀
+ */
+const XLSX_FILE_SUFFIX = '.xlsx';
+
 //当前路由信息
 const { currentRoute } = useRouter();
 const { query } = unref(currentRoute);
 const { rwbh, xqxn, type, teano } = query; //获取传递参数
-const { createConfirm, createMessage } = useMessage();
+const { createConfirm, createMessage,createWarningModal } = useMessage();
 //用户相关
 const userStore = useUserStore();
 const XxhbbksListModalPage = ref();
@@ -879,6 +960,7 @@ const WjxWjxxTmlbDjjgsModalPage = ref();
 const registerZcjcModal = ref();
 const YinyongTikuListModalpage = ref();
 const YinyongTikuDcListModalpage = ref();
+const TikuListModalPage = ref();
 
 const showType = ref<number>(0);
 const zycs = ref<number>(0);
@@ -953,6 +1035,92 @@ function handleViewEwm(record) {
   ewmInfo.value = record;
 }
 
+
+//题库类型（6作业，1问卷）
+function handleTiku(wjLeixing){
+  var record = {wjLeixing}
+  TikuListModalPage.value.disableSubmit = true;
+  TikuListModalPage.value.init(record);
+}
+
+async function exportTmlbXls(isXlsx = false) {
+  var name = "问卷导入模板";var url = "/wjxWjxxTmlb/wjxWjxxTmlb/exportDownXls"; var params ={title: '-1'} ;
+    const data = await defHttp.get({ url: url, params: params, responseType: 'blob', timeout: 9000000 }, { isTransformResponse: false });
+    if (!data) {
+      createMessage.warning('文件下载失败');
+      return;
+    }
+    if (!name || typeof name != 'string') {
+      name = '导出文件';
+    }
+    let blobOptions = { type: 'application/vnd.ms-excel' };
+    let fileSuffix = '.xls';
+    if (isXlsx === true) {
+      blobOptions['type'] = XLSX_MIME_TYPE;
+      fileSuffix = XLSX_FILE_SUFFIX;
+    }
+    if (typeof window.navigator.msSaveBlob !== 'undefined') {
+      window.navigator.msSaveBlob(new Blob([data], blobOptions), name + fileSuffix);
+    } else {
+      let url = window.URL.createObjectURL(new Blob([data], blobOptions));
+      let link = document.createElement('a');
+      link.style.display = 'none';
+      link.href = url;
+      link.setAttribute('download', name + fileSuffix);
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link); //下载完成移除元素
+      window.URL.revokeObjectURL(url); //释放掉blob对象
+    }
+  }
+
+  
+  /**
+   * 导入xls
+   * @param data 导入的数据
+   * @param url
+   */
+   async function importXls(data, url) {
+    url = "/wjxWjxxTmlb/wjxWjxxTmlb/importExcel";
+    const isReturn = (fileInfo) => {
+      try {
+        if (fileInfo.code === 201) {
+          let {
+            message,
+            result: { msg, fileUrl, fileName },
+          } = fileInfo;
+          let href = glob.uploadUrl + fileUrl;
+          createWarningModal({
+            title: message,
+            centered: false,
+            content: `<div>
+              <span>${msg}</span><br/>
+              <span>具体详情请<a href = ${href} download = ${fileName}> 点击下载 </a> </span>
+            </div>`,
+          });
+          //update-begin---author:wangshuai ---date:20221121  for：[VUEN-2827]导入无权限，提示图标错误------------
+        } else if (fileInfo.code === 500 || fileInfo.code === 510) {
+          createMessage.error(fileInfo.message || `${data.file.name} 导入失败`);
+          //update-end---author:wangshuai ---date:20221121  for：[VUEN-2827]导入无权限，提示图标错误------------
+        } else {
+          createWarningModal({
+            centered: false,
+            content: `<div>
+              <span>${fileInfo.message}</span><br/>
+            </div>`,
+          });
+        }
+      } catch (error) {
+        console.log('导入的数据异常', error);
+      } finally {
+      }
+    };
+    await defHttp.uploadFile({ url }, { file: data.file }, { success: isReturn });
+  }
+
+
+
+
 //答题结果
 function handleTeaDtjg(item) {
   console.log('🧳', item);
@@ -1253,6 +1421,22 @@ function addTigan(type) {
     };
     list.push(params);
     tiganData.value = [...list];
+  }else if (type == 8) {
+    var chk = '';
+    if (isShow.value) {
+      chk = '1';
+    }
+    let params = {
+      wjType: parseInt(type),
+      wjIndex: list.length + 1,
+      mainId: mainId,
+      wjTitle: null,
+      wjScore: null,
+      wjLeixing,
+      wjSfqh: '0',
+    };
+    list.push(params);
+    tiganData.value = [...list];
   }
 }
 
@@ -1543,7 +1727,7 @@ async function submitForm() {
       }
 
       var wjType = param.wjType;
-      if (wjType != 5) {
+      if (wjType == 3 && wjType == 4) {
         var itemlist = param.wjxWjxxTmxxList;
         for (let j = 0; j < itemlist.length; j++) {
           if (!itemlist[j].itemTitle) {
@@ -1563,7 +1747,9 @@ async function submitForm() {
             return;
           }
         }
-      } else {
+      }else if(wjType == 8){
+        
+      } else if(wjType == 6) {
         if (isShow.value) {
           var wjAnswer = values[i].wjAnswer;
           if (!wjAnswer || wjAnswer == 'NaN' || wjAnswer == 'undefined') {
@@ -2008,4 +2194,12 @@ onMounted(() => {
   margin-left: 10px;
    font-size: 12px;
 }
+/deep/.ant-card-head-title {
+  display: inline-block;
+  flex: 1;
+  padding: 16px 0;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: clip;
+}
 </style>
diff --git a/src/views/kc/wjxWjxx/WjxWjxx.api.ts b/src/views/kc/wjxWjxx/WjxWjxx.api.ts
index 2f95de7..39932aa 100644
--- a/src/views/kc/wjxWjxx/WjxWjxx.api.ts
+++ b/src/views/kc/wjxWjxx/WjxWjxx.api.ts
@@ -11,6 +11,8 @@ enum Api {
   deleteBatch = '/wjxWjxx/wjxWjxx/deleteBatch',
   importExcel = '/wjxWjxx/wjxWjxx/importExcel',
   exportXls = '/wjxWjxx/wjxWjxx/exportXls',
+  exportTmlbXls = '/wjxWjxxTmlb/wjxWjxxTmlb/exportXls',
+  
 }
 
 /**
@@ -18,6 +20,7 @@ enum Api {
  * @param params
  */
 export const getExportUrl = Api.exportXls;
+export const exportTmlbXls = Api.exportTmlbXls;
 
 /**
  * 导入api
diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjV2Form.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjV2Form.vue
index 2d194f5..81d7f06 100644
--- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjV2Form.vue
+++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjV2Form.vue
@@ -59,7 +59,7 @@
                       </a-checkbox-group>
                     </a-card>
                   </div>
-                  <!-- 多选题 -->
+                  <!-- 填空题 -->
                   <div style="width: 100%" v-else-if="item.wjType == 5">
                     <div style="text-align: left; width: 100%; font-weight: bold; line-height: 80px; font-size: 18px">填空题</div>
                     <a-card>
@@ -85,6 +85,26 @@
                       </a-row>
                     </a-card>
                   </div>
+                  <!-- 填空题 -->
+                  <div style="width: 100%" v-else-if="item.wjType == 8">
+                    <div style="text-align: left; width: 100%; font-weight: bold; line-height: 80px; font-size: 18px">文件上传</div>
+                    <a-card>
+                      <template #title>
+                        <span>{{ index + 1 }}、</span
+                        ><span v-html="item.wjTitle" style="font-weight: bold; white-space: pre-wrap; word-wrap: break-word" />
+                      </template>
+                      <template #extra>
+                        <span style="margin-left: 40px" v-if="isShow"
+                          >题目分值： <span class="answer-word">{{ item.wjScore }}</span> 分</span
+                        >
+                      </template>
+                      <a-row>
+                        <a-col :span="24">
+                          <j-upload v-model:value="item.wjAnswer" :disabled="disabled" ></j-upload>
+                        </a-col>
+                      </a-row>
+                    </a-card>
+                  </div>
                   <div v-else> 无对应类型 </div>
                 </div>
               </a-col>
@@ -151,6 +171,7 @@ import { defHttp } from '/@/utils/http/axios';
 import { queryWjxWjxxTmxxListByMainId, queryDataById, saveOrUpdate, djtj } from '/@/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.api';
 import headerPage from '/@/views/site/common/header.vue';
 import footerPage from '/@/views/site/common/footer.vue';
+import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
 
 const title = ref<string>('');
   const content = ref<string>('');
@@ -213,7 +234,6 @@ function edit(record, isDisabled, type, flag) {
 //提交数据
 async function submitForm() {
   const data = tiganData.value;
-  // console.log(`🚀 ~ submitForm ~ data:`, data)
   const values = Object.assign([], data);
   for (let i = 0; i < values.length; i++) {
     let param = values[i];
diff --git a/src/views/kc/wjxWjxxTmlb/TikuGongyouList.vue b/src/views/kc/wjxWjxxTmlb/TikuGongyouList.vue
index bfa8916..7c708a8 100644
--- a/src/views/kc/wjxWjxxTmlb/TikuGongyouList.vue
+++ b/src/views/kc/wjxWjxxTmlb/TikuGongyouList.vue
@@ -90,6 +90,7 @@
                fixed:'right'
            },
            beforeFetch: (params) => {
+            params.column = 'id',params.order = 'desc';//新生成的默认不带排序
              return Object.assign(params, queryParam.value);
            },
         },
diff --git a/src/views/kc/wjxWjxxTmlb/TikuList.vue b/src/views/kc/wjxWjxxTmlb/TikuList.vue
index d7b3800..ce77f7e 100644
--- a/src/views/kc/wjxWjxxTmlb/TikuList.vue
+++ b/src/views/kc/wjxWjxxTmlb/TikuList.vue
@@ -93,6 +93,7 @@
                fixed:'right'
            },
            beforeFetch: (params) => {
+            params.column = 'id',params.order = 'desc';//新生成的默认不带排序
              return Object.assign(params, queryParam.value);
            },
         },
diff --git a/src/views/zy/zyInfo/ZyInfoV2List.vue b/src/views/zy/zyInfo/ZyInfoV2List.vue
index 7d6c488..1a0a586 100644
--- a/src/views/zy/zyInfo/ZyInfoV2List.vue
+++ b/src/views/zy/zyInfo/ZyInfoV2List.vue
@@ -481,7 +481,7 @@
               </a-card>
               <a-card
                 :title="'第' + item.sort + '次作业(占比' + item.score + '%)'"
-                v-if="item.endTime && item.zyStatus == '1'"
+                v-if="item.endTime && (item.zyStatus == '1' || item.zyStatus == '2')"
                 class="cardClass module-bg"
               >
                 <template #extra><span class="card-label">已发布</span> </template>
@@ -820,7 +820,7 @@ function handleKcnr() {
 function searchQueryZyxq() {
   selectedRowKeys.value = [];
 
-  queryParam.value.mainId = zyInfo.value.id;
+  // queryParam.value.mainId = zyInfo.value.id;
   queryParam.value.queryType = queryType.value;
   reload();
 }