zydx-plus 1.32.287 → 1.32.289

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zydx-plus",
-  "version": "1.32.287",
+  "version": "1.32.289",
   "description": "Vue.js",
   "main": "src/index.js",
   "files": [

package/src/components/biz_header/src/button_name.js

@@ -2127,24 +2127,24 @@ let buttonNames = {
                     }
                 },
                 resource_lesson020: {
-                    actionName: '逻辑思维',
+                    actionName: '思维训练',
                     buttonList: {
                         0: {
                             headLevel: {
                                 default: "demand",
                                 demand: '训练要求',
-                                resourceIndex: '训练题目',
+                                resourceIndex: '训练试题',
                                 analyse: '训练分析',
                                 countermeasure: '教学对策'
                             },
                             otherLevel: {
                                 default: "singletonClass",
-                                singletonClass: this.getCurrentPrefix(item) + '题目',
-                                allClass: this.getPrefix(item) + '题目'
+                                singletonClass: this.getCurrentPrefix(item) + '试题',
+                                allClass: this.getPrefix(item) + '试题'
                             },
                             lowLevel: {
                                 default: "singletonClass",
-                                singletonClass: this.getCurrentPrefix(item) + '题目'
+                                singletonClass: this.getCurrentPrefix(item) + '试题'
                             }
                         }
                     }
@@ -2155,10 +2155,10 @@ let buttonNames = {
                         0: {
                             headLevel: {
                                 default: "demand",
-                                demand: '分析要求',
-                                resourceIndex: '题  目',
-                                review: '分析点评',
-                                analyse: '分析资源',
+                                demand: '案析要求',
+                                resourceIndex: '案析题目',
+                                review: '案析点评',
+                                analyse: '案析分析',
                                 countermeasure: '教学对策'
                             },
                             otherLevel: {

package/src/components/choice/src/choice.vue

@@ -294,7 +294,7 @@ export default {
     font-style: normal;
 }
 .but{
-    margin-left: 5px;
+    margin-left: 1px;
     font-size: 12px;
     background-color: transparent;
     border: 1px solid #000;

package/src/components/flip/src/flip.vue

@@ -146,7 +146,7 @@ export default {
     this.id = 'canvas-wrap' + Math.random().toString(36).substr(2)
     // 在画板以外松开鼠标后冻结画笔
     document.onmouseup = () => {
-      this.mouseUp()
+      if (this.isDrawing) this.mouseUp()
     }
   },
   methods: {
@@ -185,9 +185,11 @@ export default {
     drawStart (obj) {
       obj.index = this.pageIndex
       obj.start = 'start'
+      obj.scale = this.scales
       this.startX = obj.x
       this.startY = obj.y
       this.ctx.beginPath()
+      this.ctx.strokeStyle = 'red'
       this.ctx.moveTo(this.startX, this.startY)
       this.ctx.lineTo(obj.x, obj.y)
       this.ctx.lineCap = 'round'
@@ -200,7 +202,9 @@ export default {
     drawEnd (obj) {
       obj.index = this.pageIndex
       obj.start = 'end'
+      obj.scale = this.scales
       this.ctx.beginPath()
+      this.ctx.strokeStyle = 'red'
       this.ctx.moveTo(this.startX, this.startY)
       this.ctx.lineTo(obj.x, obj.y)
       this.ctx.lineCap = 'round'
@@ -213,6 +217,7 @@ export default {
     drawMove (obj) {
       obj.index = this.pageIndex
       obj.start = 'move'
+      obj.scale = this.scales
       this.ctx.beginPath()
       this.ctx.moveTo(this.startX, this.startY)
       this.ctx.lineTo(obj.x, obj.y)
@@ -308,9 +313,9 @@ export default {
             for(let i = 0; i < that.points.length; i++) {
               if(that.points[i].index === that.pageIndex) {
                 that.ctx.beginPath()
-                that.ctx.moveTo(that.points[i].x,that.points[i].y)
+                that.ctx.moveTo(that.points[i].x*that.scales/that.points[i].scale,that.points[i].y*that.scales/that.points[i].scale)
                 if(that.points[i].start !== 'end') {
-                  that.ctx.lineTo(that.points[i+1].x, that.points[i+1].y)
+                  that.ctx.lineTo(that.points[i+1].x*that.scales/that.points[i].scale, that.points[i+1].y*that.scales/that.points[i].scale)
                 }
                 that.ctx.strokeStyle = 'red'
                 that.ctx.lineCap = 'round'

package/src/components/preface/src/preface.vue

@@ -104,24 +104,30 @@ export default {
     font-size: 14px;
     color: #000;
     font-weight: 700;
-    line-height: 30px;
+    line-height: 15px;
 }
 .preface-input{
     width: 40px;
-    height: 30px;
+    height: 15px;
     border: 1px solid rgba(204, 204, 204, 1);
     display: inline-block;
     overflow: hidden;
+    position: relative;
+    box-sizing: border-box;
 }
 .preface-input>input{
     width: 55px;
-    height: 29px;
+    height: 13px;
     border: none;
     padding-left: 5px;
+   position: absolute;
+   top: 0;
+   left: 0;
+  font-size: 12px;
 }
 .preface-right{
     display: flex;
-    line-height: 30px;
+    line-height: 15px;
 }
 .preface-list>label{
     display: inline-block;
@@ -141,4 +147,4 @@ export default {
     line-height: 30px;
     padding: 0 10px 0 25px;
 }
-</style>
+</style>

package/src/components/read/src/read.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="read">
       <vue-office-docx v-if="fileType === 'docx'" :src="url" style="height: 100%;" @rendered="renderedHandler" />
-      <vue-office-excel v-if="fileType === 'xlsx'" :src="url" style="height: 100%;" @rendered="renderedHandler" />
+      <vue-office-excel v-if="fileType === 'xlsx' && xlsx" :src="url" style="height: 100%;" @rendered="renderedHandler" />
       <div class="view-pdf" v-if="fileType === 'pdf'">
           <div class="pageContainer" v-for="(item,index) in idArr">
               <canvas :id="item"></canvas>
@@ -45,7 +45,13 @@ export default {
             pdfPages: 0,
             loading: false,
             repeat: false,
-            idArr: []
+            idArr: [],
+            scales: 1.35,
+          timer: null,
+          pdf: null,
+          page: 0,
+          xlsx: true,
+          canvasArr: []
         }
     },
     props: {
@@ -57,6 +63,10 @@ export default {
             type: Number,
             default: 1.35
         },
+      scaleStyle: {
+        type: Object,
+        default: () => {}
+      },
     },
     watch: {
         url: {
@@ -66,7 +76,36 @@ export default {
             },
             deep: true,
             immediate: true
-        }
+        },
+      scaleStyle: {
+        handler: function (val) {
+          if(!val) return
+          if (this.repeat) return
+          if (this.timer) {
+            clearTimeout(this.timer)
+          }
+          this.timer = setTimeout(() => {
+            this.scales = val.width / 550
+            if(this.scales >= this.scale) {
+              this.scales = this.scale
+            }
+            if(this.fileType === 'pdf') {
+              if(val.width >= 800) return
+              this.canvasArr.map(item => {
+                item.style.width = val.width + 'px'
+                item.style.height = val.width*1.35 + 'px'
+              })
+            }
+            if(this.fileType === 'xlsx') {
+              this.xlsx = false
+              setTimeout(() => {
+                this.xlsx = true
+              },0)
+            }
+          }, 200)
+        },
+        deep: true
+      }
     },
     methods: {
         repeatInit() {
@@ -99,9 +138,10 @@ export default {
                 cMapPacked: true
             })
             loadingTask.promise.then((pdf) => {
+                that.pdf = pdf
                 that.pdfPages = pdf.numPages // 获取pdf文件的总页数
-                let page = pdf.numPages
-                that.getPDF(pdf,page)
+                that.page = pdf.numPages
+                that.getPDF(pdf,that.page)
             })
         },
         getPDF(pdf,page) {
@@ -111,8 +151,9 @@ export default {
                 that.idArr.push(id)
                 pdf.getPage(that.idArr.length).then(function (page) {
                     let canvas = document.getElementById(id)
+                    that.canvasArr.push(canvas)
                     let ctx = canvas.getContext('2d');
-                    let viewport = page.getViewport({scale: that.scale})
+                    let viewport = page.getViewport({scale: that.scales})
                     canvas.width = viewport.width * 2
                     canvas.height = viewport.height * 2
                     canvas.style.width = viewport.width + 'px'

package/src/components/seek/src/word.css

@@ -137,7 +137,7 @@
     width: 50%;
 }
 .but{
-    margin-left: 5px;
+    margin-left: 1px;
     font-size: 12px;
     background-color: transparent;
     border: 1px solid #000;

package/src/index.js

@@ -81,7 +81,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.32.287',
+    version: '1.32.289',
     install,
     Calendar,
     Message,