zydx-plus 1.32.312 → 1.32.314

package/package.json

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

package/src/components/biz_header/src/bizHeader.vue

@@ -21,21 +21,21 @@
                     <template v-for="(buttonInfo, buttonIndex) in initConfig(item).buttonList[tabType]">
                         <template v-if="buttonInfo instanceof Object" v-for="(childButtonInfo, childButtonIndex) in buttonInfo">
                             <!-- 在课上渲染的 -->
-                            <button class="z-button"
+                            <button class="defaultButton"
                                     :class="childButtonIndex === getSelectBtnIndex && selectItem.level === item.level? 'active' : ''"
                                     v-if="item.level === 0 && buttonIndex === 'headLevel' && childButtonIndex !== 'default'"
                                     @click="clickRightBtn(item, childButtonIndex, childButtonInfo)"
                                     v-html="childButtonInfo"
                             />
                             <!-- 单独在最低节点设置的按钮 -->
-                            <button :ref="childButtonIndex + item.catalogId" class="z-button"
+                            <button :ref="childButtonIndex + item.catalogId" class="defaultButton"
                                     :class="childButtonIndex === getSelectBtnIndex && selectItem.level === item.level? 'active' : ''"
                                     v-if="item.level !== 0 && (!item.children || item.children.length === 0) && buttonIndex === 'lowLevel'  && childButtonIndex !== 'default'"
                                     @click="clickRightBtn(item, childButtonIndex, childButtonInfo)"
                                     v-html="childButtonInfo"
                             />
                             <!-- 在非课和非最低节点 -->
-                            <button class="z-button"
+                            <button class="defaultButton"
                                     :class="childButtonIndex === getSelectBtnIndex && selectItem.level === item.level? 'active' : ''"
                                     v-if="item.level !== 0 && item.children && item.children.length !== 0 && buttonIndex === 'otherLevel'  && childButtonIndex !== 'default'"
                                     @click="clickRightBtn(item, childButtonIndex, childButtonInfo)"
@@ -43,7 +43,7 @@
                             />
                         </template>
                         <template v-else-if="buttonInfo != null && buttonInfo.constructor === String">
-                            <button class="z-button"
+                            <button class="defaultButton"
                                     :class="buttonIndex === getSelectBtnIndex && selectItem.level === item.level? 'active' : ''"
                                     v-if="buttonIndex !== 'level0btn' && buttonInfo != null"
                                     @click="clickRightBtn(item, buttonIndex, buttonInfo)"
