Merge branch 'debug' of http://8.136.199.33:3000/eta_gn_front/eta_front into debug

index.html

@@ -50,7 +50,7 @@
 	<script>
 		window.addEventListener('error',(e)=>{
 			if(e.message=="Uncaught SyntaxError: Unexpected token '<'"){
-				window.alert('系统更新中,请稍后刷新重试!')
+				window.alert('系统登录异常，请强刷后重试!')
 				setTimeout(() => {
 					window.location.reload(true)
 				}, 1000);

src/views/ppt_manage/newVersion/components/formatPage/FormatFourteen.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="total-wrap" :style="{'pointer-events' :isPreview?'none':'auto'}">
+  <div class="total-wrap format-fourteen" :style="{'pointer-events' :isPreview?'none':'auto'}">
       <div class="wrap-full-left-half top flex-center" :style="pageItem.layers&&!isLayerShow()?TypeName(1)==='ChartEl'?'z-index:5':'z-index:3':''">
         <component
           :data-position="1"
@@ -90,4 +90,19 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.format-fourteen {
+  .wrap-full-left-half{
+    width: 40%;
+    &.top {
+      height: 65%;
+    }
+    &.bottom {
+      height: 35%;
+      top: 65%;
+    }
+  }
+  .fourteen-right {
+    width: 60%;
+  }
+}
 </style>

src/views/ppt_manage/newVersion/components/formatPreview/FormatPreFourteen.vue

@@ -2,7 +2,8 @@
   <div class="format-pre-wrap flex-center">
     <div class="half-left flex-center">
       <img class="half-top" src="~@/assets/img/ppt_m/format-pic.png" />
-      <img class="half-bottom" src="~@/assets/img/ppt_m/format-pic.png" />
+      <!-- <img class="half-bottom" src="~@/assets/img/ppt_m/format-pic.png" /> -->
+      <div class="half-bottom text"></div>
     </div>
     <div class="half-right flex-center">
       <div class="full text"></div>

src/views/ppt_manage/newVersion/pptCatalog.vue

@@ -390,7 +390,7 @@ export default {
           'present':checkPermissionBtn(pptPermission.ppt_show),
           'download':checkPermissionBtn(pptPermission.ppt_download)&&((item.State===6&&item.ReportSource===2) || item.ReportSource===1),
           'edit':checkPermissionBtn(pptPermission.ppt_save)&&item.HasAuth&&(([3,5].includes(item.State)&&item.ReportSource===2) || item.ReportSource===1),
-          'delete':checkPermissionBtn(pptPermission.ppt_del)&&item.HasAuth&&item.ReportSource===1,
+          'delete':checkPermissionBtn(pptPermission.ppt_del)&&item.ReportSource===1&&item.AdminId===this.RoleId,
       }
 
       return toolList.filter((i)=>btnAuthMap[i.key]) 

src/views/ppt_manage/newVersion/utils/config.js

@@ -557,21 +557,21 @@ export const modelConfig = [{
       modelId: 14,
       elements: [{
           position: 1,
-          width: 100*0.5,
-          height: (restHeight)*0.5*0.84,
+          width: 100*0.4,
+          height: (restHeight)*0.65*0.84,
           x: 0,
           y: ((restHeight)*0.5-(restHeight)*0.5*0.84)/2
       }, {
           position: 2,
-          width: 100*0.5,
-          height: (restHeight)*0.5*0.84,
+          width: 100*0.4,
+          height: (restHeight)*0.35*0.84,
           x: 0,
-          y: 50-7/* +((restHeight)*0.5-(restHeight)*0.5*0.84)/2 */,//or 50
+          y: 52/* +((restHeight)*0.5-(restHeight)*0.5*0.84)/2 */,//or 50
       }, {
           position: 3,
-          width: 100*0.5,
+          width: 100*0.6,
           height: (restHeight)*0.9,
-          x: 50,
+          x: 40,
           y: ((restHeight)-(restHeight)*0.9)/2
       }]
   },

src/views/ppt_manage/newVersion/utils/untils.js

@@ -360,9 +360,9 @@ export const getTextContentSize = (model,position)=>{
             1:[],2:[]
         },
         14: {
-          1:[1,0.5,1,0.9],
-          2:[1,0.5,1,0.9],
-          3:[1,0.5,1,0.9]
+          1:[1,0.4,1,0.9],
+          2:[1,0.4,1,0.9],
+          3:[1,0.6,1,0.9]
         }
     }
     const modelMapHeight = {
@@ -422,8 +422,8 @@ export const getTextContentSize = (model,position)=>{
             1:[],2:[]
         },
         14: {
-            1:[0.86,1,0.5,0.84],
-            2:[0.86,1,0.5,0.84],
+            1:[0.86,1,0.65,0.84],
+            2:[0.86,1,0.35,0.84],
             3:[0.86,1,0.9]
         }
     }

src/views/report_manage/reportV2/components/chapterEditWrapper.vue

@@ -351,7 +351,12 @@ export default {
         let str = res.Data.map(_ =>_.Title).join('，')
         return this.$message.warning(this.$t('ReportManage.ReportList.chapter_nosubmit_msg',{name: str}))
       } 
-
+      
+      tp === 'submit' && await this.$confirm('是否确认提交报告进入审批流程？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
       this.$emit('handlePublish',tp)
     },
 

src/views/report_manage/reportV2/list.vue

@@ -412,52 +412,6 @@
         </div>
       </div>
     </el-dialog>
-
-
-    <!-- 批量发布弹窗 -->
-    <el-dialog
-      :title="$t('ReportManage.smart_release_prompt_btn')"
-      :visible.sync="showPublish"
-      :modal-append-to-body="false"
-      :close-on-click-modal="false"
-      :center="true"
-      v-dialogDrag
-      custom-class="dialogclass"
-      width="510px"
-      @close="handleClosePublish"
-    >
-      <div>
-        <div style="height: 100px; padding-top: 40px">
-          <i
-            class="el-icon-warning"
-            style="font-size: 24px; color: #e6a23c; vertical-align: middle"
-          ></i>
-          {{isDSFB?$t('ReportManage.smart_template_msg'):$t('ReportManage.smart_push_template_btn')}}
-        </div>
-        <div style="margin-bottom: 20px; text-align: center">
-          <el-button
-            type="primary"
-            plain
-            style="width: 100px"
-            @click="handleClosePublish"
-            >{{$t('Dialog.cancel_btn')}}</el-button
-          >
-          <el-button
-            type="primary"
-            style="width: 100px; margin: 0 20px"
-            @click="handlePublic(1)"
-            >{{$t('ReportManage.smart_btn.only_publish')}}</el-button
-          >
-          <el-button
-            type="primary"
-            style="width: 100px"
-            :disabled="!canPushMsg"
-            @click="handlePublic(2)"
-            >{{$t('ReportManage.smart_btn.publish_push')}}</el-button
-          >
-        </div>
-      </div>
-    </el-dialog>
     
   </div>
 </template>
@@ -584,8 +538,8 @@ export default {
       allButtons:[
         {label:"发布",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_publish'),States:[1],text:'ReportManage.smart_btn.publish'},
         {label:"提交",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_publish'),States:[3],text:'ReportManage.smart_btn.submission'},
-        {label:"编辑",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_reportEdit'),States:[1,3],text:'Table.edit_btn'},
-        {label:"编辑中",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_reportEdit'),States:[1,3],text:'ReportManage.smart_btn.editing',},
+        {label:"编辑",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_reportEdit'),States:[1,3,5],text:'Table.edit_btn'},
+        {label:"编辑中",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_reportEdit'),States:[1,3,5],text:'ReportManage.smart_btn.editing',},
         {label:"删除",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_reportDel'),States:[1,3],text:'Table.delete_btn'},
         {label:"取消发布",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_cancelPublish'),States:[2],text:'ReportManage.smart_btn.withdraw'},
         {label:"撤销",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_cancelPublish'),States:[4,5,6],text:'ReportManage.smart_btn.withdraw'},
@@ -887,7 +841,7 @@ export default {
     },
 
     //发布报告
-    async publishreport(item) {
+    async publishreport(item,type) {
       this.batches = [];
       this.batches.push(item.Id);
       this.publishReportCode = item.ReportCode
@@ -896,7 +850,11 @@ export default {
       let baseUrl= localStorage.getItem('dynamicOutLinks') ? JSON.parse(localStorage.getItem('dynamicOutLinks')).ReportViewUrl : '';
 			this.linkPdfUrl = item.ReportLayout===1 ? `${baseUrl}/reportshare_pdf` : `${baseUrl}/reportshare_smart_pdf`;
 
-      
+      type === '提交' && await this.$confirm('是否确认提交报告进入审批流程？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
       this.handlePublic(1)
       
     },
@@ -1000,7 +958,7 @@ export default {
       switch (type) {
         case '发布':
         case '提交':
-          this.publishreport(data)
+          this.publishreport(data,type)
           break;
         // case '提交':
         //   this.handleSubmitReport(data)
@@ -1058,10 +1016,12 @@ export default {
     },
 
     downloadPdfImg(row,type){
+      let name = `${row.Title}${this.$moment().format('YYYYMMDD')}`
       if(type == 1){
-          window.open(row.DetailPdfUrl,"_blank")
+          // window.open(row.DetailPdfUrl,"_blank")
+          this.handleDownloadResource(row.DetailPdfUrl,`${name}`)
       }else{
-          this.handleDownloadResource(row.DetailImgUrl,`${row.Title}`)
+          this.handleDownloadResource(row.DetailImgUrl,`${name}`)
       }
     },
 

src/views/sandbox_manage/common/customize.js

@@ -173,6 +173,7 @@ export default {
                   : this.$store.state.sand.styleConfig.dataTextColor,
             },
           },
+          zIndex:0,
           data: linkItem,
         });
         childNodeCells.push(currentNode)
@@ -186,6 +187,7 @@ export default {
                   stroke:this.$store.state.sand.styleConfig.lineColor
                 }
               },
+              zIndex:0,
               source: {
                 cell: select_cell.id,
                 anchor: {
@@ -233,6 +235,7 @@ export default {
                 fill: this.$store.state.sand.styleConfig.titleTextColor ,
               },
             },
+            zIndex:0,
             data: linkItem,
           });
           cells.push(titleNode);
@@ -287,6 +290,7 @@ export default {
                   "pointer-events": "none",
                 },
               },
+              zIndex:0,
               data: item,
             });
             cells.push(innerNode)

src/views/sandbox_manage/common/mindmap.js

@@ -858,6 +858,7 @@ export default {
                   fill:data.type == 'datanode-title' ? this.$store.state.sand.styleConfig.titleTextColor  :  'transparent',
                 }
               },
+              zIndex:0,
               data:data.data,
             })
             cells.push(wrapNode);
@@ -886,6 +887,7 @@ export default {
                     'pointer-events': 'none',
                   }
                 },
+                zIndex:0,
                 data:data.data,
               })
               cells.push(currentNode);
@@ -913,6 +915,7 @@ export default {
                     fill:this.$store.state.sand.styleConfig.titleTextColor 
                   }
                 },
+                zIndex:0,
                 data:data.data,
               });
               cells.push(titleNode);
@@ -959,6 +962,7 @@ export default {
                       'pointer-events': 'none',
                     },
                   },
+                  zIndex:0,
                   data:v,
                 });
                 cells.push(innerNode);

