Merge branch 'master' of http://8.136.199.33:3000/eta_front/eta_front

src/views/dataEntry_manage/databaseList.vue

@@ -232,29 +232,28 @@
 							</el-tab-pane>
 						</el-tabs>
 						<div class="edb-tool-icon edb-tool" style="align-items: center;">
+							<el-button v-if="isEdbBtnShow('update')"
+								type="text" @click="refreshTargetHandle" >刷新</el-button>
+							<el-button v-if="isEdbBtnShow('edit')"
+								type="text" :disabled="!(EdbData.Button.OpButton)"
+								@click="editNode({},EdbData)">编辑</el-button>
+							<!-- 指保存指标的上下限，在走势图才显示 -->
+							<el-button v-if="activeTab==='Chart'&&isEdbBtnShow('saveEdb')"
+								type="text" @click.stop="saveEdbLimit">保存</el-button>
+							<el-button v-if="EdbData.EdbType===2&&isEdbBtnShow('toSource')"
+								type="text" @click="isLookHistory=true;lookEdbId=selected_edbid">指标溯源</el-button>
 							<el-popover 
 								placement="left" 
 								trigger="hover"
 								popper-class="edb-tool-popover"
 								width="320" style="display: inline-block;">
 								<div class="edb-tool-wrap">
-									<el-button v-if="isEdbBtnShow('update')"
-										type="text" @click="refreshTargetHandle" >刷新</el-button>
-									<el-button v-if="isEdbBtnShow('edit')"
-											type="text" :disabled="!(EdbData.Button.OpButton)"
-											@click="editNode({},EdbData)"
-										>编辑</el-button>
-									<!-- 指保存指标的上下限，在走势图才显示 -->
-									<el-button v-if="activeTab==='Chart'&&isEdbBtnShow('saveEdb')"
-										type="text" @click.stop="saveEdbLimit">保存</el-button>
 									<el-button v-if="isEdbBtnShow('setEn')"
 										type="text" @click="openEnNameDia">设置英文名称</el-button>
 									<el-button v-if="EdbData.Button.InsertNewDataButton&&isEdbBtnShow('newValue')"
 										type="text" @click.stop="updateNewestDataHandle" >{{(EdbData.DataInsertConfig.Date)?'编辑最新值':'添加最新值'}}</el-button>
 									<el-button v-if="EdbData.EdbType===2&&isEdbBtnShow('calculateAgain')"
 										type="text" @click.stop="reCalculateHandler" :loading="calculateLoading">重新计算</el-button>
-									<el-button v-if="EdbData.EdbType===2&&isEdbBtnShow('toSource')"
-										type="text" @click="isLookHistory=true;lookEdbId=selected_edbid">指标溯源</el-button>
 									<el-button v-if="EdbData.EdbType===1&&isEdbBtnShow('refreshAll')"
 										type="text" @click.stop="refreshBaseHandler" :loading="refreshLoading">全部刷新</el-button>
 									<el-button v-if="isEdbBtnShow('copyData')"
@@ -263,7 +262,7 @@
 										type="text" @click="removeNode(_,EdbData)" style="color:#C54322;">删除</el-button>
 								</div>
 								<div class="edb-btn" slot="reference">
-									<el-button type="text">操作</el-button>
+									<el-button type="text">更多操作</el-button>
 									<i class="el-icon-more" style="font-size: 14px;transform: rotate(90deg);cursor: pointer;color: #3375e1;"/>
 								</div>
 							</el-popover>

src/views/ppt_manage/newVersion/components/catalog/pptContent.vue

