Merge branch 'master' into eta1.7.6

config/index.js

@@ -36,13 +36,6 @@ module.exports = {
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
     proxyTable:{
-    '/voice':{
-      target: "http://localhost:3003",
-      changeOrigin:true, // 如果接口跨域，需要进行这个参数配置
-      pathRewrite:{
-        '^/voice':'/voice'
-      }
-    },
 		'/adminapi': {
       target: "http://8.136.199.33:7778",
       // target: "http://192.168.77.7:8606",

src/views/ppt_manage/mixins/pptMixins.js

@@ -989,19 +989,29 @@ export default {
 
       if(chartData.SourcesFrom&&JSON.parse(chartData.SourcesFrom).isShow) {
         let sourceObj = JSON.parse(chartData.SourcesFrom);
+        //pptx 只接受6bit的颜色格式,用333警告太多了 优化下
+        const color = sourceObj.color.includes('rgb') ? rgbaToHex(sourceObj.color).color.substring(1) 
+                    : sourceObj.color.indexOf('#')===0 
+                    ? sourceObj.color.substring(1).length<6 
+                    ? '000000':sourceObj.color.substring(1)
+                    : '666666'
         slide.addText(`来源:${sourceObj.text}`,{
           x:x,
           y: yPercent,
           w: width,
           margin:10,
           fontSize: sourceObj.fontSize*0.75,
-          color: sourceObj.color.includes('rgb') ? rgbaToHex(sourceObj.color).color.substring(1) : sourceObj.color.indexOf('#')===0 ? sourceObj.color.substring(1): '666',
+          color,
         })
       }
 
       if(chartData.Instructions&&JSON.parse(chartData.Instructions).isShow) {
         let instructObj = JSON.parse(chartData.Instructions);
-
+        const color = instructObj.color.includes('rgb') ? rgbaToHex(instructObj.color).color.substring(1) 
+                    : instructObj.color.indexOf('#')===0 
+                    ? instructObj.color.substring(1).length<6 
+                    ? '000000':instructObj.color.substring(1)
+                    : '666666'
         slide.addText(instructObj.text,{
           x:x,
           y: yPercent,
@@ -1009,7 +1019,7 @@ export default {
           align:'right',
           margin:10,
           fontSize: instructObj.fontSize*0.75,
-          color: instructObj.color.includes('rgb') ? rgbaToHex(instructObj.color).color.substring(1) : instructObj.color.indexOf('#')===0 ? instructObj.color.substring(1): '666',
+          color,
         })
       }
     }

src/views/ppt_manage/newVersion/components/editor/DeletePageDialog.vue

@@ -102,6 +102,9 @@ import FormatSix from '@/views/ppt_manage/newVersion/components/formatPage/Forma
 import FormatSeven from '@/views/ppt_manage/newVersion/components/formatPage/FormatSeven.vue';
 import FormatEight from '@/views/ppt_manage/newVersion/components/formatPage/FormatEight.vue';
 import FormatNine from '@/views/ppt_manage/newVersion/components/formatPage/FormatNine.vue';
+import FormatTen from '@/views/ppt_manage/newVersion/components/formatPage/FormatTen.vue';
+import FormatEle from '@/views/ppt_manage/newVersion/components/formatPage/FormatEle.vue';
+import FormatTwelve from '@/views/ppt_manage/newVersion/components/formatPage/FormatTwelve.vue';
 import {countComponentName} from '@/views/ppt_manage/newVersion/utils/untils';
 export default {
   props:{
@@ -117,7 +120,7 @@ export default {
     }
   },
   components:{ FormatOne,FormatTwo,FormatThree,
-    FormatFour,FormatFive,FormatSix,FormatSeven,FormatEight,FormatNine},  
+    FormatFour,FormatFive,FormatSix,FormatSeven,FormatEight,FormatNine,FormatTen,FormatEle,FormatTwelve},  
   data() {
     return {
       startPageNum:null,//开始的页数

src/views/report_manage/reportEn/reportlist.vue

@@ -293,8 +293,8 @@
                   clearable
                   :props="{
                     multiple:true,
-                    value:'EnPermissionId',
-                    label:'EnPermissionName',
+                    value:'PermissionId',
+                    label:'PermissionName',
                     children:'Child'
                   }"
                   :placeholder="$t('ReportManage.ReportList.select_variety_permission')"
@@ -808,7 +808,7 @@ export default {
           // 设置全部选中
           this.popData.varietyOpt.forEach(e=>{
             e.Child.forEach(_e=>{
-              this.popData.varietyVal.push([e.EnPermissionId,_e.EnPermissionId])
+              this.popData.varietyVal.push([e.PermissionId,_e.PermissionId])
             })
           })
         }

src/views/semantics_manage/asr/ASR.vue

@@ -976,7 +976,7 @@ export default {
               transferingNumber:res.Data?res.Data.filter(dat => dat.State==1).length:0,
               list:res.Data || []
             }
-            if(this.transferStatus && this.transferStatus.transferingNumber){
+            if(this.transferStatus.list && this.transferStatus.list.length>0){
               this.transferStatusShow=true
             }
           }

src/views/semantics_manage/asr/components/transferStatus.vue

@@ -56,10 +56,17 @@ import { asrInterface } from '../../../../api/modules/semanticsApi'
         stateTextArr:['','转写中','转写完成','转写失败']
       }
     },
-    mounted(){
-      this.$nextTick(()=>{
-        this.dragDocument = $('#transfer-status-box')[0]
-      })
+    watch:{
+      windowShow:{
+        handler:function(value){
+          if(value){
+            this.$nextTick(()=>{
+              this.dragDocument = $('#transfer-status-box')[0]
+            })
+          }
+        },
+        immediate:true
+      }
     },
     methods: {
       deleteRow(item,index){