Explorar el Código

修改 type和数据对应不上bug 和查看更多跳转bug

秦鹏 hace 3 años
padre
commit
138375202a

+ 1 - 1
src/components/Header.vue

@@ -275,7 +275,7 @@ export default {
   async created() {
   async created() {
     let _this = this;
     let _this = this;
     _this.getChildSysList();
     _this.getChildSysList();
-    console.log("v2022.09.09.17:38");
+    console.log("v2022.03.09.10:20");
     let userInfor = getToken();
     let userInfor = getToken();
     if (userInfor) {
     if (userInfor) {
       await updateWordPack({
       await updateWordPack({

+ 1 - 1
src/components/teacher-dev/Teaching.vue

@@ -3,7 +3,7 @@
   <div class="Teaching">
   <div class="Teaching">
     <div class="top" v-if="!type">
     <div class="top" v-if="!type">
       <div class="title">
       <div class="title">
-        <span class="text"> <!-- 教辅资料  -->{{ $t("Key554") }} </span>
+        <span class="text"> <!-- 教辅资料  -->{{ $t("Key214") }} </span>
         <div class="more" @click="goMore">
         <div class="more" @click="goMore">
           <span> <!-- 查看更多  -->{{ $t("Key47") }} </span>
           <span> <!-- 查看更多  -->{{ $t("Key47") }} </span>
           <img src="../../assets/teacherdev/moreImage.png" alt="" />
           <img src="../../assets/teacherdev/moreImage.png" alt="" />

+ 1 - 1
src/components/teacher-dev/Textbook.vue

@@ -3,7 +3,7 @@
   <div class="Textbook">
   <div class="Textbook">
     <div class="top">
     <div class="top">
       <div class="title">
       <div class="title">
-        <span class="text"> <!-- 教研资料 -->{{ $t("Key214") }} </span>
+        <span class="text"> <!-- 教研资料 -->{{ $t("Key554") }} </span>
         <div class="more" @click="goMore">
         <div class="more" @click="goMore">
           <span> <!-- 查看更多  -->{{ $t("Key47") }} </span>
           <span> <!-- 查看更多  -->{{ $t("Key47") }} </span>
           <img src="../../assets/teacherdev/moreImage.png" alt="" />
           <img src="../../assets/teacherdev/moreImage.png" alt="" />

+ 3 - 3
src/views/teacher-dev/Viewmore.vue

@@ -265,13 +265,13 @@ export default {
     ];
     ];
     if (this.$route.query.classify) {
     if (this.$route.query.classify) {
       if (this.$route.query.classify == "TEXTBOOK") {
       if (this.$route.query.classify == "TEXTBOOK") {
-        this.text = this.$t("Key214"); //"教材";
+        this.text = this.$t("Key554"); //"教辅";
       }
       }
       if (this.$route.query.classify == "TEACHING") {
       if (this.$route.query.classify == "TEACHING") {
-        this.text = this.$t("Key554"); //"教学";
+        this.text = this.$t("Key214"); //"教研";
       }
       }
       if(this.$route.query.classify == "TOOLBOOK"){
       if(this.$route.query.classify == "TOOLBOOK"){
-        this.text = this.$t("Key555"); //"教学";
+        this.text = this.$t("Key555"); //"工具书";
       }
       }
       this.tag.push(this.$route.query.classify);
       this.tag.push(this.$route.query.classify);
     }
     }

+ 5 - 5
src/views/teacher-dev/index.vue

@@ -43,11 +43,11 @@
     </div>
     </div>
     <!-- 主要信息列表 -->
     <!-- 主要信息列表 -->
     <div class="main" v-loading="loading">
     <div class="main" v-loading="loading">
-      <div id="TEACHING" v-if="textBookList">
-        <Teaching v-if="textBookList.data" :classList="textBookList.data" />
+      <div id="TEXTBOOK" v-if="textBookList">
+        <Textbook v-if="textBookList.data" :classList="textBookList.data" />
       </div>
       </div>
-      <div id="TEXTBOOK" v-if="teachingList">
-        <Textbook v-if="teachingList.data" :classList="teachingList.data" />
+      <div id="TEACHING" v-if="teachingList">
+        <Teaching v-if="teachingList.data" :classList="teachingList.data" />
       </div>
       </div>
       <div id="TOOLBOOK" v-if="toolBookList">
       <div id="TOOLBOOK" v-if="toolBookList">
         <ToolBook v-if="toolBookList.data" :classList="toolBookList.data" />
         <ToolBook v-if="toolBookList.data" :classList="toolBookList.data" />
@@ -230,7 +230,7 @@ export default {
     img {
     img {
       width: 18px;
       width: 18px;
       height: 18px;
       height: 18px;
-      cursor:pointer;
+      cursor: pointer;
     }
     }
   }
   }
   .nav_title {
   .nav_title {

+ 42 - 19
src/views/teacher-devEntering/creadDocument.vue

@@ -14,9 +14,12 @@
       </div>
       </div>
       <div class="btn">
       <div class="btn">
         <!-- 完成 -->
         <!-- 完成 -->
-        <el-button @click="submit('form')" style="width: 180px" type="primary">{{
-          $t("Key82")
-        }}</el-button>
+        <el-button
+          @click="submit('form')"
+          style="width: 180px"
+          type="primary"
+          >{{ $t("Key82") }}</el-button
+        >
 
 
         <el-button @click="preview" style="width: 180px" type="warning">
         <el-button @click="preview" style="width: 180px" type="warning">
           <!-- 预览 -->{{ $t("Key144") }}
           <!-- 预览 -->{{ $t("Key144") }}
@@ -122,15 +125,21 @@
           <!-- 下载 -->
           <!-- 下载 -->
           <el-form-item :label="$t('Key242')" prop="download">
           <el-form-item :label="$t('Key242')" prop="download">
             <el-radio-group v-model="form.download">
             <el-radio-group v-model="form.download">
-              <el-radio label="downloadable"> <!-- 开启 -->{{ $t("Key245") }} </el-radio>
+              <el-radio label="downloadable">
+                <!-- 开启 -->{{ $t("Key245") }}
+              </el-radio>
               <el-radio label="0"> <!-- 关闭 -->{{ $t("Key246") }} </el-radio>
               <el-radio label="0"> <!-- 关闭 -->{{ $t("Key246") }} </el-radio>
             </el-radio-group>
             </el-radio-group>
           </el-form-item>
           </el-form-item>
           <!-- 分类 -->
           <!-- 分类 -->
           <el-form-item :label="$t('Key243')" prop="classify">
           <el-form-item :label="$t('Key243')" prop="classify">
             <el-radio-group v-model="form.classify">
             <el-radio-group v-model="form.classify">
-              <el-radio label="TEXTBOOK"> <!-- 教辅资料 -->{{ $t("Key554") }}</el-radio>
-              <el-radio label="TEACHING"> <!-- 教研资料 -->{{ $t("Key214") }} </el-radio>
+              <el-radio label="TEXTBOOK">
+                <!-- 教辅资料 -->{{ $t("Key554") }}</el-radio
+              >
+              <el-radio label="TEACHING">
+                <!-- 教研资料 -->{{ $t("Key214") }}
+              </el-radio>
               <el-radio label="TOOLBOOK">
               <el-radio label="TOOLBOOK">
                 <!-- 工具书 -->
                 <!-- 工具书 -->
                 {{ $t("Key555") }}
                 {{ $t("Key555") }}
@@ -230,7 +239,10 @@ export default {
     },
     },
     // 处理教材价格 失去焦点保留两位小数
     // 处理教材价格 失去焦点保留两位小数
     priceBlur() {
     priceBlur() {
-      if (Object.prototype.toString.call(this.form.price * 1).indexOf("Number") != -1) {
+      if (
+        Object.prototype.toString.call(this.form.price * 1).indexOf("Number") !=
+        -1
+      ) {
         if (this.form.price * 1 > 9999) {
         if (this.form.price * 1 > 9999) {
           // 可能需要提示
           // 可能需要提示
           this.form.price = "";
           this.form.price = "";
@@ -304,13 +316,21 @@ export default {
     submit(formName) {
     submit(formName) {
       this.loading = true;
       this.loading = true;
       let flag = false;
       let flag = false;
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-        } else {
-          flag = true;
-          return false;
-        }
-      });
+      // this.$refs[formName].validate((valid) => {
+      //   if (valid) {
+      //   } else {
+      //     flag = true;
+      //     return false;
+      //   }
+      // });
+      if (
+        !this.form.name ||
+        this.dynamicTags.length == 0 ||
+        this.form.price == "" ||
+        !this.form.institutionID
+      ) {
+        flag = true;
+      }
       if (flag) {
       if (flag) {
         this.$message.warning(this.$t("Key605")); //"请填写完整"
         this.$message.warning(this.$t("Key605")); //"请填写完整"
         this.loading = false;
         this.loading = false;
@@ -586,12 +606,15 @@ export default {
     font-size: 16px;
     font-size: 16px;
     color: #000000;
     color: #000000;
   }
   }
-  .el-upload-list__item-name {
-    margin-left: 50px;
-  }
-  .el-form-item__error {
-    margin-left: 50px;
+  .upload{
+    width: 400px;
   }
   }
+  // .el-upload-list__item-name {
+  //   margin-left: 50px;
+  // }
+  // .el-form-item__error {
+  //   margin-left: 50px;
+  // }
 }
 }
 .text_right {
 .text_right {
   .el-form-item {
   .el-form-item {

+ 1 - 1
vue.config.js

@@ -42,7 +42,7 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       // http://mk.wmjh.cn
       // http://mk.wmjh.cn
       [process.env.VUE_APP_BASE_API]: {
       [process.env.VUE_APP_BASE_API]: {
-        target: `https://gcls.utschool.cn`,
+        target: `https://gcls.helxsoft.cn`,
         changeOrigin: true,
         changeOrigin: true,
         pathRewrite: {
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''
           ['^' + process.env.VUE_APP_BASE_API]: ''