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

src/views/Home.vue

@@ -290,16 +290,6 @@
             </div>
             <div class="userinfo">
               <div class="userinfo-fingerpost">
-                <!-- <el-button
-                  @click="linkToOtherMS(item)"
-                  v-for="item in linkSystems"
-                  :key="item.path"
-                  type="text"
-                  style="margin-right: 18px;color:#333;padding:12px;"
-                >
-                  <img :src="item.icon" v-if="item.icon" width="20" height="20" style="vertical-align: middle;">
-                  {{item.name}}
-                </el-button> -->
 
                 <el-dropdown
                   trigger="click"
@@ -362,9 +352,6 @@
                     style="width: 84px; height: 24; cursor: pointer"
                   />
                 </div>
-                <!-- <div class="lang-content" @click="langChangeHandler">
-                  {{ $i18n.locale == "zh" ? "English" : "中文" }}
-                </div> -->
               </div>
               <!-- 消息通知 -->
               <notification-msg ref="notification" />
@@ -385,9 +372,6 @@
                       $t("MainPage.tab_log_out")
                     }}</el-dropdown-item
                   >
-                  <!-- <el-dropdown-item divided @click.native="toDoc"
-                    >更新日志</el-dropdown-item
-                  > -->
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
@@ -664,10 +648,6 @@ export default {
         this.dialogVisiblePwd = res.Data;
       }
     },
-    // 点击导航 打开今日待办
-    // handleShowSallerTodayList() {
-    //   this.getSellerTodayList("click");
-    // },
 
     // 点击完成 批量提交备注
     handleTodayFinished() {
@@ -850,15 +830,9 @@ export default {
     },
     // 操作指南的跳转
     toOperation() {
-      // this.$router.replace({name: '/fingerpost', params: {id: 1}})
-      // let { href } = this.$router.resolve({
-      //   path: `/${url}`,
-      //   query: { contractid: this.contractId },
-      // });
-      // window.open(href, "_blank");
+      
       //打开帮助文档
       const href = `${process.env.VUE_APP_ETA_HELP_DOCS}?bus_code=${this.bus_code}`
-      // const href = `http://192.168.77.13:3033/help/index?bus_code=${this.bus_code}`
       window.open(href, "_blank");
     },
     // 跳转去其他的系统

src/views/Login.vue

@@ -3,73 +3,8 @@
 		<div id="login_wrapper">
       
             <img class="login-bg" :src="$setting.login_bg" alt />
-            <!-- <img class="login-icon" :src="$setting.login_logo" /> -->
-			<!-- <el-form
-				:model="ruleForm"
-				:rules="rules"
-				ref="ruleForm"
-				label-position="right"
-				label-width="0px"
-				class="demo-ruleForm"
-				id="login-container"
-				@submit.native.prevent
-			>
-				<el-form-item>
-					<span class="login-title">ETA — 让投研领先市场半步</span>
-				</el-form-item>
-				<el-form-item prop="account">
-					<el-input
-						type="text"
-						v-model="ruleForm.account"
-						auto-complete="off"
-						placeholder="请输入用户名"
-					>
-					</el-input>
-				</el-form-item>
-				<el-form-item prop="checkPass" v-if="visible">
-					<el-input
-						type="password"
-						v-model="ruleForm.checkPass"
-						auto-complete="off"
-						placeholder="请输入账号"
-					>
-					</el-input>
-				</el-form-item>
-				<el-form-item prop="checkPass" v-else>
-					<el-input
-						type="text"
-						v-model="ruleForm.checkPass"
-						auto-complete="off"
-						placeholder="请输入密码"
-					>
-					</el-input>
-				</el-form-item>
-				<div class="remember-cont">
-					<el-checkbox v-model="checked" class="remember"
-						>保持登录状态</el-checkbox
-					>
-					<div class="warn-check-tip" v-show="checked">
-						<i class="el-icon-warning"/>
-						勾选表示信任此设备，系统将不会自动退出该设备，使用公用电脑请勿勾选！
-					</div>
-				</div>
-				<el-form-item>
-					<el-button
-						type="primary"
-						size="medium"
-						@click.native="handleSubmit2"
-						:loading="logining"
-						class="submit_btn"
-						>登录</el-button
-					>
-				</el-form-item>
-			</el-form>  -->
-
-            <!-- <el-radio-group v-model="lang" @input="changeLang" class="lang-wrapper">
-                <el-radio-button label="zh">中文</el-radio-button>
-                <el-radio-button label="en">English</el-radio-button>
-            </el-radio-group> -->
-
+           
+			
 			<div class="login-box" id="login-container" v-if="activeModel!=='forgetPassModel'">
                 <div class="fixed-login-cont">
                     <span class="login-title">{{ loginTitle }}</span>
@@ -98,24 +33,7 @@
                         :loading="logining"
                         class="submit_btn"
                         ><!-- 登录 -->{{ $t('LoginPage.login_btn') }}</el-button>
-                    <!-- <div class="another-login-type">
-                        <div class="another-type-hint">
-                            <div class="type-hint-line"></div>
-                            <div class="type-hint-text">{{ $t('LoginPage.other_login_type') }}</div>
-                            <div class="type-hint-line"></div>
-                        </div>
-                        <div class="another-type">
-                            <div class="login-type-item"
-                                v-for="item in loginTypeIcons"
-                                :key="item.name"
-                                :style="activeModel===item.name?'display: none':''"
-                                @click="activeModel=item.name;handleClick(item)"
-                            >
-                            <div v-html="item.svg"></div>
-                            {{item.label}}
-                            </div>
-                        </div>
-                    </div> -->
+                    
                 </div>
 			</div>
 			<div class="login-box" v-else>
@@ -182,7 +100,6 @@ export default {
             let loginUrl=publicConfigs.LoginUrl
             if(loginUrl){
                 window.location.replace(loginUrl)
-                // window.location.href = loginUrl
             }else{
                 next();
             }
@@ -368,15 +285,9 @@ export default {
                                 case "researcher":
                                     path = "/reportlist";
                                     break;
-                                // case "compliance": //合规
-                                //     path = "/contractapprovallist";
-                                //     break;
                                 case "special_researcher": //特邀研究员
                                     path = "/dataList";
                                     break;
-                                // case "special_ficc_seller":
-                                //     path = "/meetingCalendar";
-                                //     break;
                                 default:
                                     path = await this.getOtherRolePath("myCalendar");
                             }
@@ -619,15 +530,9 @@ export default {
                 case "researcher":
                     path = "/reportNew";
                     break;
-                // case "compliance": //合规
-                //     path = "/contractapprovallist";
-                //     break;
                 case "special_researcher": //特邀研究员
                     path = "/dataList";
                     break;
-                // case "special_ficc_seller":
-                //     path = "/meetingCalendar";
-                //     break;
                 default:
                     path = await this.getOtherRolePath("myCalendar");
             }
@@ -716,11 +621,6 @@ export default {
 			height: 90%;
 		}
 
-		// .login-icon {
-		// 	position: absolute;
-		// 	top: 40px;
-		// 	right: 40px;
-		// }
 		.login-title {
 			color: #0052D9;
 			font-size: 28px;

src/views/edbHistoryPage.vue

@@ -3,16 +3,6 @@
     <div class="edb-history-page-wrap">
         <div class="edb-title">{{currentLang==='en'?(treeData.EdbNameEn||treeData.EdbName):treeData.EdbName}}</div>
         <div class="edb-source-wrap">
-            <!-- <vue2-org-tree
-                :data="treeData"
-                :props="{
-                    label: 'EdbName',
-                    children: 'Child',
-                }"
-                :horizontal="false"
-                :render-content="renderContent"
-                @on-node-click="handleClickNode"
-            /> -->
             <div class="sandbox-body">
                 <div class="sand-chart-body" id="sand-chart-body"></div>
                 <div id="minimap" class="minimap"></div>
@@ -48,24 +38,7 @@ export default {
         }
     },
     methods: {
-        // renderContent(h, data) {
-        //     return (
-        //         <el-tooltip content={data.RuleTitle} placement='top' popper-class='node-tooltip'>
-        //             {
-        //                 data.IsStop?<span class='node stop'>{data.EdbName+'(暂停更新)'}</span>
-        //                 :<span class='node'>{data.EdbName}</span>
-        //             }
-        //         </el-tooltip>
-        //     )
-        // },
-        // handleClickNode(e, data) {
-        //     //EdbInfoType=1 跳预测指标详情,=0跳指标库详情
-        //     const { ClassifyId, UniqueCode, EdbInfoId, EdbInfoType } = data
-        //     let { href } =
-        //     this.$router.resolve({ path: EdbInfoType === 1 ? '/predictEdb' : '/database', query: { code: UniqueCode, id:
-        //     EdbInfoId, classifyId: ClassifyId } });
-        //     window.open(href, '_blank');
-        // },
+        
         async getData() {
             const res = await dataBaseInterface.getEdbCreateHistory({ UniqueCode: this.$route.query.code})
             if (res.Ret !== 200) return
@@ -386,52 +359,7 @@ export default {
     }
 }
 </style>
-<!-- <style lang="scss">
-.edb-history-page-wrap{
-  .org-tree-container {
-    margin: 0 auto;
-    /* .org-tree-node-label {  } */
-    .org-tree-node-label-inner{
-        cursor: pointer;
-        background-color: #F2F6FA;
-        color: #333333;
-        padding:20px;
-        border-radius: 4px;
-        font-size: 16px;
-        max-width: 100px;
-        &:hover{
-            color:#0052D9;
-            text-decoration: underline;
-            background-color: #ECF5FF;
-        }
-    }
-    .org-tree{
-        >.org-tree-node{
-            >.org-tree-node-label{
-                .org-tree-node-label-inner{
-                    background-color: #0052D9;
-                    color: white;
-                }
-            }
-        }
-        .stop{
-            color:red;
-        }
-    }
-    .org-tree-node-children {
-        .org-tree-node ~ .org-tree-node{
-            padding-left: 40px;
-        }
-    }
-    
-  }
-}
-.node-tooltip{
-    font-size: 14px;
-    padding:10px;
-    text-align: center;
-}
-</style> -->
+
 <style lang="scss">
 .sandbox-body{
   .x6-graph-scroller {

src/views/knowledge_manage/components/importFileDia.vue

@@ -47,20 +47,6 @@
             style="width:80%"
             clearable
           />
-          <!-- <el-select
-              v-model="eventForm.source"
-              placeholder="请选择来源"
-              size="medium"
-              clearable
-              style="width:80%"
-          >
-              <el-option 
-                v-for="item in sourcesOptions" 
-                :key="item"
-                :label="item" 
-                :value="item" 
-              />
-          </el-select> -->
         </el-form-item>
         <el-form-item prop="tagId" label="标签">
           <el-select
@@ -130,7 +116,6 @@ export default {
       if(!nval) return 
 
       this.getClassifyList();
-      // this.getSourceList();
       this.getTagsList();
     }
   },

src/views/knowledge_manage/edit.vue

@@ -38,19 +38,6 @@
             placeholder="请输入来源"
             clearable
           />
-          <!-- <el-select
-              v-model="eventForm.source"
-              placeholder="请选择来源"
-              size="medium"
-              clearable
-          >
-              <el-option 
-                v-for="item in sourcesOptions" 
-                :key="item"
-                :label="item" 
-                :value="item" 
-              />
-          </el-select> -->
         </el-form-item>
         <el-form-item prop="tagId">
           <el-select
@@ -193,7 +180,6 @@ export default {
   },
   mounted(){
     this.getClassifyList()
-    // this.getSourceList()
     this.getTagsList()
 
     this.id && this.getEventDetail()

src/views/knowledge_manage/list.vue

@@ -120,11 +120,6 @@
                           />
                       </el-select>
                   </div>
-
-                  <!-- <div class="select-bot">
-                    <el-button type="primary" plain>取消</el-button>
-                    <el-button type="primary">确认</el-button>
-                  </div> -->
               </div>
               <div class="select-btn" slot="reference">
                   <img src="~@/assets/icons/filter.svg">

src/views/login_manage/ForgetPassModel.vue

@@ -223,12 +223,6 @@ export default {
                 Source:3
             }).then(res=>{
                 if(res.Ret!==200) return
-                /* //60秒倒计时
-                this.countDown()
-                this.timer = setInterval(()=>{
-                    this.countDown()
-                },1000)
-                this.goSteps() */
                 this.goSteps()
             })
         },

src/views/login_manage/OrdinaryModel.vue

@@ -41,7 +41,6 @@
                         </span>
                     </el-tooltip>
                 </el-checkbox>
-                <!-- <el-button type="text" style="font-size: 16px;" @click="changeModel">{{ $t('LoginPage.label_forget') }}</el-button> -->
             </el-form-item>
         </el-form>
     </div>

src/views/login_manage/components/VerificationBox.vue

@@ -70,8 +70,6 @@ export default {
         font-size: 18px;
     }
     .el-button{
-        /* background-color: #3654C1;
-        color: #fff; */
         margin-left: auto;
     }
 }

src/views/login_manage/modelMixins.js

@@ -20,8 +20,6 @@ export default {
             })
         },
         countDown(){
-            /* if(!this.timer) return */
-            //console.log('click down')
             this.codeCountDown--
             this.codeStr=/* `重新获取（${this.codeCountDown}）秒` */ this.$t('LoginPage.recode_ing_msg',{count: this.codeCountDown})
             if(this.codeCountDown<=0){

src/views/mychart_manage/components/chartDetailDia.vue

@@ -50,15 +50,6 @@
                 }}</el-button>
               </template>
               <!-- 季节性图选择年份区间 -->
-              <!-- <date-picker
-                v-else-if="chartInfo.ChartType === 2"
-                v-model="season_year"
-                type="month"
-                value-type="format"
-                range
-                placeholder="年份日期选择"
-                @change="seasonYearChange"
-              /> -->
               <div v-else-if="chartInfo.ChartType === 2&&chartInfo.Source!==11" @click="openDateDia" class="date-setting">
                 {{ season_year && season_year.length>0 ? season_year[0]+'~'+season_year[1]:"年份日期选择" }}
               </div>
@@ -108,19 +99,6 @@
               >
                 <span><i class="el-icon-refresh" style="font-size: 15px;"/>&nbsp;<!-- 刷新 -->{{$t('Edb.detail_refresh_btn')}} </span>
               </span>
-              <!-- <span
-                  class="span-item"
-                  style="margin-left: 7px"
-                  @click="$parent.addMychartHandle(chartInfo)"
-                  v-if="['/database','/edbBasicbase'].includes($route.path)"
-              >
-                  <img
-                      :src="$icons.chart_join_ico"
-                      alt=""
-                      style="width: 13px; height: 12px; vertical-align: middle"
-                  />
-                  {{$t('Chart.chart_addmy_btn')}}
-              </span> -->
               <span
                 v-permission="permissionBtn.myETAPermission.myChart_edit"
                 class="span-item"
@@ -465,17 +443,6 @@
 			:source="chartInfo.Source"
     />
 
-    <!-- 输入英文指标弹窗 -->
-    <!-- <set-en-name-dia 
-      :isOpenDialog="setEnName" 
-      @cancel="setEnName=false" 
-      @updateEnName="updateEnName" 
-      :formData="formItemArray"
-      :chartType="chartInfo.ChartType"
-      :datainfo="chartInfo.ChartType===10?JSON.parse(chartInfo.ExtraConfig):null"
-      :edblist="chartInfo.ChartType===10?tableData:[]"
-    /> -->
-
     <!-- 设置对应版本信息弹窗 -->
 		<setLangInfoDia
 			:isOpenDialog="isLangInfoDia"
