guanchunjie 3 роки тому
батько
коміт
bbf5e268ca

+ 79 - 81
package-lock.json

@@ -1717,6 +1717,16 @@
           "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "cacache": {
           "version": "13.0.1",
           "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-13.0.1.tgz",
@@ -1743,6 +1753,53 @@
             "unique-filename": "^1.1.1"
           }
         },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz?cache=0&sync_timestamp=1598275560784&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsource-map%2Fdownload%2Fsource-map-0.6.1.tgz",
@@ -1759,6 +1816,16 @@
             "minipass": "^3.1.1"
           }
         },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
         "terser-webpack-plugin": {
           "version": "2.3.8",
           "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.3.8.tgz",
@@ -1775,6 +1842,18 @@
             "terser": "^4.6.12",
             "webpack-sources": "^1.4.3"
           }
+        },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.5.0",
+          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz",
+          "integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          }
         }
       }
     },
@@ -11857,87 +11936,6 @@
         }
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.5.0",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz",
-      "integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "vue-pdf": {
       "version": "4.2.0",
       "resolved": "https://registry.npm.taobao.org/vue-pdf/download/vue-pdf-4.2.0.tgz",

+ 4 - 5
src/components/teacher-dev/Teaching.vue

@@ -148,16 +148,15 @@ export default {
     }
   }
   .class_list {
-    width: 1160px;
-    height: 778px;
+    width: 1200px;
+    box-sizing: border-box;
     margin: 0 auto;
     background: #fff;
     display: flex;
     flex-wrap: wrap;
     justify-content: flex-start;
-    padding-top: 50px;
-    padding-left: 20px;
-    padding-right: 20px;
+    padding: 50px 20px 8px 20px;
+
     > div {
       width: 192px;
       margin-left: 20px;

+ 3 - 5
src/components/teacher-dev/Textbook.vue

@@ -147,16 +147,14 @@ export default {
     }
   }
   .class_list {
-    width: 1160px;
+    width: 1200px;
+    box-sizing: border-box;
     margin: 0 auto;
     background: #fff;
-    height: 778px;
     display: flex;
     flex-wrap: wrap;
     justify-content: flex-start;
-    padding-top: 50px;
-    padding-left: 20px;
-    padding-right: 20px;
+    padding: 50px 20px 8px 20px;
     > div {
       width: 192px;
       margin-left: 20px;

+ 24 - 29
src/views/teacher-dev/Viewmore.vue

@@ -55,35 +55,13 @@
               background
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
-              layout="prev, pager, next"
+              :page-sizes="[10, 20, 30, 40, 50]"
+              layout="prev, pager, next,total, sizes,jumper"
               :current-page="pageNum"
               :page-size="pageSize"
               :total="DataList.total"
             >
             </el-pagination>
-            <span> | </span>
-            <span>
-              <span class="number">{{ Math.ceil(DataList.total / 10) }}</span>
-              页
-            </span>
-            <span> | </span>
-            <span>
-             每页
-              <span class="number"> {{ pageSize }} </span>
-              <span> 个 </span>
-            </span>
-            <span>|</span>
-            <span> 跳转 </span>
-            <span>
-              <el-input
-                @input="toPageChange"
-                v-model="gotoPage"
-                :maxlength="1"
-                class="gotoPage"
-                type="text"
-              />
-            </span>
-            <span>页</span>
           </div>
         </template>
         <template v-else>
@@ -329,6 +307,8 @@ export default {
 <style lang="scss" scoped>
 /* @import url(); 引入css类 */
 .Viewmore {
+  min-height: 100vh;
+  background: #f6f6f6;
   .header {
     height: 64px;
     background: url("../../assets/teacherdev/Homebg2.png") no-repeat;
@@ -358,7 +338,7 @@ export default {
     }
   }
   .main {
-    background: #F6F6F6;
+    background: #f6f6f6;
     min-height: 568px;
     padding-top: 24px;
     padding-bottom: 20px;
@@ -402,13 +382,12 @@ export default {
       }
     }
     .paging {
-      // position: fixed;
-      // bottom: 0;
+      width: 1200px;
+      margin: 0 auto;
       display: flex;
       align-items: center;
-      height: 150px;
-      padding-left: 170px;
       color: darkgrey;
+      padding: 32px 0;
       .number {
         color: black;
       }
@@ -467,4 +446,20 @@ export default {
 .el-pagination.is-background .el-pager li:not(.disabled).active {
   background: #ff9900;
 }
+.el-pagination.is-background .btn-next,
+.el-pagination.is-background .btn-prev,
+.el-pagination.is-background .el-pager li {
+  background: #fff;
+  min-width: 32px;
+  height: 32px;
+  line-height: 32px;
+  border-radius: 4px;
+  font-size: 18px;
+  color: #2c2c2c;
+}
+.el-pagination button,
+.el-pagination span:not([class*="suffix"]) {
+  height: 32px;
+  line-height: 32px;
+}
 </style>

+ 37 - 29
src/views/teacher-dev/index.vue

@@ -7,29 +7,31 @@
       <div class="shade"></div>
     </div>
     <div class="nav_title">
-      <el-menu
-        :default-active="activeIndex"
-        class="el-menu-demo"
-        mode="horizontal"
-        @select="handleSelect"
-        text-color="#000"
-        active-text-color="#FF9900"
-      >
-        <el-menu-item index="TEXTBOOK">教材</el-menu-item>
-        <el-menu-item index="TEACHING">教学</el-menu-item>
-      </el-menu>
-      <div class="seek" @keyup="keyDownSeekData">
-        <el-input
-          v-model="SeekName"
-          style="width: 300px"
-          placeholder="请输入内容"
+      <div class="inner">
+        <el-menu
+          :default-active="activeIndex"
+          class="el-menu-demo"
+          mode="horizontal"
+          @select="handleSelect"
+          text-color="#000"
+          active-text-color="#FF9900"
         >
-        </el-input>
-        <img
-          @click="gotoSeekResult"
-          src="../../assets/teacherdev/Group2149.png"
-          alt=""
-        />
+          <el-menu-item index="TEXTBOOK">教材</el-menu-item>
+          <el-menu-item index="TEACHING">教学</el-menu-item>
+        </el-menu>
+        <div class="seek" @keyup="keyDownSeekData">
+          <el-input
+            v-model="SeekName"
+            style="width: 300px"
+            placeholder="请输入内容"
+          >
+          </el-input>
+          <img
+            @click="gotoSeekResult"
+            src="../../assets/teacherdev/Group2149.png"
+            alt=""
+          />
+        </div>
       </div>
     </div>
     <!-- 主要信息列表 -->
@@ -214,7 +216,8 @@ export default {
 </script>
 <style lang="scss"  scoped>
 .teacher_edu {
-  height: 100%;
+  min-height: 100vh;
+  background: #f6f6f6;
   .nav {
     background: url("../../assets/teacherdev/Homebg2.png") no-repeat;
     background-size: 100% 100%;
@@ -256,11 +259,16 @@ export default {
     }
   }
   .nav_title {
-    display: flex;
-    justify-content: space-between;
-    padding: 0 156px;
-    align-items: center;
-    font-weight: 600;
+    background: #fff;
+    .inner {
+      width: 1200px;
+      margin: 0 auto;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      font-weight: 600;
+    }
+
     .el-menu-item {
       font-size: 16px;
     }
@@ -271,7 +279,7 @@ export default {
   }
   .main {
     min-height: 80vh;
-    background: #F6F6F6;
+    background: #f6f6f6;
     padding-bottom: 50px;
   }
 }

+ 7 - 1
src/views/teacher-devEntering/creadDocument.vue

@@ -47,8 +47,9 @@
               style="width: 500px"
               placeholder="请输入价格"
               @input="priceInput"
+              @blur="priceBlur"
             >
-            <template slot="prepend">¥</template>
+              <template slot="prepend">¥</template>
             </el-input>
           </el-form-item>
           <el-form-item label="所属机构" prop="institutionID">
@@ -142,6 +143,11 @@ export default {
     priceInput(e) {
       this.form.price = this.form.price.match(/^\d*(\.?\d{0,2})/g)[0] || "";
     },
+    // 处理教材价格 失去焦点保留两位小数
+    priceBlur() {
+      if (this.form.price) this.form.price = Number(this.form.price).toFixed(2);
+    },
+
     // 预览
     preview() {
       if (!this.isSubmit) {