comit

config/dev.env.js

@@ -11,5 +11,6 @@ module.exports = merge(prodEnv, {
 	REPORT_SHARE_LINK:'"http://rddpweb.brilliantstart.cn"',
   VUE_APP_HR_MANAGEMENT_SYSTEM:'"http://8.136.199.33:8391/login"',
   VUE_APP_FINANCIAL_MANAGEMENT_SYSTEM:'"http://8.136.199.33:8618/login"',
-  VUE_APP_CRM_SYSTEM:'"http://8.136.199.33:7777/temppage"'
+  VUE_APP_CRM_SYSTEM:'"http://8.136.199.33:7777/temppage"',
+  VUE_APP_ETA_DOCS:'"http://8.136.199.33:8622/update/index"'
 });

config/prod.env.js

@@ -8,5 +8,6 @@ module.exports = {
 	REPORT_SHARE_LINK:'"https://ficc.hzinsights.com"',
 	VUE_APP_HR_MANAGEMENT_SYSTEM:'"https://hr.hzinsights.com/login"',
 	VUE_APP_FINANCIAL_MANAGEMENT_SYSTEM:'"https://fms.hzinsights.com/login"',
-	VUE_APP_CRM_SYSTEM:'"https://admin.hzinsights.com/temppage"'
+	VUE_APP_CRM_SYSTEM:'"https://admin.hzinsights.com/temppage"',
+    VUE_APP_ETA_DOCS:'"https://etadocs.hzinsights.com/update/index"'
 }

config/prod.test.env.js

@@ -8,5 +8,6 @@ module.exports = {
 	REPORT_SHARE_LINK:'"http://rddpweb.brilliantstart.cn"',
 	VUE_APP_HR_MANAGEMENT_SYSTEM:'"http://8.136.199.33:8391/login"',
   VUE_APP_FINANCIAL_MANAGEMENT_SYSTEM:'"http://8.136.199.33:8618/login"',
-	VUE_APP_CRM_SYSTEM:'"http://8.136.199.33:7777/temppage"'
+	VUE_APP_CRM_SYSTEM:'"http://8.136.199.33:7777/temppage"',
+	VUE_APP_ETA_DOCS:'"http://8.136.199.33:8622/update/index"'
 }

src/App.vue

@@ -171,7 +171,7 @@ iframe {
 }
 .el-collapse-item__header {
   border: none;
-  font-size: 16px;
+  font-size: 14px;
   color: #333;
   font-weight: bold;
   position: relative;

src/api/api.js

@@ -182,7 +182,8 @@ const {
   setchapterTPermission,
   reportMessageSend,
   weekReportValidAudio,
-  getUserUuid
+  getUserUuid,
+  getBusinessCode
 } = oldApis;
 
 export {
@@ -255,6 +256,7 @@ export {
   setchapterTPermission,
   reportMessageSend,
   weekReportValidAudio,
-  getUserUuid
+  getUserUuid,
+  getBusinessCode
 };
 

src/api/modules/chartApi.js

@@ -810,8 +810,46 @@ const dataBaseInterface = {
 	 */
 	getEDBInfoCalculateMap:params=>{
 		return http.get('/datamanage/edb_info/calculate/mapping',params)
+	},
+
+	/* eta图库 图表预览  启用之前根据传参刷数据的详情接口 
+		{
+			ChartType：1，
+			"ChartEdbInfoList": [
+					{
+							"EdbInfoId": 102767,
+							"EdbInfoType": 1,
+							"LeadUnit": "",
+							"LeadValue": 0,
+					},
+					{
+							"EdbInfoId": 102769,
+							"EdbInfoType": 1,
+							"LeadUnit": "",
+							"LeadValue": 0,
+					}
+			],
+			"DateType": 3,
+			"StartDate": "",
+			"EndDate": ""，
+			Calendar
+			SeasonStartDate
+			SeasonEndDate
 	}
+	*/
+	getSplinePreviewData: params => {
+		return http.post('/datamanage/chart_info/detail/preview',params)
+	},
 
+	/**
+	 * 获取图表信息 在eta图库内替换上面的图表详情接口
+	 * @param {*} params ChartInfoId
+	 * @returns 
+	 */
+	getChartInfoById: params => {
+		return http.get('/datamanage/chart_info/detail/v2',params)
+	},
+	
 }
 
 /* 我的图库 */

src/api/modules/etaBaseConfigApi.js

@@ -0,0 +1,10 @@
+/* ETA-系统设置-基础配置 相关接口 */
+import http from "@/api/http.js"
+export const etaBaseConfigInterence = {
+    getBaseConfig:params=>{
+        return http.get('/business_conf/fetch',params)
+    },
+    saveBaseConfig:params=>{
+        return http.post('/business_conf/save',params)
+    }
+}

src/api/modules/oldApi.js

@@ -292,6 +292,11 @@ const reportMessageSend=params=>{
 	return http.post('/report/sendMsg',params)
 }
 
+// 获取商家code
+const getBusinessCode=params=>{
+    return http.get('/business_conf/code_encrypt',params)
+}
+
 export {
 	userLogin,
 	modifyPwd,
@@ -362,5 +367,6 @@ export {
 	setchapterTPermission,
 	reportMessageSend,
 	weekReportValidAudio,
-	getUserUuid
+	getUserUuid,
+    getBusinessCode
 }

src/routes/modules/oldRoutes.js

@@ -293,6 +293,12 @@ export default [
         name: "英文权限配置",
         hidden: false,
       },
+      {
+        path: "etaBaseConfig",
+        component: () => import("@/views/system_manage/etaBaseConfig.vue"),
+        name: "基本配置",
+        hidden: true,
+      },
     ],
   },
 ];

src/styles/element-ui.scss

@@ -59,3 +59,8 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts';
 .el-table th.is-leaf {
   border-color: #DCDFE6 !important;
 }
+
+.el-menu--vertical {
+  max-height: 100vh;
+  overflow-y: auto;
+}

src/views/Home.vue

@@ -236,6 +236,9 @@
                   <el-dropdown-item divided @click.native="logout"
                     >退出登录</el-dropdown-item
                   >
+                  <el-dropdown-item divided @click.native="toDoc"
+                    >更新日志</el-dropdown-item
+                  >
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
@@ -274,6 +277,7 @@
 <script>
 import {
   checkPwd,
+  getBusinessCode,
   departInterence,
   customInterence,
   roadshowInterence,
@@ -851,6 +855,17 @@ export default {
         })
         .catch(() => {});
     },
+    toDoc(){
+        //获取商家code
+        getBusinessCode().then(res=>{
+            if(res.Ret!==200) return 
+            const bus_code = res.Data||''
+            //打开更新日志项目
+            const href = `${process.env.VUE_APP_ETA_DOCS}?bus_code=${bus_code}`
+            window.open(href, "_blank");
+        })
+        
+    },
     collapseHandle () {
       //折叠导航栏
       this.isCollapse = !this.isCollapse;

src/views/chartRelevance_manage/relevanceChartEditor.vue

@@ -557,6 +557,8 @@ export default {
         this.chartInfo.Curve.StartDate = '';
         this.chartInfo.Curve.EndDate = '';
       }
+
+      this.getPreviewSplineChart()
     },
 
     // 确定保存图表配置

src/views/dataEntry_manage/addChart.vue

@@ -150,7 +150,7 @@
                   <el-radio
                     v-model="item.EdbInfoType"
                     :label="1"
-                    @change="refreshTarget"
+                    @change="getPreviewSplineInfo"
                     >标准指标</el-radio
                   >
                   <div style="margin-top: 15px">
@@ -158,7 +158,7 @@
                       v-model="item.EdbInfoType"
                       :label="0"
                       style="margin-right: 10px"
-                      @change="refreshTarget"
+                      @change="getPreviewSplineInfo"
                       >领先指标</el-radio
                     >
                     <template v-if="item.EdbInfoType === 0">
@@ -169,7 +169,7 @@
                         type="number"
 												min="0"
                         v-model="item.LeadValue"
-                        @change="refreshTarget"
+                        @change="getPreviewSplineInfo"
                         @keyup.native="filterCode(item)"
                       ></el-input>
                       <el-select
@@ -177,7 +177,7 @@
                         placeholder=""
                         style="width: 60px"
                         size="mini"
-                        @change="refreshTarget"
+                        @change="getPreviewSplineInfo"
                       >
                         <el-option
                           v-for="item in fre_options"
@@ -411,7 +411,7 @@
 							v-model="calendar_type"
 							class="calendar-cont"
 							v-if="chartInfo.ChartType === 2"
-							@change="refreshChart"
+							@change="getPreviewSplineInfo"
 						>
 							<el-radio-button label="公历" />
 							<el-radio-button label="农历" />

src/views/dataEntry_manage/chartSetting.vue

@@ -199,7 +199,7 @@
                   <el-radio
                     v-model="item.EdbInfoType"
                     :label="1"
-                    @change="refreshTarget"
+                    @change="getPreviewChartInfo"
                     >标准指标</el-radio
                   >
                   <div style="margin-top: 15px">
@@ -207,7 +207,7 @@
                       v-model="item.EdbInfoType"
                       :label="0"
                       style="margin-right: 10px"
-                      @change="refreshTarget"
+                      @change="getPreviewChartInfo"
                       >领先指标</el-radio
                     >
                     <template v-if="item.EdbInfoType === 0">
@@ -218,7 +218,7 @@
                         type="number"
                         min="0"
                         v-model="item.LeadValue"
-                        @change="refreshTarget"
+                        @change="getPreviewChartInfo"
                         @keyup.native="filterCode(item)"
                       ></el-input>
                       <el-select
@@ -226,7 +226,7 @@
                         placeholder=""
                         style="width: 60px"
                         size="mini"
-                        @change="refreshTarget"
+                        @change="getPreviewChartInfo"
                       >
                         <el-option
                           v-for="item in fre_options"
@@ -466,7 +466,7 @@
                     v-model="calendar_type"
                     class="calendar-cont"
                     v-if="chartInfo.ChartType === 2"
-                    @change="getChartInfo"
+                    @change="getPreviewChartInfo"
                   >
                     <el-radio-button label="公历" />
                     <el-radio-button label="农历" />
