Merge remote-tracking branch 'origin/develop' into develop

src/views/courselibrary/CoursewareManage.vue

@@ -4188,7 +4188,7 @@ export default defineComponent({
     const getDictList = (param) => {
       let obj = {
         pageNo: 1,
-        pageSize: 20,
+        pageSize: 10000,
         setCode: param,
       };
       api1
@@ -5104,18 +5104,6 @@ export default defineComponent({
     };
 
     // 预览弹框 开启和关闭
-    //  内容分类 场景 -- 目前直接写死的
-    const sceneist11 = [
-      { dictCode: "6", dictValue: "场景一" },
-      { dictCode: "7", dictValue: "场景二" },
-    ];
-    const contentList11 = [
-      { dictCode: "8", dictValue: "分类一" },
-      { dictCode: "5", dictValue: "分类二" },
-    ];
-    // const heroImg = ref(null);
-    // // const valueHtmlRef = ref(null);
-    // const attachMap = ref([]);
     const ft_exit_see = () => {
       state.lookCourseModal = false;
     };
@@ -5134,6 +5122,7 @@ export default defineComponent({
         if (res.data.code === 200) return res.data.data;
       });
       state.lookCourseModal = true;
+      item.attach = item.attach == "" ? [] : item.attach.split(",");
       state.faceDetailObj = item;
       // heroImg.value.src = item.picUrl;
       // valueHtmlRef.value = item.outline;
@@ -5542,8 +5531,6 @@ export default defineComponent({
       ftsr_exit,
       stm_exit,
       ft_exit_see,
-      contentList11,
-      sceneist11,
       createkk,
       handleCancelStu,
       handleSureStu,

src/views/courselibrary/components/seeModal.vue

@@ -44,21 +44,10 @@
                 </div>
                 <div class="item_inp">
                   <div class="i1_input">
-                    <!-- {{ faceDetailObj !== null ? faceDetailObj.name : "" }} -->
+                    {{ filterTxt(detail.name) }}
                   </div>
                 </div>
               </div>
-              <!-- <div class="i2_cz">
-                <div class="i2_top">
-                  <div
-                    class="i2_right"
-                    @click="hideShow"
-                    style="cursor: pointer"
-                  >
-                    <div class="b_icon"></div>
-                  </div>
-                </div>
-              </div> -->
               <div class="mbl_items2">
                 <div class="item_nam">
                   <div class="asterisk_icon">
@@ -70,11 +59,10 @@
                   <span style="margin-right: 14px">封面图：</span>
                 </div>
                 <img
-                  ref="heroImg"
+                  :src="detail.picUrl"
                   alt="img"
                   style="width: 100px; height: 100px"
                 />
-                <!-- <div class="item_inp"></div> -->
               </div>
               <div class="mbl_items">
                 <div class="item_nam">
@@ -89,9 +77,7 @@
                 </div>
                 <div class="item_inp">
                   <div class="i1_input">
-                    <!-- {{
-                        faceDetailObj !== null ? faceDetailObj.targetUser : ""
-                      }} -->
+                    {{ filterTxt(detail.targetUser) }}
                   </div>
                 </div>
               </div>
@@ -101,21 +87,10 @@
                 </div>
                 <div class="item_inp">
                   <div class="i1_input">
-                    <!-- {{ faceDetailObj !== null ? faceDetailObj.meaning : "" }} -->
+                    {{ filterTxt(detail.meaning) }}
                   </div>
                 </div>
               </div>
-              <!-- <div class="mbl_items">
-                  <div class="item_nam">
-                    <div class="asterisk_icon">
-                      <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                    </div>
-                    <span style="margin-right: 14px">资源归属：</span>
-                  </div>
-                  <div class="item_inp">
-                    <div class="select i6_input">{{ faceDetailObj !== null ? faceDetailObj.projectId : "" }}</div>
-                  </div>
-                </div> -->
               <div class="mbl_items">
                 <div class="item_nam">
                   <div class="asterisk_icon">
@@ -127,15 +102,8 @@
                   <span style="margin-right: 14px">内容分类：</span>
                 </div>
                 <div class="item_inp">
-                  <!-- <div class="select i6_input">{{ faceDetailObj !== null ? faceDetailObj.categoryId : "" }}</div> -->
                   <div class="select i6_input">
-                    <!-- {{
-                        faceDetailObj !== null
-                          ? contentList11.find(
-                              (e) => e.dictCode == faceDetailObj.categoryId
-                            )?.dictValue
-                          : ""
-                      }} -->
+                    {{ filterClassTxt(detail.categoryId) }}
                   </div>
                 </div>
               </div>
@@ -144,15 +112,8 @@
                   <span style="margin-right: 14px">场景：</span>
                 </div>
                 <div class="item_inp">
-                  <!-- <div class="select i7_input">{{ faceDetailObj !== null ? faceDetailObj.sceneId : "" }}</div> -->
                   <div class="select i7_input">
-                    <!-- {{
-                        faceDetailObj !== null
-                          ? sceneist11.find(
-                              (e) => e.dictCode == faceDetailObj.sceneId
-                            )?.dictValue
-                          : ""
-                      }} -->
+                    {{ filterSenceTxt(detail.sceneId) }}
                   </div>
                 </div>
               </div>
@@ -161,7 +122,7 @@
                   <span style="margin-right: 14px">内容标签：</span>
                 </div>
                 <div class="item_inp">
-                  <!-- {{ faceDetailObj !== null ? faceDetailObj.tips : "" }} -->
+                  {{ filterTxt(detail.tips) }}
                 </div>
               </div>
             </div>
@@ -178,7 +139,7 @@
                 </div>
                 <div class="item_inp">
                   <div class="i1_input">
-                    <!-- {{ faceDetailObj !== null ? faceDetailObj.teacher : "" }} -->
+                    {{ filterTxt(detail.teacher) }}
                   </div>
                 </div>
               </div>
@@ -188,51 +149,14 @@
                 </div>
                 <div class="item_inp">
                   <div class="i10_textarea">
-                    <!-- {{ faceDetailObj !== null ? faceDetailObj.intro : "" }} -->
+                    {{ filterTxt(detail.intro) }}
                   </div>
                 </div>
               </div>
-              <div class="mbl_items">
-                <!-- <div v-if="attachMap.length > 0" class="item_nam">
-                  <span style="margin-right: 10px">附件</span>
-                </div> -->
-                <!-- <div
-                  class="item_inp"
-                  v-for="(value, index) in attachMap"
-                  :key="index"
-                >
-                  <a>
-                    {{
-                      [
-                        "附件一",
-                        "附件二",
-                        "附件三",
-                        "附件四",
-                        "附件五",
-                        "附件六",
-                      ][index]
-                    }}
-                  </a>
-                  <a style="margin-left: 120px" :src="value" :href="value">
-                    查看
-                  </a> 
-                       </div>-->
-                <!-- <a-upload multiple :show-upload-list="false" :before-upload="beforeUpload2">
-                      <div class="accessory" style="cursor: pointer">
-                        <div class="accessory_icon">
-                          <img src="@/assets/images/coursewareManage/enclosure.png" alt="enclosure" />
-                        </div>
-                        <span style="color: #4ea6ff">添加附件</span>
-                      </div>
-                    </a-upload>
-                    <span>
-                      支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip
-                    </span> -->
-              </div>
               <div class="mbl_items12">
                 <div
                   class="i12_box1"
-                  v-for="(item, index) in imgList"
+                  v-for="(item, index) in detail.attach"
                   :key="index"
                 >
                   <div class="file_img">
@@ -253,13 +177,6 @@
                       </div>
                     </div>
                   </div>
-                  <!-- <div class="file_operation">
-                    <div class="fobox">
-                      <span style="color: #4ea6ff" @click="handleDel(index)">
-                        删除
-                      </span>
-                    </div>
-                  </div> -->
                 </div>
               </div>
             </div>
@@ -270,27 +187,11 @@
             </div>
             <div class="fotarea">
               <div style="border: 1px solid #ccc">
-                <!-- <Toolbar style="border-bottom: 1px solid #ccc;width:900px;height: 300px;"  :defaultConfig="toolbarConfig"
-                    :mode="mode" /> -->
-                <!-- <Editor
-                    @focus="onEditorFocus"
-                    style="
-                      border-bottom: 1px solid #ccc;
-                      width: 900px;
-                      height: 300px;
-                    "
-                    v-model="valueHtml"
-                    :defaultConfig="editorConfig"
-                    :mode="mode"
-                    @onCreated="handleCreated"
-                  /> -->
+                <div v-html="detail.outline" />
               </div>
             </div>
           </div>
           <div class="m_btn">
-            <!-- <div class="btn btn5" @click="handleCancel">
-                <div class="btnText">取消</div>
-              </div> -->
             <div class="btn btn6" @click="handleCancel">
               <div class="btnText">确定</div>
             </div>
@@ -301,7 +202,8 @@
   </a-modal>
 </template>
 <script>
-import { reactive, toRefs, defineComponent, toRef, watch } from "vue";
+import { reactive, toRefs, defineComponent, ref } from "vue";
+import * as api1 from "../../../api/index1";
 
 export default defineComponent({
   props: {
@@ -316,18 +218,9 @@ export default defineComponent({
   },
   setup(props, { emit }) {
     console.log(props);
-    const detailWatch = toRef(props, "detail");
     const state = reactive({
       imgList: [],
     });
-    watch(
-      () => detailWatch,
-      (newValue) => {
-        console.log(78787878);
-        console.log(newValue);
-      },
-      { deep: true }
-    );
 
     const filterTxt = (txt) => {
       if (txt) {
@@ -336,13 +229,83 @@ export default defineComponent({
         return "-";
       }
     };
+    const filterClassTxt = (txt) => {
+      let str = "-";
+      if (txt) {
+        options2.value.forEach((item) => {
+          if (item.value === String(txt)) {
+            str = item.label;
+          }
+        });
+      }
+      return str;
+    };
+    const filterSenceTxt = (txt) => {
+      let str = "-";
+      if (txt) {
+        options3.value.forEach((item) => {
+          if (item.value === String(txt)) {
+            str = item.label;
+          }
+        });
+      }
+      return str;
+    };
     const handleCancel = () => {
       emit("cancel");
     };
 
+    //获取分类、场景-----------字典配置-------------------------------
+    const options2 = ref([]);
+    const options3 = ref([]);
+    const getDictList = (param) => {
+      let obj = {
+        pageNo: 1,
+        pageSize: 20,
+        setCode: param,
+      };
+      api1
+        .getDict(obj)
+        .then((res) => {
+          console.log("获取字典成功", res);
+          if (res.data.code === 200) {
+            if (param === "faceclassClass") {
+              let arr = res.data.data.rows;
+              let newArr = [];
+              arr.forEach((item) => {
+                newArr.push({
+                  value: item.dictCode,
+                  label: item.dictName,
+                });
+              });
+              options2.value = newArr;
+            }
+            if (param === "faceclassScene") {
+              let arr = res.data.data.rows;
+              let newArr = [];
+              arr.forEach((item) => {
+                newArr.push({
+                  value: item.dictCode,
+                  label: item.dictName,
+                });
+              });
+              options3.value = newArr;
+            }
+          }
+        })
+        .catch((err) => {
+          console.log("获取字典失败", err);
+        });
+    };
+    getDictList("faceclassClass");
+    getDictList("faceclassScene");
+    //获取分类、场景----------------字典配置---------------------------
+
     return {
       ...toRefs(state),
       filterTxt,
+      filterClassTxt,
+      filterSenceTxt,
       handleCancel,
     };
   },
@@ -685,6 +648,7 @@ export default defineComponent({
             }
 
             .fotarea {
+              width: calc(100% - 100px);
               position: relative;
 
               .fuwenben {