@@ -205,27 +205,45 @@ export default {
     .borderBottom1cccccc {
         border-bottom: 1px #cccccc solid !important;
     }
-    .z-button {
-        margin: 1px;
+    /*.z-button {*/
+        /*margin: 1px;*/
+        /*width: auto;*/
+        /*min-width: 60px;*/
+        /*max-width: 60px;*/
+        /*text-overflow: ellipsis;*/
+        /*white-space: nowrap;*/
+        /*overflow: hidden;*/
+        /*height: 20px;*/
+        /*background-color: #FFFFFF;*/
+        /*color: #000000;*/
+        /*border: #000000 1px solid;*/
+        /*line-height: 18px;*/
+        /*border-radius: 3px;*/
+        /*font-size: 12px !important;*/
+        /*letter-spacing: 0px !important;*/
+        /*text-align: center;*/
+        /*padding: 0 5px;*/
+        /*font-weight: normal;*/
+        /*cursor: pointer;*/
+    /*}*/
+
+    .defaultButton {
         width: auto;
         min-width: 60px;
-        max-width: 60px;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        overflow: hidden;
         height: 20px;
-        background-color: #FFFFFF;
-        color: #000000;
-        border: #000000 1px solid;
-        line-height: 18px;
+        font-size: 12px;
+        line-height: 20px;
+        border: 1px solid #000;
+        color: #000;
         border-radius: 3px;
-        font-size: 12px !important;
-        letter-spacing: 0px !important;
         text-align: center;
-        padding: 0 5px;
-        font-weight: normal;
         cursor: pointer;
+        background-color: #fff;
+        user-select: none;
+        margin: 1px;
+        box-sizing: border-box;
     }
+
     .active{
         color: rgba(0, 255, 0, 1) !important;
     }

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

@@ -235,12 +235,12 @@ let buttonNames = {
                             headLevel: {
                                 default: "demand",
                                 demand: '回答要求',
-                                singletonClass: this.getCurrentPrefix(item) + '追问',
+                                singletonClass: this.getCurrentPrefix(item) + '主题',
                                 allClass: this.getPrefix(item) + '情况',
                             },
                             otherLevel: {
                                 default: "singletonClass",
-                                singletonClass: this.getCurrentPrefix(item) + '追问',
+                                singletonClass: this.getCurrentPrefix(item) + '主题',
                                 allClass: this.getPrefix(item) + '情况',
                             },
                             lowLevel: {
@@ -254,12 +254,12 @@ let buttonNames = {
                         2: {
                             headLevel: {
                                 default: "singletonClass",
-                                singletonClass: this.getCurrentPrefix(item) + '追问',
+                                singletonClass: this.getCurrentPrefix(item) + '主题',
                                 allClass: this.getPrefix(item) + '情况',
                             },
                             otherLevel: {
                                 default: "singletonClass",
-                                singletonClass: this.getCurrentPrefix(item) + '追问',
+                                singletonClass: this.getCurrentPrefix(item) + '主题',
                                 allClass: this.getPrefix(item) + '情况',
                             },
                             lowLevel: {
@@ -547,13 +547,13 @@ let buttonNames = {
                         0: {
                             headLevel: {
                                 default: "demand",
-                                demand: '分析要求',
-                                singletonClass: this.getCurrentPrefix(item) + '分析',
+                                demand: '案析要求',
+                                singletonClass: this.getCurrentPrefix(item) + '案析',
                                 allClass: this.getPrefix(item) + '情况',
                             },
                             otherLevel: {
                                 default: "singletonClass",
-                                singletonClass: this.getCurrentPrefix(item) + '分析',
+                                singletonClass: this.getCurrentPrefix(item) + '案析',
                                 allClass: this.getPrefix(item) + '情况',
                             },
                             lowLevel: {
@@ -567,12 +567,12 @@ let buttonNames = {
                         2: {
                             headLevel: {
                                 default: "singletonClass",
-                                singletonClass: this.getCurrentPrefix(item) + '分析',
+                                singletonClass: this.getCurrentPrefix(item) + '案析',
                                 allClass: this.getPrefix(item) + '情况',
                             },
                             otherLevel: {
                                 default: "singletonClass",
-                                singletonClass: this.getCurrentPrefix(item) + '分析',
+                                singletonClass: this.getCurrentPrefix(item) + '案析',
                                 allClass: this.getPrefix(item) + '情况',
                             },
                             lowLevel: {
@@ -684,12 +684,12 @@ let buttonNames = {
                             headLevel: {
                                 default: "demand",
                                 demand: '作业要求',
-                                singletonClass: this.getPrefix(item) + '作业',
+                                singletonClass: this.getCurrentPrefix(item) + '作业',
                                 allClass: this.getPrefix(item) + '情况',
                             },
                             otherLevel: {
                                 default: "singletonClass",
-                                singletonClass: this.getPrefix(item) + '作业',
+                                singletonClass: this.getCurrentPrefix(item) + '作业',
                                 allClass: this.getPrefix(item) + '情况',
                             },
                             lowLevel: {
@@ -1334,12 +1334,12 @@ let buttonNames = {
                             headLevel: {
                                 default: "demand",
                                 demand: '回答要求',
-                                singletonClass: this.getCurrentPrefix(item) + '追问',
+                                singletonClass: this.getCurrentPrefix(item) + '主题',
                                 allClass: this.getPrefix(item) + '情况',
                             },
                             otherLevel: {
                                 default: "singletonClass",
-                                singletonClass: this.getCurrentPrefix(item) + '追问',
+                                singletonClass: this.getCurrentPrefix(item) + '主题',
                                 allClass: this.getPrefix(item) + '情况',
                             },
                             lowLevel: {
@@ -1532,13 +1532,13 @@ let buttonNames = {
                         0: {
                             headLevel: {
                                 default: "demand",
-                                demand: '分析要求',
-                                singletonClass: this.getCurrentPrefix(item) + '分析',
+                                demand: '案析要求',
+                                singletonClass: this.getCurrentPrefix(item) + '案析',
                                 allClass: this.getPrefix(item) + '情况',
                             },
                             otherLevel: {
                                 default: "singletonClass",
-                                singletonClass: this.getCurrentPrefix(item) + '分析',
+                                singletonClass: this.getCurrentPrefix(item) + '案析',
                                 allClass: this.getPrefix(item) + '情况',
                             },
                             lowLevel: {
@@ -2529,7 +2529,7 @@ let buttonNames = {
                                 selectResource: '查找资源',
                             }
                         },
-                        0: {
+                        2: {
                             headLevel: {
                                 default: "btnIndex1",
                                 btnIndex1: this.getCurrentPrefix(item) + '课件',
@@ -2644,7 +2644,7 @@ let buttonNames = {
                             },
                             lowLevel: {
                                 default: "viewResource",
-                                importResource: '导入数据',
+                                createResource: '创建数据',
                                 viewResource: '数据列表',
                                 selectResource: '查找资源',
                             }

package/src/components/biz_taskInfo/src/bizTaskInfo.vue

@@ -4,7 +4,7 @@
             <div v-if="actionConfig[actionId].isShowFinishState" class="task_item_main width100" :class="isWidth50 ? 'width50': 'width100'" style="z-index: 110">
                 <div class="task_text_desc">动作性质：</div>
                 <div class="width250">
-                    <zydxSelect :color="'#000000'" :readonly="readonly" :options="finishStateOptions" v-model:value="finishState"></zydxSelect>
+                    <zydxSelect :color="'#000000'" :readonly="actionId == 'action_lesson051'?true:readonly" :options="finishStateOptions" v-model:value="finishState"></zydxSelect>
                 </div>
             </div>
             <template v-if="actionConfig[actionId].isShowEndTime">
@@ -44,7 +44,7 @@
                             <template v-else>
                                 <zydx-input :value="dateFormat(info.endTime)"
                                             :placeholder="'请选择日期'"
-                                            :readonly="readonly"
+                                            :readonly="true"
                                             :border="!readonly"
                                             :key="JSON.stringify(info.endTime)"
                                             :type="'input'">
@@ -60,7 +60,7 @@
                     </div>
                 </template>
                 <div v-if="actionConfig[actionId].isShowLaterScore" class="task_item_main" :class="getZindex(index)">
-                    <div class="task_text_desc">迟交扣分：</div>
+                    <div class="task_text_desc">{{actionId == 'action_lesson012' || 'action_Interrogation'?'迟答扣分' : '迟交扣分'}}：</div>
                     <div class="width250">
                         <zydxSelect :color="'#000000'" :readonly="readonly" :options="laterScoreOptions" v-model:value="laterScore"></zydxSelect>
                     </div>
@@ -315,8 +315,8 @@
                     },
                     action_lesson029: {
                         actionName: '案例分析',
-                        endTimeBtn1: '分析截止',
-                        endTimeBtn2: '分析时长',
+                        endTimeBtn1: '案析截止',
+                        endTimeBtn2: '案析时长',
                         laterScoreBtn: '迟交扣分',
                         isShowFinishState: true,
                         isShowEndTime: true,

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

@@ -29,9 +29,13 @@
             </div>
           </div>
           <div class="page-but-left" :style="{cursor: pageIndex === 1?'default':'pointer'}"
-               @click.stop="flipRight(pageIndex-=1,false)"></div>
+               @click.stop="flipRight(pageIndex-=1,false)">
+            <img v-if="pageIndex !== 1" src="data:image/png;base64,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" alt="" />
+          </div>
           <div class="page-but-right" :style="{cursor: pageIndex === pdfPages?'default':'pointer'}"
-               @click.stop="flipLeft(pageIndex+=1,false)"></div>
+               @click.stop="flipLeft(pageIndex+=1,false)">
+            <img v-if="pageIndex !== pdfPages" src="data:image/png;base64,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" alt="" />
+          </div>
         </div>
       </div>
       <div class="but-wrap" v-if="butShow">
@@ -43,82 +47,7 @@
         </button>
       </div>
     </div>
-    <div v-if="readingPen" class="flip-tool" @click="flipTool" :style="{height: flipToolShow? '600px': '25px', overflow: flipToolShow2? 'visible':'hidden'}">
-      <div class="tool-text" v-if="!flipToolShow">
-        <span>阅读笔</span>
-      </div>
-      <div class="tool-list" :style="{transform: `translateY(${flipToolShow? '0':'-130%'})`}">
-        <div v-if="setShow" class="set" :style="{top: top + 'px'}">
-          <div class="set-list set-text" v-if="state === 'text'">
-            <span>文字字号</span>
-            <em v-for="(item) in textData" :style="{color: fontSize === Number(item)? 'rgba(198, 76, 16, 1)': '#000'}" @click.stop="textSizeTap(item)">{{ item }}</em>
-          </div>
-          <div class="set-list" v-else>
-            <span>线条粗细</span>
-            <em v-for="(item) in strokeData" :style="{color: lineWidth === Number(item)? 'rgba(198, 76, 16, 1)': '#000'}" @click.stop="strokeTap(item)">{{ item }}</em>
-          </div>
-          <div class="set-list">
-            <span>线条颜色</span>
-            <i v-for="(item) in strokeColor" @click.stop="strokeColTap(item)" :style="{'background-color': item === color? '#fff': item, border: `4px solid ${item}`}"></i>
-          </div>
-        </div>
-        <div class="tool-item" :class="{'tool-item-active': state === null}" @click.stop="mouse">
-          <div class="tool-item-img">
-            <img src="./img/shubiao.png" alt=""/>
-          </div>
-        </div>
-        <div class="tool-item" :class="{'tool-item-active': state === 'brush'}" @click.stop="brush">
-          <div class="tool-item-img">
-            <img src="./img/huabi.png" alt=""/>
-          </div>
-        </div>
-        <div class="tool-item" :class="{'tool-item-active': state === 'text'}" @click.stop="textTap">
-          <div class="tool-item-img">
-            <img src="./img/wenzi.png" alt=""/>
-          </div>
-        </div>
-        <div class="tool-item" :class="{'tool-item-active': state === 'rectangle'}" @click.stop="rectangleTap">
-          <div class="tool-item-img">
-            <img src="./img/juxing.png" alt=""/>
-          </div>
-        </div>
-        <div class="tool-item" :class="{'tool-item-active': state === 'circula'}" @click.stop="circularTap">
-          <div class="tool-item-img">
-            <img src="./img/yuan.png" alt=""/>
-          </div>
-        </div>
-        <div class="tool-item" :class="{'tool-item-active': state === 'straight'}" @click.stop="straightTap">
-          <div class="tool-item-img">
-            <img src="./img/jian.png" alt=""/>
-          </div>
-        </div>
-        <div class="tool-item" :class="{'tool-item-active': state === 'arrow'}" @click.stop="arrowTap">
-          <div class="tool-item-img">
-            <img src="./img/jiantou.png" alt=""/>
-          </div>
-        </div>
-        <div class="tool-item" @click.stop="backward">
-          <div class="tool-item-img">
-            <img src="./img/houtui.png" alt=""/>
-          </div>
-        </div>
-        <div class="tool-item" @click.stop="preserve">
-          <div class="tool-item-img">
-            <img src="./img/baocun.png" alt=""/>
-          </div>
-        </div>
-        <div class="tool-item" @click.stop="empty">
-          <div class="tool-item-img">
-            <img src="./img/xiangpi.png" alt=""/>
-          </div>
-        </div>
-        <div class="tool-item">
-          <div class="tool-item-img">
-            <img src="./img/guanbi.png" alt=""/>
-          </div>
-        </div>
-      </div>
-    </div>
+
     <div v-if="loading" class="loading-back">
       <div class="loading-cont">
         <div class="loadings">Loading</div>
@@ -168,13 +97,9 @@ export default {
       setShow: false,
       flipToolShow2: false,
       flipToolShow: false,
-      strokeData: ['1', '2', '3', '4', '5', '6', '7'], // 画笔数据
-      strokeColor: ['#000', '#f00', '#0f0', '#00f', '#f0f', '#ff0', '#0ff'], // 画笔颜色
-      textData: ['14', '16', '18', '20', '22', '24'], // 文本数据
       color: '#000',
       text: '',
       state: null,
-      top: 0,
       fontSize: 14,
       textX: 0,
       textY: 0,
@@ -184,14 +109,16 @@ export default {
       contenteditable: false,
       linkId: null,
       pointsSelect: [],
-      checkDrawing: false,
+      checkDrawing: false, // 是否在画板以外画笔
       checkX: 0,
       checkY: 0,
       textWidth: 0,
       textHeight: 0,
       textDownX: 0,
       textDownY: 0,
-      textMoveStart: false
+      textMoveStart: false,
+      chartIndexID: null, // 当前点击的图形索引
+      signStart: false,
     }
   },
   props: {
@@ -266,7 +193,7 @@ export default {
       deep: true
     }
   },
-  emits: ['flip','updateData'],
+  emits: ['flip'],
   mounted() {
     this.id = 'canvas-wrap' + Math.random().toString(36).substr(2)
     window.addEventListener('keydown', this.handleKeyEvent)
@@ -280,12 +207,26 @@ export default {
     window.removeEventListener('keydown', this.handleKeyEvent)
   },
   methods: {
+    colorTap(v) {
+      this.color = v
+    },
+    fontSizeTap(v) {
+      this.fontSize = Number(v)
+    },
+    lineWidthTap(v) {
+      this.lineWidth = Number(v)
+    },
     handleKeyEvent(e) {
       const {key} = e
       if (key === 'Backspace' || key === 'Delete') {
+        if(this.contenteditable) return
         this.backward()
       }
     },
+    // 删除
+    delTap() {
+      this.state = 'del'
+    },
     empty() {
       this.setShow = false
       this.points = []
@@ -293,7 +234,7 @@ export default {
     },
     preserve() {
       this.setShow = false
-      this.$emit('updateData', this.points)
+      return this.points
     },
     // 后退
     backward() {
@@ -316,13 +257,11 @@ export default {
     mouse() {
       this.state = null
       this.setShow = false
-      this.turnText()
     },
     // 画笔
     brush() {
       this.state = 'brush'
       this.setShow = true
-      this.top = 60
     },
     // 文字字号
     textSizeTap(v) {
@@ -332,28 +271,25 @@ export default {
     rectangleTap() {
       this.state = 'rectangle'
       this.setShow = true
-      this.top = 60*3
     },
     // 圆形
     circularTap() {
       this.state = 'circular'
       this.setShow = true
-      this.top = 60*4
     },
     // 直线
     straightTap() {
       this.state = 'straight'
       this.setShow = true
-      this.top = 60*5
     },
     // 箭头
     arrowTap() {
       this.state = 'arrow'
       this.setShow = true
-      this.top = 60*6
     },
     // 文字
-    textTap() {
+    textTap(v) {
+      this.turnText()
       this.state = 'text'
       this.setShow = true
       this.top = 60*2
@@ -363,18 +299,7 @@ export default {
       this.textWidth = 100
       this.textHeight = this.fontSize + 1
       this.$refs.textInput.innerText = ''
-    },
-    flipTool() {
-      this.setShow = false
-      this.textShow = false
-      this.flipToolShow = !this.flipToolShow
-      if(this.flipToolShow) {
-        setTimeout(() => {
-          this.flipToolShow2 = true
-        }, 600)
-      } else {
-        this.flipToolShow2 = false
-      }
+      if(v === 'sign') this.signStart = true
     },
     strokeColTap(v) {
       this.color = v
@@ -421,17 +346,30 @@ export default {
             const x2 = this.points[i].x*this.scales/this.points[i].scale + len*this.points[i].size*this.sratio
             const y2 = this.points[i].y*this.scales/this.points[i].scale + len*this.points[i].size*this.sratio
             if(obj.x >= x1 && obj.x <= x2 && obj.y >= y1 && obj.y <= y2) {
-              this.state = 'text'
-              this.textX2 = x1
-              this.textY2 = y1
-              this.textWidth = 'auto'
-              this.color = this.points[i].color
-              this.textHeight = this.points[i].text.length*this.points[i].size + 1
-              this.$refs.textInput.innerText = this.points[i].text.join('\n')
+              if(this.state !== 'del') {
+                this.state = 'text'
+                this.textX2 = x1
+                this.textY2 = y1
+                this.textWidth = 'auto'
+                this.color = this.points[i].color
+                this.textHeight = this.points[i].text.length*this.points[i].size + 1
+                this.$refs.textInput.innerText = this.points[i].text.join('\n')
+              }
               this.points.splice(i,1)
+              if(this.points[i - 1] !== undefined) {
+                if(this.points[i - 1].type === 'sign') {
+                  if(this.state !== 'del') {
+                    this.points.push(this.points.splice(i - 1, 1)[0])
+                  }else {
+                    this.points.splice(i - 1, 1)
+                  }
+                }
+              }
+
               this.clearRect()
             }
           }
+          // 判断点击的是否是矩形
           if(this.points[i]?.type === 'rectangle') {
             const x2 = this.points[i].x*this.scales/this.points[i].scale + this.points[i].width*this.scales/this.points[i].scale
             const y2 = this.points[i].y*this.scales/this.points[i].scale + this.points[i].height*this.scales/this.points[i].scale
@@ -441,6 +379,7 @@ export default {
               this.points.splice(i,1)
             }
           }
+          // 判断点击的是否是直线
           if(this.points[i]?.type === 'line') {
             const x2 = this.points[i+1]?this.points[i+1].x*this.scales/this.points[i].scale:0
             const y2 = this.points[i+1]?this.points[i+1].y*this.scales/this.points[i].scale:0
@@ -462,6 +401,7 @@ export default {
               }
             }
           }
+          // 判断点击的是否是箭头
           if(this.points[i]?.type === 'straight' || this.points[i]?.type === 'arrow') {
             const x2 = this.points[i].x2*this.scales/this.points[i].scale
             const y2 = this.points[i].y2*this.scales/this.points[i].scale
@@ -536,7 +476,7 @@ export default {
       this.setShow = false
       e = e || event
       e.preventDefault()
-      if(this.state === null) {
+      if(this.state === null || this.state === 'del') {
         this.checkDrawing = true
         this.checkDown(e)
         return
@@ -547,6 +487,7 @@ export default {
         y: e.offsetY*this.sratio
       }
       this.drawStart(obj)
+      if(this.signStart) this.sign()
     },
     textDblclick() {
       if(!this.contenteditable) this.contenteditable = true
@@ -557,12 +498,18 @@ export default {
       this.textDownY = e.offsetY
       this.textMoveStart = true
     },
+    // 鼠标移动
     mouseMove (e) {
       e = e || event
       e.preventDefault()
       if(this.textMoveStart) {
         this.textX2 = e.offsetX*this.sratio - this.textDownX
         this.textY2 = e.offsetY*this.sratio - this.textDownY
+        if(this.points[this.points.length - 1].type === 'sign') {
+          this.points[this.points.length - 1].x = this.textX2
+          this.points[this.points.length - 1].y = this.textY2
+          this.clearRect()
+        }
       }
       if(this.state === null) {
         if(this.checkDrawing) this.checkMove(e)
@@ -576,12 +523,16 @@ export default {
         this.drawMove(obj)
       }
     },
+    // 鼠标松开
     mouseUp (e) {
       e = e || event
       e.preventDefault()
-      if(this.state === null) {
+      if(this.state === null || this.state === 'del') {
         this.checkDrawing = false
         this.checkUp(e)
+        if(this.state === 'del') {
+          this.delChart()
+        }
         return
       }
       let obj = {
@@ -590,6 +541,19 @@ export default {
       }
       this.drawEnd(obj)
       this.isDrawing = false
+      this.signStart = false
+      this.pointsSelect = []
+    },
+    delChart() {
+      if(this.pointsSelect.length === 0) return
+      const id = this.pointsSelect[0].id
+      for(let i = 0; i < this.points.length; i++) {
+        if(this.points[i].id === id) {
+          this.points.splice(i,1)
+          i--
+        }
+      }
+      this.clearRect()
     },
     // 绘制
     drawStart (obj) {
@@ -641,10 +605,57 @@ export default {
         const text = this.$refs.textInput.innerText
         this.contenteditable = false
         this.state = null
-        if(text === '') return
+        if(text === '') {
+          this.points.pop()
+          this.clearRect()
+          return
+        }
         this.addText(text)
       }
     },
+    // 画标记
+    sign() {
+      const x = this.textX2
+      const y = this.textY2
+      this.clearRect()
+      this.ctx.beginPath();
+      this.ctx.arc(x - 30,y + 10,20,0.3,Math.PI-0.3,true);
+      this.ctx.fillStyle = 'red';
+      this.ctx.fill();
+      this.ctx.closePath();
+      this.ctx.beginPath();
+      this.ctx.moveTo(x - 50,y + 15); // 左上角
+      this.ctx.lineTo(x - 10, y + 15); // 右上角
+      this.ctx.lineTo(x - 30,y + 40);  // 下角
+      this.ctx.fillStyle = 'red';
+      this.ctx.fill();
+      this.ctx.closePath()
+      this.ctx.beginPath();
+      this.ctx.font = `24px 黑体`;
+      this.ctx.fillStyle = '#fff';
+      let num = this.signNum() < 10 ? '0' + this.signNum() : this.signNum()
+      this.ctx.fillText(num,x - 42,y + 20);
+      this.ctx.stroke();
+      this.ctx.closePath()
+      this.points.push({
+        x: this.textX2,
+        y: this.textY2,
+        index: this.pageIndex,
+        type: 'sign',
+        scale: this.scales,
+        id: this.linkId,
+        num: num
+      })
+    },
+    signNum() {
+      let num = []
+      this.points.forEach(item => {
+        if(item.type === 'sign') {
+          num.push(Number(item.num))
+        }
+      })
+      return num.length === 0 ? 1 : Math.max(...num) + 1
+    },
     // 添加文字
     addText(v) {
       let obj = {}
@@ -664,6 +675,8 @@ export default {
         this.ctx.stroke()
         this.ctx.closePath()
       }
+      const poi = this.points[this.points.length - 1]
+      if(poi?.type === 'sign') poi.id = this.linkId
       this.points.push({
         x: this.textX2,
         y: this.textY2,
@@ -913,6 +926,28 @@ export default {
         this.ctx.closePath()
       }
     },
+    signProcessing(data,v) {
+      const x = data.x*this.scales/data.scale + v.x
+      const y = data.y*this.scales/data.scale + v.y
+      this.ctx.beginPath();
+      this.ctx.arc(x - 30,y + 10,20,0.3,Math.PI-0.3,true);
+      this.ctx.fillStyle = 'red';
+      this.ctx.fill();
+      this.ctx.closePath();
+      this.ctx.beginPath();
+      this.ctx.moveTo(x - 50,y + 15); // 左上角
+      this.ctx.lineTo(x - 10, y + 15); // 右上角
+      this.ctx.lineTo(x - 30,y + 40);  // 下角
+      this.ctx.fillStyle = 'red';
+      this.ctx.fill();
+      this.ctx.closePath()
+      this.ctx.beginPath();
+      this.ctx.font = `24px 黑体`;
+      this.ctx.fillStyle = '#fff';
+      this.ctx.fillText(data.num,x - 42,y + 20);
+      this.ctx.stroke();
+      this.ctx.closePath()
+    },
     // 处理数据
     processing() {
       for(let i = 0; i < this.points.length; i++) {
@@ -935,11 +970,13 @@ export default {
           if(this.points[i].type === 'text') {
             this.textProcessing(this.points[i],{x:0,y:0})
           }
+          if(this.points[i].type === 'sign') {
+            this.signProcessing(this.points[i],{x:0,y:0})
+          }
         }
       }
     },
     flipLeft(e, v) {
-      console.log(e)
       if (e > this.pdfPages) {
         this.pageIndex = this.pdfPages
         return
@@ -1073,182 +1110,7 @@ export default {
   width: 100%;
   height: 100%;
 }
-.flip-tool{
-  position: absolute;
-  top: 0;
-  right: 0;
-  z-index: 200;
-  box-shadow: 0 0 10px rgba(0,0,0,.2);
-  border-bottom-left-radius: 10px;
-  border-bottom-right-radius: 10px;
-  transition: all 0.5s;
-}
-.tool-text{
-  width: 50px;
-  background-color: #fff;
-  text-align: center;
-  border-bottom-left-radius: 10px;
-  border-bottom-right-radius: 10px;
-  line-height: 25px;
-  cursor: pointer;
-  font-size: 12px;
-  color: rgba(198, 76, 16, 1);
-}
-.tool-list{
-  width: 50px;
-  background-color: #fff;
-  border-bottom-left-radius: 10px;
-  border-bottom-right-radius: 10px;
-  cursor: pointer;
-  position: relative;
-  text-align: center;
-  padding: 18px 0;
-  transition: all 0.5s;
-  user-select: none;
-}
-.tool-item{
-  padding: 18px 0;
-  position: relative;
-}
-.tool-item-img{
-  overflow: hidden;
-}
-.tool-item img {
-  width: 30%;
-  display: block;
-  margin: 0 auto;
-}
-.tool-item:hover img{
-  filter: drop-shadow(40px 0 rgba(198, 76, 16, 1));
-  margin-left: -22px;
-}
-.tool-item-active img {
-  filter: drop-shadow(40px 0 rgba(198, 76, 16, 1));
-  margin-left: -22px;
-}
-.set {
-  position: absolute;
-  right: 40px;
-  width: 280px;
-  background-color: #fff;
-  border-radius: 10px;
-  box-shadow: 0 0 5px 3px rgba(0, 0, 0, 0.3);
-  padding: 10px;
-  z-index: 1;
-}
-
-.set-list {
-  padding: 5px 0;
-  font-size: 15px;
-}
-
-.set-list:after {
-  content: '';
-  display: block;
-  clear: both;
-}
-
-.set-list span {
-  margin-right: 10px;
-  float: left;
-}
-
-.set-list em {
-  font-style: normal;
-  font-size: 15px;
-  width: 16px;
-  display: inline-block;
-  margin-right: 10px;
-  text-align: center;
-}
 
-.set-list em:hover {
-  color: rgba(198, 76, 16, 1);
-}
-
-.set-list i {
-  display: inline-block;
-  width: 16px;
-  height: 16px;
-  background-color: #000;
-  margin: 2px 10px 0 0;
-  float: left;
-  box-sizing: border-box;
-}
-
-.set-list input {
-  width: calc(100% - 60px);
-  height: 22px;
-  border: 1px solid #ccc;
-  border-radius: 5px;
-  padding: 0 10px;
-  box-sizing: border-box;
-  float: left;
-}
-.but {
-  margin-left: 5px;
-  font-size: 12px;
-  background-color: transparent;
-  border: 1px solid #000;
-  border-radius: 3px;
-  padding: 2px 5px;
-  cursor: pointer;
-  min-width: 60px;
-  height: 21px;
-  margin-right: 20px;
-}
-/*动画部分*/
-/*I'm the home page动画*/
-.flip-animation-start {
-  transform-origin: left center;
-  animation: flipBook1 1s forwards;
-}
-
-.flip-animation-end {
-  transform-origin: left center;
-  animation: flipBook2 1s forwards;
-}
-
-@keyframes flipBook1 {
-  0% {
-    transform: perspective(3000px) rotateY(0deg);
-    opacity: 1;
-  }
-  60% {
-    opacity: 1;
-  }
-  100% {
-    transform: perspective(3000px) rotateY(-160deg);
-    opacity: 0;
-  }
-}
-
-/*关闭书页*/
-@keyframes flipBook2 {
-  0% {
-    transform: perspective(3000px) rotateY(-160deg);
-    opacity: 0;
-  }
-  30% {
-    opacity: 1;
-  }
-  70% {
-    opacity: 1;
-  }
-  100% {
-    transform: perspective(3000px) rotateY(0deg);
-    opacity: 0;
-  }
-}
-
-.wrap-one {
-  position: absolute;
-  top: 0;
-  left: 50%;
-  right: 0;
-  bottom: 0;
-  z-index: 2;
-}
 
 .wrap-one img {
   width: 100%;
@@ -1294,6 +1156,14 @@ export default {
   width: 8%;
 }
 
+.page-but-left img{
+  width: 50%;
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+  left: 0;
+}
+
 .page-but-right {
   position: absolute;
   top: 0;
@@ -1303,6 +1173,14 @@ export default {
   width: 8%;
 }
 
+.page-but-right img{
+  width: 50%;
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+  right: 0;
+}
+
 .load > span {
   display: inline-block;
   width: 100%;

package/src/components/menuTree/src/ZydxMenuTree.vue

@@ -115,7 +115,7 @@ export default {
     // 点击回调事件
     clickItem(item) {
       this.getPcatalogIds(item.pcatalogId);
-      item["catalogPIds"] = this.pcatalogIds.split("").reverse().join("");
+      item["catalogPIds"] = this.pcatalogIds.split("").join("");
       this.$emit("clickItem", item);
       this.pcatalogIds = '';
     },

package/src/components/select/src/select.vue

@@ -18,8 +18,7 @@
                width="16"
                height="16"
                viewBox="0 0 24 24">
-            <g :transform="transform"
-               :style="style">
+            <g :transform="transform">
               <path fill="#c0c4cc"
                     d="M15.125 21.1L6.7 12.7q-.15-.15-.213-.325T6.425 12q0-.2.062-.375T6.7 11.3l8.425-8.425q.35-.35.875-.35t.9.375q.375.375.375.875t-.375.875L9.55 12l7.35 7.35q.35.35.35.863t-.375.887q-.375.375-.875.375t-.875-.375Z" />
             </g>

package/src/components/tipBox/src/zydxStyle.css

@@ -91,7 +91,6 @@
 
 .tip-btnBox > div {
     width: 60px;
-    height: 22px;
     line-height: 20px;
     margin-right: 10px;
     border-radius: 3px;
@@ -341,4 +340,4 @@
     top: 3px;
     left: 0;
     z-index: 1;
-}
+}

package/src/index.js

@@ -79,7 +79,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.32.312',
+    version: '1.32.314',
     install,
     Calendar,
     Message,