@@ -849,7 +849,7 @@ export default {
     },
     selected_chartid(newval) {
       if (!newval) {
-        // this.year_select = 3;
+
         this.year_select = this.yearSelector[0].value;
         this.calendar_type = '公历';
         this.season_year = '';
@@ -858,7 +858,7 @@ export default {
       } else {
         sessionStorage.removeItem('beforeOptions');
         
-        newval && this.getChartInfo();
+        newval && this.getChartDetail();
         this.formItemArray=[]
       }
     },
@@ -1233,8 +1233,7 @@ export default {
     sucessCallback(type) {
       this.isOpenDialog = false;
       this.getTreeData();
-      // type && this.getDataList();
-      this.selected_chartid && this.getChartInfo();
+
       if (type === 'add') {
         //新增分类完成之后，展开父节点显示刚新增的分类，若已展开节点则不做处理
         let code = sessionStorage.getItem('expandCode');
@@ -1525,87 +1524,164 @@ export default {
 			}
 		},
 
+    /* 获取图表详情 回显参数 */
+    async getChartDetail() {
+      const res = await dataBaseInterface.getChartInfoById({
+          ChartInfoId: this.selected_chartid
+        })
+        
+      if (res.Ret !== 200) return;
+      this.chartInfo = res.Data.ChartInfo;
+      
+
+      this.tableData = res.Data.EdbInfoList;
+      this.setDefaultDateSelect(); //设置默认的日期选中
+
+      sessionStorage.setItem('defaultArr',JSON.stringify(res.Data.EdbInfoList));
+
+      const chartTypeMap = {
+        7: this.initBarData, //柱形图
+        10: this.initSectionScatterData //截面散点
+      }
+      chartTypeMap[this.chartInfo.ChartType] && chartTypeMap[this.chartInfo.ChartType](res.Data);
+
+      //将指标添加进标签列表中
+      const {ChartNameEn,ChartName,ChartInfoId,UniqueCode,ChartClassifyId}=res.Data.ChartInfo
+      this.addLabel({code:UniqueCode,id:ChartInfoId,classifyId:ChartClassifyId,EdbName:ChartName,EdbNameEn:ChartNameEn,chartData:res.Data.ChartInfo})
+      this.defaultShowNodes=this.findParentNodeHandle(this.treeData,ChartClassifyId)
+      this.changeTreeNode()
+    },
+
+    /* 设置默认时间选中项 */
+    setDefaultDateSelect() {
+      this.year_select = this.chartInfo.DateType;
+      this.select_date = [this.chartInfo.StartDate, this.chartInfo.EndDate];
+      this.calendar_type = this.chartInfo.Calendar; //日历类型
+      this.season_year = [
+        this.chartInfo.SeasonStartDate,
+        this.chartInfo.SeasonEndDate,
+      ];
+      this.dateTip =
+        this.chartInfo.DateType === 5
+          ? `${this.chartInfo.StartDate}~${this.chartInfo.EndDate}`
+          : this.chartInfo.DateType === 6
+          ? `${this.chartInfo.StartDate}~至今`
+          : '请选择时间段';
+    },
+
     /* 获取图表详情信息  type为refresh刷新指标不存储时间 */
-    getChartInfo(type) {
-      // 判断图标类型 设置参数
-      let params =
-        this.sameOptionType.includes(this.selected_chartType)
-          ? {
-              ChartInfoId: this.selected_chartid,
-              DateType: this.year_select,
-              StartDate:
-                this.year_select === 5 || this.year_select === 6
-                  ? this.select_date[0]
-                  : '',
-              EndDate: this.year_select === 5 ? this.select_date[1] : '',
-            }
-          : {
-              ChartInfoId: this.selected_chartid,
-              Calendar: this.calendar_type,
-              SeasonStartDate: this.season_year ? this.season_year[0] : '',
-              SeasonEndDate: this.season_year ? this.season_year[1] : '',
-            };
-      dataBaseInterface.chartInfo(params).then((res) => {
-        if (res.Ret === 200) {
-          this.chartInfo = res.Data.ChartInfo;
-          let beforeOptions = sessionStorage.getItem('beforeOptions')
-            ? JSON.parse(sessionStorage.getItem('beforeOptions'))
-            : '';
-          //合并缓存配置和新的数据
-          let newarr = res.Data.EdbInfoList.map((item, index) => {
-            if (beforeOptions && type === 'refresh') {
-              const DataList = item.DataList;
-              return {
-                ...beforeOptions[index],
-                DataList,
-              };
-            } else {
-              return item;
-            }
-          });
-          this.tableData = newarr;
-          //  刷新最新的指标数据 防止领先配置已保存 指标数据确实原数据的情况 针对正常图
-          if (
-            type === 'refresh' &&
-            beforeOptions &&
-            (this.sameOptionType.includes(this.chartInfo.ChartType) && this.chartInfo.ChartType!==5)
-          )
-            this.refreshTarget();
-          sessionStorage.setItem(
-            'defaultArr',
-            JSON.stringify(res.Data.EdbInfoList)
-          );
-          if (!type) {
-            this.year_select = this.chartInfo.DateType;
-            this.select_date = [
-              this.chartInfo.StartDate,
-              this.chartInfo.EndDate,
-            ];
-            this.calendar_type = this.chartInfo.Calendar; //日历类型
-            // this.season_year = [ this.chartInfo.SeasonStartDate, this.chartInfo.SeasonEndDate ];
-            this.dateTip =
-              this.chartInfo.DateType === 5
-                ? `${this.chartInfo.StartDate}~${this.chartInfo.EndDate}`
-                : this.chartInfo.DateType === 6
-                ? `${this.chartInfo.StartDate}~至今`
-                : '请选择时间段';
-
-            //新图表类型 依赖数据不同单独init 数据
-            const typeInitMap = {
-              7: this.initBarData,
-              10: this.initSectionScatterData
-            }
-            typeInitMap[this.chartInfo.ChartType] && typeInitMap[this.chartInfo.ChartType](res.Data);
+    async getPreviewChartInfo(type) {
+      let params = {
+        ChartType: this.chartInfo.ChartType,
+        DateType: this.year_select,
+        StartDate: [5, 6].includes(this.year_select)
+          ? this.select_date[0]
+          : '',
+        EndDate: this.year_select === 5 ? this.select_date[1] : '',
+        Calendar: this.calendar_type,
+        SeasonStartDate: this.season_year ? this.season_year[0] : '',
+        SeasonEndDate: this.season_year ? this.season_year[1] : '',
+        ChartEdbInfoList: this.tableData.map(_ => ({
+          EdbInfoId: _.EdbInfoId,
+          EdbInfoType: _.EdbInfoType,
+          LeadValue: _.EdbInfoType ? 0 : Number(_.LeadValue),
+          LeadUnit: _.EdbInfoType ? '' : _.LeadUnit,
+        }))
+      }
+
+      const res = await dataBaseInterface.getSplinePreviewData(params)
+
+      if(res.Ret !== 200) return
+
+      const { EdbInfoList } = res.Data;
+
+      this.tableData.forEach((item) => {
+        let edbData = EdbInfoList.find(_ => _.EdbInfoId===item.EdbInfoId);
+        item.DataList = edbData.DataList;
+        if(edbData.EdbInfoCategoryType===1) item.MoveLatestDate = edbData.MoveLatestDate;
+      });
+
+
+
+      // // 判断图标类型 设置参数
+      // let params =
+      //   this.sameOptionType.includes(this.selected_chartType)
+      //     ? {
+      //         ChartInfoId: this.selected_chartid,
+      //         DateType: this.year_select,
+      //         StartDate:
+      //           this.year_select === 5 || this.year_select === 6
+      //             ? this.select_date[0]
+      //             : '',
+      //         EndDate: this.year_select === 5 ? this.select_date[1] : '',
+      //       }
+      //     : {
+      //         ChartInfoId: this.selected_chartid,
+      //         Calendar: this.calendar_type,
+      //         SeasonStartDate: this.season_year ? this.season_year[0] : '',
+      //         SeasonEndDate: this.season_year ? this.season_year[1] : '',
+      //       };
+      // dataBaseInterface.chartInfo(params).then((res) => {
+      //   if (res.Ret === 200) {
+      //     this.chartInfo = res.Data.ChartInfo;
+      //     let beforeOptions = sessionStorage.getItem('beforeOptions')
+      //       ? JSON.parse(sessionStorage.getItem('beforeOptions'))
+      //       : '';
+      //     //合并缓存配置和新的数据
+      //     let newarr = res.Data.EdbInfoList.map((item, index) => {
+      //       if (beforeOptions && type === 'refresh') {
+      //         const DataList = item.DataList;
+      //         return {
+      //           ...beforeOptions[index],
+      //           DataList,
+      //         };
+      //       } else {
+      //         return item;
+      //       }
+      //     });
+      //     this.tableData = newarr;
+      //     //  刷新最新的指标数据 防止领先配置已保存 指标数据确实原数据的情况 针对正常图
+      //     if (
+      //       type === 'refresh' &&
+      //       beforeOptions &&
+      //       (this.sameOptionType.includes(this.chartInfo.ChartType) && this.chartInfo.ChartType!==5)
+      //     )
+      //       this.refreshTarget();
+      //     sessionStorage.setItem(
+      //       'defaultArr',
+      //       JSON.stringify(res.Data.EdbInfoList)
+      //     );
+      //     if (!type) {
+      //       this.year_select = this.chartInfo.DateType;
+      //       this.select_date = [
+      //         this.chartInfo.StartDate,
+      //         this.chartInfo.EndDate,
+      //       ];
+      //       this.calendar_type = this.chartInfo.Calendar; //日历类型
+      //       // this.season_year = [ this.chartInfo.SeasonStartDate, this.chartInfo.SeasonEndDate ];
+      //       this.dateTip =
+      //         this.chartInfo.DateType === 5
+      //           ? `${this.chartInfo.StartDate}~${this.chartInfo.EndDate}`
+      //           : this.chartInfo.DateType === 6
+      //           ? `${this.chartInfo.StartDate}~至今`
+      //           : '请选择时间段';
+
+      //       //新图表类型 依赖数据不同单独init 数据
+      //       const typeInitMap = {
+      //         7: this.initBarData,
+      //         10: this.initSectionScatterData
+      //       }
+      //       typeInitMap[this.chartInfo.ChartType] && typeInitMap[this.chartInfo.ChartType](res.Data);
             
-          }
-          //将指标添加进标签列表中
-            const {ChartNameEn,ChartName,ChartInfoId,UniqueCode,ChartClassifyId}=res.Data.ChartInfo
-            this.addLabel({code:UniqueCode,id:ChartInfoId,classifyId:ChartClassifyId,EdbName:ChartName,EdbNameEn:ChartNameEn,chartData:res.Data.ChartInfo})
-            this.defaultShowNodes=this.findParentNodeHandle(this.treeData,ChartClassifyId)
-            this.changeTreeNode()
-        }
+      //     }
+      //     //将指标添加进标签列表中
+      //       const {ChartNameEn,ChartName,ChartInfoId,UniqueCode,ChartClassifyId}=res.Data.ChartInfo
+      //       this.addLabel({code:UniqueCode,id:ChartInfoId,classifyId:ChartClassifyId,EdbName:ChartName,EdbNameEn:ChartNameEn,chartData:res.Data.ChartInfo})
+      //       this.defaultShowNodes=this.findParentNodeHandle(this.treeData,ChartClassifyId)
+      //       this.changeTreeNode()
+      //   }
         
-      });
+      // });
     },
 
     /* 搜索 */
@@ -1893,7 +1969,7 @@ export default {
       //保存表格配置和上下限 曲线图需要保存表格配置 季节图就不用了
       this.saveNowOptions();
       // 图表已存在
-      this.selected_chartid && this.getChartInfo('refresh');
+      this.selected_chartid && this.getPreviewChartInfo();
     },
     /* 打开时间段弹窗 */
     openDateDia() {
@@ -1919,7 +1995,7 @@ export default {
         this.dateTip = `${data.start_date}~至今`;
       }
       this.saveNowOptions();
-      this.getChartInfo('refresh');
+      this.getPreviewChartInfo();
     },
 
     /* 编辑图表 跳转 */
@@ -2057,18 +2133,18 @@ export default {
     },
     /* 保存图表当前配置项 上下限 */
     saveNowOptions() {
-      const dataArr = _.cloneDeep(this.tableData);
-      dataArr.forEach((item) => {
-        item.MaxData = Number(item.MaxData);
-        item.MinData = Number(item.MinData);
-        delete item.DataList;
-      });
-      sessionStorage.setItem('beforeOptions', JSON.stringify(dataArr));
+      // const dataArr = _.cloneDeep(this.tableData);
+      // dataArr.forEach((item) => {
+      //   item.MaxData = Number(item.MaxData);
+      //   item.MinData = Number(item.MinData);
+      //   delete item.DataList;
+      // });
+      // sessionStorage.setItem('beforeOptions', JSON.stringify(dataArr));
     },
     /* 季节图切换年份  保持当前配置 */
     seasonYearChange() {
       this.saveNowOptions();
-      this.getChartInfo('refresh');
+      this.getPreviewChartInfo();
     },
     /* 一键刷新 超长等待..*/
     refreshHandle() {
@@ -2086,7 +2162,7 @@ export default {
         .then((res) => {
           this.refreshLoading.close();
           if (res.Ret === 200) {
-            this.getChartInfo('refresh');
+            this.getPreviewChartInfo();
             this.$message.success(res.Msg);
           }
         });

src/views/dataEntry_manage/components/setEnNameDia.vue

@@ -84,7 +84,7 @@
 					<span v-show="item.notEdit">{{item.value}}</span>
           <el-input v-show="!item.notEdit" v-model="item.value" :placeholder="item.placeholder" style="width: 100%;"></el-input>
 				</el-form-item>
-				<el-form-item style="text-align: center;">
+				<el-form-item style="text-align: center;margin-left:-110px">
 					<el-button @click="cancel">取消</el-button>
 					<el-button type="primary" @click="saveEnName">确定</el-button>
 				</el-form-item>

src/views/dataEntry_manage/editChart.vue

@@ -155,7 +155,7 @@
                   <el-radio
                     v-model="item.EdbInfoType"
                     :label="1"
-                    @change="refreshTarget"
+                    @change="getPreviewSplineInfo"
                     >标准指标</el-radio
                   >
                   <div style="margin-top: 15px">
@@ -163,7 +163,7 @@
                       v-model="item.EdbInfoType"
                       :label="0"
                       style="margin-right: 10px"
-                      @change="refreshTarget"
+                      @change="getPreviewSplineInfo"
                       >领先指标</el-radio
                     >
                     <template v-if="item.EdbInfoType === 0">
@@ -174,7 +174,7 @@
                         type="number"
 												min="0"
                         v-model="item.LeadValue"
-                        @change="refreshTarget"
+                        @change="getPreviewSplineInfo"
                         @keyup.native="filterCode(item)"
                       ></el-input>
                       <el-select
@@ -182,7 +182,7 @@
                         placeholder=""
                         style="width: 60px"
                         size="mini"
-                        @change="refreshTarget"
+                        @change="getPreviewSplineInfo"
                       >
                         <el-option
                           v-for="item in fre_options"
@@ -408,7 +408,7 @@
 							v-model="calendar_type"
 							class="calendar-cont"
 							v-if="chartInfo.ChartType === 2"
-							@change="refreshChart"
+							@change="getPreviewSplineInfo"
 						>
 							<el-radio-button label="公历" />
 							<el-radio-button label="农历" />

src/views/dataEntry_manage/mixins/addOreditMixin.js

@@ -229,68 +229,37 @@ export default {
 			})
 		},
 
-		/* 刷数据接口 图表未添加请求数据 */
-		refreshChart() {
-			let params =  this.sameOptionType.includes(this.chartInfo.ChartType) ? {
-				EdbInfoId: this.tableData.map(item => item.EdbInfoId).join(','),
-				ChartType: this.chartInfo.ChartType,
-				DateType: this.year_select,
-				StartDate:
-					this.year_select === 5 || this.year_select === 6
-						? this.select_date[0]
-						: '',
-				EndDate: this.year_select === 5 ? this.select_date[1] : '',
-			} : {
-				EdbInfoId: this.tableData[0].EdbInfoId,
-				ChartType: this.chartInfo.ChartType,
-				Calendar: this.calendar_type,
-				SeasonStartDate: this.season_year ? this.season_year[0] : '',
-				SeasonEndDate: this.season_year ? this.season_year[1] : '',
-			};
-			dataBaseInterface.chartInfo(params).then((res) => {
-				if(res.Ret !== 200) return;
-
-				//只替换新数据
-				res.Data.EdbInfoList.forEach((item, index) => {
-					const newData = item.DataList;
-					this.tableData[index].DataList = newData;
-					
-				});
-
-				/* 防止领先指标配置数据未更新 除掉散点图 */
-				(this.sameOptionType.includes(this.chartInfo.ChartType) && this.chartInfo.ChartType!==5) && this.refreshTarget();
-
-			})
-		},
-
-		/* 刷指标数据 用于领先指标  */
-		refreshTarget() {
-			this.tableData.forEach((item, index) => {
-				let params = {
-					EdbInfoId: item.EdbInfoId,
-					DateType: this.year_select,
-					StartDate:
-						this.year_select === 5 || this.year_select === 6
-							? this.select_date[0]
-							: '',
-					EndDate: this.year_select === 5 ? this.select_date[1] : '',
-					EdbInfoType: item.EdbInfoType,
-					LeadValue: item.EdbInfoType
-						? 0
-						: item.LeadValue,
-					LeadUnit: item.EdbInfoType
-						? ''
-						: item.LeadUnit,
-				};
-				dataBaseInterface.edbinfoDetail(params).then((res) => {
-					if (res.Ret === 200) {
-						let newData = res.Data.EdbInfo;
-						item.DataList = newData.DataList;
-						if(newData.EdbInfoCategoryType===1) item.MoveLatestDate = newData.MoveLatestDate;
-					}
-				});
-
-			})
+		/* 曲线图切换筛选项时请求数据 */
+		async getPreviewSplineInfo() {
+			let params = {
+        ChartType: this.chartInfo.ChartType,
+        DateType: this.year_select,
+        StartDate: [5, 6].includes(this.year_select)
+          ? this.select_date[0]
+          : '',
+        EndDate: this.year_select === 5 ? this.select_date[1] : '',
+        Calendar: this.calendar_type,
+        SeasonStartDate: this.season_year ? this.season_year[0] : '',
+        SeasonEndDate: this.season_year ? this.season_year[1] : '',
+        ChartEdbInfoList: this.tableData.map(_ => ({
+          EdbInfoId: _.EdbInfoId,
+          EdbInfoType: _.EdbInfoType,
+          LeadValue: _.EdbInfoType ? 0 : Number(_.LeadValue),
+          LeadUnit: _.EdbInfoType ? '' : _.LeadUnit,
+        }))
+      }
+
+      const res = await dataBaseInterface.getSplinePreviewData(params)
+
+      if(res.Ret !== 200) return
+
+      const { EdbInfoList } = res.Data;
+
+      this.tableData.forEach((item) => {
+        let edbData = EdbInfoList.find(_ => _.EdbInfoId===item.EdbInfoId);
+        item.DataList = edbData.DataList;
+        if(edbData.EdbInfoCategoryType===1) item.MoveLatestDate = edbData.MoveLatestDate;
+      });
 		},
 
 		/* 年份改变 重新刷新图表接口  保存当前的图表配置和上下限 只改变图表 */
@@ -299,7 +268,7 @@ export default {
 			this.select_date = '';
 			this.dateTip = '请选择时间段';
 
-			this.refreshChart();
+			this.getPreviewSplineInfo();
 		},
 
 		/* 打开时间段弹窗 */
@@ -325,12 +294,12 @@ export default {
 			} else {
 				this.dateTip = `${data.start_date}~至今`;
 			}
-			this.refreshChart();
+			this.getPreviewSplineInfo();
 		},
 
 			/* 季节图切换年份  保持当前配置 */
 		seasonYearChange() {
-			this.refreshChart();
+			this.getPreviewSplineInfo();
 		},
 
 		/* 切换图重置状态 */

src/views/mychart_manage/components/chartDetailDia.vue

@@ -307,7 +307,7 @@
               v-if="chartInfo.ChartType === 2 && !chartInfo.WarnMsg"
               v-model="calendar_type"
               class="calendar-cont"
-              @change="reloadChartInfo"
+              @change="getPreviewChartInfo"
             >
               <el-radio-button label="公历" />
               <el-radio-button label="农历" />
@@ -347,7 +347,7 @@
                     <el-radio
                       v-model="props.row.EdbInfoType"
                       :label="1"
-                      @change="refreshTarget"
+                      @change="getPreviewChartInfo"
                       >标准指标</el-radio
                     >
                     <div style="margin-top: 22px">
@@ -355,7 +355,7 @@
                         v-model="props.row.EdbInfoType"
                         :label="0"
                         style="margin-right: 10px"
-                        @change="refreshTarget"
+                        @change="getPreviewChartInfo"
                         >领先指标</el-radio
                       >
                       <template v-if="props.row.EdbInfoType === 0">
@@ -366,7 +366,7 @@
                           type="number"
                           min="0"
                           v-model="props.row.LeadValue"
-                          @change="refreshTarget"
+                          @change="getPreviewChartInfo"
                           @keyup.native="filterCode(props.row)"
                         ></el-input>
                         <el-select
@@ -374,7 +374,7 @@
                           placeholder=""
                           style="width: 60px"
                           size="mini"
-                          @change="refreshTarget"
+                          @change="getPreviewChartInfo"
                         >
                           <el-option
                             v-for="item in fre_options"
@@ -649,7 +649,7 @@ export default {
     getChartInfo(){
       this.getChartDetail(this.chartInfo.UniqueCode)
     },
-    /* 获取指标所有数据 */
+    /* 获取详情 */
     getChartDetail(code = '') {
       this.refreshLoading = true;
       dataBaseInterface
@@ -726,97 +726,40 @@ export default {
           : '请选择时间段';
     },
 
-    /* 选择项发生变化时 非配置项 获取新的图表数据 */
-    reloadChartInfo(type = '') {
-      let params =
-        this.sameOptionType.includes(this.chartInfo.ChartType)
-          ? {
-              ChartInfoId: this.chartInfo.ChartInfoId,
-              DateType: this.year_select,
-              StartDate: [5, 6].includes(this.year_select)
-                ? this.select_date[0]
-                : '',
-              EndDate: this.year_select === 5 ? this.select_date[1] : '',
-            }
-          : {
-              ChartInfoId: this.chartInfo.ChartInfoId,
-              Calendar: this.calendar_type,
-              SeasonStartDate: this.season_year ? this.season_year[0] : '',
-              SeasonEndDate: this.season_year ? this.season_year[1] : '',
-            };
-      dataBaseInterface.chartInfo(params).then((res) => {
-        if (res.Ret !== 200) return;
+    /* 曲线图筛选项发生变化时 非配置项 获取新的图表数据 */
+   async getPreviewChartInfo() {
+
+      let params = {
+        ChartType: this.chartInfo.ChartType,
+        DateType: this.year_select,
+        StartDate: [5, 6].includes(this.year_select)
+          ? this.select_date[0]
+          : '',
+        EndDate: this.year_select === 5 ? this.select_date[1] : '',
+        Calendar: this.calendar_type,
+        SeasonStartDate: this.season_year ? this.season_year[0] : '',
+        SeasonEndDate: this.season_year ? this.season_year[1] : '',
+        ChartEdbInfoList: this.tableData.map(_ => ({
+          EdbInfoId: _.EdbInfoId,
+          EdbInfoType: _.EdbInfoType,
+          LeadValue: _.EdbInfoType ? 0 : Number(_.LeadValue),
+          LeadUnit: _.EdbInfoType ? '' : _.LeadUnit,
+        }))
+      }
 
-        this.chartInfo = res.Data.ChartInfo;
-        let beforeOptions = sessionStorage.getItem('myChartbeforeOptions')
-          ? JSON.parse(sessionStorage.getItem('myChartbeforeOptions'))
-          : '';
-        //合并缓存配置和新的数据
-        let newarr = res.Data.EdbInfoList.map((item, index) => {
-          if (beforeOptions) {
-            const DataList = item.DataList;
-            return {
-              ...beforeOptions[index],
-              DataList,
-            };
-          } else {
-            return item;
-          }
-        });
-        this.tableData = newarr;
-
-        /* 防止上次配置领先指标 刷新后数据回到配置前 */
-        if (
-          type === 'refresh' &&
-          beforeOptions &&
-          (this.sameOptionType.includes(this.chartInfo.ChartType) && this.chartInfo.ChartType!==5)
-        ) {
-          this.refreshTarget();
-        }
-      });
-    },
+      const res = await dataBaseInterface.getSplinePreviewData(params)
+
+      if(res.Ret !== 200) return
+
+      const { EdbInfoList } = res.Data;
 
-    /* 刷新指标数据 领先值获取数据 */
-    refreshTarget() {
       this.tableData.forEach((item) => {
-        let params = {
-          EdbInfoId: item.EdbInfoId,
-          DateType: this.year_select,
-          StartDate:
-            this.year_select === 5 || this.year_select === 6
-              ? this.select_date[0]
-              : '',
-          EndDate: this.year_select === 5 ? this.select_date[1] : '',
-          EdbInfoType: item.EdbInfoType,
-          LeadValue: item.EdbInfoType ? 0 : item.LeadValue,
-          LeadUnit: item.EdbInfoType ? '' : item.LeadUnit,
-        };
-        dataBaseInterface.edbinfoDetail(params).then((res) => {
-          if (res.Ret !== 200) return;
-          let newData = res.Data.EdbInfo;
-          item.DataList = newData.DataList;
-          if(newData.EdbInfoCategoryType===1) item.MoveLatestDate = newData.MoveLatestDate;
-        });
+        let edbData = EdbInfoList.find(_ => _.EdbInfoId===item.EdbInfoId);
+        item.DataList = edbData.DataList;
+        if(edbData.EdbInfoCategoryType===1) item.MoveLatestDate = edbData.MoveLatestDate;
       });
     },
 
-    /* 设置默认时间选中项 */
-    setDefaultDateSelect() {
-      this.year_select = this.chartInfo.DateType;
-      this.select_date = [this.chartInfo.StartDate, this.chartInfo.EndDate];
-      this.calendar_type = this.chartInfo.Calendar; //日历类型
-      this.season_year = [
-        this.chartInfo.SeasonStartDate,
-        this.chartInfo.SeasonEndDate,
-      ];
-      this.dateTip =
-        this.chartInfo.DateType === 5
-          ? `${this.chartInfo.StartDate}~${this.chartInfo.EndDate}`
-          : this.chartInfo.DateType === 6
-          ? `${this.chartInfo.StartDate}~至今`
-          : '请选择时间段';
-    },
-
     /* 打开时间段弹窗 */
     openDateDia() {
       // 自定义时间段回显
@@ -843,13 +786,13 @@ export default {
           : `${data.start_date}~至今`;
 
       this.saveNowOptions();
-      this.reloadChartInfo('refresh');
+      this.getPreviewChartInfo();
     },
 
     /* 季节图切换年份  保持当前配置 */
     seasonYearChange() {
       this.saveNowOptions();
-      this.reloadChartInfo('refresh');
+      this.getPreviewChartInfo();
     },
 
     /* 年份改变 重新刷新图表接口  保存当前的图表配置和上下限 只改变图表 */
@@ -860,18 +803,18 @@ export default {
   
       //保存表格配置和上下限 曲线图需要保存表格配置
       this.saveNowOptions();
-      this.reloadChartInfo('refresh');
+      this.getPreviewChartInfo();
     },
 
     /* 保存图表当前配置项 上下限 */
     saveNowOptions() {
-      const dataArr = _.cloneDeep(this.tableData);
-      dataArr.forEach((item) => {
-        item.MaxData = Number(item.MaxData);
-        item.MinData = Number(item.MinData);
-        delete item.DataList;
-      });
-      sessionStorage.setItem('myChartbeforeOptions', JSON.stringify(dataArr));
+      // const dataArr = _.cloneDeep(this.tableData);
+      // dataArr.forEach((item) => {
+      //   item.MaxData = Number(item.MaxData);
+      //   item.MinData = Number(item.MinData);
+      //   delete item.DataList;
+      // });
+      // sessionStorage.setItem('myChartbeforeOptions', JSON.stringify(dataArr));
     },
 
     /* 一键刷新 超长等待..*/
@@ -896,7 +839,7 @@ export default {
         this.refreshLoading = false;
         if (res.Ret !== 200) return
         this.$message.success(res.Msg);
-        Source === 1 ? this.reloadChartInfo('refresh') : this.getChartDetail(UniqueCode);
+        Source === 1 ? this.getPreviewChartInfo() : this.getChartDetail(UniqueCode);
     },
     // 英文面板时候的判断
     copyChartConfirm(type){

src/views/ppt_manage/mixins/pptMixins.js

@@ -3,6 +3,7 @@ import Highcharts from "highcharts/highstock";
 import HighchartszhCN  from '@/utils/highcahrts-zh_CN'
 HighchartszhCN(Highcharts)
 import { dataBaseInterface,pptInterface } from "@/api/api.js";
+import {etaBaseConfigInterence} from '@/api/modules/etaBaseConfigApi.js';
 import {pptEnInterface} from '@/api/modules/pptEnApi.js';
 import * as sheetInterface from '@/api/modules/sheetApi.js';
 import futuresInterface from '@/api/modules/futuresBaseApi';
@@ -37,6 +38,9 @@ export default {
       dataLoading:null,//getPptData loading
       pageLoading:null,//演示时，切换page需要加载图表数据
       publishLoading:null,//发布时loading
+      pptCoverList:[],//配置ppt封面
+      pptBgImage:'',
+      pptBackImage:'',
 
       setEnName:false,
       // 传入的formItem所需内容
@@ -52,6 +56,23 @@ export default {
     }
   },
   methods: {
+    //获取ppt配置
+    async getpptConfig(){
+        const res = await etaBaseConfigInterence.getBaseConfig()
+        if(res.Ret!==200) return 
+        const {CnPptCoverImgs,CnPptBackgroundImg,CnPptBottomImg,
+               EnPptCoverImgs,EnPptBackgroundImg,EnPptBottomImg,
+              } = res.Data
+        if(this.currentLang==='en'){
+            this.pptCoverList = EnPptCoverImgs.split(',')
+            this.pptBgImage = EnPptBackgroundImg
+            this.pptBackImage = EnPptBottomImg
+        }else{
+            this.pptCoverList = CnPptCoverImgs.split(',')
+            this.pptBgImage = CnPptBackgroundImg
+            this.pptBackImage = CnPptBottomImg
+        }
+    },
     //获取ppt详情
     async getpptDataById(id){
       const res = this.currentLang!=='en'?await pptInterface.getpptDetail({
@@ -710,5 +731,8 @@ export default {
 			})
 			this.setEnName = false
 		},
+  },
+  mounted(){
+    this.getpptConfig()
   }
 }

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

@@ -2,7 +2,7 @@
     <div class="flex-column cover" style="width:100%;" v-if="pageInfo">
         <!-- <img :src="pageInfo.BackgroundImg" class="pptbg" /> -->
         <!-- <img :src="base64Url" class="pptbg" /> -->
-        <img :src="pageInfo.imgLocalUrl.image_url" class="pptbg"  style="width:100%"/>
+        <img :src="pageInfo.BackgroundImg" class="pptbg"  style="width:100%"/>
         <div
         style="width:62%; font-size:16px; text-align:center; line-height:1.6; color:#fff; position:absolute; right:20px; top:50%;zIndex:20;">
         <p style="height:5px; border-top:1px solid #fff;marginBottom:21px;"></p>

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

@@ -1,6 +1,6 @@
 <template>
     <div class="flex-column cover" style="width:100%;" v-if="pageInfo">
-        <img :src="pageInfo.imgLocalUrl" class="pptbg"  style="width:100%"/>
+        <img :src="pageInfo.BackgroundImg" class="pptbg"  style="width:100%"/>
         <div
         style="width:62%; font-size:16px; text-align:center; line-height:1.6; color:#fff; position:absolute; right:20px; top:50%;zIndex:20;">
         <p style="height:5px; border-top:1px solid #fff;marginBottom:21px;"></p>

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

@@ -10,8 +10,8 @@
               <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'" :key="item.id">
-            <img src="~@/assets/img/pptlastimg.png" class="pptbg" />
+          <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" 
@@ -158,6 +158,7 @@ export default {
       }
       this.$store.commit('SET_CHART_INFO_MAP',chartInfoMap)
       this.dataLoading.close();
+      $('.ppt-item').css('background-image',`url(${this.pptBgImage})`);
     },
     async getpptData(){
       const id = this.pptItem.PptId
@@ -261,7 +262,6 @@ export default {
       if($('.editor-content')[0]){
         $('.editor-content').css('transform',`scale(${this.contentScale})`)
       }
-      
     })
     window.onresize = ()=>{
       $('.ppt-item').css('height',$('.ppt-item').width()*0.7);
@@ -290,7 +290,7 @@ export default {
 .ppt-item{
   &#cover,&#back{
     overflow: hidden;
-    background:none;
+    background:none !important;
     img{
       width:100%;
     }

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

@@ -9,8 +9,8 @@
               <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'" :key="item.id">
-            <img src="~@/assets/img/ppt_en_last.png" class="pptbg" style="width:100%;height:100%;object-fit: fill !important;"/>
+          <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" 
@@ -153,6 +153,7 @@ export default {
       }
       this.$store.commit('SET_CHART_INFO_MAP',chartInfoMap)
       this.dataLoading.close();
+      $('.ppt-item').css('background-image',`url(${this.pptBgImage})`);
     },
     async getpptData(){
       const id = this.pptItem.PptId
@@ -285,7 +286,7 @@ export default {
 .ppt-item{
   &#cover,&#back{
     overflow: hidden;
-    background:none;
+    background:none !important;
     img{
       width:100%;
     }

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

@@ -54,24 +54,40 @@ export default {
     props:{
         firstPage:{
             type:Object
+        },
+        pptCoverList:{
+            type:Array
         }
     },
     data() {
         return {
             bgListIndex:0,
             bgList:[],
-            pageData:{}
+            pageData:{},
+            searchIndex:0
         };
     },
     mounted(){
         $('.el-date-editor .el-input__inner').css({backgroundColor: 'transparent',border:'none',color:'#fff',textAlign:'center',fontSize:'16px'});
 		$('.el-date-editor .el-icon-date' ).css({display:'none'});
-        this.bgList = pptCover
-        this.bgListIndex = this.firstPage.BackIndex
+        this.bgList = this.pptCoverList
+        this.searchIndex = this.bgList.findIndex(i=>i===this.firstPage.BackgroundImg)
+        this.bgListIndex = this.searchIndex===-1?0:this.searchIndex
         this.pageData = _.cloneDeep(this.firstPage)
+        //如果之前配置的图片不在pptCoverList里，则默认选中第一个，防止图片挂掉
+        if(this.searchIndex===-1){
+            this.pageData.BackgroundImg = this.bgList[0]
+            this.pageData.ImgUrl = this.bgList[0]
+            this.pageData.BackIndex = 0
+        }
     },
     methods: {
         closeDialog(){
+            //如果之前配置的图片不在pptCoverList里 用保存强制替换封面图
+            if(this.searchIndex===-1){
+                this.firstPage = Object.assign(this.firstPage,this.pageData)
+                this.$emit('save',this.firstPage)
+            }
             this.$emit('close')
         },
         saveFirstPage(){

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

@@ -55,24 +55,40 @@ export default {
     props:{
         firstPage:{
             type:Object
+        },
+        pptCoverList:{
+            type:Array
         }
     },
     data() {
         return {
             bgListIndex:0,
             bgList:[],
-            pageData:{}
+            pageData:{},
+            searchIndex:0
         };
     },
     mounted(){
         $('.el-date-editor .el-input__inner').css({backgroundColor: 'transparent',border:'none',color:'#fff',textAlign:'center',fontSize:'16px'});
 		$('.el-date-editor .el-icon-date' ).css({display:'none'});
-        this.bgList = pptCoverEn
-        this.bgListIndex = this.firstPage.BackIndex
+        this.bgList = this.pptCoverList
+        this.searchIndex = this.bgList.findIndex(i=>i===this.firstPage.BackgroundImg)
+        this.bgListIndex = this.searchIndex===-1?0:this.searchIndex
         this.pageData = _.cloneDeep(this.firstPage)
+        //如果之前配置的图片不在pptCoverList里，则默认选中第一个，防止图片挂掉
+        if(this.searchIndex===-1){
+            this.pageData.BackgroundImg = this.bgList[0]
+            this.pageData.ImgUrl = this.bgList[0]
+            this.pageData.BackIndex = 0
+        }
     },
     methods: {
         closeDialog(){
+            //如果之前配置的图片不在pptCoverList里 用保存强制替换封面图
+            if(this.searchIndex===-1){
+                this.firstPage = Object.assign(this.firstPage,this.pageData)
+                this.$emit('save',this.firstPage)
+            }
             this.$emit('close')
         },
         saveFirstPage(){

src/views/ppt_manage/newVersion/pptEditor.vue

@@ -2,7 +2,7 @@
   <div class="page-wrap">
     <div class="index-wrap ppt-page-wrap flex-column">
         <div class="cover-wrap" @click="openChooseCover">
-            <div class="cover" :style="'background: no-repeat center/cover url('+bgList[firstPage.BackIndex].image_url+')'">
+            <div class="cover" :style="'background: no-repeat center/cover url('+firstPage.BackgroundImg+')'">
                 <img src="~@/assets/img/ppt_m/add_first.png" />
             </div>
             <p class="hint-text">选择封面页</p>
@@ -225,6 +225,7 @@
     <!-- 选择封面弹窗 -->
     <choose-cover  v-if="isShowChooseCover"
         :firstPage="firstPage"
+        :pptCoverList="pptCoverList"
         @close="closeChooseCover"
         @save="saveCover"
     />
@@ -431,6 +432,7 @@ export default {
         i.isUpdating = false
       })     
       this.dataLoading.close();
+      $('.ppt-item').css('background-image',`url(${this.pptBgImage})`);
     },
     async getpptData(){
       const {id} = this.$route.query
@@ -1012,6 +1014,7 @@ export default {
     //自动保存PPT
     autoSave(){
       if(this.loopTimer) return 
+      if(!this.$route.query.id&&!this.pptId) return
       this.loopTimer = setInterval(()=>{
         const ppt_id = this.$route.query.id||this.pptId
         const {Title,ReportType,PptDate,BackgroundImg,BackIndex} = this.firstPage

src/views/ppt_manage/newVersion/pptEnEditor.vue

@@ -2,7 +2,7 @@
   <div class="page-wrap">
     <div class="index-wrap ppt-page-wrap flex-column">
         <div class="cover-wrap" @click="openChooseCover">
-            <div class="cover" :style="'background: no-repeat center/cover url('+bgList[firstPage.BackIndex].image_url+')'">
+            <div class="cover" :style="'background: no-repeat center/cover url('+firstPage.BackgroundImg+')'">
                 <img src="~@/assets/img/ppt_m/add_first.png" />
             </div>
             <p class="hint-text">选择封面页</p>
@@ -225,6 +225,7 @@
     <!-- 选择封面弹窗 -->
     <choose-cover  v-if="isShowChooseCover"
         :firstPage="firstPage"
+        :pptCoverList="pptCoverList"
         @close="closeChooseCover"
         @save="saveCover"
     />
@@ -452,6 +453,7 @@ export default {
         i.isUpdating = false
       })
       this.dataLoading.close();
+      $('.ppt-item').css('background-image',`url(${this.pptBgImage})`);
     },
     async getpptData(){
       const {id} = this.$route.query

src/views/ppt_manage/newVersion/pptEnPresent.vue

@@ -24,7 +24,7 @@
         />
         <!-- 封底 -->
         <index-item
-          v-if="currentItem"
+          v-if="currentItem&&isShowBack"
           :pageIndex="pageList.length+1" 
           :pageItem="backInfo.index" 
           :currentItem="currentItem"
@@ -44,7 +44,7 @@
             </div>
             <!-- 封底 -->
             <div class="ppt-item" id="back" v-else-if="currentIndex===pageList.length+1">
-              <img src="~@/assets/img/ppt_en_last.png" class="pptbg" style="width:100%;height:100%;object-fit: fill !important;"/>
+              <img :src="pptBackImage" class="pptbg" style="width:100%;height:100%;object-fit: fill !important;"/>
             </div>
             <!-- PPT内容 -->
               <div class="ppt-item" v-else>
@@ -70,7 +70,7 @@
         </div>
         <div class="other">
           <div class="page-info">
-            <span>第{{currentIndex+1}}页PPT,共{{pageList.length+2}}页</span>
+            <span>第{{currentIndex+1}}页PPT,共{{`${isShowBack?(pageList.length+2):(pageList.length+1)}`}}页</span>
           </div>
           <div class="btn-list">
             <el-button @click="(e)=>{FullScreen(e,'live')}" type="primary" class="btn">人像模式播放</el-button>
@@ -102,7 +102,7 @@
             </div>
             <!-- 封底 -->
             <div class="ppt-item" id="back" v-else-if="currentIndex===pageList.length+1">
-              <img src="~@/assets/img/ppt_en_last.png" class="pptbg" style="width:100%;height:100%;object-fit: fill !important;"/>
+              <img :src="pptBackImage" class="pptbg" style="width:100%;height:100%;object-fit: fill !important;"/>
             </div>
             <!-- PPT内容 -->
               <div class="ppt-item" v-else>
@@ -237,6 +237,9 @@ export default {
     },
     lineClamp(){
         return this.LayoutType===2?2:3
+    },
+    isShowBack(){
+        return Boolean(this.pptBackImage)
     }
   },
   methods: {
@@ -268,6 +271,7 @@ export default {
           $('.editor-content').css('transform',`scale(${this.contentScale})`)
         }
         this.changeLayersSize()
+        $('.ppt-item').css('background-image',`url(${this.pptBgImage})`);
       })
     },
     async init(){
@@ -465,7 +469,8 @@ export default {
     },
     //ppt下一页
     nextPPT(){
-      if(this.currentIndex===this.pageList.length+1){
+        const maxLength = this.isShowBack?(this.pageList.length+1):this.pageList.length
+      if(this.currentIndex===maxLength){
         //this.$message.warning('已经是最后一页')
         !this.hintText&&this.showHint('next')
       }else{
@@ -509,7 +514,7 @@ export default {
     },
     //currentItem内图层元素自适应
     changeLayersSize(){
-      if(this.currentItem.layers){
+      if(this.currentItem&&this.currentItem.layers){
         this.currentItem.layers.map(shape=>{
           const scale = calcScale({w:906,h:906*0.7},{w:$('.ppt-item').width(),h:$('.ppt-item').width()*this.coefficient})
           $('.shape').css('transform',`scale(${scale.x},${scale.y})`)

src/views/ppt_manage/newVersion/pptEnPublish.vue

@@ -37,8 +37,8 @@
             </component>
           </div>
           <!-- 封底 -->
-          <div class="ppt-item" id="back">
-            <img src="~@/assets/img/ppt_en_last.png" class="pptbg" style="width:100%;height:100%;object-fit: fill !important;"/>
+          <div class="ppt-item" id="back" v-if="pptBackImage.length">
+            <img :src="pptBackImage" class="pptbg" style="width:100%;height:100%;object-fit: fill !important;"/>
           </div>
         </div>
       </template>
@@ -48,8 +48,8 @@
 <script>
 import Cover from './components/CoverEn.vue';
 import TransReport from './components/catalog/transReport.vue';
-import {countComponentName,pptInit,toTextProps,toJson,svg2Base64,getImgRealSize,calcScale,getShapeOptions,createRandomCode,getTableData} from './utils/untils';
-import {marginTop,modelConfig,pptSlideMaster,pptCoverEn} from './utils/config';
+import {countComponentName,pptInit,pptConfigInit,toTextProps,toJson,svg2Base64,getImgRealSize,calcScale,getShapeOptions,createRandomCode,getTableData} from './utils/untils';
+import {marginTop,modelConfig,pptSlideMaster,pptSlideMasterEn,pptCoverEn} from './utils/config';
 import pptmixin from '../mixins/pptMixins';
 import mixins from '../mixins/mixins';
 import html2canvas from 'html2canvas';
@@ -146,6 +146,7 @@ export default {
           await this.initPageElements(this.pageList[i],'show')
         }
         this.dataLoading.close();
+        $('.ppt-item').css('background-image',`url(${this.pptBgImage})`);
       }
     },
     async getpptData(){
@@ -211,7 +212,10 @@ export default {
     async pageToPptx(){
       //开始计时
       const start = Date.now()
-      let pptx = pptInit(new pptxgen(),this.LayoutType,'en');
+      //let pptx = pptInit(new pptxgen(),this.LayoutType,'en');
+      const SlideMaster = _.cloneDeep(pptSlideMasterEn) 
+      SlideMaster.objects[1] = {image: {x:0,y:0,w:10,h:7,path:this.pptBgImage}}
+      let pptx = pptConfigInit(new pptxgen(),this.LayoutType,'en',SlideMaster,this.pptBgImage)
       //添加一页空白页,后续转换需要
       pptx.addSlide()
       const length = this.pageList.length;
@@ -355,22 +359,24 @@ export default {
           }
         }
       }
-      //添加封底
-      let back = pptx.addSlide()
-      let backId = this.loadingAll?'back':'changeback'
-      //let backImg = await this.htmlToCanvans(backId)
-      let backImg = $(`#${backId} img`)[0].src
-      back.addImage({
-        path: backImg,
-        x: 0,
-        y: 0,
-        w:'100%',
-        h: '100%',
-        size: { type: "contain" },
-      })
+      //添加封底 如果有
+      if(this.pptBackImage.length){
+        let back = pptx.addSlide()
+        let backId = this.loadingAll?'back':'changeback'
+        let backImg = $(`#${backId} img`)[0].src
+        back.addImage({
+            path: backImg,
+            x: 0,
+            y: 0,
+            w:'100%',
+            h: '100%',
+            size: { type: "contain" },
+        })
+      }
       //为了把封面放到第一页,操作pptx.slides达不成想要的效果,于是弄了个pptx2
       //将封面放在最后生成是因为htmlToCanvans占用太多内存会导致页面假死
-      let pptx2 = pptInit(new pptxgen(),this.LayoutType,'en');
+      //let pptx2 = pptInit(new pptxgen(),this.LayoutType,'en');
+      let pptx2 = pptConfigInit(new pptxgen(),this.LayoutType,'en',SlideMaster,this.pptBgImage)
       //添加封面
       let cover = pptx2.addSlide()
       let coverId = this.loadingAll?'cover':'changecover'

src/views/ppt_manage/newVersion/pptPresent.vue

@@ -24,7 +24,7 @@
         />
         <!-- 封底 -->
         <index-item
-          v-if="currentItem"
+          v-if="currentItem&&isShowBack"
           :pageIndex="pageList.length+1" 
           :pageItem="backInfo.index" 
           :currentItem="currentItem"
@@ -44,7 +44,7 @@
             </div>
             <!-- 封底 -->
             <div class="ppt-item" id="back" v-else-if="currentIndex===pageList.length+1">
-              <img src="~@/assets/img/pptlastimg.png" class="pptbg" style="width:100%;height:100%;object-fit: fill !important;"/>
+              <img :src="pptBackImage" class="pptbg" style="width:100%;height:100%;object-fit: fill !important;"/>
             </div>
             <!-- PPT内容 -->
               <div class="ppt-item" v-else>
@@ -70,7 +70,7 @@
         </div>
         <div class="other">
           <div class="page-info">
-            <span>第{{currentIndex+1}}页PPT,共{{pageList.length+2}}页</span>
+            <span>第{{currentIndex+1}}页PPT,共{{`${isShowBack?(pageList.length+2):(pageList.length+1)}`}}页</span>
           </div>
           <div class="btn-list">
             <el-button @click="(e)=>{FullScreen(e,'live')}" type="primary" class="btn">人像模式播放</el-button>
@@ -102,7 +102,7 @@
             </div>
             <!-- 封底 -->
             <div class="ppt-item" id="back" v-else-if="currentIndex===pageList.length+1">
-              <img src="~@/assets/img/pptlastimg.png" class="pptbg" style="width:100%;height:100%;object-fit: fill !important;"/>
+              <img :src="pptBackImage" class="pptbg" style="width:100%;height:100%;object-fit: fill !important;"/>
             </div>
             <!-- PPT内容 -->
               <div class="ppt-item" v-else>
@@ -235,6 +235,9 @@ export default {
     },
     lineClamp(){
         return this.LayoutType===2?2:3
+    },
+    isShowBack(){
+        return Boolean(this.pptBackImage)
     }
   },
   methods: {
@@ -266,6 +269,7 @@ export default {
           $('.editor-content').css('transform',`scale(${this.contentScale})`)
         }
         this.changeLayersSize()
+        $('.ppt-item').css('background-image',`url(${this.pptBgImage})`);
       })
     },
     async init(){
@@ -463,7 +467,8 @@ export default {
     },
     //ppt下一页
     nextPPT(){
-      if(this.currentIndex===this.pageList.length+1){
+      const maxLength = this.isShowBack?(this.pageList.length+1):this.pageList.length
+      if(this.currentIndex===maxLength){
         //this.$message.warning('已经是最后一页')
         !this.hintText&&this.showHint('next')
       }else{
@@ -507,7 +512,7 @@ export default {
     },
     //currentItem内图层元素自适应
     changeLayersSize(){
-      if(this.currentItem.layers){
+      if(this.currentItem&&this.currentItem.layers){
         this.currentItem.layers.map(shape=>{
           const scale = calcScale({w:906,h:906*0.7},{w:$('.ppt-item').width(),h:$('.ppt-item').width()*this.coefficient})
           $('.shape').css('transform',`scale(${scale.x},${scale.y})`)

src/views/ppt_manage/newVersion/pptPublish.vue

@@ -38,8 +38,8 @@
             </component>
           </div>
           <!-- 封底 -->
-          <div class="ppt-item" id="back">
-            <img src="~@/assets/img/pptlastimg.png" class="pptbg" style="width:100%;height:100%;object-fit: fill !important;"/>
+          <div class="ppt-item" id="back" v-if="pptBackImage.length">
+            <img :src="pptBackImage" class="pptbg" style="width:100%;height:100%;object-fit: fill !important;"/>
           </div>
         </div>
       </template>
@@ -108,7 +108,7 @@
 import Cover from './components/Cover.vue';
 import TransReport from './components/catalog/transReport.vue';
 //import {pageList} from './utils/mock';
-import {countComponentName,pptInit,toTextProps,toJson,svg2Base64,getImgRealSize,calcScale,getShapeOptions,createRandomCode,getTableData} from './utils/untils';
+import {countComponentName,pptInit,pptConfigInit,toTextProps,toJson,svg2Base64,getImgRealSize,calcScale,getShapeOptions,createRandomCode,getTableData} from './utils/untils';
 import {marginTop,modelConfig,pptSlideMaster} from './utils/config';
 import pptmixin from '../mixins/pptMixins';
 import mixins from '../mixins/mixins';
@@ -209,6 +209,7 @@ export default {
           await this.initPageElements(this.pageList[i],'show')
         }
         this.dataLoading.close();
+        $('.ppt-item').css('background-image',`url(${this.pptBgImage})`);
       }else{
         await this.getpptData();
         this.initVirtualScroll()
@@ -278,7 +279,10 @@ export default {
     async pageToPptx(){
       //开始计时
       const start = Date.now()
-      let pptx = pptInit(new pptxgen(),this.LayoutType);
+      //let pptx = pptInit(new pptxgen(),this.LayoutType);
+      const SlideMaster = _.cloneDeep(pptSlideMaster) 
+      SlideMaster.objects[1] = {image: {x:0,y:0,w:10,h:7,path:this.pptBgImage}}
+      let pptx = pptConfigInit(new pptxgen(),this.LayoutType,'ch',SlideMaster,this.pptBgImage)
       //添加一页空白页,后续转换需要
       pptx.addSlide()
       const length = this.pageList.length;
@@ -435,26 +439,28 @@ export default {
           }
         }
       }
-      //添加封底
-      let back = pptx.addSlide()
-      let backId = this.loadingAll?'back':'changeback'
-      //let backImg = await this.htmlToCanvans(backId)
-      let backImg = $(`#${backId} img`)[0].src
-      back.addImage({
-        path: backImg,
-        x: 0,
-        y: 0,
-        w:'100%',
-        h: '100%',
-        size: { type: "contain" },
-      })
+      //添加封底 如果有
+      if(this.pptBackImage.length){
+        let back = pptx.addSlide()
+        let backId = this.loadingAll?'back':'changeback'
+        let backImg = $(`#${backId} img`)[0].src
+        back.addImage({
+            path: backImg,
+            x: 0,
+            y: 0,
+            w:'100%',
+            h: '100%',
+            size: { type: "contain" },
+        })
+      }
+      
       //为了把封面放到第一页,操作pptx.slides达不成想要的效果,于是弄了个pptx2
       //将封面放在最后生成是因为htmlToCanvans占用太多内存会导致页面假死
-      let pptx2 = pptInit(new pptxgen(),this.LayoutType);
+      //let pptx2 = pptInit(new pptxgen(),this.LayoutType);
+      let pptx2 = pptConfigInit(new pptxgen(),this.LayoutType,'ch',SlideMaster,this.pptBgImage)
       //添加封面
       let cover = pptx2.addSlide()
       let coverId = this.loadingAll?'cover':'changecover'
-      //let coverImg = await this.htmlToCanvans(coverId)
       let coverImg = $(`#${coverId} .cover img`)[0].src
       cover.addImage({
         path: coverImg,

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

@@ -60,6 +60,23 @@ export const pptInit = (pptx,LayoutType,lang='ch') => {
   pptx.defineSlideMaster(sliderMaster)
 return pptx
 }
+//ppt配置化后 init ppt
+export const pptConfigInit = (pptx,LayoutType,lang='ch',SlideMaster,pptBgImg)=>{
+    let layout = pptLayout,
+        sliderMaster = SlideMaster
+    //如果布局不是10:7 背景图、页码需要做位置调整
+    if(LayoutType!==1){
+        layout = { name: "myppt", width: 10, height: LayoutType===2?5.625:7.5 }
+        const y = lang==='ch'?0:-0.1
+        const h = LayoutType===2?5.625:7.5
+        sliderMaster.objects[1] = {image: {x:0,y:y,w:10,h:lang==='ch'?h:h+0.1,path:pptBgImg}}
+        sliderMaster.slideNumber = {x:'95%',y:LayoutType===2?'92%':'95%',fontSize:12}
+    }
+    pptx.defineLayout(layout)
+    pptx.layout = layout.name
+    pptx.defineSlideMaster(sliderMaster)
+    return pptx
+}
 //解析富文本，参考https://github.com/pipipi-pikachu/PPTist/tree/master/src/utils/htmlParser
 export const toJson = (html) => {
     const json = parse(html)

src/views/predictEdb_manage/addPredicEdb.vue

@@ -88,6 +88,7 @@
                 v-model="formData.dateType"
                 placeholder="请选择日期类型"
                 style="width: 100%"
+                @change="getChartInfo"
               >
                 <el-option label="交易日" value="交易日"></el-option>
                 <el-option label="自然日" value="自然日"></el-option>
@@ -657,8 +658,11 @@ export default {
         if (res.Ret !== 200) return;
 
         this.classifyArr = res.Data.AllNodes || [];
-        //将formData.classify转为数组的格式
-        this.formData.classify = this.findParentNodeHandle(this.classifyArr,this.formData.classify).reverse()
+
+        if (this.$route.path == "/editpredictEdb") {
+          //将formData.classify转为数组的格式
+          this.formData.classify = this.findParentNodeHandle(this.classifyArr,this.formData.classify).reverse()
+        } 
 
       });
     },
@@ -811,7 +815,8 @@ export default {
         Calendar: this.$refs.chartInfo.calendar_type,
         ChartType: this.$refs.chartInfo.chartInfo.ChartType,
         SeasonStartDate: this.$refs.chartInfo.season_year[0] || "",
-        SeasonEndDate: this.$refs.chartInfo.season_year[1] || ""
+        SeasonEndDate: this.$refs.chartInfo.season_year[1] || "",
+        DataDateType: this.formData.dateType,
       }
 
       const res = await preDictEdbInterface.edbChartDataForAdd(rules_params.length ? {...params,RuleList: rules_params} : params);

src/views/predictEdb_manage/components/edbDetail.vue

@@ -60,7 +60,7 @@ export default {
                 Calendar:this.$refs.chartInfo.calendar_type
 			}).then(res=>{
                 if(res.Ret!=200) return
-                this.edbData.DataList=res.Data.DataList
+                this.edbData.DataList=res.Data.DataList||[]
                 this.edbData.EdbInfo={
                     ...res.Data.EdbInfo,
                     ChartColor:'',

src/views/predictEdb_manage/predictEdb.vue

@@ -611,9 +611,15 @@ export default {
 		select_id(newval) {
 			this.detail_show_chart = true;
 			this.$nextTick(()=>{
-				//切换为曲线图
-				this.$refs.detailComponentRef&&
-				(this.$refs.detailComponentRef.$refs.chartInfo.chartInfo.ChartType=1)
+				//切换为曲线图 重置选择状态
+				if(this.$refs.detailComponentRef){
+					this.$refs.detailComponentRef.$refs.chartInfo.chartInfo.ChartType=1;
+					this.$refs.detailComponentRef.$refs.chartInfo.year_select=10;
+					this.$refs.detailComponentRef.$refs.chartInfo.select_date=[];
+					this.$refs.detailComponentRef.$refs.chartInfo.season_year=[];
+					this.$refs.detailComponentRef.$refs.chartInfo.dateTip='请选择时间段';
+
+				}
 			})
 				
 		},

src/views/report_manage/editChapterReport.vue

@@ -61,12 +61,10 @@
           border: 1px solid #3464e0;
         "
       >
-        <div id="tabs">
-          <el-tabs v-model="tabsactive">
-            <el-tab-pane :label="tab" :name="tab" v-for="tab in weekPanelTabs" :key="tab"></el-tab-pane>
-          </el-tabs>
-        </div>
-        <div
+        <el-tabs v-model="tabsactive">
+					<el-tab-pane :label="tab" :name="tab" v-for="tab in panelTabs" :key="tab"></el-tab-pane>
+				</el-tabs>
+				<div
           v-if="tabsactive == '基础信息'"
           style="height: calc(100vh - 280px); overflow-y: auto"
         >
@@ -302,10 +300,9 @@ import {
   fittingEquationInterface,
   statisticFeatureInterface,
 } from "@/api/modules/chartRelevanceApi";
-import VueFroala from "vue-froala-wysiwyg";
-import urlSlug from "url-slug";
 import http from "@/api/http.js";
 import mixinMsg from "./mixins/messagePush";
+import reportMixin from './mixins/reportMixin';
 import moment from "moment";
 import importMyChart from "./components/importMyChart.vue";
 import importSemantics from './components/importSemantics.vue';
@@ -319,9 +316,8 @@ export default {
     to.matched[1].name = to.query.typename;
     next();
   },
-  mixins: [mixinMsg],
+  mixins: [mixinMsg,reportMixin],
   data() {
-    var that = this;
     return {
       weekPanelTabs:[
         "基础信息",
@@ -372,130 +368,13 @@ export default {
         ],
         addType: [{ required: true, message: "请选择", trigger: "change" }],
       },
-      editor: null,
       lastEditRange: null,
-      froalaConfig: {
-        toolbarButtons: [
-          "insertImage",
-          "insertVideo",
-          "insertLink",
-          "embedly",
-          "insertFile",
-          "textColor",
-          "bold",
-          "italic",
-          "underline",
-          "strikeThrough",
-          "subscript",
-          "superscript",
-          "fontFamily",
-          "fontSize",
-          "color",
-          "inlineClass",
-          "inlineStyle",
-          "paragraphStyle",
-          "lineHeight",
-          "paragraphFormat",
-          "align",
-          "formatOL",
-          "formatUL",
-          "outdent",
-          "indent",
-          "quote",
-          "insertTable",
-          "emoticons",
-          "fontAwesome",
-          "specialCharacters",
-          "insertHR",
-          "selectAll",
-          "clearFormatting",
-          "html",
-          "undo",
-          "redo",
-        ],
-        imageDefaultWidth: false,
-        imageInsertButtons: ["imageUpload", "imageByURL"],
-        height: 800,
-        fontSizeDefaultSelection: "16",
-        fontSize: ["12", "14", "16", "18", "20", "24", "28", "32", "36", "40"],
-        theme: "dark", //主题
-        placeholderText: "请输入内容",
-        language: "zh_cn", //国际化
-        imageUploadURL: process.env.VUE_APP_API_ROOT + "/report/uploadImg", //上传url
-        imagePaste: true,
-        imagePasteProcess: true,
-        imageResize: true,
-        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
-        toolbarSticky: false, //操作栏是否自动吸顶
-        imageEditButtons: [
-          "imageLink",
-          "imageAlign",
-          "imageInfo",
-          "imageRemove",
-        ],
-        quickInsertButtons: ["image", "table", "ul", "ol", "hr"], //快速插入项
-        toolbarVisibleWithoutSelection: true, //是否开启 不选中模式
-        saveInterval: 0,
-        /* saveParam: 'Content',
-					saveURL: process.env.VUE_APP_API_ROOT+'/report/saveReportContent',
-					saveMethod: 'POST',
-					saveParams: {}, */
-        events: {
-          initialized: function () {
-            //this.editor 定义在vue data 中
-            that.editor = this;
-          },
-          keyup: function (e, editor) {
-            //添加事件，在每次按键按下时，都记录一下最后停留位置
-            that.lastEditRange = getSelection().getRangeAt(0) || 0;
-          },
-          click: function (e, editor) {
-            //添加事件，在每次鼠标点击时，都记录一下最后停留位置
-            if (getSelection().type === "None") return;
-            that.lastEditRange = getSelection().getRangeAt(0) || 0;
-          },
-          //内容改变事件
-          contentChanged: function () {
-            console.log("cont-change");
-            that.ischange = true;
-            if (getSelection().type !== "None") {
-              that.lastEditRange = getSelection().getRangeAt(0) || 0;
-            }
-          },
-          //粘贴图片上传事件
-          "image.beforePasteUpload": function (img) {
-            //console.log('image.beforePasteUpload',img)
-            //暂停自动保存
-            that.autoSaveFlag = false;
-          },
-          //点击toolbar上传图片事件
-          "image.beforeUpload": function (imgs) {
-            //console.log('image.beforeUpload',imgs)
-            //暂停自动保存
-            that.autoSaveFlag = false;
-          },
-          "image.inserted": function ($img, response) {
-            //console.log('img-inserted',$img)
-            //开启自动保存
-            that.autoSaveFlag = true;
-          },
-          //如果上传图片出错,重置autoSaveFlag
-          "image.error": function (error, response) {
-            that.autoSaveFlag = true;
-          },
-        },
-        charCounterCount: false,
-      },
       reportloadding: false,
-      lastsavetime: "",
       timer: null,
       ischange: false,
-      isPublishloading: false,
 
       chapterTypeId: 0, //章节类型id
 
-      chart_source: 1,
       search_page: 1,
       search_page_sizes: 20,
       search_have_more: true,
@@ -507,17 +386,21 @@ export default {
   },
   mounted() {
     this.getreportdetail();
-    this.getChartList("");
-    // // $("#rightitems").css({minHeight:screen.height});
-    this.getSandTable();
+    this.getreportlist("");
+
+		this.getSandTable();
+		this.getSheetList();
     this.timer = setInterval(() => {
       this.autoSave();
     }, 6000);
+
+    window.addEventListener('message',this.reInitIframe)
   },
   updated() {
     $("#leftfroala").find("p").css({ fontSize: "16px" });
   },
   destroyed() {
+    window.removeEventListener('message',this.reInitIframe)
     if (this.timer) {
       clearInterval(this.timer);
     }
@@ -843,39 +726,6 @@ export default {
       this.isPublishloading = false;
     },
 
-    insertHtml(item, type = "html") {
-      //设置编辑器获取焦点
-      this.editor.events.focus();
-      // 获取选定对象
-      const selection = getSelection();
-      // 判断是否有最后光标对象存在
-      if (this.lastEditRange) {
-        // 存在最后光标对象，选定对象清除所有光标并添加最后光标还原之前的状态
-        selection.removeAllRanges();
-        selection.addRange(this.lastEditRange);
-      }
-      //插入内容
-      if (type === "image") {
-        this.$nextTick(() => {
-          this.editor.html.insert(
-            `<img style='width:100%' src='${item.PicUrl}' />`
-          );
-        });
-      } else {
-        if (item.Disabled)
-          return this.$message.warning("内部图表，不允许插入报告");
-
-        const LINK_CHART_URL = process.env.CHART_LINK;
-        this.$nextTick(() => {
-          this.editor.html.insert(
-            `<p style='text-align:left; margin-top:10px;'>
-							<iframe src='${LINK_CHART_URL}?code=${item.UniqueCode}' width='100%' height='350' style='border-width:0px; min-height:350px;'></iframe>
-						</p>`
-          );
-        });
-      }
-      this.lastEditRange = selection.getRangeAt(0);
-    },
     //批量插入我的图表
     handleImportMyChart(data) {
       //设置编辑器获取焦点
@@ -921,42 +771,6 @@ export default {
       });
     },
 
-    async getChartList(word) {
-      let params = {
-        Keyword: word || "",
-        CurrentIndex: this.search_page,
-        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);
-      }
-
-      if (res.Ret !== 200) return;
-      res.Data.List = res.Data.List || [];
-      this.chartlist =
-        this.search_page === 1
-          ? res.Data.List
-          : [...this.chartlist, ...res.Data.List];
-      this.search_have_more = this.search_page < res.Data.Paging.Pages;
-    },
-
-    loadReportHandle() {
-      if (!this.search_have_more) return;
-      this.search_page++;
-      this.getChartList(this.key_word);
-    },
-
     // 获取沙盘图列表 分页
     getSandTable() {
       this.sandTableLoading = true;
@@ -1104,3 +918,11 @@ export default {
   }
 }
 </style>
+<style lang="scss">
+#editreport {
+	.el-tabs__nav-wrap::after {
+		height: 0;
+	}
+	.el-tabs__item { font-size: 16px; }
+}	
+</style>

src/views/report_manage/reportEn/reportlist.vue

@@ -127,8 +127,8 @@
             <span v-else>{{ item.label }}</span>
           </template>	
 					<template slot-scope="{row}">
-							<span v-if="item.key==='Title'">
-								<span style="cursor:pointer; color:#4099ef;" @click="lookreportdtl(row)">{{row.Title}}</span>
+							<span v-if="item.key==='Title'" @click="lookreportdtl(row)">
+								<span style="cursor:pointer; color:#4099ef;">{{row.Title}}</span>
 							  <span style="cursor:pointer; color:#4099ef;" v-if="row.CreateTime">({{row.CreateTime.substring(5,7)}}{{row.CreateTime.substring(8,10)}})</span>
 							</span>
               <span v-else-if="item.key==='ClassifyNameFirst'">

src/views/report_manage/reportlist.vue

@@ -144,29 +144,31 @@
             min-width="140"
           >
             <template slot-scope="scope">
-              <span
-                style="cursor: pointer; color: #4099ef"
-                @click="lookreportdtl(scope.row)"
+              <div @click="lookreportdtl(scope.row)">
+                <span
+                  style="cursor: pointer; color: #4099ef"
                 >{{ scope.row.Title }}</span
-              >
-              <span
-                style="cursor: pointer; color: #4099ef"
-                v-if="scope.row.MsgSendTime"
-                >({{ scope.row.MsgSendTime.substring(5, 7)
-                }}{{ scope.row.MsgSendTime.substring(8, 10) }})</span
-              >
-              <span
-                style="cursor: pointer; color: #4099ef"
-                v-else-if="scope.row.PublishTime"
-                >({{ scope.row.PublishTime.substring(5, 7)
-                }}{{ scope.row.PublishTime.substring(8, 10) }})</span
-              >
-              <span
-                style="cursor: pointer; color: #4099ef"
-                v-else-if="scope.row.CreateTime"
-                >({{ scope.row.CreateTime.substring(5, 7)
-                }}{{ scope.row.CreateTime.substring(8, 10) }})</span
-              >
+                >
+                <span
+                  style="cursor: pointer; color: #4099ef"
+                  v-if="scope.row.MsgSendTime"
+                  >({{ scope.row.MsgSendTime.substring(5, 7)
+                  }}{{ scope.row.MsgSendTime.substring(8, 10) }})</span
+                >
+                <span
+                  style="cursor: pointer; color: #4099ef"
+                  v-else-if="scope.row.PublishTime"
+                  >({{ scope.row.PublishTime.substring(5, 7)
+                  }}{{ scope.row.PublishTime.substring(8, 10) }})</span
+                >
+                <span
+                  style="cursor: pointer; color: #4099ef"
+                  v-else-if="scope.row.CreateTime"
+                  >({{ scope.row.CreateTime.substring(5, 7)
+                  }}{{ scope.row.CreateTime.substring(8, 10) }})</span
+                >
+
+              </div>
             </template>
           </el-table-column>
           <el-table-column

src/views/semantics_manage/semantics/semanticsEditPage.vue

@@ -731,7 +731,7 @@ export default {
             if(text.areaRangeInfo){
                 const {StartOffset,EndOffset} = text.areaRangeInfo
                 const isIncludeStart = startOffset<=StartOffset
-                const isIncludeEnd = endOffset>=EndOffset
+                const isIncludeEnd = endOffset<=EndOffset
                 isIncludeStart&&isIncludeEnd&&(textAreaInfo.push(text))
             }
         })

src/views/semantics_manage/utils/config.js

@@ -275,7 +275,8 @@ export const froalaConfig = {
   wordPasteKeepFormatting:false,
   pastePlain:true,
   wordPasteModal:false,
-  pasteDeniedTags:['ol','li']
+  pasteDeniedTags:['ol','li'],
+  pluginsEnabled:[],//禁止所有插件，这样就不会粘贴图片
 }
 
 //icon map 方便管理

src/views/semantics_manage/utils/index.js

@@ -65,6 +65,23 @@ export const checkSelectedLabel = (selectArr, arr) => {
   const concatIds = new Set(selectArrIds.concat(arrIds))
   return !(concatIds.size === (arrIds.length + selectArrIds.length))
 }
+/**
+ * 判断数组内的每一项是否有与obj相等的
+ * @param {Array} list 
+ * @param {Object} obj 
+ * @returns 
+ */
+export const isTextEqual = (list, obj) => {
+    let flag = false
+    for (let i = 0; i < list.length; i++) {
+        if (_.isEqual(list[i], obj)) {
+            flag = true
+            break
+
+        }
+    }
+    return flag
+}
 /**
  * 获取文档的纯文本
  * @param {Object} file 
@@ -113,13 +130,15 @@ export const formatSemanticFile = (file,selectArr)=>{
     item.ishasThisLabel = item.isThisLabelArr.length ? true : false
     item.isSelectLabel = checkSelectedLabel(selectArr, item.isHistoryLabelArr) ||
       checkSelectedLabel(selectArr, item.isOtherLabelArr)||checkSelectedLabel(selectArr,item.isThisLabelArr)
-    if(item.IsPart===1){
-        textAreaList.push(
-            {...item,
-            ...{
-                startOffset:item.StartIndex,
-                endOffset:item.EndIndex
-            }})
+    if (item.IsPart === 1) {
+        const tempObj = {
+                ...item,
+                ...{
+                    startOffset: item.StartIndex,
+                    endOffset: item.EndIndex
+                }
+            }
+            !isTextEqual(textAreaList, tempObj) && textAreaList.push(tempObj)
     }
     return item
   })

src/views/system_manage/components/configAnnotation.vue

@@ -0,0 +1,44 @@
+<template>
+    <div class="config-annotation-wrap">
+        <el-button type="text" @click="showImage">{{buttonText}}</el-button>
+        <span class="hint-text">{{picHintText}}</span>
+    </div>
+</template>
+
+<script>
+export default {
+    props:{
+        buttonText:{
+            type:String,
+            default:'查看示意图'
+        },
+        picName:{
+            type:String,
+            default:''
+        },
+        picHintText:{
+            type:String,
+            default:'上传格式：png、jpg'
+        }
+    },
+    data() {
+        return {
+
+        };
+    },
+    methods: {
+        showImage(){
+            this.$emit('showImage',this.picName)
+        }
+    },
+};
+</script>
+
+<style scoped lang="scss">
+.config-annotation-wrap{
+    .hint-text{
+        margin-left: 20px;
+        color: #dcdcdc;
+    }
+}
+</style>

src/views/system_manage/components/imgThumbnail.vue

@@ -0,0 +1,92 @@
+<template>
+    <ul class="img-thumbanail-wrap">
+        <li class="img-item" v-for="(img,index) in _.cloneDeep(this.imgList).reverse()" :key="index" @click="showImage(img)">
+            <img :src="img" />
+            <span class="mask">
+                <span
+                    class="mask-icon"
+                    @click.stop="deleteImg(img)"
+                >
+                    <i class="el-icon-delete"></i>
+                </span>
+            </span>
+        </li>
+    </ul>
+</template>
+
+<script>
+import _ from "lodash";
+export default {
+    props:{
+        imgList:{
+            type:Array,
+            default:()=>{return []}
+        }
+    },
+    data() {
+        return {
+            showList:_.cloneDeep(this.imgList).reverse()
+        };
+    },
+    methods: {
+        deleteImg(img){
+            //数组是逆序过的，需要找到正确的index
+            const index = this.imgList.findIndex(i=>i===img)||0
+            this.$emit('deleteImg',index)
+        },
+        showImage(img){
+            this.$emit('showImage',{list:this.imgList,item:img})
+        }
+    },
+};
+</script>
+
+<style scoped lang="scss">
+.img-thumbanail-wrap{
+    display: flex;
+    width:280px;
+    gap:20px;
+    margin-left: 20px;
+    .img-item{
+        position:relative;
+        width:120px;
+        height: 120px;
+        background-color: #F5F7F9;
+        border: 1px dashed #DCDFE6;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        box-sizing: border-box;
+        padding:4px;
+        overflow: hidden;
+        img,.mask{
+            width:100%;
+            height:100%;
+        }
+        &:hover{
+            border: 1px dashed #3375e1;
+            .mask {
+                opacity: 1;
+            }
+        }
+        .mask {
+            position: absolute;
+            left: 0;
+            top: 0;
+            cursor: default;
+            text-align: center;
+            color: #fff;
+            opacity: 0;
+            font-size: 20px;
+            background-color: rgba(0, 0, 0, .5);
+            transition: opacity .3s;
+            z-index: 2;
+            line-height: 120px;
+            .mask-icon {
+                cursor: pointer;
+            }
+        }
+    }
+}
+</style>

src/views/system_manage/components/imgUpload.vue

@@ -0,0 +1,108 @@
+<template>
+    <el-upload action="" accept="image/*" :http-request="handleUploadImg" :show-file-list="false"
+        :key="uploadKey">
+        <div class="upload-box">
+            <template v-if="!imgUrl.length">
+                <i class="el-icon-plus" style="font-size: 24px;"></i>
+                <p class="form-hint">点击上传图片</p>
+            </template>
+            <template v-else>
+                <img class="upload-img" :src="imgUrl" alt="配图">
+                <span class="upload-mask" @click.stop="showImage">
+                    <span class="mask-icon" @click.stop="handleRemove">
+                        <i class="el-icon-delete"></i>
+                    </span>
+                </span>
+            </template>
+        </div>
+    </el-upload>
+</template>
+
+<script>
+    export default {
+        props: {
+            imgUrl: {
+                type: String,
+                default: ''
+            }
+        },
+        data() {
+            return {
+                uploadKey: 0
+            };
+        },
+        watch: {
+            imgUrl(newVal) {
+                //this.uploadKey++
+            }
+        },
+        methods: {
+            handleUploadImg(file) {
+                this.$emit('upload', file)
+            },
+            handleRemove() {
+                this.$emit('remove')
+            },
+            showImage(){
+                this.$emit('showImage',[this.imgUrl])
+            }
+        },
+    };
+</script>
+
+<style scoped lang="scss">
+    .el-upload {
+        .upload-box {
+            position: relative;
+            width: 120px;
+            height: 120px;
+            background-color: #F5F7F9;
+            border: 1px dashed #DCDFE6;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            box-sizing: border-box;
+            padding: 4px;
+            overflow: hidden;
+
+            &:hover {
+                border: 1px dashed #3375e1;
+
+                .upload-mask {
+                    opacity: 1;
+                }
+            }
+
+            .form-hint {
+                margin-top: 10px;
+                color: #999999;
+            }
+
+            .upload-img,
+            .upload-mask {
+                width: 100%;
+                height: 100%;
+            }
+
+            .upload-mask {
+                position: absolute;
+                left: 0;
+                top: 0;
+                cursor: default;
+                text-align: center;
+                color: #fff;
+                opacity: 0;
+                font-size: 20px;
+                background-color: rgba(0, 0, 0, .5);
+                transition: opacity .3s;
+                z-index: 2;
+                line-height: 120px;
+
+                .mask-icon {
+                    cursor: pointer;
+                }
+            }
+        }
+    }
+</style>

src/views/system_manage/dataAuthManage.vue

@@ -190,7 +190,7 @@ export default {
 					// console.log(bol)
 					bol === -1 && this.userList.unshift({AdminRealName: i.ItemName,
 						AdminId:id});
-					this.default_user = bol === -1 ? id : '';
+					this.default_user = id;
 				}
 			}
 		},

src/views/system_manage/etaBaseConfig.vue

@@ -0,0 +1,424 @@
+<template>
+    <div class="eta-base-config">
+        <el-form  :model="formData" :rules="rules" label-position="top" class="base-config-form"
+            label-width="120px" ref="baseConfigForm">
+            <div class="part-base part">
+                <div class="side">
+                    <el-form-item label="公司名称" prop="CompanyName">
+                        <el-input type="text" v-model="formData.CompanyName" placeholder="请输入公司名称" />
+                        <ConfigAnnotation picHintText="" picName="CompanyName" @showImage="previewImage"/>
+                    </el-form-item>
+                    <el-form-item label="公司水印" prop="CompanyWatermark" class="watermark">
+                        <ImgUpload 
+                            :imgUrl="formData.CompanyWatermark"
+                            @showImage="showImage"
+                            @upload="(file)=>handleUploadImage(file,'CompanyWatermark')"
+                            @remove="deleteFormImg('CompanyWatermark')"
+                            />
+                        <!-- 后面可能会有新的选项 -->
+                        <el-checkbox-group v-model="checkList" style="position: absolute;top: -40px;left: 100px;">
+                            <el-checkbox label="研报图表"></el-checkbox>
+                        </el-checkbox-group>
+                        <ConfigAnnotation picName="CompanyWatermark" @showImage="previewImage"/>
+                    </el-form-item>
+                </div>
+                <div class="side">
+                    <el-form-item label="免责声明" prop="Disclaimer" class="disclaimer">
+                        <div class="rich-editor-wrap">
+                            <froala :id="`disclaimer-editor`"
+                                :ref="`disclaimerEditor`" 
+                                :tag="'textarea'" 
+                                :config="disclaimerConfig" v-model="formData.Disclaimer">
+                            </froala>
+                        </div>
+                        <ConfigAnnotation picHintText="" picName="Disclaimer" @showImage="previewImage"/>
+                    </el-form-item>
+                </div>
+            </div>
+            <div class="part-ppt part">
+                <el-radio-group v-model="pptLang" style="margin-bottom: 22px;">
+                    <el-radio-button label="cn">中文PPT</el-radio-button>
+                    <el-radio-button label="en">英文PPT</el-radio-button>
+                </el-radio-group>
+                <div v-show="pptLang === 'cn'" class="ppt-form-item-wrap">
+                    <el-form-item label="PPT封面图" prop="CnPptCoverImgs">
+                        <div class="input-line" style="display:flex;">
+                            <ImgUpload 
+                                :imgUrl="formData.CnPptCoverImgs.length===3?formData.CnPptCoverImgs[2]:''"
+                                @showImage="(arr)=>{showImageOrder({list:formData.CnPptCoverImgs,item:arr[0]})}"
+                                @upload="(file)=>handleUploadImage(file,'CnPptCoverImgs')"
+                                @remove="deleteFormImg('CnPptCoverImgs',formData.CnPptCoverImgs.length-1)"
+                                />
+                            <ImgThumbnail 
+                                :imgList="formData.CnPptCoverImgs.length===3?formData.CnPptCoverImgs.slice(0,2):formData.CnPptCoverImgs"
+                                @showImage="({item})=>{showImageOrder({list:formData.CnPptCoverImgs,item})}"
+                                @deleteImg="(index)=>{deleteFormImg('CnPptCoverImgs',index)}"/>
+                        </div>
+                        <ConfigAnnotation picName="pptCoverList" @showImage="previewImage"
+                            picHintText="上传格式：png、jpg，最多上传三张，建议图片比例：10:7 16:9 4:3"/>
+                    </el-form-item>
+                    <el-form-item label="PPT背景图" prop="CnPptBackgroundImg">
+                        <ImgUpload 
+                            :imgUrl="formData.CnPptBackgroundImg"
+                            @showImage="showImage"
+                            @upload="(file)=>handleUploadImage(file,'CnPptBackgroundImg')"
+                            @remove="deleteFormImg('CnPptBackgroundImg')"
+                            />
+                        <ConfigAnnotation picName="pptBgPic" @showImage="previewImage"
+                            picHintText="上传格式：png、jpg，建议图片比例：10:7 16:9 4:3"/>
+                    </el-form-item>
+                    <el-form-item label="PPT封底图" prop="CnPptBottomImg">
+                        <ImgUpload 
+                            :imgUrl="formData.CnPptBottomImg"
+                            @showImage="showImage"
+                            @upload="(file)=>handleUploadImage(file,'CnPptBottomImg')"
+                            @remove="deleteFormImg('CnPptBottomImg')"
+                            />
+                        <ConfigAnnotation picName="pptBackPic" @showImage="previewImage"
+                            picHintText="上传格式：png、jpg，建议图片比例：10:7 16:9 4:3"/>
+                    </el-form-item>
+                </div>
+                <div v-show="pptLang === 'en'" class="ppt-form-item-wrap">
+                    <el-form-item label="PPT封面图" prop="EnPptCoverImgs">
+                        <div class="input-line" style="display:flex;">
+                            <ImgUpload 
+                                :imgUrl="formData.EnPptCoverImgs.length===3?formData.EnPptCoverImgs[2]:''"
+                                @showImage="(arr)=>{showImageOrder({list:formData.EnPptCoverImgs,item:arr[0]})}"
+                                @upload="(file)=>handleUploadImage(file,'EnPptCoverImgs')"
+                                @remove="deleteFormImg('EnPptCoverImgs',formData.EnPptCoverImgs.length-1)"
+                                />
+                            <ImgThumbnail 
+                                :imgList="formData.EnPptCoverImgs.length===3?formData.EnPptCoverImgs.slice(0,2):formData.EnPptCoverImgs"
+                                @showImage="({item})=>{showImageOrder({list:formData.EnPptCoverImgs,item})}"
+                                @deleteImg="(index)=>{deleteFormImg('EnPptCoverImgs',index)}"/>
+                        </div>
+                        <ConfigAnnotation picName="pptCoverList" @showImage="previewImage"
+                            picHintText="上传格式：png、jpg，最多上传三张，建议图片比例：10:7 16:9 4:3"/>
+                    </el-form-item>
+                    <el-form-item label="PPT背景图" prop="EnPptBackgroundImg">
+                        <ImgUpload 
+                            :imgUrl="formData.EnPptBackgroundImg"
+                            @showImage="showImage"
+                            @upload="(file)=>handleUploadImage(file,'EnPptBackgroundImg')"
+                            @remove="deleteFormImg('EnPptBackgroundImg')"
+                            />
+                        <ConfigAnnotation picName="pptBgPic" @showImage="previewImage"
+                            picHintText="上传格式：png、jpg，建议图片比例：10:7 16:9 4:3"/>
+                    </el-form-item>
+                    <el-form-item label="PPT封底图" prop="EnPptBottomImg">
+                        <ImgUpload 
+                            :imgUrl="formData.EnPptBottomImg"
+                            @showImage="showImage"
+                            @upload="(file)=>handleUploadImage(file,'EnPptBottomImg')"
+                            @remove="deleteFormImg('EnPptBottomImg')"
+                            />
+                        <ConfigAnnotation picName="pptBackPic" @showImage="previewImage"
+                            picHintText="上传格式：png、jpg，建议图片比例：10:7 16:9 4:3"/>
+                    </el-form-item>
+                </div>
+            </div>
+            <div class="part-Iflytek part">
+                <!-- 科大讯飞 -->
+                <div style="width:100%;">
+                    <span style="color:#606266;">科大讯飞服务</span> 
+                    <el-switch v-model="Iflytek"></el-switch>
+                </div>
+                <template v-if="Iflytek">
+                    <div class="side">
+                        <el-form-item label="APPID" prop="XfAppid">
+                            <el-input type="text" v-model="formData.XfAppid" placeholder="请输入APPID" />
+                        </el-form-item>
+                        <el-form-item label="APIKey" prop="XfApiKey">
+                            <el-input type="text" v-model="formData.XfApiKey" placeholder="请输入APIKey" />
+                        </el-form-item>
+                    </div>
+                    <div class="side">
+                        <el-form-item label="APISecret" prop="XfApiSecret">
+                            <el-input type="text" v-model="formData.XfApiSecret" placeholder="请输入APISecret" />
+                        </el-form-item>
+                        <el-form-item label="vcn(voice_name)" prop="XfVcn">
+                            <el-input type="text" v-model="formData.XfVcn" placeholder="请输入voice_name" />
+                        </el-form-item>
+                    </div>
+                </template>
+            </div>
+        </el-form>
+        <div class="btn-wrap" style="text-align: center;">
+            <el-button type="primary" plain style="width:200px;" @click="cancel">取消</el-button>
+            <el-button type="primary"  style="margin-left:50px;width:200px;" @click="saveBaseConfig">保存</el-button>
+        </div>
+        <el-image-viewer 
+            v-if="showViewer" 
+            :on-close="()=>{this.picShowList=[];this.showViewer = false}" 
+            :url-list="picShowList" />
+    </div>
+</template>
+
+<script>
+import ImgThumbnail from './components/imgThumbnail.vue';
+import ImgUpload from './components/imgUpload.vue';
+import ConfigAnnotation from './components/configAnnotation.vue';
+import ElImageViewer from 'element-ui/packages/image/src/image-viewer';
+
+import {bannerupload} from '@/api/api.js';
+import {etaBaseConfigInterence} from '@/api/modules/etaBaseConfigApi.js';
+export default {
+    components: { ConfigAnnotation , ElImageViewer , ImgThumbnail , ImgUpload},
+    data() {
+        let ListValidator = (rule,value,callback)=>{
+            if(!value.length){
+                return callback(new Error('请至少选择一张封面图'))
+            }else{
+                return callback()
+            }
+        }
+        return {
+            /* base config */
+            checkList:[],//水印应用
+            Iflytek:false,//是否启用科大讯飞服务
+            formData: {
+                Disclaimer: '',//免责声明
+                CompanyName:'',//公司名称
+                CompanyWatermark:'',//公司水印
+                WatermarkChart:0,//是否在研报图表中使用水印 0否 1是
+
+                UseXf:0,//是否启用科大讯飞服务 0否 1是
+                XfAppid:'',
+                XfApiKey:'',
+                XfApiSecret:'',
+                XfVcn:'',
+
+                CnPptCoverImgs:[],//ppt封面列表
+                CnPptBackgroundImg:'',//ppt背景图
+                CnPptBottomImg:'',//ppt封底图
+                EnPptCoverImgs:[],//英文ppt封面列表
+                EnPptBackgroundImg:'',//英文ppt背景图
+                EnPptBottomImg:'',//英文ppt封底图
+
+            },//表单预设值
+            rules: {
+                Disclaimer:[{ required: true, message: '请输入免责声明', trigger: 'blur' }],
+                CompanyName:[{ required: true, message: '请输入公司名称', trigger: 'blur' }],
+                //CompanyWatermark:[{ required: true, message: '请选择水印图片', trigger: 'blur' }],
+                CnPptBackgroundImg:[{ required: true, message: '请选择中文PPT背景图', trigger: 'blur' }],
+                EnPptBackgroundImg:[{ required: true, message: '请选择英文PPT背景图', trigger: 'blur' }],
+                XfAppid:[{ required: true, message: '请输入APPID', trigger: 'blur' }],
+                XfApiKey:[{ required: true, message: '请输入APIKey', trigger: 'blur' }],
+                XfApiSecret:[{ required: true, message: '请输入APISecret', trigger: 'blur' }],
+                XfVcn:[{ required: true, message: '请输入voice_name', trigger: 'blur' }],
+                CnPptCoverImgs:[{ required: true, validator:ListValidator}],
+                EnPptCoverImgs:[{ required: true, validator:ListValidator}],
+            },//表单校验
+            disclaimerConfig:{
+                toolbarButtons:[
+                    'textColor',
+                    'bold',
+                    'italic',
+                    'underline',
+                    'fontFamily',
+                    'fontSize',
+                    'align',
+                    'outdent',
+                    'indent',
+                    'specialCharacters',
+                    'insertHR',
+                    'selectAll',
+                    'clearFormatting',
+                    'undo',
+                    'redo',
+                ],
+                height:300,
+                fontSizeDefaultSelection: "16",
+                quickInsertEnabled: false,
+                pasteAllowedStyleProps: ['font-family', 'font-size', 'color'],
+                language: "zh_cn",
+                placeholderText:'请输入免责声明',
+                wordPasteKeepFormatting:false,
+                pastePlain:true,
+                wordPasteModal:false,
+                pluginsEnabled:['colors'],//定义可用插件
+            },//富文本编辑器配置项
+
+            /* ppt config */
+            pptLang:'cn',//切换中英文表单 
+            CnPptCoverImgs:[],//中文封面列表
+            EnPptCoverImgs:[],//英文封面列表
+
+            /* image preview */
+            showViewer:false,//控制图片预览组件展示
+            picShowList:[],//ElImageViewer组件展示图片的列表
+            picShowMap:{ //查看示意图需要展示的图片 支持多张
+                'Disclaimer':[
+                    require('@/assets/img/eta_base_config/disclaimer_1.jpg'),
+                    require('@/assets/img/eta_base_config/disclaimer_2.jpg'),
+                ],
+                'CompanyName':[require('@/assets/img/eta_base_config/company_1.jpg')],
+                'CompanyWatermark':[require('@/assets/img/eta_base_config/mark_1.jpg')],
+                'pptCoverList':[require('@/assets/img/eta_base_config/ppt_cover.jpg')],
+                'pptBgPic':[require('@/assets/img/eta_base_config/ppt_bgpic.jpg')],
+                'pptBackPic':[require('@/assets/img/eta_base_config/ppt_back.jpg')]
+            },
+            /* loading */
+            configLoading:null,
+
+        };
+    },
+    methods: {
+        handleUploadImage(file,key){
+            /* console.log('type',key)
+            console.log('file',file) */
+            //如果是封面图
+            if(['CnPptCoverImgs','EnPptCoverImgs'].includes(key)&&this.formData[key].length===3){
+                this.$message.warning('封面图最多只能上传三张')
+                return
+            }
+            //图片大小和格式限制
+            const {size,type} = file.file
+            const sizeLimit = key==='CompanyWatermark'?50*1024:500*1024
+            if(!['image/png','image/jpeg'].includes(type)){
+                this.$message.warning('仅支持png、jpg格式的图片')
+                return
+            }
+            if(size>sizeLimit){
+                this.$message.warning(`${key==='CompanyWatermark'?'水印图大小不能超过50kb':'ppt配图大小不能超过500kb'}`)
+                return
+            }
+            
+            let form = new FormData();
+            form.append('file',file.file);
+            bannerupload(form).then(res=>{
+                if(res.Ret!==200) return 
+                if(['CnPptCoverImgs','EnPptCoverImgs'].includes(key)){
+                    this.formData[key].push(res.Data.ResourceUrl)
+                }else{
+                    this.formData[key] = res.Data.ResourceUrl
+                }
+            })
+        },
+        previewImage(picName){
+            this.picShowList = this.picShowMap[picName]||[]
+            this.picShowList.length&&(this.showViewer = true)
+        },
+        deleteFormImg(key,index){
+            if(['CnPptCoverImgs','EnPptCoverImgs'].includes(key)){
+                this.formData[key].splice(index,1)
+            }else{
+                this.formData[key] = ''
+            }
+        },
+        showImage(imgList){
+            this.picShowList = imgList||[]
+            this.picShowList.length&&(this.showViewer = true)
+        },
+        showImageOrder({list,item}){
+            //改变list的顺序,当前点击的为第一个
+            const index = list.findIndex(img=>img===item)
+            this.picShowList = [...list.slice(index),...list.slice(0,index)]
+            this.picShowList.length&&(this.showViewer = true)
+        },
+        getBaseConfig(){
+            this.configLoading = this.$loading({
+                lock: true,
+                target: '.eta-base-config',
+                text: '正在获取基本配置...',
+                spinner: 'el-icon-loading',
+                background: 'rgba(255, 255, 255, 0.8)',
+            });
+            //获取WatermarkChart的值，赋值checkList
+            //获取UseXf的值，赋值Iflytek
+            etaBaseConfigInterence.getBaseConfig().then(res=>{
+                if(res.Ret!==200) return 
+                const {WatermarkChart,UseXf,CnPptCoverImgs,EnPptCoverImgs} = res.Data
+                this.checkList = WatermarkChart==='true'?['研报图表']:[]
+                this.Iflytek = UseXf==='true'?true:false
+                if(res.Data){
+                    this.formData = res.Data
+                    this.formData.CnPptCoverImgs = CnPptCoverImgs.length?CnPptCoverImgs.split(','):[]
+                    this.formData.EnPptCoverImgs = EnPptCoverImgs.length?EnPptCoverImgs.split(','):[]
+                }
+                this.configLoading&&this.configLoading.close()
+            })
+        },
+        saveBaseConfig(){
+            //froala 在非本地环境会有版权标识，在表单验证前去掉
+            this.formData.Disclaimer = this.formData.Disclaimer.replace(/<p data-f-id=\"pbf\".*?<\/p>/g, "");
+            //rules验证
+            this.$refs.baseConfigForm.validate((valid,obj)=>{
+                console.log('valid',valid)
+                console.log('obj',obj)
+                //如果是中英文ppt没填写，切换标签栏
+                const keys = Object.keys(obj)
+                const cnProps = ['CnPptCoverImgs','CnPptBackgroundImg','CnPptBottomImg']
+                const enProps = ['EnPptCoverImgs','EnPptBackgroundImg','EnPptBottomImg']
+                for(let i = 0;i < keys.length;i++){
+                    if(cnProps.includes(keys[i])){
+                        this.pptLang = 'cn'
+                        break
+                    }
+                    if(enProps.includes(keys[i])){
+                        this.pptLang = 'en'
+                        break
+                    }
+                }
+                if(valid){
+                    this.formData.WatermarkChart = ''+(this.checkList.includes('研报图表')?true:false)
+                    this.formData.UseXf = ''+(this.Iflytek?true:false)
+                    const CnPptCoverImgs = this.formData.CnPptCoverImgs.join(',')
+                    const EnPptCoverImgs = this.formData.EnPptCoverImgs.join(',')
+                    etaBaseConfigInterence.saveBaseConfig({...this.formData,...{CnPptCoverImgs,EnPptCoverImgs}}).then(res=>{
+                        if(res.Ret!==200) return 
+                        this.$message.success('保存成功，请稍后到对应页面/项目查看')
+                    })
+                }
+            })
+        },
+        cancel(){
+            //取消就恢复原样
+            this.getBaseConfig()
+        }
+    },
+    mounted(){
+        this.getBaseConfig()
+    }
+};
+</script>
+
+<style lang="scss">
+.eta-base-config{
+    .el-form-item{
+        .el-form-item__content{line-height: normal;}
+    }
+}
+</style>
+<style scoped lang="scss">
+.eta-base-config{
+    box-sizing: border-box;
+    padding:30px;
+    border-radius: 4px;
+    background-color: #fff;
+    .base-config-form{
+        .el-form-item{
+            width:100%;
+        }
+        .part{
+            display: flex;
+            justify-content: space-between;
+            flex-wrap: wrap;
+            &:not(:last-child){
+                border-bottom: 1px solid #DCDFE6;
+            }
+            &:not(:first-child){
+                margin-top: 30px;
+            }
+            .side{
+                width:45%;
+            }
+            .ppt-form-item-wrap{
+                width:100%;
+                display: flex;
+                justify-content: space-between;
+            }
+        }
+    }
+}
+</style>