src/views/sandbox_manage/sandFlowNew/components/addLInkDia.vue

@@ -383,7 +383,22 @@ import { calculateOption } from "../../common/options"
         return arr.find(_=>_.source == item.source || _.source == item.source2);
       },
       handleEditCal(v){ //编辑状态
-          this.calculationItem = v;
+          const getManySourseJump = (item) => {
+            let i = this.checkedLinkList.find(_=>_.RId == this.activeItem.RId);
+            if(i && i.calculationMethod && i.calculationMethod.length > 0){
+              let calItem =  i.calculationMethod.find(_=>_.source == item.source || _.source == item.source2);
+              let _ = !calItem ? item : {
+                ...item,
+                source:calItem.source
+              }
+              return _;
+            } else {
+              return item;
+            }
+
+          }
+          let hasManySource = v.source2 ? true : false;
+          this.calculationItem = !hasManySource ? v : getManySourseJump(v);
           this.isOpenCalculationDia = true;
           this.dialogDisplayNone = true;
       },
@@ -549,7 +564,9 @@ import { calculateOption } from "../../common/options"
         const chartTypeMap = {
           7: this.initBarData, //柱形图
           10: this.initSectionScatterData, //截面散点
-          11: this.initRadarData(res.Data)
+          // (res.Data)
+          11: this.initRadarData, //雷达图
+          14:this.initSectionalCombinationChart, //截面组合图
         }
         chartTypeMap[this.chartInfo.ChartType] && chartTypeMap[this.chartInfo.ChartType](res.Data);