@@ -319,8 +319,8 @@ export default {
     .ppt-item{
       position:relative;
       width:100%;
-      background: url('~@/assets/img/pptnextimg.png') no-repeat center;
-      background-size: 100%;
+      background: url('~@/assets/img/pptnextimg.png') no-repeat top;
+      background-size: 100% 100%;
       margin-bottom: 20px;
       border: 4px solid transparent;
       .ppt-info{

src/views/ppt_manage/newVersion/components/catalog/pptContentEn.vue

@@ -315,9 +315,9 @@ export default {
     .ppt-item{
       position:relative;
       width:100%;
-      background: url('~@/assets/img/ppt_en_bg.png') no-repeat center;
+      background: url('~@/assets/img/ppt_en_bg.png') no-repeat top;
       /* background-size: cover; */
-      background-size: 100% 104.5%;
+      background-size: 100% 100%;
       margin-bottom: 20px;
       border: 4px solid transparent;
       // .ppt-info{

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

@@ -5,7 +5,7 @@
                 <span>选择封面</span>
                 <img src="~@/assets/img/ppt_m/close.png" alt="" class="close_ico" @click="closeDialog">
             </header>
-            <div class="dialog-bg" :style="'backgroundImage:url('+bgList[bgListIndex]+');backgroundPosition:center;backgroundRepeat:no-repeat;backgroundSize:cover;'">
+            <div class="dialog-bg" :style="'backgroundImage:url('+bgList[bgListIndex]+');backgroundPosition:center;backgroundRepeat:no-repeat;'">
                 <div :style="`width:62%; font-size:16px; text-align:center; line-height:1.6; color:${$parent.pptCoverTextColor}; position:absolute; right:20px; top:50%;`">
                     <p :style="`height:5px;margin-bottom:21px;`"></p>
                     <el-input
@@ -214,7 +214,7 @@ export default {
             /* height: 645px; */
             position: relative;
             padding-bottom: 70%;
-            background-size: 100% 100%;
+            background-size: 100% 100% !important;
             .select_ico {
                 width: 48px;
                 height: 48px;

src/views/ppt_manage/newVersion/pptEditor.vue

@@ -1315,6 +1315,7 @@ $titleColor:#333333;
                 display: flex;
                 justify-content: center;
                 align-items: center;
+                background-size: 100% 100% !important;
                 /* background: no-repeat center/cover url(~@/assets/img/ppt_m/bg3.jpg); */
             }
         }
@@ -1383,8 +1384,8 @@ $titleColor:#333333;
                     width:calc(100% - 64px);
                     /* height: 0;
                     padding-bottom: calc(69.408% - 64px); */
-                    background: url('~@/assets/img/pptnextimg.png') no-repeat center;
-                    background-size: cover;
+                    background: url('~@/assets/img/pptnextimg.png') no-repeat top;
+                    background-size: 100% 100%;
                     /* margin-bottom: 30px; */
                     position: relative;
                     border: 4px solid transparent;

src/views/ppt_manage/newVersion/pptEnEditor.vue

@@ -1280,6 +1280,7 @@ $titleColor:#333333;
                 display: flex;
                 justify-content: center;
                 align-items: center;
+                background-size: 100% 100% !important;
                 /* background: no-repeat center/cover url(~@/assets/img/ppt_m/bg3.jpg); */
             }
         }
@@ -1348,9 +1349,9 @@ $titleColor:#333333;
                     width:calc(100% - 64px);
                     /* height: 0;
                     padding-bottom: calc(69.408% - 64px); */
-                    background: url('~@/assets/img/ppt_en_bg.png') no-repeat center;
+                    background: url('~@/assets/img/ppt_en_bg.png') no-repeat top;
                     /* background-size: 898px 642px; */
-                    background-size:101% 104.5%;
+                    background-size:100% 100%;
                     /* margin-bottom: 30px; */
                     position: relative;
                     border: 4px solid transparent;

src/views/ppt_manage/newVersion/pptEnPresent.vue

@@ -862,8 +862,8 @@ $titleColor:#333333;
     .ppt-item{
       width: 100%;
       height: 100%;
-      background: url('~@/assets/img/ppt_en_bg.png') no-repeat center;
-      background-size: 100% 104.5%;
+      background: url('~@/assets/img/ppt_en_bg.png') no-repeat top;
+      background-size: 100% 100%;
       position:relative;
       border: 4px solid transparent;
       overflow: hidden;

src/views/ppt_manage/newVersion/pptEnPublish.vue

@@ -692,8 +692,8 @@ $titleColor:#333333;
       /* height: 628.594px; */
       background-color: pink;
       margin-bottom: 20px;
-      background: url('~@/assets/img/ppt_en_bg.png') no-repeat center;
-      background-size: 100% 104.5%;
+      background: url('~@/assets/img/ppt_en_bg.png') no-repeat top;
+      background-size: 100% 100%;
       position:relative;
       border: 4px solid transparent;
       transform-origin: 0 0;

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

@@ -405,9 +405,9 @@ export const pptSlideMasterEn = {
 		{
 			image: {
         x: 0,
-        y: -0.1,
+        y: 0,
         w: 10,
-        h: 7.1,
+        h: 7,
         path: "/static/ppt_en_bg.png", 
       },
 		},

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

@@ -50,9 +50,8 @@ export const pptInit = (pptx,LayoutType,lang='ch') => {
     let layout = pptLayout,sliderMaster = lang==='ch'?pptSlideMaster:pptSlideMasterEn
     if(LayoutType!==1){
         layout = { name: "myppt", width: 10, height: LayoutType===2?5.625:7.5 }
-        const y = lang==='ch'?0:-0.1
         const h = LayoutType===2?5.625:7.5
-        sliderMaster.objects[1] = {image: {x:0,y:y,w:10,h:lang==='ch'?h:h+0.1,path: lang==='ch'?"/static/pptnextimg.png":"/static/ppt_en_bg.png"}}
+        sliderMaster.objects[1] = {image: {x:0,y:0,w:10,h,path: lang==='ch'?"/static/pptnextimg.png":"/static/ppt_en_bg.png"}}
         sliderMaster.slideNumber = {x:'95%',y:LayoutType===2?'92%':'95%',fontSize:12}
     }
   pptx.defineLayout(layout)

src/views/predictEdb_manage/predictEdb.vue

@@ -186,6 +186,14 @@
 							</el-tab-pane>
 						</el-tabs>
 						<div class="edb-tool-icon edb-tool" style="align-items: center;">
+							<el-button v-permission="permissionBtn.predictEdbPermission.edbPreData_update"
+									type="text" @click="updateEdbPartHandle">刷新</el-button>
+							<el-button type="text" @click="editEdbHandle('')" 
+									v-if="edbButton.OpButton&&isEdbBtnShow('edbPreData_edit')">编辑</el-button>
+							<el-button type="text" @click="saveEdbHandle" 
+									v-if="detail_show_chart&&isEdbBtnShow('edbPreData_save')">保存</el-button>
+							<el-button v-permission="permissionBtn.predictEdbPermission.edbPreData_edbSource"
+								type="text" @click="isLookHistory=true;lookEdbId=select_id">指标溯源</el-button>
 							<el-popover 
 								placement="left" 
 								trigger="hover"
@@ -196,14 +204,6 @@
 										type="text" @click="clickEdbNameHandle" v-if="currentLang==='ch'||!edb_nameEn">
 										设置英文名称
 									</el-button>
-									<el-button v-permission="permissionBtn.predictEdbPermission.edbPreData_edbSource"
-									type="text" @click="isLookHistory=true;lookEdbId=select_id">指标溯源</el-button>
-									<el-button v-permission="permissionBtn.predictEdbPermission.edbPreData_update"
-										type="text" @click="updateEdbPartHandle">刷新</el-button>
-									<el-button type="text" @click="editEdbHandle('')" 
-										v-if="edbButton.OpButton&&isEdbBtnShow('edbPreData_edit')">编辑</el-button>
-									<el-button type="text" @click="saveEdbHandle" 
-										v-if="detail_show_chart&&isEdbBtnShow('edbPreData_save')">保存</el-button>
 									<el-button v-permission="permissionBtn.predictEdbPermission.edbPreData_recalcu"
 										type="text" @click="updateEdbHandle">重新计算</el-button>
 									<el-button class="deletesty" @click="delEdbHandle" type="text"
@@ -212,7 +212,7 @@
 										type="text" @click="copyData">复制数据</el-button>
 								</div>
 								<div class="edb-btn" slot="reference">
-									<el-button type="text">操作</el-button>
+									<el-button type="text">更多操作</el-button>
 									<i class="el-icon-more" style="font-size: 14px;transform: rotate(90deg);cursor: pointer;color: #3375e1;"/>
 								</div>
 							</el-popover>
@@ -1707,7 +1707,7 @@ $mini-font: 12px; $normal-font: 14px;
 					}
 					.sheet-item {
 						width:23%;
-						min-width: 255px;
+						min-width: 210px;
 						border-radius: 4px;
 						box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
 						border: 1px solid #EBEEF5;

src/views/smartReport/reportDetail.vue

@@ -38,7 +38,7 @@
                     class="qrcode"
                 ></vue-qr>
             </div>
-            <div class="item" v-if="reportInfo.State == 2" @click="handleGetReportImg" v-permission="permissionBtn.smartReportManageBtn.reportManage_reportView_exportImg">
+            <div class="item" v-if="(reportInfo.State == 2&&!isApprove)||(reportInfo.State == 4&&isApprove)" @click="handleGetReportImg" v-permission="permissionBtn.smartReportManageBtn.reportManage_reportView_exportImg">
                 <img src="~@/assets/img/smartReport/icon16.png" alt="" style="width:30px;height:30px;marginRight:10px;">
                 <span>导&nbsp;&nbsp;图</span>
             </div>
@@ -63,8 +63,15 @@ export default {
 				str=`${baseUrl}/reportshare_smart_report?code=${this.$route.query.code}`
 			}
 			return str
-		}
-	},
+		},
+        //是否开启审批流,若开启,导图按钮在非已审批的状态不显示
+        isApprove(){
+            const type = this.$setting.dynamicOutLinks.ApprovalFlow ||
+                        this.$store.state.dynamicOutLinks.ApprovalFlow ||
+                        JSON.parse(localStorage.getItem('dynamicOutLinks')).ApprovalFlow||''
+            return ['2','3'].includes(type)
+        }
+    },
     data() {
         return {
             reportInfo:null,