@@ -516,7 +483,6 @@ export default {
     'click-outside':{
       bind(el, binding) {
         const clickHandle = (e)=>{
-          //console.log(e.target.className)
           //如果弹窗没打开就没必要执行了
           if(!(this&&this.isOpenDetail)) return
           const isCurrentTarget = el.contains(e.target)||e.target.className==='el-popover el-popper'||['shareLink','copy'].some(str => e.target.className.includes(str))
@@ -524,7 +490,6 @@ export default {
             return false
           }
           if(binding.value && typeof binding.value === 'function'){
-            //console.log('binding')
             binding.value(e)
           }
         }
@@ -680,7 +645,6 @@ export default {
             this.chartInfo.Source===12&&this.initIntervalAnalysisChartData(res.Data)
 
           }else if([2,5].includes(this.chartInfo.Source)) {
-            // this.tableData = [res.Data.EdbInfoList[0]];
             this.tableData=res.Data.EdbInfoList.filter(_e=>_e.Source)
             this.chartInfo = res.Data.ChartInfo.Source===5 ? {
               ...res.Data.ChartInfo,
@@ -784,9 +748,6 @@ export default {
           : '',
         EndDate: this.year_select === 5 ? dateArray[1] : '',
         Calendar: this.calendar_type,
-        //ETA1.0.5 去除了这两个入参
-        // SeasonStartDate: this.season_year ? this.season_year[0] : '',
-        // SeasonEndDate: this.season_year ? this.season_year[1] : '',
         SeasonExtraConfig:this.SeasonExtraConfig,
         StartYear:this.count_year || 0,
         ChartEdbInfoList: this.tableData.map(_ => ({
@@ -948,32 +909,6 @@ export default {
             //用Popconfirm替代confirm confirm嵌套:append-to-body="false"的弹窗会有遮罩问题
             this.resetShowPopConfirmMap()
             this.$set(this.showPopConfirmMap,type,true)
-            /* this.$confirm('英文名称未输入完整，分享图表上可能出现空名称的情况，确定继续分享吗？', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning',
-            })
-            .then(() => {
-              if(type==='url'){
-                // this.shareUrl()
-                const input = document.createElement('input')
-                input.setAttribute('readonly','readonly')
-                input.value = this.linkUrl
-                document.body.appendChild(input)
-                input.select();
-                document.execCommand('copy');
-                document.body.removeChild(input);
-                this.$message.success('复制链接成功')
-              }else{
-                this.copyChartHandle(type)
-              }
-              $('body .v-modal').remove()
-              $('#right > div > div:nth-child(4)').append('<div class="v-modal" tabindex="0"></div>')
-            })
-            .catch(() => {
-              $('body .v-modal').remove()
-              $('#right > div > div:nth-child(4)').append('<div class="v-modal" tabindex="0"></div>')
-            }); */
           }else{
             this.$set(this.showPopConfirmMap,type,false)
             if(type=='url'){
@@ -1000,7 +935,6 @@ export default {
         input.select();
         document.execCommand('copy');
         document.body.removeChild(input);
-        // this.$message.success('复制链接成功')
         this.$message.success(this.$t('Chart.OptMsg.copy_link_success'))
       }else{
         this.copyChartHandle(type)
@@ -1093,7 +1027,6 @@ export default {
 			})
 
 			if(Ret!==200) return
-			// this.$message.success('保存成功');
 			this.$message.success(this.$t('MsgPrompt.saved_msg'));
 			//关联图表和图片
 			this.setChartImage();
@@ -1209,7 +1142,6 @@ export default {
         }
       dataBaseInterface.chartSave(params).then((res) => {
         if (res.Ret === 200) {
-          // this.$message.success('保存成功');
           this.$message.success(this.$t('MsgPrompt.saved_msg'));
           sessionStorage.removeItem('myChartbeforeOptions');
           //关联图表和图片
@@ -1249,7 +1181,6 @@ export default {
       const base64img = `data:image/svg+xml;base64,${window.btoa(
         unescape(encodeURI(svg))
       )}`;
-      // console.log(base64img)
       return base64img;
     },
     /* 点击保存时关联图表和截取的图片 */
@@ -1265,12 +1196,6 @@ export default {
         this.setImageHandle(form);
     },
     async setImageHandle(form) {
-      // let { Data } = await dataBaseInterface.uploadImgSvg(form);
-      // // let { Data } = await dataBaseInterface.uploadImg(form);
-      // await dataBaseInterface.setChartImage({
-      //   ChartInfoId: this.chartInfo.ChartInfoId,
-      //   ImageUrl: Data.ResourceUrl,
-      // });
       form.append('ChartInfoId',this.chartInfo.ChartInfoId)
 			await dataBaseInterface.setChartThumbnail(form)
     },
@@ -1281,7 +1206,6 @@ export default {
         this.expandKey.length && this.expandKey[0] === row.EdbCode
           ? []
           : [row.EdbCode];
-      // this.$refs.tableRef.toggleRowExpansion(row);
       //曲线图点击行 自动置底
       if (this.sameOptionType.includes(this.chartInfo.ChartType)) {
         this.$nextTick(() => {
@@ -1367,7 +1291,6 @@ export default {
       }else if([2,5].includes(this.chartInfo.Source)){
         path='/addCommodityChart'
       }else if([3,4].includes(this.chartInfo.Source)){
-        //path='/relevancechartEditor'
         path='/relevancechartEditorV2'
         if(this.chartInfo.Source===3){
             type = this.relevanceChartData.CorrelationChartInfo&&this.relevanceChartData.CorrelationChartInfo.AnalysisMode||0
@@ -1401,14 +1324,12 @@ export default {
     shareUrl() {
       var clipboard = new this.Clipboard('.shareLink')
       clipboard.on('success', e => {
-        // this.$message.success('复制链接成功')
         this.$message.success(this.$t('Chart.OptMsg.copy_link_success'))
         e.clearSelection() // 释放内存
         clipboard.destroy()
       })
       // // 浏览器不支持
       clipboard.on('error', e => {
-        // this.$message.warning('浏览器暂不支持')
         this.$message.warning(this.$t('MsgPrompt.browser_not_support'))
         // 释放内存
         clipboard.destroy()
@@ -1416,24 +1337,11 @@ export default {
     },
 
     copyTitleText() {
-      /* let clipboard = new this.Clipboard('.my-chart-title')
-      clipboard.on('success', e => {
-        this.$message.success('复制标题成功')
-        e.clearSelection() // 释放内存
-        clipboard.destroy()
-      })
-      // // 浏览器不支持
-      clipboard.on('error', e => {
-        this.$message.warning('浏览器暂不支持')
-        // 释放内存
-        clipboard.destroy()
-      }) */
+      
       try{
         copyFit(this.chartInfo.ChartName||'')
-        // this.$message.success("复制标题成功")
         this.$message.success(this.$t('Chart.OptMsg.copy_tit_success'))
       }catch(e){
-        // this.$message.warning("复制标题失败")
         this.$message.warning(this.$t('Chart.OptMsg.copy_tit_fail'))
       }
     },
@@ -1471,9 +1379,6 @@ export default {
   }
   @media screen and (max-width: 1710px) {
 
-    /* transform: scale(0.8);
-    left: 10%;
-    top: 5%; */
     .year-btn {
       padding: 8px 20px;
     }
@@ -1635,7 +1540,6 @@ export default {
     }
     /* =================== */
     .chart-show-cont {
-      /* margin-bottom: 15px; */
       padding: 0 180px 10px 150px;
       position: relative;
       .chart-title {

src/views/mychart_manage/components/chooseChart.vue

@@ -230,7 +230,6 @@ export default {
     .chart-public-list {
       display: flex;
       flex-wrap: wrap;
-      /* height: 650px; */
       max-height: 650px;
       height: 65vh;
       padding: 0 0 0 20px;

src/views/mychart_manage/index.vue

@@ -115,7 +115,6 @@
                 <el-dropdown v-if="isShowGroupBtn"
                     style="margin-right: 10px" @command="handleCommand" trigger="click">
                   <span class="el-dropdown-link  el-dropdown-link-img">
-                    <!-- <i class="el-icon-user" style="font-size: 16px; cursor: pointer"/> -->
                      <img src="~@/assets/img/chart_m/Group.png" v-if="item.IsPublic === 0">
                      <img src="~@/assets/img/chart_m/User.png" v-else>
                   </span>
@@ -296,26 +295,21 @@ export default {
     drag(el, bindings) {
       el.onmousedown = function (e) {
         var init = e.clientX;
-        // console.log(init);
         var box = $('#mychart_container')[0];
-        // console.log(box.clientWidth)
         let total_wid = box.offsetWidth;
         var left = $('#left')[0];
         var right = $('#right')[0];
         var initWidth = left.offsetWidth;
         document.onmousemove = function (e) {
           var end = e.clientX;
-          // console.log(total_wid,initWidth,end);
           if (end > 310) {
             var newWidth = end - init + initWidth;
-            // right.style.width = total_wid-end+80 +'px'
             right.style.width = total_wid - newWidth + 'px';
             left.style.width = newWidth + 'px';
           } else {
             end = 350;
             // 最小宽度300
             left.style.width = 300 + 'px';
-            // right.style.width = total_wid-300-20 +'px'
           }
         };
         document.onmouseup = function () {
@@ -389,8 +383,6 @@ export default {
       select_classify_userid: 0,//选中图表的创建人id
       haveMove: false,
 
-      // chart_lang: 'ch',
-
       hintDialogShow:false,
       detailArr:[]
     };
@@ -458,7 +450,6 @@ export default {
     getClassify() {
       mychartInterface.classifyList().then((res) => {
         if (res.Ret !== 200) return;
-        // this.chart_lang = res.Data&&res.Data.Language === 'EN' ? 'en' : 'ch';
 
         this.classifyList = res.Data ? res.Data.List.map(item => ({
           ...item,
@@ -485,20 +476,7 @@ export default {
     getPublicClassify() {
       mychartInterface.publicClassify().then((res) => {
         if(res.Ret !== 200) return;
-        /* this.publicClassifyList = res.Data ? res.Data.List.map(item => ({
-          ...item,
-          fromPublic: 1
-        })) : []; */
         this.publicClassifyList = res.Data?res.Data.List||[]:[]
-        /* this.publicClassifyList = [{
-            MenuAdminId:204,
-            MenuName:"ficc销售name",
-            Items:[{
-                MyChartClassifyId:370,
-                MyChartClassifyName:"图库2.0",
-                RealName:'ficc销售'
-            }]
-        }] */
         this.publicClassifyList = this.publicClassifyList.map(list=>{
             list.name = list.MenuName
             list.nodeKeyId = 'list' + list.MenuAdminId
@@ -683,8 +661,6 @@ export default {
             if (res.Ret !== 200) return;
             this.$message.success(/* '复制成功' */this.$t('MsgPrompt.copy_success_msg'));
             this.isClassifyDia = false;
-            // this.isOpenDetail = false;
-            // this.select_classify = '';
             this.resetStatus();
             this.getClassify();
             this.getChartList();
@@ -738,9 +714,6 @@ export default {
         }else{
           item.IsPublic=1
         }
-        // 不想请求接口
-        // this.getPublicClassify();
-        // this.getClassify();
       })
 
       key==='auth' && mychartInterface.setClassifyAuthToUser({
@@ -750,38 +723,13 @@ export default {
           if(res.Ret !== 200) return;
           this.$message.success(/* '操作成功' */this.$t('MsgPrompt.operate_success_msg'));
           item.IsCompanyPublic=IsCompanyPublic
-          // 不想请求接口
-          // this.getPublicClassify();
         })
       
     },
 
     /* 编辑 删除*/
     dealAction(key) {
-      // this.isRightClick = false;
       key === 'del' && this.handleDeleteClassify()
-        /* this.$confirm(
-          '若删除该分类，则分类下关联的所有图表将被全部删除, 是否继续?',
-          '提示',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning',
-          }
-        )
-          .then(() => {
-            mychartInterface
-              .delClassify({
-                MyChartClassifyId: this.select_classify,
-              })
-              .then((res) => {
-                if (res.Ret !== 200) return;
-                this.$message.success('删除成功');
-                this.getClassify();
-                this.getPublicClassify();
-              });
-          })
-          .catch(() => {}); */
       const obj = this.classifyList.find(
         (x) => x.MyChartClassifyId === this.select_classify
       );
@@ -820,14 +768,6 @@ export default {
       
     },
 
-    /* 右键菜单打开 */
-    // rightClickHandle({ MyChartClassifyId }, e) {
-    //   this.rightClick_classify = MyChartClassifyId;
-    //   this.isRightClick = true;
-    //   $('.right-content')[0].style.left = e.clientX + 'px';
-    //   $('.right-content')[0].style.top = e.clientY + 'px';
-    // },
-
     /* 拖动开始 记录位置 */
     dragStartHandler({ oldIndex }) {
       this.startIndex = this.chartList[oldIndex].MyChartId;
@@ -835,7 +775,6 @@ export default {
 
     /* 拖动结束 替换  */
     dragOverHandler() {
-      // if (this.startIndex === this.preIndex) return;
       mychartInterface
         .move({
           MyChartId: this.startIndex,
@@ -939,10 +878,6 @@ export default {
     },
     /* 移动到 打开分类弹窗 */
     async moveMychart(id) {
-      // if (!this.select_classify)
-      //   return this.$message.warning(
-      //     '当前图表所属多个分类，请选中具体分类移动'
-      //   );
       this.dia_title = /* '复制图表分类' */ this.$t('MyEtaPage.label_copy_classify');
       this.move_id = id;
       this.dialogKeyArrs = [
@@ -1040,7 +975,6 @@ export default {
   }
   .slide-icon {
     padding: 20px 0;
-    /* display: block; */
     box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.3);
     border-radius: 5px;
     cursor: pointer;
@@ -1099,10 +1033,6 @@ export default {
         display: flex;
         justify-content: space-between;
         align-items: center;
-        /* &:hover {
-          background: #e0eefd;
-          color: #409eff;
-        } */
         &.act {
           background: #e0eefd;
           color: #409eff;
@@ -1114,8 +1044,6 @@ export default {
       }
       .public-classify {
         margin-bottom: 20px;
-        /* .public-ul {
-        } */
         .tree-wrap{
             padding:15px;
         }
@@ -1133,7 +1061,6 @@ export default {
     .move-btn {
       height: 100%;
       width: 4px;
-      /* opacity: 0; */
       position: absolute;
       right: 0px;
       top: 0;
@@ -1168,7 +1095,6 @@ export default {
       border: 1px solid #ececec;
       height: calc(100vh - 118px);
       overflow: auto;
-      /* overflow: hidden; */
       border-radius: 4px;
       box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.05);
       .cont-top {
@@ -1207,8 +1133,6 @@ export default {
       }
       .cont-bottom {
         padding: 30px;
-        /* height: calc(100vh - 250px);
-				overflow: auto; */
         .el-input__inner {
           height: 27px;
           line-height: 27px;
@@ -1245,9 +1169,7 @@ export default {
         }
         /* =================== */
         .chart-show-cont {
-          /* border: 1px solid #c9c9c9; */
           margin-bottom: 15px;
-          /* padding: 26px 120px 35px; */
           padding: 0 120px 20px;
           position: relative;
           .chart-title {
@@ -1368,7 +1290,6 @@ export default {
     }
   }
   .el-dropdown-menu .el-dropdown-menu-item-chat-act {
-      // background-color: #ecf5ff !important;
       color: #66b1ff !important;
  }
 </style>

src/views/operation_manage/AIQA/AIQA.vue

@@ -38,7 +38,6 @@
                             :label="item.label"
                             :value="item.key">
                             <span style="float:left">{{item.label}}</span>
-                            <!-- <span style="float:right"><img :src="item.icon" style="margin-top:5px;width:24px;height:24px;"/></span> -->
                         </el-option>
                     </el-select>
                 </div>
@@ -113,22 +112,7 @@ export default {
                     key:'Kimi',
                     icon:require('@/assets/img/icons/gpt-4-turbo.png'),
                 },
-                // {
-                //     label:'GPT4',
-                //     icon:require('@/assets/img/icons/gpt-4.png'),
-                // },
-                // {
-                //     label:'gpt-3.5-turbo-16k',
-                //     icon:require('@/assets/img/icons/chat-gpt-16k.png'),
-                // },
-                // {
-                //     label:'gpt-3.5-turbo',
-                //     icon:require('@/assets/img/icons/chat-gpt.png'),
-                // },
-                // {
-                //     label:'eta',
-                //     icon:require('@/assets/img/icons/horizon.png'),
-                // },
+                
             ],//模型列表
             showHint:false,//选择模型提示
             isTyping:false,//是否处于打字动画中
@@ -171,8 +155,6 @@ export default {
             this.historyList = []
             this.isTyping = false
             this.getWindowDetail()
-            //切换窗口是否重置输入框
-            //this.inputText=''
         },
         //获取对话窗口具体信息
         getWindowDetail(){
@@ -244,7 +226,6 @@ export default {
             this.historyList=[]
             this.model='Kimi'
             this.aiFileIds=[]
-            //this.inputText=''
             this.isTyping = false
         },
         //开始播放动画
@@ -296,7 +277,6 @@ export default {
         },
         //选择模型
         changeModel(value){
-            //console.log('change',value)
             //非新建窗口时,模型之间切换需弹窗提示
             if(this.activeWindowId!==0&&value!==''){
                 //弹窗提示:切换模型
@@ -308,11 +288,9 @@ export default {
                     this.activeWindow=null
                     this.historyList=[]
                     this.aiFileIds=[]
-                    //this.inputText=''
                     this.isTyping = false
                     this.$message.success('切换模型成功')
                 }).catch(()=>{
-                    //this.$message.success('已取消切换模型')
                     this.model= this.modelOldValue
                     this.modelOldValue=''
                 })
@@ -341,21 +319,12 @@ export default {
                 return
             }
             //新建窗口,未选择模型
-            // if(this.activeWindowId===0&&this.model===''){
-            //     this.showHint = true
-            //     this.$message.error('请选择模型')
-            //     this.$nextTick(()=>{
-            //         this.$refs.modelSelect.focus()
-            //     })
-            //     return
-            // }
             if(this.inputText.length===0){
                 this.$message.warning(this.$t('ToolBox.AIQuestion.inter_check'))
                 return
             }
             this.answerLoading=true
             this.activeWindowId===0&&(this.activeWindowId = -1)
-            //this.activeWindowId!==0&&this.getWindowDetail()
             //mock 加入到historyList中
             const msgObj = {
                 AiChatId:-1,
@@ -384,7 +353,6 @@ export default {
                 apiName="fileRetrieve"
                 params.OpenaiFileId=this.aiFileIds
             }
-            // console.log(params,"params");
             aiQAInterence[apiName](params).then(res=>{
                 this.answerLoading=false
                 //在回答未获取前切换了新窗口
@@ -403,7 +371,6 @@ export default {
                 } 
                 //提问成功,替换对应数据
                 const {AiChatTopicId,Answer,Ask,Model} = res.Data
-                //this.inputText=''
                 if(this.activeWindowId<=0){
                     const windowItem = {
                         AiChatTopicId:AiChatTopicId||0,
@@ -494,7 +461,6 @@ export default {
             }
         },
         handleUpload(e){
-            // console.log(this.windowSet,this.activeWindowId);
             if(this.windowSet.has(this.activeWindowId)){
                 return this.$message.warning("请等待文件上传完成")
             }
@@ -601,7 +567,6 @@ $border-color:#3D52A1;
             display: flex;
             justify-content: space-between;
             align-items: center;
-            // overflow: hidden;
             .icon img{
                 width:58px;
                 height:58px;
@@ -679,7 +644,6 @@ $border-color:#3D52A1;
         }
         .window-content-wrap{
             flex: 1;
-            /* border-bottom: 1px solid black; */
             padding:30px;
             text-align: center;
             overflow-y: scroll;

src/views/operation_manage/AIQA/components/messageItem.vue

@@ -98,7 +98,6 @@ export default {
             console.log('start typing')
             this.$emit('startTyping')
             for(let index=0;index<textArr.length;index++){
-                //this.typingText+=textArr[index]
                 await writeText(textArr[index])
             }
             console.log('finish typing')

src/views/operation_manage/AIQA/components/windowListItem.vue

@@ -2,7 +2,6 @@
     <div class="list-item" :class="[activeWindowId===item.AiChatTopicId?'active':'']">
         <template v-if="!isEdit">
             <p>{{item.TopicName}}</p>
-            <!-- <span>6 messages </span> -->
             <span>{{item.ModifyTime||item.CreateTime}}</span>
             <div class="tool-list" >
                 <span @click.stop="editItem"><img src="~@/assets/img/ai_m/edit.png" /></span>
@@ -52,9 +51,6 @@ export default {
                 return
             }
             this.$emit('changeEdit',this.newTitle)
-            /* this.$nextTick(()=>{
-                this.isEdit = false
-            }) */
             setTimeout(()=>{
                this.isEdit = false 
             },200)
@@ -144,17 +140,12 @@ export default {
         }
 
     }
-    &.active/* ,&:hover */{
+    &.active{
         border:2px solid #3D52A1;
         .tool-list{
             opacity: 1;
             pointer-events:auto;
         }
     }
-    /* &:hover{
-        .tool-list{
-            opacity: 1;
-        }
-    } */
 }
 </style>

src/views/positionAnalysis_manage/components/chartBox.vue

@@ -24,7 +24,6 @@
       </div>
     </div>
     <div class="chart-content">
-      <!-- <img class="mark-img" src="../../../../../assets/hzyb/chart/mark.png" alt=""> -->
       <div class="chart-box" :id="'chart-box-' + keyVal"></div>
     </div>
 
@@ -54,7 +53,6 @@
             <div>{{ (showDetailData.Rate * 100).toFixed(2) }}%</div>
           </div>
           <div class="item">
-            <!-- <div>前{{ showDetailData.Rank }}名持净多单</div> -->
             <div>{{$t('ToolBox.PositionAnalysis.top_held_long_position',{num:showDetailData.Rank})}}</div>
             <div>{{ showDetailData.BeforeAllValue }}</div>
           </div>
@@ -240,7 +238,6 @@ export default {
         }
       });
       // 判断是否是在pc中 如果是则通知pc显示弹窗
-      // console.log(window.innerWidth);
 
       this.showDetailDia = true;
       this.showDetailData = {
@@ -376,7 +373,6 @@ export default {
     cursor: pointer;
   }
 }
-// @media (min-width: 600px){
 .chart-render-box-pc {
   .label-box {
     display: flex;
@@ -399,5 +395,4 @@ export default {
     height: 800px;
   }
 }
-// }
 </style>

src/views/positionAnalysis_manage/components/chartDetail.vue

@@ -128,31 +128,6 @@ export default {
       allClassifyTypeList: [],
 
       pageLoading: false,
-      // chartListState: {
-      //   BuyList: {
-      //     name: "多单",
-      //     labelName: "持多单量",
-      //   },
-      //   SoldList: {
-      //     name: "空单",
-      //     labelName: "持空单量",
-      //   },
-      //   CleanBuyList: {
-      //     name: "净多单",
-      //     labelName: "净多单量",
-      //   },
-      //   CleanSoldList: {
-      //     name: "净空单",
-      //     labelName: "净空单量",
-      //   },
-      // },
-
-      // tabKeys: [
-      //   { label: "多单", key: "BuyList" },
-      //   { label: "空单", key: "SoldList" },
-      //   { label: "净多单", key: "CleanBuyList" },
-      //   { label: "净空单", key: "CleanSoldList" },
-      // ],
       tabKey: "BuyList",
       chartItemInfo: null,
     };
@@ -196,7 +171,6 @@ export default {
         )
           indexNum = index;
       });
-      // console.log(indexNum);
       let obj = {};
       if (type === "before") {
         obj =
@@ -209,7 +183,6 @@ export default {
             indexNum === this.allClassifyTypeList.length - 1 ? 0 : indexNum + 1
           ];
       }
-      // console.log(obj);
 
       this.$router.replace({
         query: {
@@ -219,7 +192,6 @@ export default {
           classify_type: obj.classify_type,
         },
       });
-      // window.location.reload();
     },
 
     //切换 前一天\后一天 如果遇到周六日则跳过

src/views/positionAnalysis_manage/detail.vue

@@ -3,7 +3,6 @@
     <div class="detail">
         <div class="detail-top">
             <div>
-                <!-- <el-button type="primary" @click="refreshData" plain>一键刷新</el-button> -->
                 <el-button type="primary" @click="handleOpt('beforeClassifyType')">{{$t('ToolBox.PositionAnalysis.before_btn')}}</el-button>
                 <el-button type="primary" @click="handleOpt('nextClassifyType')">{{$t('ToolBox.PositionAnalysis.next_btn')}}</el-button>
             </div>
@@ -177,15 +176,6 @@ export default {
               .el-tabs__nav-wrap::after{
                 display: none
               }
-                // .el-tabs__nav{
-                //     display: flex;
-                //     width: 100%;
-                // }
-                // .el-tabs__item{
-                    // text-align: center;
-                    // flex: 1;
-                    // padding:0;
-                // }
                 .el-tabs__header{
                     margin-bottom: 0;
                 }
@@ -208,7 +198,6 @@ export default {
       background: #fff;
       border: 1px solid #F2F2F2;
       border-radius: 4px;
-      /* box-shadow: 0 3px 6px rgba(0,0,0,.05); */
       .header{
           padding:30px;
           display: flex;

src/views/ppt_manage/mixins/layerMixins.js

@@ -123,10 +123,6 @@ export default {
         this.isEditLayer = true
         this.changeActLayerEl(this.activeLayerEl)
       })
-      /* this.pageList[this.currentIndex] = this.currentItem;
-      this.pageList[this.currentIndex].key++;
-      this.initPageElements(this.pageList[this.currentIndex])
-      this.initPreviewPageEl() */
     }
   }
 }

src/views/ppt_manage/mixins/mixins.js

@@ -41,9 +41,6 @@ export default {
         {image_url:require('@/assets/img/ppt_m/bg3.jpg')},
         {image_url:require('@/assets/img/ppt_m/bg4.jpg')},
         {image_url:require('@/assets/img/ppt_m/bg5.jpg')},
-        // {image_url:'https://hzstatic.hzinsights.com/ppt/bg3.jpg'},
-        // {image_url:'https://hzstatic.hzinsights.com/ppt/bg4.jpg'},
-        // {image_url:'https://hzstatic.hzinsights.com/ppt/bg5.jpg'},
       ],//首页背景
       //领先频度对应英文
       leadUnitEnMap: {
@@ -178,7 +175,6 @@ export default {
             align: 'high',
             rotation: 0,
             y: -12,
-            // x: (item.IsAxis===0 && this.rightTwoIndex>-1) ? -chartData[this.rightTwoIndex].Unit.length*12 : 0,
             textAlign: item.IsAxis===1 ? 'left' : 'right',
             reserveSpace: false
           },
@@ -300,7 +296,6 @@ export default {
         ydata = [];
 
       let rightTwoIndex = this.dataList.findIndex((item) => item.IsAxis ===2);
-      // const chartData = _.cloneDeep(this.dataList);
       let chartData = this.dataList.some(_ =>_.IsAxis===2) ? this.changeEdbOrder(this.dataList) : _.cloneDeep(this.dataList);
 
       chartData.forEach((item, index) => {
@@ -582,7 +577,6 @@ export default {
           nameEn:nameEn,
           color: item.ChartColor,
           lineWidth: Number(item.ChartWidth)||(chartTheme&&chartTheme.lineOptionList[lineIndex].lineWidth) || 1,
-          // fillColor: (this.chartInfo.ChartType === 3 || (this.chartInfo.ChartType === 6 && item.ChartStyle === 'areaspline')) ? item.ChartColor : undefined,
           borderWidth: 1,
           borderColor: item.ChartColor,
           zIndex: (this.chartInfo.ChartType === 6 && ['line','spline'].includes(item.ChartStyle)) ? 1 : 0, //防止组合图曲线被遮住
@@ -1136,7 +1130,6 @@ export default {
     initBarData(data) {
       const { XEdbIdValue,YDataList,EdbInfoList,ChartInfo } = data;
 
-      // let xData = XEdbIdValue.map(_ => EdbInfoList.find(edb => edb.EdbInfoId===_).EdbAliasName)
 
       this.barDateList = YDataList;
       this.barXIdData = XEdbIdValue;
@@ -1975,7 +1968,6 @@ export default {
         endOnTick: false,
         startOnTick: false,
         showLastLabel: true,
-        // tickAmount:4,
         title: {
           text:  this.chartInfo.Unit,
           textCh: this.chartInfo.Unit,
@@ -2054,7 +2046,6 @@ export default {
         'years',
         true
       );
-      // console.log(year_differ)
       if ([5, 6].includes(this.chartInfo.DateType) && year_differ <= 1) {
         return true;
       } else {

src/views/ppt_manage/mixins/pptEditorMixins.js

@@ -115,7 +115,6 @@ export default{
         }
         //如果点击的页不是当前页，将点击页切换至当前页
         if(this.currentItem.id!==item.id){
-            //this.changeCurrentItem(item,'change')
             const {id} = item
             this.isEditLayer = false
             this.activeLayerEl = {}
@@ -136,7 +135,6 @@ export default{
                 behavior: 'smooth'
             })
         }
-        //this.isEditTitle = !this.isEditTitle
         this.isEditTitle = true
         if(this.isEditTitle){
             //进入标题编辑模式,需要退出其他模式
@@ -196,7 +194,6 @@ export default{
                 baseHeight:baseHeight||defaultHeight*height/100
             }
         })
-        /* this.$message.success('全局设置成功') */
     },
     //全局改变标题宽高
     changeSizeAll({width,height}){
@@ -219,7 +216,6 @@ export default{
                 baseLeft:baseLeft||defaultWidth*left/100,
             }
         })
-        //this.$message.success(this.$t('MsgPrompt.set_success_msg'))
     },
     //全局改变标题设置，并存储本次设置
     changeSettingAll(detail){
@@ -293,8 +289,6 @@ export default{
         elements = elements.filter((i)=>{
           return i.position<=newModel.elChartNum
         })
-        /* console.log('posEl',posChartsEl)
-        console.log('element',elements) */
         //更新统计图表数
         this.chartNum = this.chartNum - (posChartsEl.length-elements.length)
         if(textEl&&newModel.elTextNum>0){
@@ -333,7 +327,6 @@ export default{
     },
     //插入PPT页
     handleInsert(list){
-      //console.log('pageList',list)
       //重新设置每一页的id,过滤不合法 element
       let pages = []
       list.forEach(page=>{
@@ -348,9 +341,6 @@ export default{
         this.changeCurrentItem(this.pageList[0])
       //当前PPT有页
       }else{
-        /* pages.forEach((page,index)=>{
-          this.pageList.splice(this.currentIndex+index+1,0,page)
-        }) */
         this.pageList.splice(this.currentIndex+1,0,...pages)
       }
       this.insertPageShow = false
@@ -447,9 +437,6 @@ export default{
         }
         pages.push(newPage)
       }
-      /* pages.forEach((page,index)=>{
-        this.pageList.splice(this.currentIndex+index+1,0,page)
-      }) */
       this.pageList.splice(this.currentIndex+1,0,...pages)
       this.initPages([page,...pages],true)
     },
@@ -468,27 +455,10 @@ export default{
         //暂停自动保存
         this.loopTimer&&clearInterval(this.loopTimer)
         this.loopTimer=null
-        /* for(let i=0;i<chartElements.length;i++){
-            await this.getRefreshChart(chartElements[i].chartId);
-        }
-        //重新获取图表数据
-        for(let i=0;i<chartElements.length;i++){
-            await this.getchartData(chartElements[i].chartId);
-        }
-        //更新vuex里的图表信息
-        let chartInfoMap = _.cloneDeep(this.$store.state.ppt.chartInfoMap)
-        for(let i=0;i<chartElements.length;i++){     
-            let temp = getChartInfo(this.optionMap[chartElements[i].chartId])
-            chartInfoMap[chartElements[i].chartId] = temp
-        }
-        this.$store.commit('SET_CHART_INFO_MAP',chartInfoMap)
-        //渲染图表
-        await this.initCharts(chartElements, page); */
 
         chartElements.length&&await this.refreshPageChart(chartElements,page)
         SheetElements.length&&await this.refreshPageSheet(SheetElements,page)
         page.isUpdating = false
-        //this.$message.success(this.$t('MsgPrompt.refresh_success_msg'))
         this.pageList.splice(index,1,page)
         //开启自动保存
         this.autoSave()
@@ -544,10 +514,8 @@ export default{
       //去除重复添加page的情况
       if(this.copyPagesMap[id]){
         this.$set(this.copyPagesMap,id,false)
-        //this.copyPagesMap[id] = false
         this.copyPages = this.copyPages.filter(i=>i.id!==id)
       }else{
-        //this.copyPagesMap[id]= true
         this.$set(this.copyPagesMap,id,true)
         this.copyPages.push(page)
       }
@@ -606,9 +574,6 @@ export default{
         pages.push(page)
       })
       const coefficient = type.includes('Before')?0:1
-      /* pages.forEach((page,index)=>{
-        this.pageList.splice(this.currentIndex+index+coefficient,0,page)
-      }) */
       this.pageList.splice(this.currentIndex+coefficient,0,...pages)
       this.changeCurrentItem(this.currentItem)
       this.initPages(pages)

src/views/ppt_manage/mixins/virtualScrollMixins.js

@@ -51,14 +51,6 @@ export default {
       //console.log(Highcharts.charts)
       Highcharts.charts = []
       //触底的情况
-     /*  if (scrollHeight - (clientHeight + scrollTop) < 200) {
-        console.log('should load next')
-        if(this.pageNo===this.pageNum){
-          console.log('已经是最后一项')
-        }else{
-          this.loadMore(this.pageSize)
-        }
-      } */
       const direction = scrollTop>this._scrollTop?1:-1
       this.toggleTopItems(direction, scrollTop)
       this.toggleBottomItems(direction, scrollTop, clientHeight)
@@ -116,11 +108,6 @@ export default {
 			    this.loadList.push(item)
           if(i!==this.allPageList.length-1){
             this.initPageElements(this.loadList[this.loadList.length-1],'show')
-            /* if(this.loadList[this.loadList.length-1].isLoading){
-              this.initPageElements(this.loadList[this.loadList.length-1],'show')
-            }else{
-              await this.initPageElements(this.loadList[this.loadList.length-1],'show')
-            } */
           }
         }
       }

src/views/ppt_manage/newVersion/components/Cover.vue

@@ -1,11 +1,5 @@
 <template>
-    <!-- ETA1.4.9之前的展示封面组件,若该版本上线后无回滚需求,可删除 -->
-      <!-- 此页面不中英互译 -->
-        <!-- 此页面不中英互译 -->
-          <!-- 此页面不中英互译 -->
     <div class="flex-column cover" :style="`width:100%;height:100%;color: ${$parent.pptCoverTextColor||'#fff'};`" v-if="pageInfo">
-        <!-- <img :src="pageInfo.BackgroundImg" class="pptbg" /> -->
-        <!-- <img :src="base64Url" class="pptbg" /> -->
         <img :src="pageInfo.BackgroundImg" class="pptbg"  style="width:100%;height:100%;object-fit: fill !important;"/>
         <div
         style="width:62%; font-size:16px; text-align:center; line-height:1.6;  position:absolute; right:20px; top:50%;zIndex:20;">

src/views/ppt_manage/newVersion/components/CoverEn.vue

@@ -1,8 +1,4 @@
 <template>
-    <!-- ETA1.4.9之前的展示封面组件,若该版本上线后无回滚需求,可删除 -->
-      <!-- 此页面不中英互译 -->
-        <!-- 此页面不中英互译 -->
-          <!-- 此页面不中英互译 -->
     <div class="flex-column cover" style="width:100%;height:100%;" v-if="pageInfo">
         <img :src="pageInfo.BackgroundImg" class="pptbg"  style="width:100%;height:100%;object-fit: fill !important;"/>
         <div

src/views/ppt_manage/newVersion/components/CustomCover.vue

@@ -18,11 +18,6 @@
                 </div>
             </div>
         </div>
-        <!-- 不需要显示了 -->
-        <!-- 如果没有自定义文本，则在右下的位置显示标题 -->
-        <!-- <div class="cover-el default" v-if="!coverList.length">
-            <div class="editor-content"><p style="font-size:28px;color:#fff;">{{ pageInfo.Title }}</p></div>
-        </div> -->
     </div>
 </template>
 

src/views/ppt_manage/newVersion/components/DrawingBoardTool.vue

@@ -13,35 +13,6 @@
       @mousemove="(e)=>{mouse.x=e.clientX;mouse.y=e.clientY}"
     />
     <!-- 工具栏 -->
-    <!-- <div class="tools" v-show="model==='paint'"
-      :style="{
-        left:toolEl.left+'px',
-        top:toolEl.top+'px'
-      }">
-      <div class="move-area flex-center" @mousedown.stop="(e)=>{handleMoveStart(e,'tools')}">
-        <div class="move-line"></div>
-      </div>
-      <div class="tool-item flex-center" :class="{'active':activeTool===item.iconName}"
-        v-for="item in toolList" :key="item.iconName" 
-        @mousedown.stop
-        @mouseenter.stop="checkPalettle(item.iconName,'enter')"
-        @mouseleave.stop="checkPalettle(item.iconName,'leave')"
-        @click.stop="chooseBoardTool(item.iconName)" >
-        <img :src="require(`@/assets/icons/${item.iconName}.svg`)" :style="brushStyle(item)">
-      </div>
-     
-      <div class="color-box"
-        v-show="isPalettleShow"
-        :style="{
-          left:paletteEl.left+'px',
-          top:paletteEl.top+'px'
-        }">
-        <span class="color-item" 
-          :style="{'background-color':color}"
-          v-for="color in colorList" :key="color"
-          @click.stop="changeBrushColor(color)" />
-      </div>
-    </div> -->
     <!-- 鼠标跟随-画笔和橡皮擦图标 -->
     <div class="pen"
       :style="{

src/views/ppt_manage/newVersion/components/IndexItem.vue

@@ -41,7 +41,6 @@
             icon="el-icon-info"
             iconColor="red"
             :title="$t('Slides.is_delete_ppt_msg')">
-        <!-- <span class="close-btn el-icon-close" @click.stop="deletePage" ></span>  -->
             <span class="close-btn el-icon-close" slot="reference"  v-if="showCloseBtn" v-show="!ctrlKeyActive"></span>
         </el-popconfirm>
     </div>
@@ -131,8 +130,6 @@ export default {
 .index-item{
   .wrap{
     .page-input{
-     /*  width:80px;
-      height:20px; */
       display: flex;
       justify-content: flex-end;
       .el-input,.el-input__inner{

src/views/ppt_manage/newVersion/components/TextEditor.vue

@@ -1,6 +1,4 @@
 <template>
-    <!-- 需求199上线后停用,可删除 -->
-  <!-- <div style="width:100%;height:100%">{{content}}</div> -->
   <Editor v-model="content" 
           :init="setting" ref="editor"
           :disabled="$parent.type==='show'" 
@@ -20,9 +18,6 @@ import "tinymce/themes/silver";
 
 //插件
 import "tinymce/plugins/link"; //链接插件
-/* import "tinymce/plugins/image"; */ //图片插件
-/* import "tinymce/plugins/media"; */ //媒体插件
-/* import "tinymce/plugins/table";  */ //表格插件
 import "tinymce/plugins/lists"; //列表插件
 import "tinymce/plugins/quickbars"; //快速栏插件
 import "tinymce/plugins/fullscreen"; //全屏插件
@@ -54,9 +49,6 @@ export default {
           "bold italic underline strikethrough numlist bullist backcolor",
           "fontselect fontsizeselect",
         ],
-        /* toolbar_drawer: "sliding", */
-        /* quickbars_selection_toolbar:
-          "bold italic underline strikethrough forecolor backcolor | fontselect fontsizeselect ", */
         quickbars_selection_toolbar:false,  
         quickbars_insert_toolbar: false,
         plugins: "lists quickbars paste",
@@ -121,8 +113,6 @@ export default {
     },
     handleBlur(){
       const { elementId } = this.$refs.editor;
-      //tinymce.editors[elementId].hide()
-      //console.log(tinymce.editors[elementId].targetElm)
     },
     getSetting(){
       if(this.$parent.pageItem.id===this.$parent.choosedId&&!this.$parent.pageItem.isLoadText&&!this.$parent.isEditLayer)
@@ -134,8 +124,6 @@ export default {
   mounted() {
       console.log('init')
       this.afterMounted = true
-    /* if(this.$parent.pageItem.id===this.$parent.choosedId){
-    } */
   },
 };
 </script>

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

@@ -94,11 +94,9 @@ export default {
     },
     /* 获取研究员列表 */
     async getResearcherList() {
-      // const res = await roadshowInterence.getResearcherList();
       // 换成全部系统用户
       const res = await dataAuthInterface.userSearch();
       if (res.Ret !== 200) return
-      // this.researcherList = this.formatResearcherList(res.Data);
       this.researcherList = res.Data || []
     },
 

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

@@ -104,9 +104,7 @@ export default {
     return {
       pptInfo:{
         Title:'',
-        //ReportType:'',
         ImgUrl:'',//读取etaBaseConfig中封面页的第一个
-        //PptDate:(new Date().getFullYear())+'年'+(new Date().getMonth()+1)+'月',
         BackIndex:0,
         TemplateType:1
       },//PPT的标题信息
@@ -167,7 +165,6 @@ export default {
       }
       await this.addNewPpt()
       if(this.PptId!==0){
-        //this.$emit('merged',{PptId:this.PptId,catalogId:this.selectedCatalogId})
         this.saveLoading.close()
         //跳转至ppt编辑页
         const path = this.$parent.currentLang!=='en'?'/ppteditor':'/ppteneditor'
@@ -188,12 +185,6 @@ export default {
       if(!this.pptInfo.Title.length){
         return {result:false,msg:this.$t('Slides.please_fill_title_msg')}
       }
-      /* if(!this.pptInfo.ReportType){
-        return {result:false,msg:'请填写PPT类型'}
-      }
-      if(!this.pptInfo.PptDate){
-        return {result:false,msg:'请选择日期'}
-      } */
       if(this.selectedCatalogId===0){
         return {result:false,msg:this.$t('Slides.please_select_directory_msg') }
       }
@@ -376,9 +367,6 @@ export default {
         .el-checkbox .el-checkbox__inner {
           display: none;
         }
-        /* .el-checkbox.is-disabled{
-          display: none;
-        } */
       }
     }
   }

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

@@ -1,25 +1,14 @@
 <template>
   <div class="page-wrap ppt-content-wrap">
-    <!-- ↓ @scroll="handleScroll" -->
     <div class="ppt-scroll">
       <template  v-for="(item,index) in loadArr">
           <div class="ppt-item" id="cover" v-if="index===0" :key="item.id">
-            <!-- <Cover :pageInfo="firstPage" v-show="firstPage"></Cover> -->
             <CustomCover :pageInfo="firstPage" :CoverContent="pptCoverContent" v-show="firstPage"/>
-            <!-- <div class="ppt-info">
-              <p>作者：{{pptItem.AdminRealName}}</p>
-              <p>{{pptItem.PptxUrl?'发布':'保存'}}时间：{{$moment(pptTime).format('YYYY-MM-DD')}}</p>
-            </div> -->
           </div>
           <div class="ppt-item" id="back" v-else-if="isLoadBack&&item.name==='back'&&pptBackImage.length" :key="item.id">
             <img :src="pptBackImage" class="pptbg" />
           </div>
           <div class="ppt-item" v-else :key="item.id">
-              <!-- <div class="title-wrap" :title="item.title" 
-                :style="`${getStrCount(item.title)<58?'':'top:0;height:14%;'}`"
-                :class="{'title-ellipsis':getStrCount(item.title)>172}">
-                {{item.title}}
-              </div> -->
               <!-- 自定义标题 -->
               <div class="custom-title-wrap editor-content" 
                     :style="item.titleDetail?{
@@ -153,10 +142,6 @@ export default {
       await this.getPPTLimit()
       this.checkLimit()
       this.loadArr.push(this.firstPage)
-      /* //分页时,首次加载只加载第一页数据
-      this.loadArr.push(this.pageList[0])
-      await this.initPageElements(this.pageList[0],'show')
-      this.loadedPage++ */
       //全部加载
       await this.initPPTAllPage(this.pageList)
       for(let i=0;i<this.pageList.length;i++){
@@ -284,7 +269,6 @@ export default {
       }
       //标题自适应
       if($('.title-wrap')[0]){
-        //$('.title-wrap').css('transform',`scale(${this.contentScale})`)
         $('.title-wrap').css('font-size',this.contentScale*24*0.9+'px')
       }
       this.changeLayerStyle()
@@ -301,7 +285,6 @@ export default {
           $('.content').css('transform',`scale(${this.contentScale})`)
         }
         if($('.title-wrap')[0]){
-          //$('.title-wrap').css('transform',`scale(${this.contentScale})`)
           $('.title-wrap').css('font-size',this.contentScale*24*0.9+'px')
         }
         this.changeLayerStyle()

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

@@ -3,22 +3,12 @@
     <div class="ppt-scroll">
       <template  v-for="(item,index) in loadArr">
           <div class="ppt-item" id="cover" v-if="index===0" :key="item.id">
-            <!-- <Cover :pageInfo="firstPage" v-show="firstPage"></Cover> -->
             <CustomCover :pageInfo="firstPage" :CoverContent="pptCoverContent" v-show="firstPage"/>
-            <!-- <div class="ppt-info">
-              <p>作者：{{pptItem.AdminRealName}}</p>
-              <p>{{pptItem.PptxUrl?'发布':'保存'}}时间：{{$moment(pptTime).format('YYYY-MM-DD')}}</p>
-            </div> -->
           </div>
           <div class="ppt-item" id="back" v-else-if="isLoadBack&&item.name==='back'&&pptBackImage.length" :key="item.id">
             <img :src="pptBackImage" class="pptbg" style="width:100%;height:100%;object-fit: fill !important;"/>
           </div>
           <div class="ppt-item" v-else :key="item.id">
-              <!-- <div class="title-wrap" :title="item.title" 
-                :style="`${getStrCount(item.title)<52?'top:4.5%;left:8%;width:62%;':'top:0;left:8%;width:62%;height:14%;'}`"
-                :class="{'title-ellipsis':getStrCount(item.title)>150}">
-                {{item.title}}
-              </div> -->
               <!-- 自定义标题 -->
               <div class="custom-title-wrap editor-content" 
                     :style="item.titleDetail?{
@@ -278,7 +268,6 @@ export default {
       }
       //标题自适应
       if($('.title-wrap')[0]){
-        //$('.title-wrap').css('transform',`scale(${this.contentScale})`)
         $('.title-wrap').css('font-size',this.contentScale*24*0.9+'px')
       }
       this.changeLayerStyle()
@@ -296,7 +285,6 @@ export default {
           $('.content').css('transform',`scale(${this.contentScale})`)
         }
         if($('.title-wrap')[0]){
-          //$('.title-wrap').css('transform',`scale(${this.contentScale})`)
           $('.title-wrap').css('font-size',this.contentScale*24*0.9+'px')
         }
         this.changeLayerStyle()
@@ -347,13 +335,6 @@ export default {
       background-size: 100% 100%;
       margin-bottom: 20px;
       border: 4px solid transparent;
-      // .ppt-info{
-      //   position:absolute;
-      //   top:10px;
-      //   right:15px;
-      //   color: #fff;
-      //   font-size: 14px;
-      // }
       .page-num{
         color:#666666;
         position:absolute;

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

@@ -21,7 +21,6 @@
 				</div>
 				<div v-for="(item,i) in pageitem" :key="i+1" style="position:relative; margin:20px auto;" :id="'wrapper'+i">
 					<p style="position:absolute; top:6.5%; left:11.5%;fontSize:24px;color:#666">{{item.title}}</p>
-					<!-- <img v-if="item.img_url" :src="item.img_url" style="width:70%; position:absolute; top:20%; left:15%;" /> -->
 					<p style="position:absolute; bottom:3%; right:20px; color:#666;"> {{$i18n.locale == 'zh' ?`第${i+1}页`:` Slide${i+1}`}}</p>
 					<div class="container" :id="'container'+item.resource_id" v-if="item.resource_id"></div>
 					<div class="container" v-if="item.noSource">

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

@@ -11,14 +11,7 @@
     </div>
     <div class="dialog-container" v-loading="getListLoading" :element-loading-text="$t('Slides.get_report_data_loading')">
       <div class="input-item">
-        {{$t('Slides.report_type_select')}}：<!-- <el-select  placeholder="请选择报告类型" v-model="reportItem.type" required >
-                    <el-option
-                      v-for="item in typeArr"
-                      :key="item.Id"
-                      :label="item.ClassifyName"
-                      :value="item.Id"
-                    ></el-option>
-                  </el-select> -->
+        {{$t('Slides.report_type_select')}}：
                   <el-cascader :placeholder="$t('Slides.please_report_type_select')" v-model="choosedReport" required
                                :options="reportList"
                                :props="{children:'Child',value:'Id',label:'ClassifyName'}"

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

@@ -98,7 +98,6 @@ export default {
     },
     previewComponentName(modelId) {
       return countComponentName(modelId,'pre')
-      //return `formatPre${modelMap[modelId]}`;
     },
     addPage(modelId) {
       this.$emit("addPage", modelId);

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

@@ -1,8 +1,4 @@
 <template>
-    <!-- ETA1.4.9之前的选择封面组件,若该版本上线后无回滚需求,可删除 -->
-    <!-- 此页面不中英互译 -->
-      <!-- 此页面不中英互译 -->
-        <!-- 此页面不中英互译 -->
     <div class="first_dialog">
         <div class="dialog-min">
             <header class="dialog-top">

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

@@ -1,8 +1,4 @@
 <template>
-    <!-- ETA1.4.9之前的选择封面组件,若该版本上线后无回滚需求,可删除 -->
-    <!-- 此页面不中英互译 -->
-      <!-- 此页面不中英互译 -->
-        <!-- 此页面不中英互译 -->
     <div class="first_dialog">
         <div class="dialog-min">
             <header class="dialog-top">
@@ -122,7 +118,6 @@ export default {
             pptEnInterface.pptTitleCheck({PptId:this.$route.query.id || this.PptId || 0,Title:this.pageData.Title}).then(res=>{
                 if(res.Ret == 200){
                     //格式化PptDate
-                    //this.pageData.PptDate = this.$moment(new Date(this.pageData.PptDate)).format("YYYY.MM")
                     this.firstPage = Object.assign(this.firstPage,this.pageData)
                     this.$emit('save',this.firstPage)
                 }

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

@@ -120,19 +120,15 @@ export default {
                 return this.$message.warning(this.$t('Slides.input_ppt_title'))
             }
             const coverContent = JSON.stringify(this.coverElList);
-            //this.coverLoading=true
             //校验标题
             const pptId = this.$route.query.id || this.PptId||0
             const res = this.$parent.currentLang!=='en'
                 ?await pptInterface.pptTitleCheck({PptId:pptId,Title:this.pageData.Title})
                 :await pptEnInterface.pptTitleCheck({PptId:pptId,Title:this.pageData.Title})
             if(res.Ret===200){
-                //const coverBase64 = await this.coverToCanvas()
-                //this.coverLoading=false
                 this.$emit('saveCover', {
                         firstPage:Object.assign(this.firstPage,this.pageData),
                         content:coverContent,
-                        //covetImg:coverBase64||''
                     })
             }
         },
@@ -268,7 +264,6 @@ export default {
         .edit-cover-wrap{
             display: flex;
             flex: 1;
-            /* overflow: auto; */
             .cover,.editor-tool{
                 box-sizing: border-box;
             }
@@ -288,7 +283,6 @@ export default {
                     width:100%;
                     height: 0;
                     padding-bottom: 70%;
-                    /* background-color:bisque; */
                     background-repeat: no-repeat;
                     background-position: center;
                     background-size: 100% 100%;
@@ -298,7 +292,6 @@ export default {
                 min-width:320px;
                 padding-left:20px;
                 position:relative;
-                /* background-color: burlywood; */
                 .box{
                     margin-bottom: 10px;
                     p{

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

@@ -81,10 +81,6 @@
           </div>
         </div>
       </div>
-      <!-- <div slot="footer" class="foot-container">
-        <el-button @click="cancelHandle">取 消</el-button>
-        <el-button type="primary" @click="saveHandle">确 定</el-button>
-      </div> -->
     </el-dialog>
   </div>
 </template>
@@ -350,12 +346,9 @@ export default {
       min-width: 500px;
       max-height: 450px;
       overflow-y:scroll;
-      /* border:1px solid black; */
-      /* padding:10px; */
       display: flex;
       .preview-wrap{
         .preview-item{
-          /* border:1px solid green; */
           width: 450px;
           height: 0;
           padding-bottom: 70%;

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

@@ -14,7 +14,6 @@
                         <span class="demonstration">{{$t('Slides.title_location_left_right')}}（%）</span>
                         <el-slider v-model="detail.left" :step="0.1"></el-slider>
                     </div>
-                    <!-- <el-button type="text" @click="changePosition">应用至整个PPT</el-button> -->
                 </el-collapse-item>
                 <!-- 大小设置 -->
                 <el-collapse-item :title="$t('Slides.title_size_settings')" name="size">
@@ -29,14 +28,6 @@
                         <el-slider v-model="detail.height" :max="14-detail.top" :step="0.1"></el-slider>
                     </div>
                 </el-collapse-item>
-                <!-- <el-collapse-item :title="$t('Slides.title_content_settings')" name="content">
-                    <div class="editor-tool"></div>
-                    <div class="editor" id="editorDom">
-                        <Editor v-model="content" 
-                            :init="setting" 
-                            ref="editor"/>
-                    </div>
-                </el-collapse-item> -->
             </el-collapse>
             <div class="other-setting">
                 <div class="setting-item">
@@ -145,7 +136,6 @@ export default {
         initTitleEditor(){
             const {left,top,width,height,fontFamily='helvetica',fontSize=22,color='#333'} = this.currentItem.titleDetail
             this.detail = {left,top,width,height,fontFamily,fontSize,color}
-            //this.content = this.currentItem.title
         },
         changePosition(){
             const {left,top} = this.detail

src/views/ppt_manage/newVersion/components/formatEl/ChartEl.vue

@@ -21,7 +21,6 @@
         style="margin-right:2%;"
         @click.stop="addChart(position)"
       >
-       <!--  <i class="el-icon-circle-plus-outline"></i> -->
       </div>
     </el-tooltip>
     <el-tooltip :content="$t('Slides.copy_name_tooltip')" placement="bottom"  v-if="$parent.isCopy&&chartTitle.length&&item">
@@ -29,7 +28,6 @@
         style="margin-right:2%;"
         @click.stop="copyChartName(position)"
       >
-       <!--  <i class="el-icon-document-copy"></i> -->
       </div>
     </el-tooltip>
     <div
@@ -137,7 +135,6 @@ export default {
   width: 95%;
   position: absolute;
   left: 2%;
-  //bottom: 4%;//top,bottom在具体版式单独设置
   align-items: center;
   justify-content: space-between;
 }

src/views/ppt_manage/newVersion/components/formatEl/SheetEl.vue

@@ -6,7 +6,6 @@
     :id="`${$parent.isPreview?'preview_':''}sheet_${index}_${position}`"
     style="overflow:hidden"
   >
-    <!-- :style="{overflow:$parent.isPreview?'hidden':'auto'}" -->
     <table :key="tableKey" :style="`font-size:${$parent.$parent.pptSheetSize}px`" cellpadding="0" cellspacing="0">
       <tbody>
         <tr v-for="(row,rowIndex) in tableData" :key="rowIndex">
@@ -100,7 +99,6 @@ export default {
 
 <style scoped lang="scss">
 .table-wrap{
-  /* overflow: auto; */
   table{
     width:99%;
     table-layout: auto;
@@ -108,12 +106,10 @@ export default {
         width: auto;
         height: auto;
         padding: 0.4em 0;
-			/* 	min-width: 35px; */
 				border: 1px solid #747474;
         word-break: break-all;
         word-wrap: break-word;
         line-height: 1.2em;
-				/* height: 45px; */
 				text-align: center;
 			}
   }

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

@@ -1,6 +1,5 @@
 <template>
   <div class="total-wrap" :style="{'pointer-events' :isPreview?'none':'auto'}">
-    <!-- <div class="wrap-full-left flex-column" :style="pageItem.layers&&!isLayerShow()?'z-index:3':''"> -->
       <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"
@@ -29,8 +28,6 @@
           @getText="getText($event,2)"
         ></component>
       </div>
-   <!--  </div> -->
-   <!--  <div class="wrap-full-right flex-column" :style="pageItem.layers&&!isLayerShow()?'z-index:3':''"> -->
       <div class="wrap-full-right-half top flex-center" :style="pageItem.layers&&!isLayerShow()?TypeName(3)==='ChartEl'?'z-index:5':'z-index:3':''">
         <component
           :data-position="3"
@@ -59,7 +56,6 @@
           @getText="getText($event,4)"
         ></component>
       </div>
-    <!-- </div> -->
     <!-- 图层编辑模式 -->
     <div class="layers" :id="`layers_${pageItem.id}`"
         v-if="isLayerShow()" @click.stop="clickLayer" @contextmenu.stop="showLayerContentMenu">
@@ -74,7 +70,6 @@
           @chooseThis="changeActEl(item)"
           v-on="$listeners"
         ></component>
-        <!-- @deleteLayer="delLayer" -->
       </template>
     </div>
     <!-- 非图层编辑模式 -->

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

@@ -1,6 +1,5 @@
 <template>
   <div class="total-wrap" :style="{'pointer-events' :isPreview?'none':'auto'}">
-   <!--  <div class="wrap-full-left flex-column" :style="pageItem.layers&&!isLayerShow()?'z-index:3':''"> -->
       <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"
@@ -29,8 +28,6 @@
           @getText="getText($event,2)"
         ></component>
       </div>
-   <!--  </div> -->
-  <!--   <div class="wrap-full-right flex-column" :style="pageItem.layers&&!isLayerShow()?'z-index:3':''"> -->
       <div class="wrap-full-right-half top flex-center" :style="pageItem.layers&&!isLayerShow()?TypeName(3)==='ChartEl'?'z-index:5':'z-index:3':''">
         <component
           :data-position="3"
@@ -59,7 +56,6 @@
           @getText="getText($event,4)"
         ></component>
       </div>
-    <!-- </div> -->
     <!-- 图层编辑模式 -->
     <div class="layers" :id="`layers_${pageItem.id}`"
         v-if="isLayerShow()" @click.stop="clickLayer" @contextmenu.stop="showLayerContentMenu">
@@ -74,7 +70,6 @@
           @chooseThis="changeActEl(item)"
           v-on="$listeners"
         ></component>
-        <!-- @deleteLayer="delLayer" -->
       </template>
     </div>
     <!-- 非图层编辑模式 -->

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

@@ -1,8 +1,5 @@
 <template>
   <div class="total-wrap flex-column format-nine" :style="{'pointer-events' :isPreview?'none':'auto'}">
-<!--     <div class="wrap-full-top top-70 flex-center" 
-      :style="{zIndex:pageItem.layers&&!isLayerShow()?'3':'',
-      justifyContent:'space-between'}"> -->
         <div class="half half-left flex-center" :style="pageItem.layers&&!isLayerShow()?TypeName(1)==='ChartEl'?'z-index:5':'z-index:3':''">
           <component
             :data-position="1"
@@ -31,7 +28,6 @@
             @getText="getText($event,2)"
           ></component>
         </div>
-    <!-- </div> -->
     <div class="wrap-full-bottom bottom-30 flex-center" :style="pageItem.layers&&!isLayerShow()?TypeName(3)==='ChartEl'?'z-index:5':'z-index:3':''">
       <component
         :data-position="3"

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

@@ -25,7 +25,6 @@
           @chooseThis="changeActEl(item)"
           v-on="$listeners"
         ></component>
-        <!-- @deleteLayer="delLayer" -->
       </template>
     </div>
     <!-- 非图层编辑模式 -->

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

@@ -26,7 +26,6 @@
           @chooseThis="changeActEl(item)"
           v-on="$listeners"
         ></component>
-        <!-- @deleteLayer="delLayer" -->
       </template>
     </div>
     <!-- 非图层编辑模式 -->

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

@@ -1,6 +1,5 @@
 <template>
   <div class="total-wrap" :style="{'pointer-events' :isPreview?'none':'auto'}">
-<!--     <div class="wrap-full-left flex-column" :style="pageItem.layers&&!isLayerShow()?'z-index:4':''"> -->
       <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"
@@ -58,7 +57,6 @@
           @chooseThis="changeActEl(item)"
           v-on="$listeners"
         ></component>
-        <!-- @deleteLayer="delLayer" -->
       </template>
     </div>
     <!-- 非图层编辑模式 -->

src/views/ppt_manage/newVersion/components/formatPage/mixins.js

@@ -1,7 +1,6 @@
 import {checkClipboard,checkClipboardItems,getTextContentSize} from '../../utils/untils';
 import {defaultPosition} from "../../utils/config";
 import { copyFit } from '@/utils/svgToblob.js';
-/* import Ediotr from '../TextEditor.vue'; */
 import BaseShape from '../layer/Element/BaseShape.vue';
 import LineShape from "../layer/Element/LineShape.vue";
 import TextShape from "../layer/Element/TextShape.vue";
@@ -199,9 +198,6 @@ export default {
             //初始化编辑器
             if(this.isHintShow(position)){
                 this.getText({val:'',richContent:''},position)
-                /* this.$nextTick(()=>{
-                  this.$refs[`word_${this.pageIndex}_${position}`].getFocus()  
-                }) */
             }
         },
         //获取富文本的值
@@ -243,10 +239,6 @@ export default {
         onDragStart(e){
           const position = Number(e.currentTarget.dataset['position'])
           const dragInfo = this.positionInfo[position]
-          /* if(this.isHintShow(position)){
-            e.dataTransfer.effectAllowed = 'none'
-            return
-          } */
           if(this.choosedId!==this.pageItem.id) return
           this.$parent.isEditTitle = false
           this.dragElement = e.currentTarget
@@ -304,7 +296,6 @@ export default {
         },
         addChart(position){
           const {chartId} = this.pageItem.elements.find(i=>i.position===position)
-          /* const chartInfo = this.$store.state.ppt.chartInfoMap[chartId] */
           this.$emit('addChart',chartId)
         }
     },

src/views/ppt_manage/newVersion/components/layer/Element/TextShape.vue

@@ -38,7 +38,6 @@
       <div class="right-2 resize-handle" @mousedown.stop="(e)=>{handleScaleStart(e,'RIGHT')}"></div>
       <div class="right-3 resize-handle" @mousedown.stop="(e)=>{handleScaleStart(e,'RIGHT_BOTTOM')}"></div>
     </div>
-<!--     <div class="borderline" v-if="!isActive&&isLayerEdit"></div> -->
     <!-- 自定义右键菜单 -->
     <ContextMenu :menu="contextmenus" :menuId="elementInfo.id"
       @deleteShape="handleDeleteLayer"

src/views/ppt_manage/newVersion/pptCatalog.vue

@@ -39,7 +39,6 @@
 
         <!-- 公共 -->
         <div class="public-ppt" v-show="default_tab === '3'">
-          <!-- <h3>公共PPT <span @click="listExpand=!listExpand">{{listExpand?'收起':'展开'}} <i :class="listExpand?'el-icon-arrow-up':'el-icon-arrow-down'"></i></span></h3> -->
           <div class="ppt-list">
             <el-tree
               ref="publicTree"
@@ -66,7 +65,6 @@
                     v-show="(data.copyIconShow&&data.PptVersion===2)||checkNode(data)"
                     @click.stop="handleCopy(data)"
                   ></i>
-                  <!-- v-show="(data.copyIconShow&&data.PptVersion===2)||(data.copyIconShow&&data.GroupId&&!data.OnlyOld)||checkNode(data)" -->
                 </span>
               </span>
             </el-tree>
@@ -75,7 +73,6 @@
 
         <!-- 我的 -->
         <div class="private-ppt" v-show="default_tab === '1'">
-          <!-- <h3>我的PPT</h3> -->
           <div class="ppt-list">
             <el-tree
               ref="privateTree"
@@ -210,25 +207,6 @@
             @end="moveListPPT"
             :disabled="(treeName==='private'&&!selectNode)||treeName!=='private'"
             >
-            <!-- <div class="list-item" 
-              v-for="item in catalogPPTList" :key="item.PptId"
-              @click="changeModel('ppt',item)"
-              >
-              <div class="item-title">
-                <span>{{item.Title}}</span>
-                <img
-                  v-if="treeName==='private'&&selectNode"
-                  src="~@/assets/img/data_m/move_ico.png"
-                  style="width: 14px; height: 14px; margin-right: 8px"
-                />
-              </div>
-              <div style="height:1px;background:#ECECEC;margin:0 -10px;"></div>
-              <div class="item-image" 
-              :style="item.BackgroundImg?{background: `no-repeat top/cover url('${item.BackgroundImg}')`}:{}">
-                <span>{{item.Title}}</span>
-              </div>
-              <span style="font-size:14px;">{{$t('Slides.creation_time')}}：{{$moment(item.PptModifyTime).format('YYYY-MM-DD')}}</span>
-            </div> -->
             <div class="list-item" 
                 v-for="item in catalogPPTList" :key="item.PptId"
                 @click="changeModel('ppt',item)">
@@ -458,9 +436,6 @@ export default {
       }
       this.searchOptions=[]
     },
-/*     default_tab(newVal){
-      newVal&&this.handleTabClick(newVal) 
-    } */
   },
   methods: {
     //ppt列表操作栏
@@ -556,11 +531,6 @@ export default {
           this.transformCatalogtoEn(selectedCatalog)
         }
       }
-      //如果是合并ppt,打开合并ppt弹窗
-      /* if(this.chooseCatalogType==='merge'){
-        this.selectCatalogId = selectedCatalog
-        this.mergePptShow = true
-      } */
     },
     //关闭弹窗
     closeDialog(name){
@@ -694,9 +664,6 @@ export default {
     //判断公共目录按钮是否显示
     checkNode(data){
      if(!this.selectNode||this.treeName!=='public') return false
-     /* if(this.model==='list'&&this.selectNode.GroupId===data.GroupId&&!data.OnlyOld){
-       return true
-     } */
      if(this.model==='list'){
        return false
      }
@@ -947,22 +914,6 @@ export default {
         if(isIE){
           window.open(PptxUrl, '_blank')
         }else{
-          /* let a = document.createElement('a') 
-          a.href = PptxUrl 
-          a.download=`${Title}aaa.pptx`
-          a.click(); */
-          /* const x = new XMLHttpRequest()
-          x.open('GET', PptxUrl, true)
-          x.responseType = 'blob'
-          x.onload = () => {
-            const url = window.URL.createObjectURL(x.response)
-            let a = document.createElement('a') 
-            a.href = url
-            a.download=`${Title}.pptx`
-            a.click();
-            window.URL.revokeObjectURL(url)
-          }
-          x.send() */
           this.handleDownloadResource(PptxUrl,`${Title}.pptx`)
         }
       }else{
@@ -976,16 +927,6 @@ export default {
       if(item.isShare===1&&key==='share') return 
       if(item.GroupId){
         //共享目录
-        //ppt5.1:取消私有目录的共享功能
-        //shareCatalog
-        /* pptInterface.shareCatalog({
-          GroupId:item.GroupId
-        }).then(res=>{
-          if(res.Ret===200){
-            this.$message.success('设置成功')
-            this.getCatalogsList()
-          }
-        }) */
       }else{
         //共享ppt
         //ppt5.1:入参更改GroupPptId->PptId
@@ -1022,9 +963,6 @@ export default {
     },
     //判断节点是否能拖拽:目录和ppt均可拖拽
     checkAllowDrag(node){
-      /* if(node.isLeaf){
-        return true
-      } */
       return true
     },
     //判断节点是否能放入
@@ -1066,19 +1004,15 @@ export default {
      * position:当前拖动目录放置位置(before,after) inner已在checkAllowDrop里排除;
      */
     handleDragCatalog(item,target,position){
-      //console.log('item',item.data.GroupId,'target',target.data.GroupId,'position',position)
-      //console.log(this.privateList)
       //目录拖动后privateList顺序会发生变化 
       const itemIndex = this.privateList.findIndex(i=>i.GroupId===item.data.GroupId)
       //console.log(itemIndex)
       let preGroupId=0,nextGroupId=0
-      //position:before && itemIndex===0
       //说明拖动后,item在私有目录下置顶
       if(position==='before'&&itemIndex===0){
         preGroupId=0
         nextGroupId = target.data.GroupId
       }
-      //position:before && itemIndex!==0
       //说明拖动后,拖动的目录在target之前
       if(position==='before' && itemIndex!==0){
         preGroupId = this.privateList[itemIndex-1].GroupId
@@ -1204,8 +1138,6 @@ export default {
       if(this.dragStartIndex===newIndex){
         return
       }
-      //console.log('list',this.catalogPPTList)
-      //console.log('pre',this.dragPrepPpt.Title,'next',this.dragNextPpt.Title,'item',this.dragPpt.Title)
       //movePPT
       pptInterface.movePPT({
         GroupPptId:this.dragPpt.GroupPptId,
@@ -1319,10 +1251,6 @@ export default {
         this.publicList = changeCatalogArr(PublicList)
         this.privateList = changeCatalogArr(PrivateList)
         this.sharedList = changeCatalogArr(GrantList)
-        /* if(type==='load'){
-          this.handleTabClick(1)
-          this.handleTabClick(2)
-        } */
         this.$nextTick(()=>{
           this.$refs[`${this.treeName}Tree`].setCurrentKey(currentKey)
           if(this.selectNode&&this.selectNode.GroupId){

src/views/ppt_manage/newVersion/pptEditor.vue

@@ -12,7 +12,6 @@
           <p style="text-align:start;color:#999999;">
             {{$i18n.locale == 'zh' ? `已添加${pageList.length}页`:`${pageList.length}slides added successfully`}}
           </p>
-          <!-- <p class="hint-text" style="cursor: pointer;margin-left:auto;" @click="insertPageShow=true">插入PPT</p> -->
           <p class="hint-text" style="cursor: pointer;" @click="saveCopyPages('cut')">{{$t('Slides.operations_cut')}}</p>
           <p class="hint-text" style="cursor: pointer;" @click="saveCopyPages('copy')">{{$t('Slides.operations_copy')}}</p>
           <p style="color:#B72E18;cursor: pointer;" @click="openDeletePageDialog">{{$t('Slides.operations_batch_delete')}}</p>
@@ -49,7 +48,6 @@
         <div class="ppt-editor" id="pptEditor" ref="pptEditor" @paste="handlePasteOutSide">
             <!-- 显示全部ppt -->
             <template v-if="pageList.length">
-                <!-- <transition-group name="flip-list"> -->
                 <div class="ppt-editor-item flex-column" v-for="(item,index) in pageList" :key="item.id">
                     <AddFormat @addPage="addPage($event,index)" :chooseModalId="chooseModalId"/>
                     <div class="ppt-item" :class="{'choose':currentItem.id===item.id}" 
@@ -243,10 +241,6 @@
                       </div>
                     </div>
                   </el-collapse-item>
-                  <!-- <el-collapse-item v-if="activeLayerEl.type" :name="activeLayerEl.type"
-                  :title="{'line':'线条','shape':'线框','text':'文本'}[activeLayerEl.type]+`设置`" >
-                    <LayerEditTool :elInfo="activeLayerEl" />
-                  </el-collapse-item> -->
                   <el-collapse-item  name="line"
                    :title="$t('Slides.line_settings')" >
                     <LayerEditTool 
@@ -288,13 +282,6 @@
     </div>
 
     <!-- 选择封面弹窗 -->
-    <!-- <choose-cover  v-if="isShowChooseCover"
-        :firstPage="firstPage"
-        :pptCoverList="pptCoverList"
-        :PptId="pptId"
-        @close="closeChooseCover"
-        @save="saveCover"
-    /> -->
     <ChooseCoverNew 
         :isShowChooseCover="isShowChooseCover"
         :firstPage="firstPage"
@@ -443,10 +430,8 @@ export default {
     panelTabs(){
       return  [ 
         {val:'图表',label:this.$t('Slides.table_chart') },
-        // {val:'MyETA批量',label:this.$t('Slides.my_eta_batch')},
         {val:'沙盘', label:this.$t('Slides.sandbox_name')},
         {val:'表格', label:this.$t('Slides.table_name')},
-        // {val:'语义分析插入', label:this.$t('Slides.table_analysis_semantic')},
       ]
     },  
     
@@ -481,8 +466,6 @@ export default {
           this.maxPageChart = res.Data.chart_num
         }
       })
-     /*  this.maxPageNum = 60
-      this.maxPageChart = 8 */
     },
     async init(){
        this.dataLoading = this.$loading({
@@ -575,17 +558,11 @@ export default {
         let page = {
             id: createRandomCode(),
             key:0,
-            /* isUpdating:false, */
             modelId: modelId,
             title:'',
             elements: [],
             titleDetail:this.titleSetting?this.titleSetting:null
         }
-        //限制取消
-        /* if(this.pageList.length>=this.maxPageNum){
-          this.$message.warning(`最多可添加${this.maxPageNum}页PPT,已超过最大页数!`)
-          return
-        } */
         this.pageList.splice(index,0,page)
         this.changeCurrentItem(page)
         this.chooseModalId = modelId
@@ -647,10 +624,6 @@ export default {
       if(textElements.length>0){
         this.pageList[this.currentIndex].isLoadText = true
       }
-      //通过deleteFormatEl重新渲染被删除的区域，下面这几行都不需要了
-      //this.$refs[`pptPage_${this.currentIndex}`][0].initPositionInfo()
-      //this.initPageElements(this.pageList[this.currentIndex])
-      //this.initPreviewPageEl('delete')
     },
     deleteFormatEl(type,position){
       if(type==='chart'){
@@ -821,11 +794,6 @@ export default {
           let height = $('.ppt-editor-item')[0].offsetHeight
           const index = this.currentIndex
           //pptEditor的滚动条动画
-          /* this.$refs.pptEditor.scrollTo({
-              top:height*index,
-              left:0,
-              behavior: 'smooth'
-          }) */
           const pptEditorDom = document.getElementById('pptEditor')
           pptEditorDom.scrollTo({
             top:height*index,
@@ -945,19 +913,6 @@ export default {
         // type:sandImage 沙盘图  chart 图表 sheet
         if(type=='chart'){
           //判断选择的图表是否已经插入
-          /* const length = this.pageList.length
-          for(let i=0;i<length;i++){
-            let hasChart = this.pageList[i].elements.some(i=>i.chartId===item.UniqueCode)
-            if(hasChart){
-              this.$message.warning("该图表已被使用");
-              return
-            }
-          } */
-          //限制取消
-          /* if(this.chartNum>=this.maxPageChart){
-            this.$message.warning("超过可设置的最大图表数,请删除现有图表");
-            return;
-          } */
           this.isChartLoading = true
           await this.getchartData(item.UniqueCode);
           
@@ -971,8 +926,6 @@ export default {
           );
           this.chartNum++
           this.refleshElements(temp_elements);
-          /* const page = this.currentItem
-          const pageElements = page.elements.filter(i=>i.type==='chart') */
           //优化一下
           const tempEls = [{type:'chart',position:addPositions[0],chartId:item.UniqueCode}]
           const tempPage = {id:this.currentItem.id,elements:tempEls}
@@ -1087,11 +1040,6 @@ export default {
     },
     //手动保存PPT
     async handleSave(type){
-     /*  const {result,hintText} = this.checkPPT()
-      if(!result){
-        this.$message.warning(hintText)
-        return
-      } */
       //保存走save_checkPPT,发布走checkPPT
       let checkResult = null
       if(type==='save'){
@@ -1104,8 +1052,6 @@ export default {
         return checkResult
       }
       let Content = JSON.stringify(this.pageList)
-      //console.log(Content)
-      //console.log('firstPage',this.firstPage)
       const {Title,ReportType,PptDate,BackgroundImg,BackIndex} = this.firstPage
       const FirstPage = {
         Title,ReportType,PptDate,BackIndex,
@@ -1130,7 +1076,6 @@ export default {
         this.isSaved = false
         if(res.Ret===200){
           this.$message.success(this.$t('MsgPrompt.add_msg'))
-          //this.$router.push({path:'/pptlist'})
           this.isSave = true
           this.pptId = res.Data.PptId
           sessionStorage.removeItem('selectedCatalog')
@@ -1157,11 +1102,6 @@ export default {
           this.isSave = true
           this.pptId = res.Data.PptId
           //如果ppt已转成双周报,则更新
-          /* if(this.ReportId!==0){
-            pptInterface.transReport({
-              PptId:Number(this.pptId),
-            }).then(res=>{})
-          } */
         }
       })
     },
@@ -1203,9 +1143,7 @@ export default {
     save_checkPPT(){
       if(!this.firstPage.Title){
         return {result:false,hintText:this.$t('Slides.please_input_cover_title')+'!'}
-      }/* else if(!this.firstPage.ReportType){
-        return {result:false,hintText:'请输入ppt类型!'}
-      } */
+      }
       if(this.pageList.length===0){
         return {result:false,hintText:this.$t('Slides.least_one_ppt_msg') }
       }
@@ -1216,9 +1154,7 @@ export default {
       //检验首页
       if(!this.firstPage.Title){
         return {result:false,hintText:this.$t('Slides.please_input_cover_title')+'!'}
-      }/* else if(!this.firstPage.ReportType){
-        return {result:false,hintText:'请输入ppt类型!'}
-      } */
+      }
       if(this.pageList.length===0){
         return {result:false,hintText:this.$t('Slides.least_one_ppt_msg') }
       }
@@ -1430,7 +1366,6 @@ $titleColor:#333333;
                 justify-content: center;
                 align-items: center;
                 background-size: 100% 100% !important;
-                /* background: no-repeat center/cover url(~@/assets/img/ppt_m/bg3.jpg); */
             }
         }
         .hint-box{
@@ -1492,12 +1427,8 @@ $titleColor:#333333;
                 position: relative;
                 align-items: center;
                 .ppt-item {
-                    /* width: 835px;
-                    height: 580px; */
                     //padding 两边 40 减掉边框两边 8 max-width:100% - 32px
                     width:calc(100% - 64px);
-                    /* height: 0;
-                    padding-bottom: calc(69.408% - 64px); */
                     background: url('~@/assets/img/pptnextimg.png') no-repeat top;
                     background-size: 100% 100%;
                     /* margin-bottom: 30px; */
@@ -1505,7 +1436,6 @@ $titleColor:#333333;
                     border: 4px solid transparent;
                     cursor: pointer;
                     &.choose {
-                        // box-shadow: 1px 1px 2px rgba($color: #409eff, $alpha: 0.6);
                         border: 4px solid rgba($color: #4B8DFF, $alpha: 0.7);
                     }
                     .close-btn{
@@ -1588,24 +1518,19 @@ $titleColor:#333333;
                 }
               }
               .chart-tool{
-               //btn:40+20,wrapPadding:40 -> 120+100
-               //height: calc(100vh - 220px);
                flex: 1;
                margin-top: 10px;
-              //  height:calc(100% - 230px);
               height: calc(100% - 80px);
                .chart-search{
                    margin-bottom: 10px;
                }
                .chart-list{
-                   /* background-color: rgb(82, 106, 106); */
                    flex: 1;
                    border:2px solid #EBEBEB;
                    border-radius: 4px;
                    overflow-y: scroll;
                    text-align: center;
                     .chart-item {
-                        /* border: 0.5px solid rgba(116, 129, 141,0.1); */
                         cursor: pointer;
                         text-align: center;
                         color: #74818d;
@@ -1627,11 +1552,6 @@ $titleColor:#333333;
                     img{
                       cursor: pointer;
                     }
-                    // .source-identification{
-                    //   color: #000;
-                    //   text-align: left;
-                    //   padding-left: 12px;
-                    // }
                   }
                   .loaded-text{
                       height: 20px;
@@ -1645,7 +1565,6 @@ $titleColor:#333333;
 		        }
             .layer-edit-box,.title-edit-box{
               flex: 1;
-              /* height: calc(100% - 182px); */
               padding: 0 20px;
               box-sizing: border-box;
               border: 2px solid #EBEBEB;
@@ -1655,7 +1574,6 @@ $titleColor:#333333;
               .tool-list{
                 .el-wrap{
                   display: flex;
-                  /* justify-content: space-between; */
                   gap: 0 15px;
                   flex-wrap: wrap;
                   .el-item{

src/views/ppt_manage/newVersion/pptEnCatalog.vue

@@ -205,25 +205,6 @@
             @end="moveListPPT"
             :disabled="treeName!=='private'"
             >
-            <!-- <div class="list-item" 
-              v-for="item in catalogPPTList" :key="item.PptId"
-              @click="changeModel('ppt',item)"
-              >
-              <div class="item-title">
-                <span>{{item.Title}}</span>
-                <img
-                  v-if="treeName==='private'"
-                  src="~@/assets/img/data_m/move_ico.png"
-                  style="width: 14px; height: 14px; margin-right: 8px"
-                />
-              </div>
-              <div style="height:1px;background:#ECECEC;margin:0 -10px;"></div>
-              <div class="item-image" 
-              :style="item.BackgroundImg?{background: `no-repeat top/cover url('${item.BackgroundImg}')`}:{}">
-                <span>{{item.Title}}</span>
-              </div>
-              <span style="font-size:14px;">{{$t('Slides.creation_time')}}：{{$moment(item.PptModifyTime).format('YYYY-MM-DD')}}</span>
-            </div> -->
             <div class="list-item" 
                 v-for="item in catalogPPTList" :key="item.PptId"
                 @click="changeModel('ppt',item)">
@@ -241,11 +222,6 @@
                       <span class="item-update-item">{{$moment(item.PptModifyTime).format('YYYY-MM-DD HH:mm:ss')}}</span>
                     </el-tooltip>
                     <span>{{ $i18n.locale == 'zh'?`${item.PptPage}页`:`P${item.PptPage}` }}</span>
-                    <!-- <img
-                        v-if="treeName==='private'&&selectNode"
-                        src="~@/assets/img/ppt_m/move_ico2.png"
-                        style="width: 14px; height: 14px; margin-right: 8px"
-                    /> -->
                 </div>
             </div>
           </draggable>
@@ -878,17 +854,6 @@ export default {
         if(isIE){
           window.open(PptxUrl, '_blank')
         }else{
-          /* const x = new XMLHttpRequest()
-          x.open('GET', PptxUrl, true)
-          x.responseType = 'blob'
-          x.onload = () => {
-            const url = window.URL.createObjectURL(x.response)
-            let a = document.createElement('a') 
-            a.href = url
-            a.download=`${Title}.pptx`
-            a.click();
-          }
-          x.send() */
           this.handleDownloadResource(PptxUrl,`${Title}.pptx`)
         }
       }else{
@@ -1223,10 +1188,6 @@ export default {
         this.publicList = changeCatalogArr(PublicList)
         this.privateList = changeCatalogArr(PrivateList)
         this.sharedList = changeCatalogArr(GrantList)
-        /* if(type==='load'){
-          this.handleTabClick(1)
-          this.handleTabClick(2)
-        } */
         this.$nextTick(()=>{
           this.$refs[`${this.treeName}Tree`].setCurrentKey(currentKey)
           if(this.selectNode&&this.selectNode.GroupId){

src/views/ppt_manage/newVersion/pptEnEditor.vue

@@ -274,13 +274,6 @@
     </div>
 
     <!-- 选择封面弹窗 -->
-    <!-- <choose-cover  v-if="isShowChooseCover"
-        :firstPage="firstPage"
-        :pptCoverList="pptCoverList"
-        :PptId="pptId"
-        @close="closeChooseCover"
-        @save="saveCover"
-    /> -->
     <ChooseCoverNew 
         :isShowChooseCover="isShowChooseCover"
         :firstPage="firstPage"
@@ -667,9 +660,6 @@ export default {
         return
       }
       //如果是文本框内右键粘贴,也返回
-      /* if(e.path.some((item)=>{if(item.className)return item.className.includes('mce-content-body')})){
-        return
-      } */
       if(e.target.tagName!=='DIV') return
       //算出currentItem还有哪些位置可以插入图表
       const {isAdd,addPositions}=this.checkElements(this.currentItem.modelId,this.currentItem.elements,'chart')
@@ -836,18 +826,6 @@ export default {
           PageSize: this.search_page_sizes,
           IsShowMe: this.isShowMe
         }
-        // let res=null
-        // if(this.chart_source === 1){
-        //   res=await dataBaseInterface.chartSearchByEs(params)
-        // }else if(this.chart_source === 2){
-        //   res=await futuresInterface.searchChart(params)
-        // }else if(this.chart_source === 3){
-        //   res=await chartRelevanceApi.searchChart(params)
-        // }else if(this.chart_source === 6){
-        //   res=await fittingEquationInterface.searchChart(params)
-        // }else if(this.chart_source === 7){
-        //   res=await statisticFeatureInterface.searchChart(params)
-        // }
 
         const apiMap = {
           1: dataBaseInterface.chartSearchByEs,
@@ -1169,9 +1147,7 @@ export default {
     save_checkPPT(){
       if(!this.firstPage.Title){
         return {result:false,hintText:this.$t('Slides.please_input_cover_title') }
-      }/* else if(!this.firstPage.ReportType){
-        return {result:false,hintText:'请输入ppt类型!'}
-      } */
+      }
       if(this.pageList.length===0){
         return {result:false,hintText:this.$t('Slides.least_one_ppt_msg') }
       }
@@ -1182,9 +1158,7 @@ export default {
       //检验首页
       if(!this.firstPage.Title){
         return {result:false,hintText:this.$t('Slides.please_input_cover_title') }
-      }/* else if(!this.firstPage.ReportType){
-        return {result:false,hintText:'请输入ppt类型!'}
-      } */
+      }
       if(this.pageList.length===0){
         return {result:false,hintText:this.$t('Slides.least_one_ppt_msg') }
       }
@@ -1458,21 +1432,14 @@ $titleColor:#333333;
                 position: relative;
                 align-items: center;
                 .ppt-item {
-                    /* width: 835px;
-                    height: 580px; */
                     //padding 两边 40 减掉边框两边 8 max-width:100% - 32px
                     width:calc(100% - 64px);
-                    /* height: 0;
-                    padding-bottom: calc(69.408% - 64px); */
                     background: url('~@/assets/img/ppt_en_bg.png') no-repeat top;
-                    /* background-size: 898px 642px; */
                     background-size:100% 100%;
-                    /* margin-bottom: 30px; */
                     position: relative;
                     border: 4px solid transparent;
                     cursor: pointer;
                     &.choose {
-                        // box-shadow: 1px 1px 2px rgba($color: #409eff, $alpha: 0.6);
                         border: 4px solid rgba($color: #4B8DFF, $alpha: 0.7);
                     }
                     .close-btn{
@@ -1555,8 +1522,6 @@ $titleColor:#333333;
                 }
               }
               .chart-tool{
-               //btn:40+20,wrapPadding:40 -> 120+100
-               //height: calc(100vh - 220px);
                flex: 1;
                margin-top: 10px;
               //  height:calc(100% - 230px);
@@ -1606,11 +1571,6 @@ $titleColor:#333333;
                     img{
                       cursor: pointer;
                     }
-                    // .source-identification{
-                    //   color: #000;
-                    //   text-align: left;
-                    //   padding-left: 12px;
-                    // }
                   }
                   .loaded-text{
                       height: 20px;

src/views/ppt_manage/newVersion/pptEnPresent.vue

@@ -36,11 +36,9 @@
       </div>
       <div class="show-wrap flex-column">
         <div id="fullscreen" class="fullscreen flex-center"  ref="pptWrap">
-          <!-- <div class="image-move" v-if="dragShow" @mousedown.stop="handleMoveStart" ></div> -->
           <div class="ppt-wrap" @wheel.stop="normalMouseWheel">
             <!-- 封面 -->
             <div class="ppt-item" id="cover" v-if="currentIndex===0" style="background-size:20%;">
-              <!-- <Cover :pageInfo="coverInfo.page" v-show="coverInfo.page"></Cover> -->
               <CustomCover :pageInfo="coverInfo.page" :CoverContent="pptCoverContent" v-show="coverInfo.page"></CustomCover>
             </div>
             <!-- 封底 -->
@@ -49,15 +47,6 @@
             </div>
             <!-- PPT内容 -->
               <div class="ppt-item" v-else>
-                <!-- <div class="title-wrap" 
-                    :title="currentItem.title" 
-                    :style="`
-                        top:${lineClamp===2?'2%':getStrCount(currentItem.title)<52?'4.5%':'0'};
-                        height:${lineClamp===2?'12%':getStrCount(currentItem.title)<52?'7%':'14%'};
-                        -webkit-line-clamp:${lineClamp===2?2:3};`" 
-                    :class="{'title-ellipsis':getStrCount(currentItem.title)>lineClamp*50}">
-                  {{currentItem.title}}
-                </div> -->
                  <!-- 自定义标题 -->
                  <div class="custom-title-wrap editor-content" 
                     :style="currentItem.titleDetail?{
@@ -116,7 +105,6 @@
           <div class="ppt-wrap">
             <!-- 封面 -->
             <div class="ppt-item" id="cover" v-if="currentIndex===0" style="background-size:20%;">
-              <!-- <Cover :pageInfo="coverInfo.page" v-show="coverInfo.page"></Cover> -->
               <CustomCover :pageInfo="coverInfo.page" :CoverContent="pptCoverContent" v-show="coverInfo.page"></CustomCover>
             </div>
             <!-- 封底 -->
@@ -125,15 +113,6 @@
             </div>
             <!-- PPT内容 -->
               <div class="ppt-item" v-else>
-                <!-- <div class="title-wrap" 
-                    :title="currentItem.title" 
-                    :style="`
-                        top:${lineClamp===2?'2%':'0'};
-                        height:${lineClamp===2?'12%':'14%'};
-                        -webkit-line-clamp:${lineClamp===2?2:3};`" 
-                    :class="{'title-ellipsis':getStrCount(currentItem.title)>lineClamp*57}">
-                  {{currentItem.title}}
-                </div> -->
                 <!-- 自定义标题 -->
                 <div class="custom-title-wrap editor-content" 
                     :style="currentItem.titleDetail?{
@@ -227,12 +206,6 @@ export default {
           id:0,
           title:'封面',
         },
-        /* page:{
-          Title:'ppt标题阿巴阿巴',
-          ReportType:'ppt副标题阿巴阿巴',
-          BackgroundImg:'https://hzstatic.hzinsights.com/ppt/bg3.jpg',
-          PptDate:'2022年7月'
-        } */
       },//封面信息
       backInfo:{
         index:{
@@ -326,12 +299,6 @@ export default {
         background: 'rgba(255, 255, 255, 0.8)'
       });
       await this.getpptData();
-      //加载每一项
-      /* for(let i=0;i<this.pageList.length;i++){
-        await this.changeCurrentItem(this.pageList[i])
-      } 
-      this.currentItem = this.coverInfo.index
-      this.currentIndex=0 */
       //加载每一项图表的数据
       for(let i=0;i<this.pageList.length;i++){
         this.canvasPage[i] = null
@@ -377,9 +344,6 @@ export default {
         this.$message.error(this.$t('Slides.no_corresponding_ppt_msg') )
         window.close()
       }
-      /* this.pageList = pageList
-      this.currentItem = this.coverInfo.index
-      this.currentIndex = 0 */
     },
     //设置全屏
     FullScreen(_,type='normal'){
@@ -601,9 +565,6 @@ export default {
     },
     //全屏/非全屏设置
     async setScreen(isScreen){
-      /* //重新加载该页
-      if(!(this.currentItem.id===0||this.currentItem.id===-1))
-        await this.initPageElements(this.currentItem,'show',true) */
       if(!isScreen){
         this.$nextTick(()=>{
           $('.fullscreen .ppt-wrap').css('width','1100px')
@@ -619,8 +580,6 @@ export default {
       }
     },
     fullScreenSet(){
-      /* console.log('total-height',window.screen.height)
-      console.log('height?',this.screenHeight) */
       $('.fullscreen .ppt-wrap').css('height',this.screenHeight)
       //全屏模式
       if(this.fullScreenType==='normal'){

src/views/ppt_manage/newVersion/pptEnPublish.vue

@@ -3,18 +3,6 @@
       <div class="pub-btn-list">
         <el-button  type="primary" plain style="width:182px;height:40px;" @click="$router.push({path:'/pptenlist'})">{{$t('Slides.return_to_list')}}</el-button>
           <!-- 下载配置 -->
-          <!-- <div class="setting">
-            <div>
-                <span>是否压缩</span>
-                <el-radio v-model="setCompression" :label="true">是</el-radio>
-                <el-radio v-model="setCompression" :label="false">否</el-radio>
-            </div>
-            <div>
-                <span>图表转换优化</span>
-                <el-radio v-model="setCompression2" :label="true">开</el-radio>
-                <el-radio v-model="setCompression2" :label="false">关</el-radio>
-            </div>
-        </div> -->
         <el-button  type="primary" style="width:182px;height:40px;margin-left: 0;" @click="downloadPPT" :disabled="isPublish">{{$t('Slides.operations_download')}}</el-button>
         <el-dropdown split-button style="width:182px;height:40px;" type="primary" @click="transHandle" @command="handleCommand" :disabled="isPublish">
           {{layoutStr}}
@@ -30,14 +18,10 @@
         <div class="ppt-wrap flex-center">
           <!-- 封面 -->
           <div class="ppt-item" id="cover" style="background-size:20%;">
-            <!-- <Cover :pageInfo="coverInfo.page"></Cover> -->
             <CustomCover :pageInfo="coverInfo.page" :CoverContent="pptCoverContent" v-show="coverInfo.page"></CustomCover>
           </div>
           <!-- 内容 -->
           <div class="ppt-item" v-for="(item,index) in pageList" :key="item.id">
-            <!-- <div class="title-wrap">
-              {{item.title}} 
-            </div> -->
             <!-- 自定义标题 -->
             <div class="custom-title-wrap content" 
                 :style="item.titleDetail?{
@@ -106,12 +90,6 @@ export default {
           title:'封面',
           idName:'cover'
         },
-        /* page:{
-          Title:'ppt标题阿巴阿巴',
-          ReportType:'ppt副标题阿巴阿巴',
-          BackgroundImg:'https://hzstatic.hzinsights.com/ppt/bg3.jpg',
-          PptDate:'2022年7月'
-        } */
       },//封面信息
       backInfo:{
         id:-1,
@@ -302,14 +280,6 @@ export default {
       const length = this.pageList.length;
       for (let i = 0; i < length; i++) {
         let slide = pptx.addSlide({ masterName: pptSlideMaster.title });
-        /* slide.addText(this.pageList[i].title, {
-          placeholder:"slideTitle",
-          x:'8%',
-          y:'5.5%',
-          w:'62%',
-          h:'7%',
-          color:'333333'
-        }); */
         slide = this.setPPTTitle(slide,this.pageList[i])
         const elements = this.pageList[i].elements;
         const elLength = elements.length;
@@ -463,11 +433,6 @@ export default {
         fullscreen:true,
         text:this.$t('Slides.publishing_loading')
       })
-      //console.log('pptx',pptx)
-      // pptx.write('blob').then((data)=>{
-      //   // 上传到阿里云oss
-      //   // this.handleUploadToOSS(data)
-      // })
       // 生成文件名
       let t=new Date()
       let month=moment(t).format('YYYYMM')
@@ -542,20 +507,12 @@ export default {
       if(res.Ret===200){
         this.$message.success(this.$t('MsgPrompt.publish_msg'))
         this.publishLoading&&this.publishLoading.close()
-        //如果该ppt已转成双周报,则发布成功后更新双周报
-        //需求池272 PPT生成报告后，PPT更新内容或报告更新内容两者互不影响 遂注释
-        /* if(this.ReportId!==0){
-          pptEnInterface.transPPTtoReport({
-            PptId:parseInt(this.$route.query.id),
-          }).then(res=>{}) 
-        } */
       }
     },
     //将svgDom转为base64 png
     changeUrl(id){
       let img = new Image()
       const svgHtml = $(`#${id} svg`)[0].outerHTML
-      /* img.src = `data:image/svg+xml;base64,${window.btoa(unescape(encodeURIComponent(svgHtml)))}` */
       img.src = svg2Base64($(`#${id} svg`)[0]);//不支持unescape时可用
       const imgW = $(`#${id}`)[0].offsetWidth*4,imgH = $(`#${id}`)[0].offsetHeight*4
       let canvas = document.createElement('canvas')
@@ -664,19 +621,6 @@ export default {
       this.layoutStr = ['',`10:7${this.$t('Slides.default_publish')}`,`16:9 ${this.$t('Slides.publish_info')}`,`4:3 ${this.$t('Slides.publish_info')}`][this.LayoutType]
       await this.init()
     },
-  /*   getTransSet(data){
-      pptEnInterface.transReport({
-        PptId:Number(this.$route.query.id),
-        ClassifyIdSecond:data.type,
-        Title:data.title
-      }).then(res=>{
-        if(res.Ret===200){
-          this.$message.success('转换成功')
-          this.transReportShow = false
-          this.ReportId = res.Data.report_id
-        }
-      })
-    }, */
     //pageList[].layers 图层元素自适应
     changeLayerStyle(){
       for(let i=0;i<this.pageList.length;i++){
@@ -741,8 +685,6 @@ $titleColor:#333333;
     .ppt-item{
       width:1008px;
       height: 705.6px;
-      /* width: 906px; */
-      /* height: 628.594px; */
       background-color: pink;
       margin-bottom: 20px;
       background: url('~@/assets/img/ppt_en_bg.png') no-repeat top;

src/views/ppt_manage/newVersion/pptList.vue

@@ -1,7 +1,4 @@
 <template>
-  <!-- 此页面不中英互译 -->
-    <!-- 此页面不中英互译 -->
-      <!-- 此页面不中英互译 -->
   <div class="page-wrap">
     <div class="ppt-page-wrap">
       <div class="top-wrap">

src/views/ppt_manage/newVersion/pptPresent.vue

@@ -49,15 +49,7 @@
             </div>
             <!-- PPT内容 -->
               <div class="ppt-item" v-else>
-                <!-- <div class="title-wrap" 
-                    :title="currentItem.title" 
-                    :style="`
-                        top:${lineClamp===2?'2%':getStrCount(currentItem.title)<58?'5.5%':'0'};
-                        height:${lineClamp===2?'12%':getStrCount(currentItem.title)<58?'7%':'14%'};
-                        -webkit-line-clamp:${lineClamp===2?2:3};`" 
-                    :class="{'title-ellipsis':getStrCount(currentItem.title)>lineClamp*57}">
-                  {{currentItem.title}}
-                </div> -->
+                
                 <!-- 自定义标题 -->
                 <div class="custom-title-wrap editor-content" 
                     :style="currentItem.titleDetail?{
@@ -125,15 +117,6 @@
             </div>
             <!-- PPT内容 -->
               <div class="ppt-item" v-else>
-                <!-- <div class="title-wrap" 
-                    :title="currentItem.title" 
-                    :style="`
-                        top:${lineClamp===2?'2%':getStrCount(currentItem.title)<58?'5.5%':'0'};
-                        height:${lineClamp===2?'12%':getStrCount(currentItem.title)<58?'7%':'14%'};
-                        -webkit-line-clamp:${lineClamp===2?2:3};`" 
-                    :class="{'title-ellipsis':getStrCount(currentItem.title)>lineClamp*57}">
-                  {{currentItem.title}}
-                </div> -->
                 <!-- 自定义标题 -->
                 <div class="custom-title-wrap editor-content" 
                     :style="currentItem.titleDetail?{
@@ -226,12 +209,6 @@ export default {
           id:0,
           title:'封面',
         },
-        /* page:{
-          Title:'ppt标题阿巴阿巴',
-          ReportType:'ppt副标题阿巴阿巴',
-          BackgroundImg:'https://hzstatic.hzinsights.com/ppt/bg3.jpg',
-          PptDate:'2022年7月'
-        } */
       },//封面信息
       backInfo:{
         index:{
@@ -327,11 +304,6 @@ export default {
       });
       await this.getpptData();
       //加载每一项
-      /* for(let i=0;i<this.pageList.length;i++){
-        await this.changeCurrentItem(this.pageList[i])
-      } 
-      this.currentItem = this.coverInfo.index
-      this.currentIndex=0 */
       //加载每一项图表的数据
       for(let i=0;i<this.pageList.length;i++){
         this.canvasPage[i] = null
@@ -377,9 +349,6 @@ export default {
         this.$message.error(this.$t('Slides.no_corresponding_ppt_msg') )
         window.close()
       }
-      /* this.pageList = pageList
-      this.currentItem = this.coverInfo.index
-      this.currentIndex = 0 */
     },
     //设置全屏
     FullScreen(_,type='normal'){
@@ -601,9 +570,6 @@ export default {
     },
     //全屏/非全屏设置
     async setScreen(isScreen){
-      /* //重新加载该页
-      if(!(this.currentItem.id===0||this.currentItem.id===-1))
-        await this.initPageElements(this.currentItem,'show',true) */
       if(!isScreen){
         this.$nextTick(()=>{
           $('.fullscreen .ppt-wrap').css('width','1100px')
@@ -619,8 +585,6 @@ export default {
       }
     },
     fullScreenSet(){
-      /* console.log('total-height',window.screen.height)
-      console.log('height?',this.screenHeight) */
       $('.fullscreen .ppt-wrap').css('height',this.screenHeight)
       //全屏模式
       if(this.fullScreenType==='normal'){

src/views/ppt_manage/newVersion/pptPublish.vue

@@ -4,18 +4,6 @@
         <el-button  type="primary" plain style="width:182px;height:40px;" @click="$router.push({path:'/pptlist'})">{{$t('Slides.return_to_list')}}</el-button>
 
         <!-- 下载配置 -->
-        <!-- <div class="setting">
-            <div>
-                <span>是否压缩</span>
-                <el-radio v-model="setCompression" :label="true">是</el-radio>
-                <el-radio v-model="setCompression" :label="false">否</el-radio>
-            </div>
-            <div>
-                <span>图表转换优化</span>
-                <el-radio v-model="setCompression2" :label="true">开</el-radio>
-                <el-radio v-model="setCompression2" :label="false">关</el-radio>
-            </div>
-        </div> -->
         <el-button  type="primary" style="width:182px;height:40px;margin-left: 0;" @click="downloadPPT" :disabled="isPublish">{{$t('Slides.operations_download')}}</el-button>
         <el-dropdown split-button style="width:182px;height:40px;" type="primary" @click="transHandle" @command="handleCommand" :disabled="isPublish">
           {{layoutStr}}
@@ -31,19 +19,10 @@
         <div class="ppt-wrap flex-center">
           <!-- 封面 -->
           <div class="ppt-item" id="cover" style="background-size:20%;">
-            <!-- <Cover :pageInfo="coverInfo.page"></Cover> -->
             <CustomCover :pageInfo="coverInfo.page" :CoverContent="pptCoverContent" v-show="coverInfo.page"></CustomCover>
           </div>
           <!-- 内容 -->
           <div class="ppt-item" v-for="(item,index) in pageList" :key="item.id">
-            <!-- <div class="title-wrap"
-            :style="`
-                top:${lineClamp===2?'2%':getStrCount(item.title)<58?'5.5%':'0'};
-                height:${lineClamp===2?'12%':getStrCount(item.title)<58?'7%':'14%'};
-                -webkit-line-clamp:${lineClamp===2?2:3};`" 
-            :class="{'title-ellipsis':getStrCount(item.title)>lineClamp*57}">
-              {{item.title}} 
-            </div> -->
             <!-- 自定义标题 -->
             <div class="custom-title-wrap content" 
                 :style="item.titleDetail?{
@@ -76,13 +55,6 @@
           </div>
         </div>
       </template>
-      <!-- <trans-report
-        v-if="coverInfo.page"
-        :transReportShow="transReportShow"
-        :pptTitle="coverInfo.page.Title"
-        @transSet="getTransSet"
-        @cancel="transReportShow=false" 
-      /> -->
   </div>
 </template>
 
@@ -90,7 +62,6 @@
 import Cover from './components/Cover.vue';
 import CustomCover from './components/CustomCover.vue';
 import TransReport from './components/catalog/transReport.vue';
-//import {pageList} from './utils/mock';
 import {countComponentName,pptConfigInit,toTextProps,toJson,svg2Base64,svgData2Base64,getImgRealSize,calcScale,countStrSize,getShapeOptions,createRandomCode,getTableData,getChartInfo,pptInit,rgbaToHex } from './utils/untils';
 import {marginTop,modelConfig,pptSlideMaster} from './utils/config';
 import pptmixin from '../mixins/pptMixins';
@@ -119,12 +90,6 @@ export default {
           title:'封面',
           idName:'cover'
         },
-        /* page:{
-          Title:'ppt标题阿巴阿巴',
-          ReportType:'ppt副标题阿巴阿巴',
-          BackgroundImg:'https://hzstatic.hzinsights.com/ppt/bg3.jpg',
-          PptDate:'2022年7月'
-        } */
       },//封面信息
       backInfo:{
         id:-1,
@@ -322,14 +287,6 @@ export default {
       const length = this.pageList.length;
       for (let i = 0; i < length; i++) {
         let slide = pptx.addSlide({ masterName: pptSlideMaster.title });
-        /* slide.addText(this.pageList[i].title, {
-          placeholder:"slideTitle",
-          x:'10%',
-          y:'5.5%',
-          w:'68%',
-          h:'7%',
-          color:'333333'
-        }); */
         slide = this.setPPTTitle(slide,this.pageList[i])
         const elements = this.pageList[i].elements;
         const elLength = elements.length;
@@ -569,31 +526,6 @@ export default {
       if(res.Ret===200){
         this.$message.success(this.$t('MsgPrompt.publish_msg'))
         this.publishLoading.close()
-        //如果该ppt没有转成双周报
-        /* if(this.ReportId===0){
-          this.$confirm(
-            '检测到该PPT未转成双周报，是否现在转成双周报？',
-            '操作提醒',
-            {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning',
-            }
-          ).then(()=>{
-            this.transReportShow = true
-          }).catch(()=>{})
-        }else{
-          pptInterface.transReport({
-            PptId:parseInt(this.$route.query.id),
-          }).then(res=>{})  
-        } */
-        //如果该ppt已转成双周报,则发布成功后更新双周报
-        //需求池272 PPT生成报告后，PPT更新内容或报告更新内容两者互不影响 遂注释
-        /* if(this.ReportId!==0){
-          pptInterface.transReport({
-            PptId:parseInt(this.$route.query.id),
-          }).then(res=>{}) 
-        } */
       }
     },
     //将svgDom转为base64 png

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

@@ -578,20 +578,6 @@ export const pptSlideMasterEn = {
   title: "幻灯片母版",
 	objects: [
 		{
-			/* placeholder: {
-				options: {
-					name: "slideTitle",
-					type: "title",
-					x: "8%",
-					y: "5%",
-					w: "62%",
-					h: titleHeight + "%",
-					color: "333333",
-                    align:'left',
-                    valign:'middle',
-					fontSize:24*0.75,
-				},
-			}, */
 		},
 		{
 			image: {
@@ -609,9 +595,6 @@ export const pptSlideMasterEn = {
 export const pptLayout = { name: "myppt", width: 10, height: 7 }
 //ppt封面图
 export const pptCover = [
-    /* 'https://hzstatic.hzinsights.com/ppt/bg3.jpg',
-    'https://hzstatic.hzinsights.com/ppt/bg4.jpg',
-    'https://hzstatic.hzinsights.com/ppt/bg5.jpg', */
     require('@/assets/img/ppt_m/bg3.jpg'),
     require('@/assets/img/ppt_m/bg4.jpg'),
     require('@/assets/img/ppt_m/bg5.jpg'),

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

@@ -35,9 +35,6 @@ export const setting = {
                     if (cmd === 'FontName') { 
                         editor.dom.setStyle(nodeParent, 'font-family', val); 
                     } 
-                    /* if (cmd === 'mceApplyTextcolor') {
-                        editor.dom.setStyle(nodeParent,'color',val)
-                    } */
                 } else if (node.nodeName === 'UL' || node.nodeName === 'OL') { 
                     let li = editor.dom.select('li', node); 
                     if (cmd === 'FontSize') { 
@@ -46,9 +43,6 @@ export const setting = {
                     if (cmd === 'FontName') { 
                         editor.dom.setStyle(li, 'font-family', val); 
                     }
-                    /* if (cmd === 'mceApplyTextcolor') {
-                        editor.dom.setStyle(li,'color',val)
-                    } */
                 } 
             }
         });

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

@@ -1,6 +1,5 @@
 import { modelMap,pptLayout,pptSlideMaster,pptSlideMasterEn } from "./config";
 import { parse } from "himalaya";
-//import http from '@/api/http.js'
 //根据modelId返回组件名,用于component:is
 export const countComponentName = (modelId,type)=>{
     let componentName = type==='pre'?'formatPre':'format'

src/views/ppt_manage/pptdtl.vue

@@ -1,7 +1,4 @@
 <template>
-  <!-- 此页面不中英互译 -->
-    <!-- 此页面不中英互译 -->
-      <!-- 此页面不中英互译 -->
 	<div class="detail-container">
 		<template  v-if="pageitem.length">
 			<div id="pptdtl">
@@ -12,12 +9,12 @@
 						<p style="font-size:28px;">{{firstform.title}}</p>
 						<p style="display:flex; align-items:center; justify-content:center;margin:10px 0;">
 							<span style="display:inline-block; width:15px; margin-right:5px; border-top:1px solid #fff;"></span>
-							<span>弘则弥道（上海）投资咨询有限公司</span>
+							<span> </span>
 							<span style="display:inline-block; width:14px; height:14px; background:#fff; border-radius:100%; margin:0 5px;"></span>
 							<span>{{firstform.report_type}}</span>
 							<span style="display:inline-block; width:15px; margin-left:5px; border-top:1px solid #fff;"></span>
 						</p>
-						<p>FICC研究部</p>
+						<p> </p>
 						<p>{{firstform.ppt_date}}</p>
 						<p style="width:80%; height:1px; border-bottom:1px solid #fff; margin:21px auto 0;"></p>
 					</div>

src/views/ppt_manage/pptlist.vue

@@ -1,7 +1,4 @@
 <template>
-  <!-- 此页面不中英互译 -->
-    <!-- 此页面不中英互译 -->
-      <!-- 此页面不中英互译 -->
   <div id="pptlist">
     <el-card class="box-card">
       <div slot="header" class="header">
@@ -257,47 +254,13 @@ export default {
   },
   mounted() {
     this.getlist();
-    // document.onkeydown=e=>{
-    // 	let keyval=window.event.keyCode;
-    //     if( keyval===13 && this.$route.path === '/pptlist'){
-    // 		this.getlist();
-    //     }
-    // }
   },
   methods: {
     getpptdtl(id, auth) {
-      // pptdetail({ppt_id:id}).then(res =>{
-      // 	if( res.Ret === 200 ){
-      // 		let pptpage=res.result.ppt_pages || [];
-      // 		let firstform={
-      // 			title:res.result.ppt.title,
-      // 			report_type:res.result.ppt.report_type,
-      // 			ppt_date:res.result.ppt.ppt_date || http.dateFormatter(new Date(),false),
-      // 			img_url:pptpage[0].img_url,
-      // 			ppt_pages_id:parseInt(pptpage[0].ppt_pages_id),
-      // 			ppt_id:parseInt(pptpage[0].ppt_id),
-      // 			back_index:parseInt(pptpage[0].back_index)
-      // 		}
-      // 		let pageitem=[];
-      // 		pptpage.forEach((item,i)=>{
-      // 			if( i!=0 ){
-      // 				pageitem.push({
-      // 					title:item.title,
-      // 					ppt_pages_id:parseInt(item.ppt_pages_id),
-      // 					ppt_id:parseInt(item.ppt_id),
-      // 					resource_id:parseInt(item.resource_id)
-      // 				});
-      // 			}
-      // 		});
-      // 		sessionStorage.setItem('firstform',JSON.stringify(firstform));
-      // 		sessionStorage.setItem('pageitem',JSON.stringify(pageitem));
       sessionStorage.setItem("ppt_id", id);
       sessionStorage.setItem("ppt_auth", auth);
-      // this.$router.push({path:'/pptdtl'});
       let { href } = this.$router.resolve({ name: "预览ppt" });
       window.open(href, "_blank");
-      // 	}
-      // });
     },
     addPPT() {
       let { href } = this.$router.resolve({ path: "/addpptNew" });
@@ -343,7 +306,6 @@ export default {
     edititem(item) {
       //去编辑
       sessionStorage.setItem("ppt_auth", item.IsAuth);
-      // this.$router.push({path:'/editpptNew',query:{id:item.PptId}});
       let { href } = this.$router.resolve({
         path: "/editpptNew",
         query: { id: item.PptId },

src/views/predictEdb_manage/addPredicEdb.vue

@@ -410,12 +410,6 @@
       @ensureBack="saveDynamicDifferRule"
       @lookHistory="id => {toHistoryPage(id,$route.matched);lookEdbId=id;}"
     />
-
-    <!-- 指标历史记录 -->
-    <!-- <edbHistoryDialog
-      :isOpenDialog.sync="isLookHistory"
-      :edbId="lookEdbId"
-    /> -->
     
   </div>
 </template>
@@ -527,8 +521,6 @@ export default {
         ],
       },
       classifyArr: [],
-      /* predictTypeOptions:[], */
-      /* rulesTip: this.$t('PredictEditPage.rule_tip'), */
       rulesArr: [{ 
         endDate: "",
         predict_type: 1,
@@ -681,11 +673,6 @@ export default {
         this.filterNodes(res.Data.AllNodes || [])
         this.classifyArr = res.Data.AllNodes || [];
 
-        // if (this.$route.path == "/editpredictEdb") {
-        //   //将formData.classify转为数组的格式
-        //   this.formData.classify = this.findParentNodeHandle(this.classifyArr,this.formData.classify).reverse()
-        // } 
-
       });
     },
     findParentNodeHandle(arr, id) {
@@ -749,8 +736,6 @@ export default {
           ChartStyle: "",
           ChartType: 0,
           ChartWidth: 0,
-          // MaxData: Data.MaxValue,
-          // MinData: Data.MinValue,
           EdbInfoCategoryType: 1,
           EdbInfoType: 1,
           EdbName: this.formData.edbName,
@@ -856,9 +841,6 @@ export default {
         EndDate: dateArray[1] || "",
         Calendar: this.$refs.chartInfo.calendar_type,
         ChartType: this.$refs.chartInfo.chartInfo.ChartType,
-        // ETA1.0.5 去除了这两个参数
-        // SeasonStartDate: this.$refs.chartInfo.season_year[0] || "",
-        // SeasonEndDate: this.$refs.chartInfo.season_year[1] || "",
         DataDateType: this.formData.dateType,
         StartYear:StartYear || 0
       }
@@ -988,11 +970,6 @@ export default {
     },
 
     async setImageHandle(form) {
-      // let { Data } = await dataBaseInterface.uploadImgSvg(form);
-      // await preDictEdbInterface.setImg({
-      //   EdbInfoId: this.formData.edb_id,
-      //   ImageUrl: Data.ResourceUrl,
-      // });
       form.append("EdbInfoId", this.formData.edb_id);
       await preDictEdbInterface.setThumbnail(form)
     },
@@ -1043,8 +1020,6 @@ export default {
       if(frequency==='年度'){
         filterKey = [5,6,11,12]
       }
-      //this.predictTypeOptions = this.predictTypeSetting.filter(item=>{return !filterKey.includes(item.key)})
-     /*  this.predictTypeOptions = this.predictTypeSetting */
       //年度指标时，将不支持的规则类型重置
       this.isNeedWatch = false
       this.rulesArr.forEach(item=>{
@@ -1075,13 +1050,6 @@ export default {
           return this.$message.warning('所选日期不能和其他规则重复')
           
       }
-      // if(index > 0) {
-      //   let prev_date = this.rulesArr[index-1].endDate;
-      //   if(this.$moment(prev_date).valueOf() >= this.$moment(value).valueOf()){
-      //     this.$message.warning('所选日期不能小于上个规则的日期')
-      //     this.rulesArr[index].endDate = '';
-      //   }
-      // }
       this.rulesArr[index].predict_type===16 && this.rulesArr[index].endDate && this.checkReverseYearDate(index)
     },
 

src/views/predictEdb_manage/components/chartInfo.vue

@@ -3,15 +3,6 @@
         <div class="header">
             <!-- 曲线图时间筛选 -->
             <template v-if="chartInfo.ChartType==1">
-			<!-- <el-button
-				type="primary"
-				v-for="item in yearSelector"
-				:key="item.value"
-				size="mini"
-				:plain="item.value !== year_select"
-				class="year-btn"
-				@click.native="changeYear(item)"
-				>{{ item.name }}</el-button> -->
                 <el-popover 
                     placement="bottom" 
                     trigger="click" 
@@ -37,26 +28,13 @@
                 >{{dateTip}}</el-button>
             </template>
             <!-- 季节图时间选择 -->
-            <!-- <template v-if="chartInfo.ChartType==2">
-                <date-picker
-                    v-model="season_year"
-                    type="month"
-                    value-type="format"
-                    range
-                    placeholder="年份日期选择"
-                    @change="seasonYearChange"
-                />
-            </template> -->
             <div v-else-if="chartInfo.ChartType === 2" @click="openDateDia" class="date-setting" style="display: inline-block;">
 				{{ season_year && season_year.length>0 ? season_year[0]+'~'+season_year[1]:"年份日期选择" }}
 			</div>
-            <!-- <span v-permission="permissionBtn.predictEdbPermission.edbPreData_switchSeason"
-                class="change-chart-btn" @click="chartTypeChange">切换{{chartInfo.ChartType==1?'季节性图':'曲线图'}}</span> -->
             <el-button type="primary" size="mini" class="btn-sty" style="margin-left:auto;"
                 v-permission="permissionBtn.predictEdbPermission.edbPreData_switchSeason"
                 @click="chartTypeChange">
                 <i class="el-icon-sort" style="transform: rotate(90deg);"></i>
-                    <!-- 切换{{chartInfo.ChartType==1?'季节性图':'曲线图'}} -->
                     {{chartInfo.ChartType===1?$t('Edb.switch_season'):$t('Edb.switch_curve')}}
             </el-button>
         </div>
@@ -131,9 +109,6 @@ export default {
             deep:true,
             immediate:true
         },
-        // lang(n){
-        //     this.changeLanguage(n)
-        // }
     },
     data() {
         return {
@@ -165,9 +140,6 @@ export default {
             isPredictorChart:true, // 复用了相同的逻辑，为了预测指标图表和正常的图库图表区分开
         }
     },
-    mounted() {
-        // this.changeLanguage(this.lang)
-    },
     methods: {
         handleInitData(){
             this.tableData=[

src/views/predictEdb_manage/components/dynamicRingdiffer.vue

@@ -327,27 +327,6 @@ export default {
 				nullValueWay: 0,
 				maxNullWay: 1
 			},//空值处理
-			/* nullWayOptions: [
-				{ label: '查找前后35天最近值',value: 0 },
-				{ label: '不计算',value: 1 },
-				{ label: '前值填充',value: 2 },
-				{ label: '后值填充',value: 3 },
-				{ label: '等于0',value: 4 },
-			], */
-			/* formTips: {
-				'null-val': `1、查找前后35天最近值：在参与计算的日期序列上某指标无值时，该指标往前/往后找距离最近的值作为当天的值进行计算，遍历允许跨年，往前最多35天，往后最多35天<br>
-				2、不计算：只要有一个指标在某个日期没有值(即空值)，则计算指标在该日期没有值 <br>
-				3、前值填充：空值优先以最近的前值填充，没有前值时，用后值填充 <br>
-				4、后值填充：空值优先以最近的后值填充，没有前值时，用后值填充 <br>
-				5、等于0：空值以0值参与计算 <br>
-				注意：此处缺失值的处理，作用于数据全部时间段`,
-				'max-null-val': `MAX、MIN公式中指标存在空值时按如下规则处理：<br>
-				1、等于0，空值用0参与计算；<br>
-				2、跳过空值，去除空值指标，剩余指标进行计算，若该日期所有指标均为空值，则该日期无值；`,
-				'formula':`1、支持新增分段，实现不同分段使用不同的计算公式，若未新增分段，则所有日期序列用统一公式计算<br>
-				2、新增分段需配置新公式和时间节点，在时间节点之前（不含）使用新公式，在时间节点之后（含）使用已配置公式，每个分段公式支持修改<br>
-				3、分段时间节点不允许重复，不允许超出第一个指标的日期区间`
-			}, */
 
       resultData: [],//
 		};

src/views/predictEdb_manage/components/edbDetail.vue

@@ -9,7 +9,6 @@
                 ref="chartInfo"
             />
             <div class="info" style="display: flex;justify-content: flex-end;">
-            <!--   <span>数据来源：{{edbData.EdbInfo.SourceName}}</span> -->
                 <span v-if="edbData.EdbInfo.SysUserRealName"><!-- 添加人 -->{{$t('Edb.creater')}}：{{edbData.EdbInfo.SysUserRealName}}</span>
             </div>
             <ul
@@ -116,9 +115,6 @@ export default {
 				StartDate: dateArray[0]||'',
 				EndDate: dateArray[1]||'',
                 ChartType:this.$refs.chartInfo.chartInfo.ChartType,
-                // ETA1.0.5 去除了这两个参数
-                // SeasonStartDate:this.$refs.chartInfo.season_year[0]||'',
-                // SeasonEndDate:this.$refs.chartInfo.season_year[1]||'',
                 Calendar:this.$refs.chartInfo.calendar_type,
                 StartYear:StartYear || 0
 			}).then(res=>{
@@ -177,11 +173,6 @@ export default {
         },
 
         async setImageHandle(form) {
-            // let { Data } = await dataBaseInterface.uploadImgSvg(form);
-            // await preDictEdbInterface.setImg({
-            //     EdbInfoId: this.id,
-            //     ImageUrl: Data.ResourceUrl,
-            // });
             form.append("EdbInfoId", this.id);
             await preDictEdbInterface.setThumbnail(form)
         },

src/views/predictEdb_manage/components/edbDia.vue

@@ -21,20 +21,6 @@
 				:rules="formRules"
       >
         <el-form-item label="添加到分类" prop="classify">
-          <!-- <el-select
-            v-model="formData.classify"
-            placeholder="请选择分类"
-            style="width: 90%"
-            clearable
-          >
-            <el-option
-              v-for="item in classifyArr"
-              :key="item.ClassifyId"
-              :label="item.ClassifyName"
-              :value="item.ClassifyId"
-            >
-            </el-option>
-          </el-select> -->
           <el-cascader
                 v-model="formData.classify"
                 :options="classifyArr"

src/views/predictEdb_manage/predictEdb.vue

@@ -14,12 +14,6 @@
 							type="primary" @click="addEdbHandle"><!-- 添加指标 -->{{$t('EtaBasePage.add_edb_btn')}}</el-button>
 						<el-button v-permission="permissionBtn.predictEdbPermission.edbPreData_calcuEdb"
 							type="primary" @click="addComputedHandler" style="margin-left:0;"><!-- 计算指标 -->{{$t('EtaBasePage.calculation_edb_btn')}}</el-button>
-						<!-- <change-lang 
-							v-permission="permissionBtn.predictEdbPermission.edbPreData_switchEn"
-							:lang="currentLang" 
-							style="height: 32px;" 
-							@changeLang="changeLangHandle"
-						/> -->
 				</div>
 				<div class="search-cont" v-loading="searchLoading">
 					<el-select
@@ -115,12 +109,6 @@
 								style="display: flex; align-items: center"
 								v-if="select_node===data.UniqueCode&&data.HaveOperaAuth"
 							>
-								<!-- <img
-									src="~@/assets/img/data_m/move_ico.png"
-									alt=""
-									style="width: 14px; height: 14px; margin-right: 8px"
-									v-if="data.Button.MoveButton"
-								/> -->
 								<!-- 添加子项 -->
 								<img
 									src="~@/assets/img/set_m/add.png"
@@ -146,24 +134,7 @@
 									@click.stop="removeNode(node, data)"
 									v-if="data.Button.DeleteButton&&!data.EdbInfoId&&isEdbBtnShow('edbPreData_classifyOpt_delete')"
 								/>
-								<!-- 查看预测规则 -->
-								<!-- <i class="el-icon-view" v-if="data.EdbInfoId&&isEdbBtnShow('edbPreData_checkPreRule')" @click.stop="viewNode(node,data)"></i> -->
-								<!-- 查看关联图表 -->
-								<!-- <img 
-									v-if="data.Button.ShowChartRelation&&isEdbBtnShow('edbPreData_checkRelatedChart')" 
-									@click.stop="showAssociateChart=true,showAssociateComputeData=false"
-									src="~@/assets/img/icons/associate_chart.png" 
-									style="width: 14px; height: 14px;margin-left: 8px"
-									alt=""
-								/> -->
-								<!-- 查看关联指标 -->
-								<!-- <img 
-									v-if="data.Button.ShowEdbRelation&&isEdbBtnShow('edbPreData_checkRelatedEdb')" 
-									@click.stop="showAssociateComputeData=true,showAssociateChart=false"
-									src="~@/assets/img/icons/associate_data.png" 
-									style="width: 14px; height: 14px;margin-left: 8px"
-									alt=""
-								/> -->
+							
 							</span>
 						</span>
 					</el-tree>
@@ -626,29 +597,7 @@ export default {
 			calulateList:[],
 			computed_type:0,//打开弹窗的类型
 
-			/* tips: new Map([
-				[31,formulaTip.get(4)],
-				[42,formulaTip.get(5)],
-				[32,formulaTip.get(6)],
-				[33,formulaTip.get(7)],
-				[39,formulaTip.get(8)],
-				[43,formulaTip.get(12)],
-				[44,formulaTip.get(13)],
-				[45,formulaTip.get(14)],
-				['joint',formulaTip.get('joint')],
-				[46,formulaTip.get(22)],
-				[49,formulaTip.get(35)],
-				[50,formulaTip.get(37)],
-				[54,formulaTip.get(51)],
-				[55,formulaTip.get(52)],
-				[56,formulaTip.get(53)],
-				['toMonthSeason',formulaTip.get('toMonthSeason')],
-				['accumulate',formulaTip.get('accumulate')],
-				[64,formulaTip.get(61)],
-				[65,formulaTip.get(62)],
-				[66,formulaTip.get(63)],
-				['alpha',formulaTip.get('alpha')]
-			]),//公式说明 */
+			
 
 			isShowRuleDialog: false,
 			showRules: [],
@@ -792,10 +741,6 @@ export default {
 		search_txt(newval) {
 			if(newval) {
 				let search_obj = this.searchOptions.find(_ => _.EdbInfoId === newval);
-				// let deep_arr = _.cloneDeep(this.treeData);
-				// 查找图表的分类父级id
-				// let arr = this.findParentNodeHandle(deep_arr, search_obj.ClassifyId).reverse(); // 父的父的父-父的父-父
-				// this.defaultShowNodes = arr;
 				this.select_node = search_obj.UniqueCode;
 				this.$refs.treeRef.setCurrentKey(this.select_node);
 				// 重置筛选状态
@@ -822,15 +767,6 @@ export default {
 				setTimeout(() => {
 					const dom = document.getElementById(`node${this.select_node}`)||{}
 					const parentDom = document.getElementsByClassName('target_tree')[0];
-					/* if (dom.offsetTop > parentDom.offsetHeight) {
-						parentDom.scrollTo({
-							top: dom.offsetTop - parentDom.offsetHeight / 2,
-							left: 0,
-							behavior: "smooth",
-						});
-					} */
-					//parent可视区间：[scrollTop,scrollTop+offsetHeight]
-					//node位置:node.offsetTop
 					const overTop = dom.offsetTop+dom.clientHeight<parentDom.scrollTop
 					const overBottom = dom.offsetTop+dom.clientHeight+30>parentDom.scrollTop+parentDom.offsetHeight
 					if(overTop){
@@ -938,11 +874,6 @@ export default {
     },
 
     async setImageHandle(form) {
-      // let { Data } = await dataBaseInterface.uploadImgSvg(form);
-      // await preDictEdbInterface.setImg({
-      //   EdbInfoId: this.select_id,
-      //   ImageUrl: Data.ResourceUrl,
-      // });
 			form.append("EdbInfoId", this.select_id);
       await preDictEdbInterface.setThumbnail(form)
     },
@@ -1198,8 +1129,6 @@ export default {
 							break
 					}
 					
-					// this.computed_type =[47,48].includes(Source)?'joint': Source;
-					// this.computed_type = [72,73].includes(Source)? 'alpha': Source;
 				}
 
 			})
@@ -1347,76 +1276,6 @@ export default {
 			}
 		},300),
 
-		/* 切换中英文 */
-		// changeLangHandle: _.debounce(async function (lang){
-		// 	this.search_txt = '';
-		// 	this.currentLang = lang;
-		// 	await dataBaseInterface.setUserLang({
-		// 		ConfigCode: 'predict_edb_language',
-		// 		ConfigValue: lang === 'en' ? 'EN' : 'CN'
-		// 	})
-		// },200),
-
-		/* 编辑英文 */
-		// openEnNameDia(info){
-		// 	this.formItemArray=[{
-		// 		label:/* '指标名称' */ this.$t('Edb.Detail.e_name'),
-		// 		value:info.EdbName,
-		// 		key:'EdbName',
-		// 		notEdit:true
-		// 	}]
-		// 	// 中文单位有 才能编辑英文单位
-		// 	if(info.Unit && info.Unit!='无'){
-		// 		this.formItemArray.push({
-		// 			label:this.$t('Edb.Detail.e_unit') /* '单位' */,
-		// 			value:info.Unit,
-		// 			key:'Unit',
-		// 			notEdit:true
-		// 		},
-		// 		{
-		// 			label:this.$t('Edb.Detail.e_en_name')/* '英文指标名称' */,
-		// 			value:info.EdbNameEn,
-		// 			key:'EdbNameEn',
-		// 			placeholder: this.$t('Edb.InputHolderAll.input_common',{label:this.$t('Edb.Detail.e_en_name')}) /* '请输入英文指标名称' */
-		// 		},
-		// 		{
-		// 			label:this.$t('Edb.Detail.e_en_unit') /* '英文单位' */,
-		// 			value:info.UnitEn,
-		// 			key:'UnitEn',
-		// 			placeholder:this.$t('Edb.InputHolderAll.input_common',{label:this.$t('Edb.Detail.e_en_unit')})  /* '请输入英文单位' */
-		// 		})
-		// 	}else{
-		// 		this.formItemArray.push({
-		// 			label:this.$t('Edb.Detail.e_en_name') /* '英文指标名称' */,
-		// 			value:info.EdbNameEn,
-		// 			key:'EdbNameEn',
-		// 			placeholder:this.$t('Edb.InputHolderAll.input_common',{label:this.$t('Edb.Detail.e_en_name')}) /* '请输入英文指标名称' */
-		// 		})
-		// 	}
-
-		// 	this.setEnName = true
-		// },
-
-		// updateEnName(item){
-		// 	let params={
-		// 		EdbInfoId: Number(this.select_id),
-		// 		...item
-		// 	}
-		// 	dataBaseInterface.edbInfoEditEn(params).then(res=>{
-		// 		if(res.Ret ==200){
-		// 			this.$message({
-		// 				message:res.Msg,
-		// 				type:"success"
-		// 			})
-		// 			this.detail_show_chart ? this.$refs.detailComponentRef.getDetail() : this.$refs.detailComponentRef.getData();
-		// 			this.setEnName = false
-		// 			this.getTreeData({
-		// 				code: this.select_node,
-		// 				id: this.select_id
-		// 			});
-		// 		}
-		// 	})
-		// },
 
 		clickEdbNameHandle() {
 			this.$refs.detailComponentRef.changeLangOptions();

src/views/report_manage/cloudDisk.vue

@@ -479,15 +479,6 @@ import 'streamsaver/examples/zip-stream'
             downloadHint.close()
           })
         }else if(row.ItemType==2){
-          /* downloadFileByUrl(row.ResourceUrl).then(res=>{
-            // console.log(res);
-            downloadByFlow(res,null,row.ItemName)
-            this.$message.success(row.ItemName + this.$t('ReportManage.CloudPage.download_success_msg'))
-          }).catch((err)=>{
-            this.$message.error(row.ItemName + '下载失败')
-          }).finally(()=>{
-            downloadHint.close()
-          }) */
           this.handleDownloadResource(row.ResourceUrl,row.ItemName,()=>{
             this.$message.success(row.ItemName + this.$t('ReportManage.CloudPage.download_success_msg'))
             downloadHint.close()
@@ -548,19 +539,7 @@ import 'streamsaver/examples/zip-stream'
             })
           }else if(item.ItemType==2){
             // 下载文件
-            /* downloadFileByUrl(item.ResourceUrl).then(res=>{
-              // console.log(res);
-              downloadByFlow(res,null,item.ItemName)
-              this.$message.success(item.ItemName + this.$t('ReportManage.CloudPage.download_success_msg'))
-            }).catch((err)=>{
-              this.$message.error(item.ItemName+'下载失败')
-            }).finally(()=>{
-              downNumber++
-              if(downNumber == selectLength){
-                downloadHint.close()
-                this.$refs.tableRef.clearSelection()
-              }
-            }) */
+            
             const that = this
             this.handleDownloadResource(item.ResourceUrl,item.ItemName,()=>{
                 this.$message.success(item.ItemName + this.$t('ReportManage.CloudPage.download_success_msg'))

src/views/report_manage/dayWeekUpdate.vue

@@ -88,11 +88,6 @@
         @click="handleSave"
         >保存</el-button
       >
-      <!-- <el-button
-        style="width: 100px;"
-        @click="handleSave"
-        >取消</el-button
-      > -->
 
     </div>
 

src/views/report_manage/dayilyNews.vue

@@ -29,7 +29,6 @@
             <span class="editsty" @click="translateHandle(item)" v-if="!item.ContentEn">一键翻译</span>
           </div>
           <div>
-            <!-- <span style="margin-right: 40px;color: #666">发件人：{{item.FromName}}</span> -->
             <span style="margin-right: 20px;color: #409eff;cursor: pointer;" @click="editNews(item)">编辑</span>
             <span class="deletesty" @click="delNews(item,index)">删除此条</span>
           </div>
@@ -260,18 +259,6 @@ export default {
       if(!this.newsList.length) return this.$message.warning('暂无内容')
       const { classify,title,abstract,author,frequency,overview } = this.configForm;
       if(!classify || !title || !abstract||!overview) this.$message.warning('请先设置默认值')
-      
-/*       const params = {
-        ClassifyIdFirst: Number(JSON.parse(classify[0]).id),
-        ClassifyNameFirst: JSON.parse(classify[0]).name,
-        ClassifyIdSecond: classify.length>1 ? Number(JSON.parse(classify[1]).id) : 0,
-        ClassifyNameSecond: classify.length>1 ? JSON.parse(classify[1]).name : '',
-        Title:title,
-        Abstract: abstract,
-        Author: author,
-        Frequency: frequency,
-        Overview:overview
-      } */
 
       dayApi.translateReport(/* params */).then(res => {
         if(res.Ret !== 200) return

src/views/report_manage/everyday.vue

@@ -84,12 +84,6 @@
             <span v-else style="color: #51cc87">已发布</span>
           </template>
         </el-table-column>
-        <!-- <el-table-column label="PV/UV" align="center" width="200"> -->
-        <!-- :render-header="renderHeader" -->
-        <!-- <template slot-scope="scope">
-            {{ scope.row.Pv + "/" + scope.row.Uv }}
-          </template>
-        </el-table-column> -->
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <div v-if="scope.row.PublishStatus == 1">
@@ -338,11 +332,8 @@ export default {
         videoUploadURL: process.env.VUE_APP_API_ROOT + "/report/uploadImg", //上传url
         fileUploadURL: process.env.VUE_APP_API_ROOT + "/report/uploadImg", //上传url 更多上传介绍 请访问https://www.froala.com/wysiwyg-editor/docs/options
         imageDefaultWidth: false,
-        // imageEditButtons:['imageAlign', 'imageCaption', 'imageRemove', '|', 'imageLink', 'linkOpen', 'linkEdit', 'linkRemove', '-', 'imageDisplay', 'imageStyle', 'imageAlt', 'imageSize'],
         quickInsertButtons: ["image", "table", "ul", "ol", "hr"], //快速插入项
         toolbarVisibleWithoutSelection: true, //是否开启 不选中模式
-        // disableRightClick:true,//是否屏蔽右击
-        // colorsHEXInput:false,//关闭16进制色值
         toolbarSticky: false, //操作栏是否自动吸顶
         // zIndex:99999,
         saveInterval: 0,
@@ -598,11 +589,6 @@ export default {
     },
     //编辑的事件
     particularsClicks(item) {
-      // if(!item.PublishStatus==1) {
-      //  this.primaryBtn=false;
-      // }else {
-      //    this.primaryBtn=true;
-      // }
       morningPaper
         .articleDetail({
           ArticleId: item.ArticleId,

src/views/report_manage/mixins/editor.js

@@ -53,25 +53,13 @@ export default {
         imageDefaultWidth: false,
         quickInsertButtons: ["image", "table", "ul", "ol", "hr"], //快速插入项
         toolbarVisibleWithoutSelection: true, //是否开启 不选中模式
-        // disableRightClick:true,//是否屏蔽右击
-        // colorsHEXInput:false,//关闭16进制色值
+        
         toolbarSticky: false, //操作栏是否自动吸顶
-        // zIndex:99999,
         saveInterval: 0,
-        /* 				saveParam: 'content',
-			saveURL: process.env.VUE_APP_API_ROOT+'/report/saveReportContent',
-			saveMethod: 'POST',
-			saveParams: {}, */
         events: {
-          // 'froalaEditor.initialized':function(){
-          //   console.log('initialized', this);
-          // },
           //this.editor 定义在vue data 中
           initialized: function () {
-            // this.editor = editor;
             that.editor = this;
-            // that.editor.html.set(that.value);
-            // that.setHtml()
           },
           keyup: function (e, editor) {
             //添加事件，在每次按键按下时，都记录一下最后停留位置

src/views/report_manage/mixins/reportMixin.js

@@ -125,25 +125,13 @@ export default {
         imageDefaultWidth: false,
         quickInsertButtons: ["image", "table", "ul", "ol", "hr"], //快速插入项
         toolbarVisibleWithoutSelection: true, //是否开启 不选中模式
-        // disableRightClick:true,//是否屏蔽右击
-        // colorsHEXInput:false,//关闭16进制色值
         toolbarSticky: false, //操作栏是否自动吸顶
         // zIndex:99999,
         saveInterval: 0,
-        /* 				saveParam: 'content',
-			saveURL: process.env.VUE_APP_API_ROOT+'/report/saveReportContent',
-			saveMethod: 'POST',
-			saveParams: {}, */
         events: {
-          // 'froalaEditor.initialized':function(){
-          //   console.log('initialized', this);
-          // },
           //this.editor 定义在vue data 中
           initialized: function () {
-            // this.editor = editor;
             that.editor = this;
-            // that.editor.html.set(that.value);
-            // that.setHtml()
           },
           keyup: function (e, editor) {
             //添加事件，在每次按键按下时，都记录一下最后停留位置

src/views/report_manage/pdfList.vue

@@ -30,10 +30,6 @@
                             style="color:#409EFF;"
                         >{{row.PdfUrl}}</a>
                     </span>
-                    <!-- <div v-else-if="column.key==='ShareUrl'" class="cell-item-copy">
-                        <span class="text-ellipsis">{{row.ShareUrl}}</span>
-                        <span class="copy-btn" @click="copyLink(row)">复制</span>
-                    </div> -->
                     <span v-else class="text-ellipsis">{{row[column.key]}}</span>
                 </template>
             </el-table-column>

src/views/report_manage/priceDriven.vue

@@ -198,12 +198,6 @@ export default {
 		},
     /* 获取品种 */
     getClassify() {
-      /* priceApi.classifyList().then((res) => {
-        if (res.Ret !== 200) return;
-
-        this.varietyList = res.Data || [];
-        this.init();
-      }); */
       //接口更换
       departInterence.getTagTree({
         IncludeDisableTag:1

src/views/report_manage/reportEn/reportEditor.vue

@@ -829,17 +829,6 @@ export default {
 				}else if(tp==='submit'){
 					this.submitReport()
 				}
-			// if (tp == 'yl') { //预览
-			// 	sessionStorage.setItem('reportdtl', JSON.stringify(params));
-			// 	let { href } = this.$router.resolve({ name: '预览报告' });
-			// 	window.open(href, '_blank');
-			// 	return false;
-			// }
-			// if (tp == 'fb') {
-			// 	this.isPublishloading = true;
-			// }else { //存草稿
-			// 	this.reporteditMsg(params,tp)
-			// }
 		},
 		submitReport(){
 			this.$confirm(this.$t('ReportManage.smart_msg.submit_approval'),this.$t('Confirm.prompt'),{
@@ -981,34 +970,7 @@ export default {
 			reportEnInterface.classifyList(params).then((res) => {
 				if (res.Ret == 200 && Array.isArray(res.Data.List)) {
 					this.optionsArr = res.Data.List|| []
-					// res.Data.List.forEach(item => {
-					// 	let newitem = {
-					// 		label: item.ClassifyName,
-					// 		value: JSON.stringify({
-					// 			l: item.ClassifyName,
-					// 			v: parseInt(item.Id),
-					// 		}),
-					// 		HasTeleconference:item.HasTeleconference
-					// 	};
-					// 	if (item.Child&&item.Child.length > 0) {
-					// 		let childnode = [];
-					// 		item.Child.forEach((itemchild, i) => {
-					// 			childnode.push({
-					// 				label: itemchild.ClassifyName,
-					// 				value: JSON.stringify({
-					// 					l: itemchild.ClassifyName,
-					// 					v: parseInt(itemchild.Id),
-					// 				}),
-					// 				HasTeleconference:itemchild.HasTeleconference
-					// 			});
-					// 		});
-					// 		newitem.children = childnode;
-					// 	} else {
-					// 		newitem.children = undefined;
-					// 		newitem.disabled=true
-					// 	}
-					// 	this.optionsArr.push(newitem);
-					// });
+					
 					this.optionsArr.map(itemOne =>{
 						itemOne.label = itemOne.ClassifyName
 						itemOne.value = JSON.stringify({
@@ -1092,10 +1054,6 @@ export default {
       }
     }
   }
-	/* #leftfroala {
-		flex: 1;
-		max-width: calc(100vw - 750px);
-	} */
 	#rightitems {
 		width: 500px;
 		flex: 500px 0 0;
@@ -1141,9 +1099,6 @@ export default {
 				width: 100%;
 				height: auto;
 			}
-			// .source-identification{
-			// 	text-align: left;
-			// }
 		}
 		.loaded-text{
 			height: 20px;

src/views/report_manage/reportEn/reportlist.vue

@@ -210,56 +210,7 @@
               </span>
               <span v-else-if="item.key==='Frequency'">{{ getFrequencyTrans(row.Frequency) }}</span>
               <span v-else-if="item.key==='handle'">
-                <!-- 操作 -->
-                                <!-- 未发布,待提交 -->
-                                <!-- <template v-if="[1,3].includes(scope.row.State)">
-                    <span class="editsty" @click="publishreport(scope.row)"
-                        v-if="scope.row.CanEdit&&scope.row.State===1
-                            &&permissionBtn.isShowBtn('reportManageBtn','reportManage_publish')"
-                    >{{$t('ReportManage.smart_btn.publish')}}</span>
-                    <span class="editsty" @click="handleSubmitReport(scope.row)"
-                        v-if="scope.row.CanEdit&&scope.row.State===3
-                            &&permissionBtn.isShowBtn('reportManageBtn','reportManage_publish')"
-                    >{{$t('ReportManage.smart_btn.submission')}}</span>
-                    <span v-permission="permissionBtn.reportManageBtn.reportManage_reportEdit" class="editsty"
-                        @click="editreport(scope.row, 'edit')" v-if="scope.row.CanEdit">{{$t('Table.edit_btn')}}</span>
-                    <span v-permission="permissionBtn.reportManageBtn.reportManage_reportEdit" class="editsty"
-                        @click="editreport(scope.row, 'editing')" v-else>{{ scope.row.Editor || "" }}{{$t('ReportManage.smart_btn.editing')}}</span>
-                    <span v-permission="permissionBtn.reportManageBtn.reportManage_reportDel" class="deletesty"
-                        @click="deleteitem(scope.row)" v-if="scope.row.CanEdit">{{$t('Table.delete_btn')}}</span>
-                </template> -->
-                <!-- 已发布,已通过 -->
-                <!-- <template v-if="[2,6].includes(scope.row.State)">
-                    <span v-if="scope.row.State===2&&permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_cancelPublish)"
-                        @click="canclepublish(scope.row)" style="color: red; cursor: pointer">{{$t('ReportManage.smart_btn.withdraw')}}</span>
-                    <span v-if="scope.row.State===6&&permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_cancelPublish)"
-                        @click="cancelReport(scope.row)" style="color: red; cursor: pointer">{{$t('ReportManage.smart_btn.withdraw')}}</span>
-                    <span
-                        v-if="scope.row.MsgIsSend == 0 && permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_sendMsg)"
-                        style="color: #4099ef; cursor: pointer" @click="messageSend(scope.row)">{{$t('ReportManage.smart_push_notification_btn')}}</span>
-                    <span
-                        v-else-if="scope.row.MsgIsSend != 0&&permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_sendMsg)"
-                        style="color: red">{{$t('ReportManage.smart_notification_pushed')}}</span>
-                </template> -->
-                <!-- 待审批,已驳回 -->
-                <!-- <template v-if="[4,5].includes(scope.row.State)">
-                    <span v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_cancelPublish)"
-                        @click="cancelReport(scope.row)" style="color: red; cursor: pointer">{{$t('ReportManage.smart_btn.withdraw')}}</span>
-                </template> -->
-                <!-- 音频上传和下载,跟State无关 -->
-                <!-- <span style="color: #46c371; cursor: pointer"
-                    v-if="![$t('ReportManage.smart_btn.morning_paper'), $t('ReportManage.smart_btn.weekly')].includes(scope.row.ClassifyNameFirst)&&permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_audioUpload)"
-                    @click="openupload(scope.row.Id)">{{$t('ReportManage.smart_audio_upload_btn')}}</span>
-                <a v-permission="permissionBtn.reportManageBtn.reportManage_audioDownload"
-                    :href="hostapi + '?ReportId=' + parseInt(scope.row.Id)" v-if="
-                    scope.row.VideoUrl &&
-                    ![$t('ReportManage.smart_btn.morning_paper'), $t('ReportManage.smart_btn.weekly')].includes(scope.row.ClassifyNameFirst)
-                " :download="scope.row.VideoName" style="cursor: pointer; color: #4099ef">{{$t('ReportManage.smart_audio_download_btn')}}</a>
-                <span v-permission="permissionBtn.reportManageBtn.reportManage_audioDownload"
-                    style="cursor: pointer; color: #4099ef" v-if="
-                    [$t('ReportManage.smart_btn.morning_paper'), $t('ReportManage.smart_btn.weekly')].includes(scope.row.ClassifyNameFirst) &&
-                    scope.row.ChapterVideoList.length > 0
-                " @click="handleShowDownloadAudio(scope.row)">{{$t('ReportManage.smart_audio_download_btn')}}</span> -->
+                
                 <!-- 前面的按钮 -->
                 <span v-for="bu in getbuttonList(row,'f')" :key="bu.label" 
                 :class="[['删除'].includes(bu.label)?'deletesty':'editsty',
@@ -377,13 +328,7 @@
                 </el-select>
                 <div class="user-box">
                   <div style="margin-top:10px" class="box">
-                    <!-- <el-tooltip 
-                      effect="dark" 
-                      :content="item.Email" 
-                      placement="top"
-                      v-for="(item,index) in popData.customValue"
-                      :key="item.Id"
-                      > -->
+                    
                       <el-tag
                       closable
                       v-for="(item,index) in popData.customValue"
@@ -392,7 +337,6 @@
                       @close="handleDelSelectCompany(item,index)">
                       {{item.CompanyName}}
                     </el-tag>
-                    <!-- </el-tooltip> -->
                   </div>
                 </div>
               </div>
@@ -539,7 +483,6 @@ export default {
         publishState:''
       },
       optionsArr:[],
-      /* frequencyArr: [ '年度','半年度','季度','月度','双周度','周度','日度','不定时' ], */
 
       listLoading: false,
       tableData: [],
@@ -682,17 +625,7 @@ export default {
 			let params={CurrentIndex:0,PageSize:1000,KeyWord:''};
 			reportEnInterface.classifyList(params).then((res) => {
 				if( res.Ret==200&&Array.isArray(res.Data.List) ){
-					// res.Data.List.forEach((item,index)=>{
-					// 	let newitem={label:item.ClassifyName,value:item.ClassifyName};
-					// 	if( item.Child ){
-					// 		let childnode=[];
-					// 		item.Child.forEach((itemchild,i)=>{
-					// 			childnode.push({label:itemchild.ClassifyName,value:itemchild.ClassifyName});
-					// 		});
-					// 		newitem.children=childnode;
-					// 	}
-					// 	this.optionsArr.push(newitem);
-					// });
+					
           this.optionsArr= res.Data.List || []
 				}
 			});
@@ -744,10 +677,6 @@ export default {
         'view-log': this.goSendlog
       }
 
-      // if(key==='editing'){
-      //   this.$message.warning('该研报正在编辑，不可重复编辑')
-      //   return
-      // }
 
       handleMap[key](row);
     },

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

@@ -169,7 +169,7 @@
                     <el-dropdown-item 
                       :command="{type:'adTag',item}" 
                       v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportMange_chapter_editTag)"><!-- 添加标签 -->{{$t('ReportManage.ReportList.add_labels_section')}}</el-dropdown-item>
-                    <!-- <el-dropdown-item :command="{type:'upAudio',item}">上传录音{{$t('ReportManage.ReportList.up_recording_lable')}}</el-dropdown-item> -->
+                    
                   </el-dropdown-menu>
                 </el-dropdown>
               </div>
@@ -207,34 +207,7 @@
                 placeholder="请输入章节名称"
               />
           </el-form-item>
-          <!-- <el-form-item prop="varietys">
-              <template slot="label">
-                  <el-tooltip class="item" effect="dark">
-                      <div slot="content" v-html="varietyTip"></div>
-                      <div>
-                          <span>{{ $t('ReportManage.CategoryList.related_variety') }}</span>
-                          <i class="el-icon-info"></i>
-                      </div>
-                  </el-tooltip>
-              </template>
-
-              <el-cascader
-                  :options="reportVarietyOpts" 
-                  v-model="chapterInfo.varietys" 
-                  placeholder="请选择关联品种"
-                  collapse-tags
-                  :show-all-levels="false"
-                  :props="{
-                    value:'PermissionId',
-                    label:'PermissionName',
-                    children:'Child',
-                    multiple: true,
-                    emitPath:false
-                  }" 
-                  style="width:350px;"
-                  clearable
-              ></el-cascader>
-          </el-form-item> -->
+          
           <el-form-item prop="editors" :label="$t('ReportManage.ReportList.label_chap_editor')">
             <el-cascader
               v-model="chapterInfo.editors"
@@ -300,45 +273,6 @@
     </m-dialog>
 
 
-    <!-- 上传音频弹窗 -->
-    <!-- <m-dialog
-      :show.sync="isOpenUploadAudio"
-      :title="$t('ReportManage.smart_audio_upload_btn')"
-      width="450px"
-      @close="isOpenUploadAudio=false;uploadAudioLoading=false;"
-    >
-        <div class="edit-tag-wrap">
-            <div>
-              <el-input
-                v-model="chapterInfo.audioName"
-                readonly
-                style="width: 65%"
-                :placeholder="$t('ReportManage.ReportList.upload_audio_file')"
-              ></el-input>
-              <el-upload
-                style="display: inline-block; margin-left: 10px"
-                action=""
-                accept=".mp3,.m4a"
-                :http-request="handleUpload"
-                :before-upload="handelBeforeUploadAudio"
-                :show-file-list="false"
-                :disabled="startUploadAudio"
-              >
-                <el-button type="primary" :loading="startUploadAudio"
-                  >{{$t('ReportManage.ReportList.up_recording_lable')}}</el-button
-                >
-              </el-upload>
-
-              <p style="color: #999; font-size: 12px;margin-top: 10px;">
-                {{$t('ReportManage.ReportList.note_audio_minutes')}}
-              </p>
-            </div>
-            <div style="margin-top:30px;text-align:center">
-                <el-button type="primary" plain @click="isOpenUploadAudio=false;uploadAudioLoading=false;">{{$t('Dialog.cancel_btn')}}</el-button>
-                <el-button type="primary" @click="handleSaveAudio" :loading="uploadAudioLoading">{{uploadAudioLoading ? $t('ReportManage.smart_btn.uploading') :$t('Dialog.confirm_btn')}}</el-button>
-            </div>
-        </div>
-    </m-dialog> -->
 
     <!-- 版图设置弹窗 -->
     <smartTerritorSet 

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

@@ -52,11 +52,6 @@
           />
         </el-form-item>
 
-        <!-- <el-form-item prop="relationVariety" :label="$t('ReportManage.ReportList.label_relation_variety')" v-if="formData.relationVariety.length">
-          <div class="permission-wrap">
-            <el-tag v-for="item in formData.relationVariety" :key="item.ChartPermissionId">{{item.PermissionName}}</el-tag>
-          </div>
-        </el-form-item> -->
 
         <el-form-item prop="title" :label="$t('ReportManage.ReportList.label_report_tit')">
           <el-input
@@ -501,15 +496,6 @@ export default {
       this.formData.cooperationUsers.splice(index,1)
     },
 
-    //获取关联品种
-    // async getRelationPermission() {
-    //   if(!this.formData.classify.length) return
-
-    //   const res = await classifyPermissionInterface.classifyPermissionList({ClassifyId:this.formData.classify[this.formData.classify.length-1]})
-
-    //     if(res.Ret!==200) return
-    //     this.formData.relationVariety = res.Data || []
-    // },
 
     // 获取选择的分类名称
     getSelectClassifyName() {

src/views/report_manage/reportV2/list.vue

@@ -626,9 +626,6 @@ export default {
         {label:"下载长图",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_exportImg'),States:[2,6],text:'ReportManage.smart_btn.download_long_image'},
         {label:"推送消息",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_sendMsg'),States:[2,6],text:'ReportManage.smart_push_notification_btn'},
         {label:"已推送消息",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_sendMsg'),States:[2,6],text:'ReportManage.smart_notification_pushed'},
-        // {label:"音频上传",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_audioUpload'),States:true,text:'ReportManage.smart_audio_upload_btn'},
-        // {label:"音频下载A",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_audioDownload'),States:true,text:'ReportManage.smart_audio_download_btn'},
-        // {label:"音频下载",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_audioDownload'),States:true,text:'ReportManage.smart_audio_download_btn'},
       ],
 
       waterMarkStr:"",

src/views/report_manage/reportV2/normalReport/components/ETAChart.vue

@@ -1,10 +1,6 @@
 <template>
     <div class="eta-chart-wrap">
         <div class="top-box">
-            <!-- <div class="left-card">
-                <span :class="['item',activeType==='ETA图库'?'active':'']" @click="activeTypeChange('ETA图库')">{{$t('ReportManage.ReportList.chart_inventory_radio')}}</span>
-                <span :class="['item',activeType==='MyETA'?'active':'']" @click="activeTypeChange('MyETA')">{{$t('MyEtaPage.tab_my')}}</span>
-            </div> -->
             <el-input
                 class="search-box"
                 :placeholder="$t('ReportManage.ReportList.chart_name')"

src/views/report_manage/reportV2/smartReport/components/ETAChart.vue

@@ -1,10 +1,6 @@
 <template>
     <div class="eta-chart-wrap">
         <div class="top-box">
-            <!-- <div class="left-card">
-                <span :class="['item',activeType==='ETA图库'?'active':'']" @click="activeTypeChange('ETA图库')">{{$t('ReportManage.ReportList.chart_inventory_radio')}}</span>
-                <span :class="['item',activeType==='MyETA'?'active':'']" @click="activeTypeChange('MyETA')">{{$t('MyEtaPage.tab_my')}}</span>
-            </div> -->
             <div class="right">
                 <el-input
                     class="search-box"

src/views/report_manage/reportV2/smartReport/components/ImgSource.vue

@@ -123,10 +123,6 @@ export default {
         },
 
         handleSave(){
-            // if(!this.setType){
-            //     this.$message.warning('请选择设置的版面类型')
-            //     return
-            // }
             if(!this.selectItem){
                 this.$message.warning(this.type==1?'请选择版头':'请选择版尾')
                 return

src/views/report_manage/reportV2/smartReport/components/TextEdit.vue

@@ -97,10 +97,7 @@ export default {
                 events: {
                     //this.editor 定义在vue data 中
                     initialized: function () {
-                        // this.editor = editor;
                         that.editor = this;
-                        // that.editor.html.set(that.value);
-                        // that.setHtml()
                     },
                     keyup: function (e, editor) {
                         //添加事件，在每次按键按下时，都记录一下最后停留位置

src/views/report_manage/reportV2/smartReport/editReport.vue

@@ -368,14 +368,6 @@ export default {
                     compType:'img',
                     icon:require('@/assets/img/smartReport/icon11.png')
                 },
-                // {
-                //     compId:3,
-                //     compType:'chart',
-                // },
-                // {
-                //     compId:4,
-                //     compType:'sheet',
-                // }
                 
             ],
             conList:[],
@@ -754,12 +746,6 @@ export default {
 
             // 要添加的元素数据
             const compData=JSON.parse(item.getAttribute('comp-data'))
-            // console.log(compData);
-            // 非注册组件返回
-            // if(!comp){
-            //     this.conList.splice(newDraggableIndex,1)
-            //     return
-            // }
             const tempCompData={
                 compId:compData.compId,
                 compType:compData.compType,
@@ -769,9 +755,7 @@ export default {
                 style:compData.compType==='chart'?'height:350px':'',
                 child:[]
             }
-            // console.log(tempCompData);
             this.conList.splice(newDraggableIndex,1,tempCompData)
-            // this.activeId=tempCompData.id
         },
 
         handleChildAdd(e,parent,parentIndex){
@@ -863,18 +847,13 @@ export default {
         },
 
         handleParentMove(e){
-            // console.log(e.draggedContext);
-            // console.log(e.relatedContext);
-            // // console.log(e.relatedContext.compType);
-            // console.log(e.draggedContext.element.child.length>0&&!e.relatedContext.compType);
-            // if(e.draggedContext.element.child.length>0&&(!e.relatedContext.compType||e.relatedContext.element.compType)) return false
+            
         },
 
         // 移除事件 
         handleChildRemove(e,arr){
             console.log('child-remove操作------------------->');
             // 如果都移除了则删除这个
-            // this.conList=this.conList.filter(_item=>!(_item.child&&_item.child.length===0&&!_item.id))
 
             // 如果当前移出的这个child还有两个的话则重置他们的宽度
             arr.forEach(item=>{
@@ -1411,24 +1390,12 @@ export default {
                     visable:true,
                     icon:require('@/assets/img/smartReport/icon06.png')
                 },
-                // {
-                //     name:this.$t('ReportManage.ReportList.price_curve_radio'),
-                //     type:'etaPriceChart',
-                //     visable:true,
-                //     icon:require('@/assets/img/smartReport/icon07.png')
-                // },
                 {
                     name:this.$t('ReportManage.ReportList.sandbox_top_type'),
                     type:'etaSandBox',
                     visable:true,
                     icon:require('@/assets/img/smartReport/icon08.png')
                 },
-                // {
-                //     name:this.$t('ReportManage.ReportList.semantic_top_type'),
-                //     type:'semanticAnalysis',
-                //     visable:true,
-                //     icon:require('@/assets/img/smartReport/icon09.png')
-                // }
             ]
       },
 
@@ -1474,12 +1441,6 @@ export default {
         left: 0 !important;
         top: 0 !important;
     }
-    // height: 5px !important;
-    // background-color: #0052D9 !important;
-    // overflow: hidden !important;
-    // padding: 0 !important;
-    // min-height: 0 !important;
-    // border: none !important;
 }
 
 .el-color-picker__trigger{

src/views/report_manage/reportV2/smartReport/reportDetail.vue

@@ -240,10 +240,6 @@ export default {
 		},
 
         handleGetReportImg(){
-            // if(this.reportImgUrl){
-            //     this.showReportImg=true
-            //     return
-            // }
             apiSmartReport.getReportImg({
                 SmartReportId:Number(this.$route.query.id)
             }).then(res=>{

src/views/report_manage/reportlist.vue

@@ -146,11 +146,9 @@
               prefix-icon="el-icon-search"
             />
           </el-form-item>
-          <!-- <el-form-item><el-button type="primary" size="medium" @click.native="search">搜索</el-button></el-form-item> -->
         </el-form>
       </div>
       <template>
-        <!-- <el-table :data="tableData" v-loading="listLoading" @sort-change='sortChange' @selection-change="selectchange" :default-sort="{prop:'publish_time',order:'descending'}" :element-loading-text="$t('Table.data_loading')"  border style="width:100%;"> -->
         <el-table
           ref="table"
           :key="tableKey"
@@ -229,33 +227,6 @@
             </template>
           </el-table-column>
 
-          <!-- <el-table-column
-            v-if="!isApprove"
-            prop="PublishTime"
-            label="发布时间"
-            min-width="124"
-            align="center"
-            :formatter="formatterColumn"
-          >
-            <template slot-scope="scope">
-              <span>{{scope.row.PrePublishTime?scope.row.PrePublishTime:scope.row.PublishTime|formatTime}}</span>
-              <svg style="position: relative;top:2px" v-if="scope.row.PrePublishTime&&scope.row.State == '1'" width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-                <path d="M15.2002 8C15.2002 4.13401 12.0662 1 8.20019 1C4.3342 1 1.20019 4.13401 1.2002 8C1.2002 11.866 4.3342 15 8.2002 15C12.0662 15 15.2002 11.866 15.2002 8ZM5.2002 10L5.2002 9L8.17491 9L11.2002 4.5L11.9073 5.20711L8.58912 10L5.2002 10Z" fill="#0052D9"/>
-              </svg>
-            </template>
-          </el-table-column>
-          <el-table-column
-            v-if="isApprove"
-            prop="ApproveTime"
-            label="审批时间"
-            min-width="124"
-            align="center"
-            :formatter="formatterColumn"
-          >
-            <template slot-scope="scope">
-                <span>{{scope.row.ApproveTime|formatTime}}</span>
-            </template>
-          </el-table-column> -->
           <el-table-column prop="PublishTime" :label="$t('ReportManage.smart_release_approval_time')" min-width="124" align="center">
             <template slot-scope="scope">
                 <template v-if="[1,2].includes(scope.row.State)">
@@ -296,12 +267,6 @@
           <el-table-column :label="$t('ReportManage.smart_frequency_btn')" align="center">
             <template slot-scope="scope">{{ getFrequencyTrans(scope.row.Frequency) }}</template>
           </el-table-column>
-          <!-- <el-table-column label="音频" align="center">
-						<template slot-scope="scope">
-							<span v-if="!scope.row.VideoUrl" style="color:#46C371; cursor:pointer;" @click="openupload(scope.row.Id)">上传</span>
-							<a :href="hostapi+'?ReportId='+parseInt(scope.row.Id)" v-if="scope.row.VideoUrl" :download="scope.row.VideoName" style="cursor:pointer; color:#4099ef;">下载</a>
-						</template>
-					</el-table-column> -->
           <el-table-column
             :label="hasUV?'PV / UV':'PV'"
             align="center"
@@ -316,55 +281,7 @@
             <!-- 操作 -->
             <template slot-scope="scope">
               <div class="opt-btns">
-                              <!-- 未发布,待提交 -->
-                              <!-- <template v-if="[1,3].includes(scope.row.State)">
-                    <span class="editsty" @click="publishreport(scope.row)"
-                        v-if="scope.row.CanEdit&&scope.row.State===1
-                            &&permissionBtn.isShowBtn('reportManageBtn','reportManage_publish')"
-                    >{{$t('ReportManage.smart_btn.publish')}}</span>
-                    <span class="editsty" @click="handleSubmitReport(scope.row)"
-                        v-if="scope.row.CanEdit&&scope.row.State===3
-                            &&permissionBtn.isShowBtn('reportManageBtn','reportManage_publish')"
-                    >{{$t('ReportManage.smart_btn.submission')}}</span>
-                    <span v-permission="permissionBtn.reportManageBtn.reportManage_reportEdit" class="editsty"
-                        @click="editreport(scope.row, 'edit')" v-if="scope.row.CanEdit">{{$t('Table.edit_btn')}}</span>
-                    <span v-permission="permissionBtn.reportManageBtn.reportManage_reportEdit" class="editsty"
-                        @click="editreport(scope.row, 'editing')" v-else>{{ scope.row.Editor || "" }}{{$t('ReportManage.smart_btn.editing')}}</span>
-                    <span v-permission="permissionBtn.reportManageBtn.reportManage_reportDel" class="deletesty"
-                        @click="deleteitem(scope.row)" v-if="scope.row.CanEdit">{{$t('Table.delete_btn')}}</span>
-                </template> -->
-                <!-- 已发布,已通过 -->
-                <!-- <template v-if="[2,6].includes(scope.row.State)">
-                    <span v-if="scope.row.State===2&&permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_cancelPublish)"
-                        @click="canclepublish(scope.row)" style="color: red; cursor: pointer">{{$t('ReportManage.smart_btn.withdraw')}}</span>
-                    <span v-if="scope.row.State===6&&permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_cancelPublish)"
-                        @click="cancelReport(scope.row)" style="color: red; cursor: pointer">{{$t('ReportManage.smart_btn.withdraw')}}</span>
-                    <span
-                        v-if="scope.row.MsgIsSend == 0 && permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_sendMsg)"
-                        style="color: #4099ef; cursor: pointer" @click="messageSend(scope.row)">{{$t('ReportManage.smart_push_notification_btn')}}</span>
-                    <span
-                        v-else-if="scope.row.MsgIsSend != 0&&permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_sendMsg)"
-                        style="color: red">{{$t('ReportManage.smart_notification_pushed')}}</span>
-                </template> -->
-                <!-- 待审批,已驳回 -->
-                <!-- <template v-if="[4,5].includes(scope.row.State)">
-                    <span v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_cancelPublish)"
-                        @click="cancelReport(scope.row)" style="color: red; cursor: pointer">{{$t('ReportManage.smart_btn.withdraw')}}</span>
-                </template> -->
-                <!-- 音频上传和下载,跟State无关 -->
-                <!-- <span style="color: #46c371; cursor: pointer"
-                    v-if="![$t('ReportManage.smart_btn.morning_paper'), $t('ReportManage.smart_btn.weekly')].includes(scope.row.ClassifyNameFirst)&&permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_audioUpload)"
-                    @click="openupload(scope.row.Id)">{{$t('ReportManage.smart_audio_upload_btn')}}</span>
-                <a v-permission="permissionBtn.reportManageBtn.reportManage_audioDownload"
-                    :href="hostapi + '?ReportId=' + parseInt(scope.row.Id)" v-if="
-                    scope.row.VideoUrl &&
-                    ![$t('ReportManage.smart_btn.morning_paper'), $t('ReportManage.smart_btn.weekly')].includes(scope.row.ClassifyNameFirst)
-                " :download="scope.row.VideoName" style="cursor: pointer; color: #4099ef">{{$t('ReportManage.smart_audio_download_btn')}}</a>
-                <span v-permission="permissionBtn.reportManageBtn.reportManage_audioDownload"
-                    style="cursor: pointer; color: #4099ef" v-if="
-                    [$t('ReportManage.smart_btn.morning_paper'), $t('ReportManage.smart_btn.weekly')].includes(scope.row.ClassifyNameFirst) &&
-                    scope.row.ChapterVideoList.length > 0
-                " @click="handleShowDownloadAudio(scope.row)">{{$t('ReportManage.smart_audio_download_btn')}}</span> -->
+                              
                 <!-- 前面的按钮 -->
                 <span v-for="bu in getbuttonList(scope.row,'f')" :key="bu.label" 
                 :class="['删除'].includes(bu.label)?'deletesty':'editsty'"
@@ -744,9 +661,6 @@ export default {
         {label:"下载长图",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_exportImg'),States:[2,6],text:'ReportManage.smart_btn.download_long_image'},
         {label:"推送消息",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_sendMsg'),States:[2,6],text:'ReportManage.smart_push_notification_btn'},
         {label:"已推送消息",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_sendMsg'),States:[2,6],text:'ReportManage.smart_notification_pushed'},
-        // {label:"音频上传",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_audioUpload'),States:true,text:'ReportManage.smart_audio_upload_btn'},
-        // {label:"音频下载A",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_audioDownload'),States:true,text:'ReportManage.smart_audio_download_btn'},
-        // {label:"音频下载",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_audioDownload'),States:true,text:'ReportManage.smart_audio_download_btn'},
       ],
       waterMarkStr:"",
       publishReportCode:''
@@ -764,13 +678,6 @@ export default {
     this.getclassifylist();
     this.getlist();
     this.getSystemUserInfo()
-    // document.onkeydown=e=>{
-    // 	// console.log(this.$route)
-    // 	let keyval=window.event.keyCode;
-    //     if( keyval===13 && this.$route.path === '/reportlist'){
-    // 		this.getlist();
-    //     }
-    // }
   },
   methods: {
     //点击显示下载音频弹窗
@@ -799,14 +706,6 @@ export default {
       document.body.appendChild(a);
       a.click();
 
-      // this.downloadAudio.select.forEach(item=>{
-      //     const a=document.createElement('a')
-      //     a.setAttribute("download",item.VideoName)
-      //     a.style.display = "none"
-      // 	   a.href=`${this.dayWeekAudio}?ChapterIds=${item.ReportChapterId}`
-      //     document.body.appendChild(a);
-      //     a.click()
-      // })
     },
 
     renderHeader(h, { column, $index }) {
@@ -842,10 +741,6 @@ export default {
       ]);
     },
     async editreport(item, type) {
-      // if(type==='editing'){
-      //   this.$message.warning('该研报正在编辑，不可重复编辑')
-      //   return
-      // }
       //编辑前标记一下
       const res = await markReport({
         Status: 1,
@@ -1243,22 +1138,6 @@ export default {
           .catch(() => {});
         return false;
       }
-      // const xhr = new XMLHttpRequest();
-      // xhr.open('GET',this.exportUrlDl);
-      // xhr.onprogress = function (event) {
-      // 	console.log(event);
-      // 	if (event.lengthComputable) {
-      // 			console.log(event.loaded);
-      // 			console.log(event.total);
-      // 		const process = event.loaded/event.total;
-      // 		process < 1 ? console.log('loading') : console.log('完成')
-      // 	}
-      // };
-      // const link = document.createElement('a')
-      // link.href = this.exportUrlDl
-      // link.download = '';
-      // link.click();
-      // xhr.send();
     },
     //推送客群消息
     async messagePush(item) {

src/views/sandbox_manage/common/events.js

@@ -111,44 +111,6 @@ export const myEvents = (graph,mindmapDataUseFun) => {
 		})
 
 		/* 选中事件 */
-		// graph.on('cell:selected',({cell,options}) => {
-		// 	//节点
-		// 	if(cell.shape === 'rect') {
-		// 		const { key } = cell.data;
-
-		// 		const options = setSelectedOptions(cell.attrs,key);
-		// 		//设置toolbar状态
-		// 		store.commit('sand/SET_SELECT_STATUS',{
-		// 			key,
-		// 			options
-		// 		});
-		// 	}else if(cell.isEdge()) {
-
-		// 		const { line } = cell.attrs;
-		// 		//高亮选中
-		// 		// cell.attr('line', { stroke: '#f00', strokeWidth: 3 });
-		// 		//设置toolbar状态
-		// 		store.commit('sand/SET_SELECT_STATUS',{
-		// 			key: 'line',
-		// 			options: {
-		// 				line: {
-		// 					width: line.strokeWidth,
-		// 					color: line.stroke,
-		// 				}
-		// 			}
-		// 		});
-		// 	}
-		// })
-		
-		/* 点击空白区域清空选区 屏蔽工具栏 */
-		// graph.on('blank:click',() => {
-		// 	graph.cleanSelection();
-		// 	// store.commit('sand/SET_SELECT_STATUS',{key:'default'});
-		// 	store.commit('sand/SET_SELECT_CELLS',[]);
-
-		// 	if($('#editable-wrapper')[0]) $('#editable-wrapper')[0].blur();
-		// })
-
 		const changeSelection=_.debounce((selected)=> {
 			store.commit('sand/SET_SELECT_CELLS',selected)
 		},50)
@@ -271,29 +233,6 @@ const nodeCopyAndPaste = (graph) => {
 }
 
 /* 关联三种基础图形选中样式 */
-// const setSelectedOptions = ({ rect, text }, key) => {
-// 	return ['rect','date'].includes(key) ? {
-// 		text: { //文本设置
-// 			size: text.fontSize,
-// 			fontWeight: text.fontWeight, //
-// 			color: text.fill
-// 		},
-// 		border: { //线框设置
-// 			// isDash: 0, // 0实 1虚线
-// 			width: rect.strokeWidth,
-// 			fill: rect.fill,
-// 			borderColor: rect.stroke,
-// 		},
-
-// 	} : key === 'text' ? {
-// 		text: { //文本设置
-// 			size: text.fontSize,
-// 			fontWeight: text.fontWeight,
-// 			color: text.fill
-// 		},
-// 	}: {}
-// }
-
 const deleteNodes=(graph,mindmapDataUseFun)=>{
 	const select_cell = graph.getSelectedCells();
 	let delete_cells=[]

src/views/sandbox_manage/common/gragh.js

@@ -9,8 +9,6 @@ const { line } = configOpt;
 export function myGraph (wrapper,mindmapDataUseFun,type='edit') {
 	const graph = new Graph({
 		container: document.getElementById(wrapper),
-		// width: $(window).width(),
-		// height: $(window).height(),
 		history:{
 			enabled:true,
 			beforeAddCommand(event, args){
@@ -41,10 +39,6 @@ export function myGraph (wrapper,mindmapDataUseFun,type='edit') {
 			modifiers:['ctrl']
 		},
 		snapline: true, //对齐线
-		// panning: { //画布拖动
-		// 	enabled: true,
-		// 	eventTypes: ['leftMouseDown', 'rightMouseDown', 'mouseWheel']
-		// },
 		clipboard: true,
 		keyboard: {
 			enabled: true,

src/views/sandbox_manage/common/mindmap.js

@@ -176,8 +176,6 @@ export default {
             width: 16,
             height: 16,
             'xlink:href':require('@/assets/img/icons/add_blue_new.png'),
-            // 'xlink:href':
-            // 'https://gw.alipayobjects.com/mdn/rms_43231b/afts/img/A*SYCuQ6HHs5cAAAAAAAAAAAAAARQnAQ',
             event: 'add:topic:right',
             class: 'right-topic-image',
           },

src/views/sandbox_manage/common/node.js

@@ -268,11 +268,6 @@ export const myNodeOption = (key) => {
 									zIndex: 20,
 									...portStyle
 							},
-							// "port-bottom": {
-							// 		position: 'bottom',
-							// 		zIndex: 20,
-							// 		...portStyle
-							// }
 					}
 				},
 			}

src/views/sandbox_manage/index.vue

@@ -506,17 +506,6 @@ export default {
 
     /* 复制图片 */
     copyImg: _.debounce(function ({ PicUrl }) {
-
-      /* const copyImg = document.createElement('img');
-      $('.sandList-container')[0].appendChild(copyImg);
-      copyImg.src = PicUrl;
-
-      this.getSelect(copyImg);
-      setTimeout(() => {
-        document.execCommand('copy');
-        $('.sandList-container')[0].removeChild(copyImg);
-        this.$message.success('复制成功');
-      }); */
       this.lockLoding = this.$loading({
         lock: true,
         text: '复制图片中...',

src/views/sandbox_manage/index_new_version.vue

@@ -132,18 +132,6 @@
           <el-form-item :label="$t('SandboxManage.SandList.catalog_name')" prop="SandboxClassifyName">
             <el-input v-model.trim="classifyForm.SandboxClassifyName" style="width: 317px;" :placeholder="$t('SandboxManage.SandList.catalog_name_placeholder')"></el-input>
           </el-form-item>
-          <!-- <el-form-item :label="$t('SandboxManage.SandList.associated_variety')" prop="ChartPermissionId" v-if="hasVariety">
-            <el-cascader 
-              @change="chartPermissionIdChange"
-							:options="classifyArr"
-							:props="classifyProps"
-							v-model="classifyForm.ChartPermissionId" 
-							:placeholder="this.$t('SandboxManage.SandList.catalog_variety_placeholder')" 
-              id="classifyAddCascader"
-              ref="chartPermissionCascader"
-              :disabled="(classifyForm.SandboxClassifyId && classifyForm.Level!=1) || (!classifyForm.SandboxClassifyId && classifyForm.Level!=0)"
-						/>
-          </el-form-item> -->
         </el-form>
         <div style="text-align: center;padding:40px 0 ;">
           <el-button @click="classifyAddSubmit" type="primary" style="width: 120px;" size="large">{{$t('Dialog.confirm_save_btn')}}</el-button>
@@ -205,7 +193,6 @@ import {reportVarietyInterence} from '@/api/modules/reportVariety'
       classifyFormRules(){
         return {
           SandboxClassifyName:{required: true, message:this.$t('SandboxManage.SandList.catalog_name_placeholder')||'请输入目录名称', trigger: 'blur'},
-          // ChartPermissionId:{required: true, message:this.$t('SandboxManage.SandList.catalog_variety_placeholder')||'请选择对应品种', trigger: 'change'}
         }
       }
     },
@@ -302,8 +289,6 @@ import {reportVarietyInterence} from '@/api/modules/reportVariety'
         classifyForm:{
           SandboxClassifyId:0,
           SandboxClassifyName:'',
-          // ChartPermissionId:'',
-          // ChartPermissionName:'',
           ParentId:0,
           Level:0
         },
@@ -313,7 +298,6 @@ import {reportVarietyInterence} from '@/api/modules/reportVariety'
           value: 'PermissionId',
           emitPath:false
 			  },
-        // classifyArr:[],
         // 另存为弹窗
         saveOtherShow:false,
         saveOtherForm:{
@@ -334,7 +318,6 @@ import {reportVarietyInterence} from '@/api/modules/reportVariety'
       }
     },
     created(){
-      this.getClassify()
       if(sessionStorage.getItem("sandboxEditBack")){
         this.locationParentIds=sessionStorage.getItem("sandboxEditBack").split(',')
         this.getSandboxDetailFun(this.locationParentIds[this.locationParentIds.length-1])
@@ -357,18 +340,6 @@ import {reportVarietyInterence} from '@/api/modules/reportVariety'
 
     },
     methods:{
-      /* 获取品种 */
-      getClassify() {
-        // customInterence.getvariety({
-        //   CompanyType: 'ficc'
-        // }).then(res => {
-        //   if(res.Ret !== 200)  return
-        //     this.classifyArr = res.Data.List||[ ]
-        // })
-        // reportVarietyInterence.filterVarietyOpts().then(res=>{
-        //   this.classifyArr=res.Data||[]
-        // })
-      },
       // 获取沙盘图分类
       getSandboxClassify(parentNode,locationNode) {
         // parentNode--父节点
@@ -611,8 +582,6 @@ import {reportVarietyInterence} from '@/api/modules/reportVariety'
         this.classifyAddTitle=this.$t('SandboxManage.SandList.categories_add_btn')
         this.classifyForm.Level = node.Level
         this.classifyForm.ParentId = node.SandboxClassifyId
-        // this.classifyForm.ChartPermissionId = node.ChartPermissionId
-        // this.classifyForm.ChartPermissionName = node.ChartPermissionName
         this.classifyAddShow=true
       },
       getParentNodeName(node){
@@ -631,8 +600,6 @@ import {reportVarietyInterence} from '@/api/modules/reportVariety'
         this.classifyForm.SandboxClassifyId = node.SandboxClassifyId
         this.classifyForm.Level = node.Level
         this.classifyForm.SandboxClassifyName = node.SandboxClassifyName
-        // this.classifyForm.ChartPermissionId = node.ChartPermissionId
-        // this.classifyForm.ChartPermissionName = node.ChartPermissionName
         this.classifyAddTitle=this.$t('SandboxManage.SandList.categories_edit_btn')
         this.classifyAddShow=true
       },
@@ -704,8 +671,6 @@ import {reportVarietyInterence} from '@/api/modules/reportVariety'
               let params={
                 SandboxClassifyId:this.classifyForm.SandboxClassifyId,
                 SandboxClassifyName:this.classifyForm.SandboxClassifyName,
-                // ChartPermissionId:this.classifyForm.ChartPermissionId || 0,
-                // ChartPermissionName:this.classifyForm.ChartPermissionName,
               }
               sandInterface.editSandboxClassify(params).then(res=>{
                 if(res.Ret == 200){
@@ -728,8 +693,6 @@ import {reportVarietyInterence} from '@/api/modules/reportVariety'
                 SandboxClassifyName:this.classifyForm.SandboxClassifyName,
                 ParentId:this.classifyForm.ParentId,
                 Level:this.classifyForm.Level,
-                // ChartPermissionId:this.classifyForm.ChartPermissionId || 0,
-                // ChartPermissionName:this.classifyForm.ChartPermissionName,
               }
               sandInterface.addSandboxClassify(params).then(res=>{
                 if(res.Ret == 200){
@@ -753,8 +716,6 @@ import {reportVarietyInterence} from '@/api/modules/reportVariety'
         this.classifyForm={
           SandboxClassifyId:0,
           SandboxClassifyName:'',
-          // ChartPermissionId:'',
-          // ChartPermissionName:'',
           ParentId:0,
           Level:0
         }
@@ -1019,15 +980,6 @@ import {reportVarietyInterence} from '@/api/modules/reportVariety'
                 svg.setAttribute('height',height+60) 
                 //设置viewBox使图像居中
                 svg.setAttribute('viewBox',`${x-30} ${y-30} ${width+60} ${height+60}`)
-                // // 在图表右下方 加上"来源：弘则研究"字样
-                // let gNode = svg.getElementsByClassName('x6-graph-svg-viewport')[0]
-                // let textNode = document.createElement('text')
-                // textNode.setAttribute('x',(x-tx+width)/zoom-85)
-                // textNode.setAttribute('y',(y-ty+height)/zoom+27)
-                // textNode.setAttribute('font-size','16px')
-                // textNode.setAttribute('font-style','italic')
-                // textNode.innerText = '来源：弘则研究'
-                // gNode.appendChild(textNode)
                   },
               copyStyles:false,
               stylesheet: `svg{background-color:white;} .x6-port{visibility: hidden;}` 
@@ -1043,7 +995,6 @@ import {reportVarietyInterence} from '@/api/modules/reportVariety'
           classifyId:""
         }
         this.saveOtherClassifys=[]
-        // this.selectZTreeObj.cancelSelectedNode()
         this.$refs.saveOtherFormRef.clearValidate()
       },
       copySandHandle: _.debounce(function() {
@@ -1105,14 +1056,6 @@ import {reportVarietyInterence} from '@/api/modules/reportVariety'
           svg.setAttribute('height',height+60) 
           //设置viewBox使图像居中
           svg.setAttribute('viewBox',`${x-30} ${y-30} ${width+60} ${height+60}`)
-          // let gNode = svg.getElementsByClassName('x6-graph-svg-viewport')[0]
-          // let textNode = document.createElement('text')
-          // textNode.setAttribute('x',x-tx+width-90)
-          // textNode.setAttribute('y',y-ty+height+22)
-          // textNode.setAttribute('font-size','16px')
-          // textNode.setAttribute('font-style','italic')
-          // textNode.innerText = '来源：弘则研究'
-          // gNode.appendChild(textNode)
             },
           copyStyles:false,
           stylesheet: `svg{background-color:white;} .x6-port{visibility: hidden;}` 

src/views/sandbox_manage/sandFlow/index.vue

@@ -38,7 +38,6 @@
 			<div class="flow-wrapper">
 				<div id="flow-container"></div>
 
-				<!-- <div class="flow-source">来源：弘则研究</div> -->
 
 				<!-- 右键菜单 -->
 				<div class="contextMenu-wrapper" id="contextMenu-wrapper" @mouseleave="hideContextMenu">
@@ -123,21 +122,7 @@ export default {
 			const { id,type } = this.$route.query;
 			const sandbox_versioncode = id||SandboxVersionCode
 			const modify_type = type||modifyType
-			// type === 'edit' && sandInterface.sandData({
-			// 	SandboxId: id
-			// }).then(res => {
-			// 	if(res.Ret !== 200) return
-
-			// 	const { Name,ChartPermissionId,Content } = res.Data;
-			// 	this.sandObj = {
-			// 		name: Name,
-			// 		classify: ChartPermissionId
-			// 	}
-			// 	this.initData = JSON.parse(Content);
-			// 	this.sandInfo = res.Data;
-			// 	// 轮询
-			// 	this.$route.query.type === 'edit' && this.autoSave();
-			// })
+			
 			if(!sandbox_versioncode) return
 			sandInterface.versionData({
 				SandboxVersionCode: id||SandboxVersionCode
@@ -157,7 +142,6 @@ export default {
 					this.sandInfo = res.Data;
 					// 轮询
 					this.autoSave();
-					//this.graph.centerContent();
 				}
 			})
 		},
@@ -183,7 +167,6 @@ export default {
 				const params = new FormData();
 				params.append('Img',dataUri)
 				const { Data } = await dataBaseInterface.uploadImgSvg(params);
-				//let SandboxVersionCode = (this.sand_id && classify === this.sandInfo.ChartPermissionId)  ? this.sand_id : '';
 				let SandboxVersionCode = this.sand_id
 				const { Ret , Data : sandData} = await sandInterface.sandSave({
 					SandboxVersionCode,
@@ -197,7 +180,6 @@ export default {
 				if(Ret !== 200) return;
 				this.$message.success(`${SandboxVersionCode ? '编辑成功' : '保存成功'}`);
 				this.lockLoding.close();
-				//!SandboxVersionCode && window.close();
 				//如果是新增,直接跳转到编辑页面
 				if(!SandboxVersionCode&&sandData.VersionCode){
 					this.sand_id = sandData.VersionCode
@@ -224,14 +206,6 @@ export default {
 					//设置viewBox使图像居中
 					svg.setAttribute('viewBox',`${x-25} ${y-25} ${width+50} ${height+50}`)
 					// 在图表右下方 加上"来源：弘则研究"字样
-					// let gNode = svg.getElementsByClassName('x6-graph-svg-viewport')[0]
-					// let textNode = document.createElement('text')
-					// textNode.setAttribute('x',x-tx+width-90)
-					// textNode.setAttribute('y',y-ty+height+22)
-					// textNode.setAttribute('font-size','16px')
-					// textNode.setAttribute('font-style','italic')
-					// textNode.innerText = '来源：弘则研究'
-					// gNode.appendChild(textNode)
         		},
 				copyStyles:false,
 				stylesheet: `
@@ -260,19 +234,6 @@ export default {
 				background: 'rgba(255, 255, 255, 0.8)'
 			});
 			this.graph.toSVG(async(dataUri) => {
-				/* const params = new FormData();
-				params.append('Img',dataUri)
-				const { Data } = await dataBaseInterface.uploadImgSvg(params);
-				const copyImg = document.createElement('img');
-				$('.sand-flow-container')[0].appendChild(copyImg);
-				copyImg.src = Data.ResourceUrl;
-				this.getSelect(copyImg);
-				setTimeout(() => {
-					document.execCommand('copy');
-					$('.sand-flow-container')[0].removeChild(copyImg);
-					this.lockLoding && this.lockLoding.close();
-					this.$message.success('复制成功');
-				}); */
                 const canvas = document.createElement("canvas");
                 const ctx = canvas.getContext("2d");
                 const img = new Image();
@@ -316,14 +277,6 @@ export default {
 					svg.setAttribute('height',height+50) 
 					//设置viewBox使图像居中
 					svg.setAttribute('viewBox',`${x-25} ${y-25} ${width+50} ${height+50}`)
-					// let gNode = svg.getElementsByClassName('x6-graph-svg-viewport')[0]
-					// let textNode = document.createElement('text')
-					// textNode.setAttribute('x',x-tx+width-90)
-					// textNode.setAttribute('y',y-ty+height+22)
-					// textNode.setAttribute('font-size','16px')
-					// textNode.setAttribute('font-style','italic')
-					// textNode.innerText = '来源：弘则研究'
-					// gNode.appendChild(textNode)
         		},
 				copyStyles:false,
 				stylesheet: `
@@ -395,9 +348,6 @@ export default {
 		/* init画布 */
 		init() {
 			const graph = new myGraph('flow-container');
-
-			//graph.centerContent();
-			// graph.fromJSON(this.initData);
 			this.graph = graph;
 		}
 	},

src/views/sandbox_manage/sandFlow/toolBar.vue

@@ -200,9 +200,6 @@ export default {
         },
       });
 		},
-		// initConfig(newval) {
-		// 	console.log(newval)
-		// }
 	},
 	computed: {
 		...mapState({
@@ -219,9 +216,6 @@ export default {
 			myNodes,
 			colorsOptions,
 			sizeOptions,
-			// initConfig: {
-			// 	...configOpt
-			// },
 			activeNames: ['1','2','3','4'],
 			dnd: null,
 			select_shape: '',//选中的图形

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

@@ -288,11 +288,6 @@ import * as preDictEdbInterface from '@/api/modules/predictEdbApi.js';
     },
     data() {
       return {
-        /* linkTypeList:[
-          {value:1,label:this.$t('SandboxManage.SandFlow.link_type_opt1')},
-          {value:2,label:this.$t('SandboxManage.SandFlow.link_type_opt2')},
-          {value:3,label:this.$t('SandboxManage.SandFlow.link_type_opt3')}
-        ], */
         addLinkSearchParams:{
           linkType:1
         },