pm il y a 11 mois
Parent
commit
3418b79c3f

+ 1 - 1
src/components/separationPoint/workshop.vue

@@ -371,7 +371,7 @@ export default {
     height: 100%;
   }
 
-  p {    
+  p {
     text-align: center;
     //margin: 30% 0;
     line-height: 850px;

+ 13 - 13
src/views/print/printtemplate/index.vue

@@ -3,13 +3,13 @@
     <el-card>
     <div style="display: flex;flex-direction: column">
       <div style="margin-bottom: 10px">
-        <el-button v-no-more-click-group>
+        <el-button-group >
           <template v-for="(value,type) in paperTypes"  >
             <el-button v-no-more-click :type="curPaperType === type ? 'primary' : 'info'" @click="setPaper(type,value)" :key="type">
               {{ type }}
             </el-button>
           </template>
-          
+
           <el-popover v-model="paperPopVisible" title="设置纸张宽高(mm)" trigger="click">
               <div>
                 <el-input-number v-model="paperWidth" style=" width: 120px; text-align: center"
@@ -19,7 +19,7 @@
                 />
                 <el-input-number v-model="paperHeight" style="width: 120px; text-align: center; border-left: 0"
                       controls-position="right"   placeholder="高(mm)"/>
-              </div>                
+              </div>
               <el-button v-no-more-click type="primary" style="width: 290px; margin-top: 10px;" @click="otherPaper">确定</el-button>
             <el-button v-no-more-click slot="reference" :type="'other'==curPaperType?'primary':''">自定义纸张</el-button>
           </el-popover>
@@ -36,7 +36,7 @@
             <el-button v-no-more-click icon="el-icon-zoom-out" slot="prepend" @click="changeScale(false)"></el-button>
             <el-button v-no-more-click icon="el-icon-zoom-in" slot="append" @click="changeScale(true)"></el-button>
           </el-input>
-          <el-button v-no-more-click-group style="margin-left: 10px;">
+          <el-button-group  style="margin-left: 10px;">
             <el-button v-no-more-click type="primary" icon="el-icon-refresh-left" @click="rotatePaper()">旋转</el-button>
             <el-button v-no-more-click type="primary" icon="el-icon-view" @click="preView">
               预览
@@ -294,7 +294,7 @@
                 <el-option label="请选择字典生成" value="" />
               </el-select>
             </el-form-item>
-          </el-col>          
+          </el-col>
           <el-col :span="12">
             <el-form-item label="是否默认" prop="isDefault">
               <el-input v-model="form.isDefault" placeholder="请输入是否默认" />
@@ -350,7 +350,7 @@ export default {
         templateType: null,
         templateName: null,
         templateJson: null,
-        paperType: this.$route.params.paperType,        
+        paperType: this.$route.params.paperType,
         templateWidth: null,
         templateHeight: null,
         templatePic: null,
@@ -362,7 +362,7 @@ export default {
           { required: true, message: "模板编号不能为空", trigger: "blur" }
         ],        templateType: [
           { required: true, message: "模板类型不能为空", trigger: "change" }
-        ],      
+        ],
       },
       template: null,
       curPaper: {
@@ -456,7 +456,7 @@ export default {
         getTemplate(templateId).then(response => {
             this.form = response.data;
             if (hiprintTemplate) {
-              try {                                            
+              try {
                 this.setPaper(this.form.paperType);
                 hiprintTemplate.update(JSON.parse(this.form.templateJson));
               } catch (e) {
@@ -633,7 +633,7 @@ export default {
     },
 
     setPaper(type){
-      if (Object.keys(this.paperTypes).includes(type)) {          
+      if (Object.keys(this.paperTypes).includes(type)) {
           this.curPaper = {type: type, width: this.paperTypes[type].width, height: this.paperTypes[type].height}
           hiprintTemplate.setPaper(this.paperTypes[type].width, this.paperTypes[type].height)
       }
@@ -711,7 +711,7 @@ export default {
     },
     handleSave(){
       if(this.form.templateId !=null){
-        
+
         this.saveTemplate();
       }else{
         this.open = true;
@@ -722,7 +722,7 @@ export default {
     saveTemplate(){
       let that = this;
       if (hiprintTemplate) {
-        this.form.templateJson = JSON.stringify(hiprintTemplate.getJson() || {});        
+        this.form.templateJson = JSON.stringify(hiprintTemplate.getJson() || {});
       }
       //保存缩略图
       html2canvas(document.getElementById("hiprint-printTemplate")).then(function(canvas){
@@ -733,7 +733,7 @@ export default {
           // link.download = '测试图片.png';
           // document.body.appendChild(link);
           // link.click();
-          // document.body.removeChild(link);          
+          // document.body.removeChild(link);
           let fileName = `${new Date().getTime()}.jpg`;
           let file = new File([blob],fileName,{type: 'image/jpg'});
           let formData = new FormData();
@@ -758,7 +758,7 @@ export default {
     },
     //当前模板的打印测试
     printText(){
-      
+
     },
     onlyPrint2() {
       let that = this;

+ 1 - 1
src/views/tool/build/ResourceDialog.vue

@@ -24,7 +24,7 @@
           @click="deleteOne(index)"
         />
       </el-input>
-      <el-button v-no-more-click-group class="add-item">
+      <el-button-group  class="add-item">
         <el-button v-no-more-click
           plain
           @click="addOne('https://lib.baomitu.com/jquery/1.8.3/jquery.min.js')"