区间分析

src/components/chart/chartDetailHandlesWrap.vue

@@ -174,6 +174,17 @@ export default {
             enNameSetting:checkPermissionBtn(statisticPermission.crossVariety_enNameSetting),
             del:checkPermissionBtn(statisticPermission.crossVariety_del),
         }
+
+        const rangeAnalysisBtnMap = {
+            share:checkPermissionBtn(statisticPermission.rangeAnalysis_share),
+            addMyChart:checkPermissionBtn(statisticPermission.rangeAnalysis_addMyChart),
+            refresh:checkPermissionBtn(statisticPermission.rangeAnalysis_refresh),
+            otherSave:checkPermissionBtn(statisticPermission.rangeAnalysis_otherSave),
+            edit:checkPermissionBtn(statisticPermission.rangeAnalysis_edit),
+            copyOffice:checkPermissionBtn(statisticPermission.rangeAnalysis_copyOffice),
+            copyWechat:checkPermissionBtn(statisticPermission.rangeAnalysis_copyWechat),
+            del:checkPermissionBtn(statisticPermission.rangeAnalysis_del),
+        }
         //相关性分析
         if(path==='/chartrelevance') return chartrelevanceMap[btn]
 
@@ -197,7 +208,7 @@ export default {
             
         }
         // 区间分析
-        else if(path==='/rangeAnalysis') return crossVarietyBtnMap[btn]
+        else if(path==='/rangeAnalysis') return rangeAnalysisBtnMap[btn]
 
         return false
     }

src/components/chart/chartListTableWrap.vue

@@ -15,25 +15,41 @@
           </tr>
         </thead>
         <tbody>
-          <tr
-            v-for="row in list"
-            :key="row.ChartInfoId"
-          >
+          <tr v-for="row in list" :key="row.ChartInfoId">
             <td
               v-for="opt in tableColOpts"
               :key="opt.colKey"
               :style="{ width: opt.width }"
             >
-              <span v-if="opt.colKey==='opt'">
-                <el-button type="text" @click="handleEdit(row)">{{$t('Table.edit_btn')}}</el-button>
-                <el-button type="text" @click="handleRefresh(row)">{{$t('Table.refresh_btn')}}</el-button>
-                <el-button type="text" @click="handleSaveOther(row)">{{$t('Table.save_as')}}</el-button>
-                <el-button type="text" style="color:#f00" @click="handleDelChart(row)">删除</el-button>
+              <span v-if="opt.colKey === 'opt'">
+                <el-button type="text" v-if="isShowBtn('edit')" @click="handleEdit(row)">{{
+                  $t("Table.edit_btn")
+                }}</el-button>
+                <el-button type="text" v-if="isShowBtn('refresh')" @click="handleRefresh(row)">{{
+                  $t("Table.refresh_btn")
+                }}</el-button>
+                <el-button type="text" v-if="isShowBtn('otherSave')" @click="handleSaveOther(row)">{{
+                  $t("Table.save_as")
+                }}</el-button>
+                <el-button
+                  type="text"
+                  style="color: #f00"
+                  @click="handleDelChart(row)"
+                  v-if="isShowBtn('del')"
+                  >{{$t("Table.delete_btn")}}</el-button
+                >
               </span>
-              <span v-else-if="['CreateTime','ModifyTime'].includes(opt.colKey)">
-               {{formatTime(row[opt.colKey])}}
+              <span
+                v-else-if="['CreateTime', 'ModifyTime'].includes(opt.colKey)"
+              >
+                {{ formatTime(row[opt.colKey]) }}
               </span>
-              <div v-else-if="opt.colKey==='ChartName'" @click="handleClickName(row)">{{row[opt.colKey]}}</div>
+              <div
+                v-else-if="opt.colKey === 'ChartName'"
+                @click="handleClickName(row)"
+              >
+                {{ row[opt.colKey] }}
+              </div>
               <span v-else>{{ row[opt.colKey] }}</span>
             </td>
           </tr>
@@ -64,22 +80,22 @@ export default {
         {
           colKey: 'SysUserRealName',
           title: '创建人',
-          width:'100px'
+          width: '100px'
         },
         {
           colKey: 'CreateTime',
           title: '创建时间',
-          width:'160px'
+          width: '160px'
         },
         {
           colKey: 'ModifyTime',
           title: '更新时间',
-          width:'160px'
+          width: '160px'
         },
         {
           colKey: 'opt',
           title: '操作',
-          width:'200px'
+          width: '200px'
         },
       ]
     }
@@ -88,64 +104,47 @@ export default {
 
   },
   methods: {
-    load(){
+    load() {
       console.log('触底');
       this.$emit('loadMoreHandle')
     },
 
     // 点击名称
-    handleClickName(e){
-      this.$emit('detailShowHandle',e)
+    handleClickName(e) {
+      this.$emit('detailShowHandle', e)
     },
 
-    handleEdit(e){
-      this.$emit('edit',e)
+    handleEdit(e) {
+      this.$emit('edit', e)
     },
 
-    handleRefresh(e){
-      this.$emit('refresh',e)
+    handleRefresh(e) {
+      this.$emit('refresh', e)
     },
 
-    handleSaveOther(e){
-      this.$emit('saveOther',e)
+    handleSaveOther(e) {
+      this.$emit('saveOther', e)
     },
 
-    handleDelChart(e){
-      this.$emit('deleteChart',e)
+    handleDelChart(e) {
+      this.$emit('deleteChart', e)
     },
 
     formatTime(t) {
       return moment(t).format('YYYY-MM-DD HH:mm:ss')
     },
 
-    isShowBtn(item) {
+    isShowBtn(btn) {
       const { path } = this.$route
-      const { statisticPermission, productPricePermission, checkPermissionBtn } = this.permissionBtn
-      //相关性分析
-      if (path === '/chartrelevance') {
-        return checkPermissionBtn(statisticPermission.corrAnalysis_addMyChart)
-      }
-      //拟合方程曲线
-      else if (path === '/fittingEquationList') {
-        return checkPermissionBtn(statisticPermission.fittingEq_addMyChart)
-      }
-      //统计特性
-      else if (path === '/statisticFeatureList') {
-        return checkPermissionBtn(statisticPermission.statisticFeature_addMyChart)
-      }
-      //跨品种分析
-      else if (path === '/crossVarietyChartList') {
-        return checkPermissionBtn(statisticPermission.crossVariety_addMyChart)
-      }
-      //商品价格曲线
-      else if (path === '/commordityChartBase') {
-        const { Source, ChartType } = item
-        if (Source === 2 && ChartType === 8) {//是商品价格曲线
-          return checkPermissionBtn(productPricePermission.goodsPrice_priceLine_addMyChart)
-        } else {//是利润曲线
-          return checkPermissionBtn(productPricePermission.goodsPrice_incomeLine_addMyChart)
-        }
+      const { statisticPermission,checkPermissionBtn } = this.permissionBtn
+      const rangeAnalysisBtnMap = {
+        refresh: checkPermissionBtn(statisticPermission.rangeAnalysis_refresh),
+        otherSave: checkPermissionBtn(statisticPermission.rangeAnalysis_otherSave),
+        edit: checkPermissionBtn(statisticPermission.rangeAnalysis_edit),
+        del: checkPermissionBtn(statisticPermission.rangeAnalysis_del),
       }
+      if(path==='/rangeAnalysis') return rangeAnalysisBtnMap[btn]
+
       return false
     }
   },
@@ -154,7 +153,7 @@ export default {
 <style scoped lang='scss'>
 .chart-list-cont {
   color: #333;
-  
+
   .table-wrap {
     margin-top: 10px;
     height: calc(100vh - 160px);

src/utils/buttonConfig.js

@@ -645,6 +645,22 @@ export const statisticPermission = {
     crossVariety_refresh:'crossVariety:refresh',
     crossVariety_addMyChart:'crossVariety:addMyChart',
     crossVariety_share:'crossVariety:share',
+
+    /* 区间分析 */
+    rangeAnalysis_addChart:'rangeAnalysis:addChart',
+    rangeAnalysis_onlyMine:'rangeAnalysis:onlyMine',//只看我的
+    rangeAnalysis_classifyOpt_edit:'rangeAnalysis:classifyOpt:edit',//添加编辑分类
+    rangeAnalysis_classifyOpt_delete:'rangeAnalysis:classifyOpt:delete',//删除分类
+    rangeAnalysis_classifyOpt_move:'rangeAnalysis:classifyOpt:move',//删除分类
+    /*---图表操作栏--- */
+    rangeAnalysis_del:'rangeAnalysis:del',
+    rangeAnalysis_copyWechat:'rangeAnalysis:copyWechat',
+    rangeAnalysis_copyOffice:'rangeAnalysis:copyOffice',
+    rangeAnalysis_edit:'rangeAnalysis:edit',
+    rangeAnalysis_otherSave:'rangeAnalysis:otherSave',
+    rangeAnalysis_refresh:'rangeAnalysis:refresh',
+    rangeAnalysis_addMyChart:'rangeAnalysis:addMyChart',
+    rangeAnalysis_share:'rangeAnalysis:share',
 }
 /*
  * --------------------------------------------------------------------------供应分析------------------------------------------------

src/views/intervalAnalysis/addChart.vue

@@ -39,10 +39,11 @@
           >
         </div>
         <!-- 指标计算模块 -->
-        <edbComputedWrap 
+        <edbComputedWrap
           :computedType="computedType"
-          @showBatchSelectEdb="handleShowBatchSelectEdb" 
-          ref="edbComputedWrap" />
+          @showBatchSelectEdb="handleShowBatchSelectEdb"
+          ref="edbComputedWrap"
+        />
       </div>
 
       <span class="move-btn resize" v-drag id="resize"></span>
@@ -71,25 +72,27 @@
             </template>
           </div>
           <div class="top-left">
-            <el-button 
-              type="primary" 
-              size="medium" 
+            <el-button
+              type="primary"
+              size="medium"
               class="year-btn"
               @click="handleShowSaveEdb"
               >保存指标</el-button
             >
-            <el-dropdown 
+            <el-dropdown
               v-if="$route.query.id"
-              split-button 
+              split-button
               size="medium"
-              type="primary" 
+              type="primary"
               class="year-btn"
-              @click="updateEdbHandle" 
+              @click="updateEdbHandle"
               @command="edbCommandHandle"
             >
-              {{$t('StatisticAnalysis.ChartRelevance.update_edb')}}
+              {{ $t("StatisticAnalysis.ChartRelevance.update_edb") }}
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item :command="{scence:'saveOther'}">{{$t('Table.save_as')}}</el-dropdown-item>
+                <el-dropdown-item :command="{ scence: 'saveOther' }">{{
+                  $t("Table.save_as")
+                }}</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
             <el-button
@@ -100,10 +103,10 @@
               @click="showSaveChart = true"
               >保存图</el-button
             >
-            <el-button 
-              type="primary" 
-              plain 
-              size="medium" 
+            <el-button
+              type="primary"
+              plain
+              size="medium"
               class="year-btn"
               @click="handleShowChartSet"
               >图表设置</el-button
@@ -118,11 +121,8 @@
 									fontSize:${JSON.parse(chartInfo.ChartThemeStyle).titleOptions.style.fontSize}px;
 									color:${JSON.parse(chartInfo.ChartThemeStyle).titleOptions.style.color}
 								`" -->
-              <h2
-                class="chart-title"
-                v-show="chartInfo.ChartName||chartName"
-              >
-                {{ chartInfo.ChartName||chartName }}
+              <h2 class="chart-title" v-show="chartInfo.ChartName || chartName">
+                {{ chartInfo.ChartName || chartName }}
               </h2>
 
               <Chart :options="options" :chartInfo="chartInfo" ref="chartRef" />
@@ -201,18 +201,6 @@
                     JSON.parse(chartInfo.SourcesFrom).text
                   }}
                 </span>
-
-                <el-switch
-                  v-if="chartInfo.SourcesFrom"
-                  v-model="chartInfo.SourcesFromVisable"
-                  :active-value="true"
-                  :inactive-value="false"
-                  style="margin: 0 15px"
-                  @change="changeSourceVisable"
-                />
-                <span class="editsty" @click="isShowSourceDialog = true"
-                  ><!-- 编辑 -->{{ $t("Chart.chart_edit_btn") }}</span
-                >
               </div>
 
               <!-- 图表说明 -->
@@ -265,7 +253,7 @@
     />
 
     <!-- 单指标计算保存指标 -->
-    <saveSingleEdb 
+    <saveSingleEdb
       :isShow="showSingleEdbSave"
       :singleEdbData="singleEdbData"
       :tableData="tableData"
@@ -273,7 +261,7 @@
     />
 
     <!-- 多指标计算保存指标 -->
-    <saveMultipleEdb 
+    <saveMultipleEdb
       :isShow="showMultipleEdbSave"
       :singleEdbData="singleEdbData"
       :tableData="tableData"
@@ -281,19 +269,20 @@
     />
 
     <!-- 图表设置 -->
-    <chartSetWrap 
+    <chartSetWrap
       :isShow="showChartSet"
       :chartName="chartName"
       :chartInfo="chartInfo"
       :tableData="tableData"
       @close="showChartSet = false"
+      @success="handleChartSetChange"
     />
 
     <!-- 多指标选择 -->
-    <batchSelectEdb 
+    <batchSelectEdb
       ref="batchSelectEdb"
       :isShow="showBatchSelectEdb"
-      @close="showBatchSelectEdb=false"
+      @close="showBatchSelectEdb = false"
       @success="handleBatchSelectEdbSuccess"
     />
 
@@ -304,7 +293,6 @@
       source="interval_analysis"
       :data="chartInfo"
     />
-
   </div>
 </template>
 
@@ -313,6 +301,7 @@ import Chart from '@/views/dataEntry_manage/components/chart';
 import edbComputedWrap from './components/edbComputedWrap.vue';
 import apiIntervalAnalysis from '@/api/modules/intervalAnalysis'
 import { chartSetMixin } from '@/views/dataEntry_manage/mixins/chartPublic';
+import addOrEditMixn from '@/views/dataEntry_manage/mixins/addOreditMixin';
 import edbTableSection from '@/views/chartRelevance_manage/crossVarietyAnalysis/components/edbTableSection.vue';
 import DateChooseDia from '@/views/dataEntry_manage/components/DateChooseDia';
 import saveChart from './components/saveChart.vue'
@@ -360,7 +349,7 @@ export default {
       };
     },
   },
-  mixins: [chartSetMixin],
+  mixins: [chartSetMixin,addOrEditMixn],
   computed: {
     roleName() {
       return localStorage.getItem('userName');
@@ -368,7 +357,7 @@ export default {
   },
   data() {
     return {
-      chartInfo:null,
+      chartInfo: null,
 
       isSlideLeft: false,
       computedType: 0,//类型 0单指标 1多指标
@@ -376,72 +365,114 @@ export default {
       chartName: '',
       showSaveChart: false,//保存图
 
-      showSingleEdbSave:false,//单指标计算保存指标
-      singleEdbData:null,
+      showSingleEdbSave: false,//单指标计算保存指标
+      singleEdbData: null,
 
-      showMultipleEdbSave:false,//多指标计算保存指标
+      showMultipleEdbSave: false,//多指标计算保存指标
 
-      showChartSet:false,//图表设置
+      showChartSet: false,//图表设置
 
-      showBatchSelectEdb:false,//显示多指标选择
+      showBatchSelectEdb: false,//显示多指标选择
 
       isShowSaveOther: false,//另存为
     }
   },
   methods: {
-    handleBatchSelectEdbSuccess(e){
+    // 多指标选择回调
+    handleBatchSelectEdbSuccess(e) {
       this.$refs.edbComputedWrap.initMultipleEdbParams(e)
     },
-    handleShowBatchSelectEdb(e){
+    // 显示选择多指标弹窗
+    handleShowBatchSelectEdb(e) {
       this.$refs.batchSelectEdb.initData(e)
-      this.showBatchSelectEdb=true
+      this.showBatchSelectEdb = true
     },
-    handleComputedTypeChange(type){
-      if(this.$route.query.id&&type!==this.computedType){
+    handleComputedTypeChange(type) {
+      if (this.$route.query.id && type !== this.computedType) {
         this.$message.warning('编辑状态不允许切换计算类型')
         return
       }
-      this.computedType=type
-      if(type===1&&this.$refs.edbComputedWrap.edbList.length===0){
-        this.showBatchSelectEdb=true
+      this.computedType = type
+      if (type === 1 && this.$refs.edbComputedWrap.edbList.length === 0) {
+        this.showBatchSelectEdb = true
+      }
+    },
+
+    // 图表设置成功回调
+    handleChartSetChange(e) {
+      this.chartInfo.ChartThemeStyle = e.ChartThemeStyle
+      this.chartInfo.ChartThemeId=e.formData.themeId
+      let sourceObj=this.chartInfo.SourcesFrom?JSON.parse(this.chartInfo.SourcesFrom):''
+      if(sourceObj){
+        sourceObj={
+          ...sourceObj,
+          isShow:e.formData.showSource,
+          text:e.formData.source
+        }
       }
+      this.chartInfo.SourcesFrom=JSON.stringify(sourceObj)
+      this.tableData = e.edbList
+      this.$refs.edbComputedWrap.updateEdbListData(e.edbList)
+      // 重新渲染图表
+      this.setLimitData(this.tableData)
+      this.setDefaultChart(this.tableData)
+      this.showChartSet = false
     },
+
     // 保存指标
-    handleShowSaveEdb(){
-      this.singleEdbData=this.$refs.edbComputedWrap.getParams()
-      if(this.computedType===0){
-        this.showSingleEdbSave=true
-      }else{
-        this.showMultipleEdbSave=true
+    handleShowSaveEdb() {
+      this.singleEdbData = this.$refs.edbComputedWrap.getParams()
+      if (this.computedType === 0) {
+        this.showSingleEdbSave = true
+      } else {
+        this.showMultipleEdbSave = true
       }
     },
 
-    handleShowChartSet(){
-      this.showChartSet=true
+    handleShowChartSet() {
+      this.showChartSet = true
     },
 
     //更新图
-    updateEdbHandle(){
+    updateEdbHandle() {
       const edbParams = this.$refs.edbComputedWrap.getParams()
+      const {
+        min, max, rightMin, rightMax, rightTwoMin, rightTwoMax
+      } = this.chartLimit
       const params = {
+        ChartInfoId: Number(this.$route.query.id),
         ChartEdbInfoList: edbParams.ChartEdbInfoList,
         ExtraConfig: JSON.stringify(edbParams.ExtraConfig),
         ChartClassifyId: this.chartInfo.ChartClassifyId,
         ChartName: this.chartName,
         ChartType: 1,
         DateType: this.year_select,
-        ChartInfoId:Number(this.$route.query.id)
+        StartDate: [5, 6].includes(this.year_select)
+          ? this.select_date[0]
+          : '',
+        EndDate: this.year_select === 5 ? this.select_date[1] : '',
+        StartYear: this.count_year || 0,
+        LeftMin: min + '',
+        LeftMax: max + '',
+        RightMin: rightMin + '',
+        RightMax: rightMax + '',
+        Right2Min: rightTwoMin + '',
+        Right2Max: rightTwoMax + '',
+        MinMaxSave: Number(!this.getLimitInfo()),
+        ChartThemeId:this.chartInfo.ChartThemeId,
+        SourcesFrom:this.chartInfo.SourcesFrom
+
       }
       apiIntervalAnalysis.chartEdit(params).then(res => {
         if (res.Ret === 200) {
-					this.$message.success(this.$t('MsgPrompt.saved_msg'))
+          this.$message.success(this.$t('MsgPrompt.saved_msg'))
         }
       })
     },
 
     //另存为
-    edbCommandHandle(e){
-      this.isShowSaveOther=true
+    edbCommandHandle(e) {
+      this.isShowSaveOther = true
     },
 
     // 新增图
@@ -457,14 +488,14 @@ export default {
       }
       apiIntervalAnalysis.chartAdd(params).then(res => {
         if (res.Ret === 200) {
-					this.$message.success(this.$t('MsgPrompt.saved_msg'))
+          this.$message.success(this.$t('MsgPrompt.saved_msg'))
           this.showSaveChart = false
           setTimeout(() => {
             this.$router.replace({
-              path:'/rangeAnalysis',
-              query:{
-                code:res.Data.UniqueCode,
-                id:res.Data.ChartInfoId
+              path: '/rangeAnalysis',
+              query: {
+                code: res.Data.UniqueCode,
+                id: res.Data.ChartInfoId
               }
             })
           }, 1500);
@@ -479,9 +510,9 @@ export default {
         ...edbParams,
         DateType: this.year_select,
         StartDate: [5, 6].includes(this.year_select)
-          ? dateArray[0]
+          ? this.select_date[0]
           : '',
-        EndDate: this.year_select === 5 ? dateArray[1] : '',
+        EndDate: this.year_select === 5 ? this.select_date[1] : '',
         StartYear: this.count_year || 0,
       }
       console.log(params);
@@ -498,22 +529,22 @@ export default {
     },
 
     initChartName(data) {
-      const calculateTypeMap={
-				0:'Average()',
-				1:'Sum()',
-				2:'Growth Rate()',
-				3:'Annualized Growth Rate()',
-				4:'Max()',
-				5:'Min()'
-			}
-      let edbName=''
+      const calculateTypeMap = {
+        0: 'Average()',
+        1: 'Sum()',
+        2: 'Growth Rate()',
+        3: 'Annualized Growth Rate()',
+        4: 'Max()',
+        5: 'Min()'
+      }
+      let edbName = ''
       if (this.computedType === 0) {//单指标计算
-				edbName=this.$i18nt.locale==='zh'?data.EdbInfoList[0].EdbName:data.EdbInfoList[0].EdbNameEn||data.EdbInfoList[0].EdbName
-				
-      }else{
-        edbName=data.DataResp.SeriesName
+        edbName = this.$i18nt.locale === 'zh' ? data.EdbInfoList[0].EdbName : data.EdbInfoList[0].EdbNameEn || data.EdbInfoList[0].EdbName
+
+      } else {
+        edbName = data.DataResp.SeriesName
       }
-      this.chartName=`${edbName}${calculateTypeMap[data.DataResp.CalculateType]}`
+      this.chartName = `${edbName}${calculateTypeMap[data.DataResp.CalculateType]}`
     },
 
     /* 年份改变 重新刷新图表接口  保存当前的图表配置和上下限 只改变图表 */
@@ -571,23 +602,23 @@ export default {
       this.handleComputed();
     },
 
-		// 获取图表详情
-		getChartInfo(){
-			apiIntervalAnalysis.chartInfo({
+    // 获取图表详情
+    getChartInfo() {
+      apiIntervalAnalysis.chartInfo({
         ChartInfoId: Number(this.$route.query.id)
-      }).then(res=>{
-				if(res.Ret===200){
+      }).then(res => {
+        if (res.Ret === 200) {
           this.initEditData(res.Data)
-					this.initIntervalAnalysisChartData(res.Data)
-				}
-			})
-		},
+          this.initIntervalAnalysisChartData(res.Data)
+        }
+      })
+    },
 
     // 编辑时初始化表单数据
-    initEditData(data){
-      const {ChartInfo,DataResp,EdbInfoList}=data
-      this.computedType=DataResp.EdbInfoMode
-      this.chartName=this.$i18nt.locale==='zh'?ChartInfo.ChartName:ChartInfo.ChartNameEn
+    initEditData(data) {
+      const { ChartInfo, DataResp, EdbInfoList } = data
+      this.computedType = DataResp.EdbInfoMode
+      this.chartName = this.$i18nt.locale === 'zh' ? ChartInfo.ChartName : ChartInfo.ChartNameEn
       this.$refs.edbComputedWrap.initData(data)
     },
 
@@ -601,9 +632,9 @@ export default {
   },
 
   mounted() {
-		if(this.$route.query.id){
-			this.getChartInfo()
-		}
+    if (this.$route.query.id) {
+      this.getChartInfo()
+    }
     window.addEventListener('resize', this.reloadRightWid);
   },
   destroyed() {
@@ -677,8 +708,8 @@ export default {
           display: inline-block;
         }
         .active {
-          color: #0052D9;
-          border-bottom: 2px solid #0052D9;
+          color: #0052d9;
+          border-bottom: 2px solid #0052d9;
         }
       }
     }
@@ -871,14 +902,15 @@ export default {
       .min-data-input {
         margin-top: 230px;
       }
-      .year-btn,.year-btn .el-button--medium {
+      .year-btn,
+      .year-btn .el-button--medium {
         font-size: $font-small;
         margin-left: 5px;
         margin-right: 5px;
         margin-bottom: 5px;
         padding: 6px 12px;
       }
-      .year-btn .el-button--medium{
+      .year-btn .el-button--medium {
         margin: 0 0px;
       }
       .btn-sty {

src/views/intervalAnalysis/components/batchSelectEdb.vue

@@ -373,6 +373,10 @@ export default {
     initData(e) {
       this.selectList = e.edbList
       this.seriesName = e.seriesName
+      if(e.edbList.length>0){
+        this.edbType=e.edbList[0].EdbInfoType
+        this.getEDBList()
+      }
     },
     handleNextStep() {
       if (this.selectList.length === 0) {

src/views/intervalAnalysis/components/chartSetWrap.vue

@@ -49,7 +49,7 @@
             </div>
             <div class="content-box">
               <el-input
-                v-model="item.EdbName"
+                v-model="item.EdbAliasName"
                 style="width:100%"
               ></el-input>
             </div>
@@ -125,8 +125,25 @@ export default {
     isShow(n){
       if(n){
         this.formData.name=this.chartName
-        const temArr=this.tableData||[]
-        this.seriesArr=JSON.parse(JSON.stringify(temArr))
+        const temArr=JSON.parse(JSON.stringify(this.tableData))||[]
+        this.seriesArr=temArr.map(item=>{
+          let name=''
+          if(this.$i18nt.locale==='zh'){
+            name=item.EdbAliasName||item.EdbName
+          }else{
+            name=item.EdbAliasNameEn||item.EdbNameEn||item.EdbName
+          }
+          return {
+            ...item,
+            EdbAliasName:name
+          }
+        })
+        this.formData.themeId=this.chartInfo.ChartThemeId
+        const sourceFromData=this.chartInfo.SourcesFrom?JSON.parse(this.chartInfo.SourcesFrom):null
+        if(sourceFromData){
+          this.formData.source=sourceFromData.text
+          this.formData.showSource=sourceFromData.isShow
+        }
         this.getThemeList()
       }
     }
@@ -145,8 +162,18 @@ export default {
     }
   },
   methods: {
-    async saveHandle() {
-      
+    saveHandle() {
+      let ChartThemeStyle=''
+      this.chartThemeArr.forEach(item => {
+        if(item.ChartThemeId===this.formData.themeId){
+          ChartThemeStyle=item.Config
+        }
+      });
+      this.$emit('success',{
+        formData:this.formData,
+        edbList:this.seriesArr,
+        ChartThemeStyle:ChartThemeStyle
+      })
     },
 
     cancelHandle() {
@@ -165,19 +192,12 @@ export default {
       return {backgroundColor:color}
     },
 
-    /* 获取主题列表  type init时重新设置默认样式和主题*/
-    async getThemeList(type = null) {
+    /* 获取主题列表 */
+    async getThemeList() {
       let res = await chartThemeInterface.getThemeBySource({ ChartType: this.chartInfo.ChartType, Source: 1 })
 
       if (res.Ret !== 200) return
       this.chartThemeArr = res.Data || []
-
-      if (type === 'init') {
-        // this.chartInfo.ChartThemeId = res.Data[0].DefaultChartThemeId;
-        // this.chartInfo.ChartThemeStyle = this.chartThemeArr.find(_ => _.ChartThemeId === this.chartInfo.ChartThemeId).Config
-
-        // this.reLoadChartOption();
-      }
     },
   },
 }

src/views/intervalAnalysis/components/edbComputedWrap.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="single-edb-wrap">
-    <div class="search-cont section" v-if="computedType===0">
+    <div class="search-cont section" v-if="computedType === 0">
       <div>
         <label><!-- 选择指标 -->{{ $t("Edb.choose_edb") }}：</label>
         <el-radio-group v-model="edbFromType">
@@ -54,7 +54,7 @@
       </el-select>
     </div>
     <!-- 区间划分 -->
-    <div class="item-box section" v-if="computedType===0">
+    <div class="item-box section" v-if="computedType === 0">
       <span class="label">区间划分</span>
       <div class="con-box">
         <el-select v-model="dateRangeType" style="width: 90%">
@@ -68,10 +68,20 @@
       </div>
     </div>
     <!-- 多指标计算 -->
-    <div class="multiple-box" v-if="computedType===1&&edbList.length>0">
-      <div class="name">{{seriesName}}</div>
-      <img class="icon" src="~@/assets/img/icons/edit_blue_new.png" alt="" @click="handleShowEditBatchSelectEbd">
-      <img class="icon" src="~@/assets/img/icons/delete-red.png" alt="" @click="handleDelBatchSelectEbd">
+    <div class="multiple-box" v-if="computedType === 1 && edbList.length > 0">
+      <div class="name">{{ seriesName }}</div>
+      <img
+        class="icon"
+        src="~@/assets/img/icons/edit_blue_new.png"
+        alt=""
+        @click="handleShowEditBatchSelectEbd"
+      />
+      <img
+        class="icon"
+        src="~@/assets/img/icons/delete-red.png"
+        alt=""
+        @click="handleDelBatchSelectEbd"
+      />
     </div>
     <!-- 智能划分模块 -->
     <template v-if="dateRangeType === 0">
@@ -176,7 +186,10 @@
                   $t("ETableChildren.term_ipt")
                 }}</span>
 
-                <dateMoveWaySec ref="endDateMoveWaySec" class="date-trans-box" />
+                <dateMoveWaySec
+                  ref="endDateMoveWaySec"
+                  class="date-trans-box"
+                />
               </el-radio>
               <el-radio :label="2" style="margin-top: 20px">
                 <span>固定</span>
@@ -396,8 +409,8 @@ import * as preDictEdbInterface from '@/api/modules/predictEdbApi.js';
 import dateMoveWaySec from '@/views/datasheet_manage/components/dateMoveWaySection.vue'
 
 export default {
-  props:{
-    computedType:0,//类型 0单指标 1多指标
+  props: {
+    computedType: 0,//类型 0单指标 1多指标
   },
   components: { dateMoveWaySec },
   computed: {
@@ -470,7 +483,8 @@ export default {
       search_have_more: true,
       search_page: 1,
       current_search: '',
-      edbInfoId:'',
+      edbInfoId: '',
+      edbAxis:1,//选择的指标的轴
 
       dateRangeType: 0,//区间划分 0：智能划分，1:手工划分，2：跨年划分
 
@@ -516,57 +530,57 @@ export default {
       yearDateEnd: '',//跨年划分后一年
 
 
-      edbList:[],//多指标计算时 选择的指标数据
-      seriesName:'',//多指标计算时填写的名称
+      edbList: [],//多指标计算时 选择的指标数据
+      seriesName: '',//多指标计算时填写的名称
 
 
     }
   },
   methods: {
     // 更新多指标计算时的数据
-    initMultipleEdbParams(data){
-      this.dateRangeType=0
-      this.edbList=data.edbList
-      this.seriesName=data.seriesName
+    initMultipleEdbParams(data) {
+      this.dateRangeType = 0
+      this.edbList = data.edbList
+      this.seriesName = data.seriesName
     },
-    handleShowEditBatchSelectEbd(){
-      this.$emit('showBatchSelectEdb',{
-        edbList:this.edbList,
-        seriesName:this.seriesName
+    handleShowEditBatchSelectEbd() {
+      this.$emit('showBatchSelectEdb', {
+        edbList: this.edbList,
+        seriesName: this.seriesName
       })
     },
-    handleDelBatchSelectEbd(){
-      this.edbList=[]
-      this.seriesName=''
+    handleDelBatchSelectEbd() {
+      this.edbList = []
+      this.seriesName = ''
     },
 
     // 获取参数
     getParams() {
-      if(this.dateRangeType===0){
-        this.startDateConfig.dateTransfData=this.$refs.startDateMoveWaySec.dateChangeArr||[]
-        this.endDateConfig.dateTransfData=this.$refs.endDateMoveWaySec.dateChangeArr||[]
+      if (this.dateRangeType === 0) {
+        this.startDateConfig.dateTransfData = this.$refs.startDateMoveWaySec.dateChangeArr || []
+        this.endDateConfig.dateTransfData = this.$refs.endDateMoveWaySec.dateChangeArr || []
       }
-      let _EdbAliasName=''
-      if(this.computedType===0){
-        const selectItem=this.searchOptions.find(i=>i.EdbInfoId===this.edbInfoId)
-        _EdbAliasName=this.$i18nt.locale==='zh'?selectItem.EdbName:selectItem.EdbNameEn
+      let _EdbAliasName = ''
+      if (this.computedType === 0) {
+        const selectItem = this.searchOptions.find(i => i.EdbInfoId === this.edbInfoId)
+        _EdbAliasName = this.$i18nt.locale === 'zh' ? selectItem.EdbName : selectItem.EdbNameEn
       }
-      
-      const edbList=this.computedType===0?[{
-            EdbInfoId: this.edbInfoId,
-            IsAxis: 1,
-            EdbAliasName: _EdbAliasName,
-          }]:this.edbList.map(_i=>{
-            return {
-              EdbInfoId: _i.EdbInfoId,
-              IsAxis: 1,
-              EdbAliasName: this.$i18nt.locale==='zh'?_i.EdbName:_i.EdbNameEn,
-            }
-          })
+
+      const edbList = this.computedType === 0 ? [{
+        EdbInfoId: this.edbInfoId,
+        IsAxis: this.edbAxis,
+        EdbAliasName: _EdbAliasName,
+      }] : this.edbList.map(_i => {
+        return {
+          EdbInfoId: _i.EdbInfoId,
+          IsAxis: _i.IsAxis,
+          EdbAliasName: this.$i18nt.locale === 'zh' ? _i.EdbAliasName : _i.EdbAliasNameEn,
+        }
+      })
       const params = {
         ChartEdbInfoList: edbList,
 
-        ExtraConfig:{
+        ExtraConfig: {
           EdbInfoMode: this.computedType,//指标模式 0: 单指标，1: 多指标
           DateRangeType: this.dateRangeType,
           AutoDateConf: {//智能划分数据
@@ -607,7 +621,7 @@ export default {
             Value: this.dataConvert.value,
             Unit: this.dataConvert.unit
           },
-          SeriesName:this.seriesName
+          SeriesName: this.seriesName
         }
       }
 
@@ -654,61 +668,77 @@ export default {
     },
 
     // 初始化数据
-    initData(data){
-      const {ChartInfo,DataResp,EdbInfoList}=data
-      this.dateRangeType=DataResp.DateRangeType
-      this.startDateConfig={
-        startDateType:DataResp.AutoDateConf.IsAutoStartDate||0,//起始日期类型 0固定 1动态
-        startDateVal: DataResp.AutoDateConf.StartDate||'2020-01-01',
-        baseDateType: DataResp.AutoDateConf.StartDateConf.BaseDateType||0,//基准日期类型：0指标日期，1系统日期，2固定日期
-        MoveForward: DataResp.AutoDateConf.StartDateConf.MoveForward||0,
-        dateTransfData: DataResp.AutoDateConf.StartDateConf.DateChange||[],//日期变换数据
+    initData(data) {
+      const { ChartInfo, DataResp, EdbInfoList } = data
+      this.dateRangeType = DataResp.DateRangeType
+      this.startDateConfig = {
+        startDateType: DataResp.AutoDateConf.IsAutoStartDate || 0,//起始日期类型 0固定 1动态
+        startDateVal: DataResp.AutoDateConf.StartDate || '2020-01-01',
+        baseDateType: DataResp.AutoDateConf.StartDateConf.BaseDateType || 0,//基准日期类型：0指标日期，1系统日期，2固定日期
+        MoveForward: DataResp.AutoDateConf.StartDateConf.MoveForward || 0,
+        dateTransfData: DataResp.AutoDateConf.StartDateConf.DateChange || [],//日期变换数据
       }
-      this.endDateConfig={
-        baseDateType: DataResp.AutoDateConf.EndDateConf.BaseDateType||0,//准日期类型：0指标日期，1系统日期，2固定日期
-        endDateVal: DataResp.AutoDateConf.EndDate||'2020-01-01',
-        MoveForward: DataResp.AutoDateConf.EndDateConf.MoveForward||0,
-        dateTransfData: DataResp.AutoDateConf.EndDateConf.DateChange||[],//日期变换数据
+      this.endDateConfig = {
+        baseDateType: DataResp.AutoDateConf.EndDateConf.BaseDateType || 0,//准日期类型：0指标日期，1系统日期，2固定日期
+        endDateVal: DataResp.AutoDateConf.EndDate || '2020-01-01',
+        MoveForward: DataResp.AutoDateConf.EndDateConf.MoveForward || 0,
+        dateTransfData: DataResp.AutoDateConf.EndDateConf.DateChange || [],//日期变换数据
       }
 
-      this.calculateType=DataResp.CalculateType
+      this.calculateType = DataResp.CalculateType
 
-      this.unNormalDataDeal={
-        isDeal: DataResp.UnNormalDataDealType===0?false:true,
-        type: DataResp.UnNormalDataDealType||1,//1:剔除，2替换
-        formula_out: DataResp.UnNormalDataDealType===1?DataResp.UnNormalDataConf.Formula:'=',
-        value_out: DataResp.UnNormalDataDealType===1?DataResp.UnNormalDataConf.Value:0,
-        formula_replace: DataResp.UnNormalDataDealType===2?DataResp.UnNormalDataConf.Formula:'=',
-        value_replace: DataResp.UnNormalDataDealType===2?DataResp.UnNormalDataConf.Value:0,
-        endValue: DataResp.UnNormalDataDealType===2?DataResp.UnNormalDataConf.ReplaceValue:0,
+      this.unNormalDataDeal = {
+        isDeal: DataResp.UnNormalDataDealType === 0 ? false : true,
+        type: DataResp.UnNormalDataDealType || 1,//1:剔除，2替换
+        formula_out: DataResp.UnNormalDataDealType === 1 ? DataResp.UnNormalDataConf.Formula : '=',
+        value_out: DataResp.UnNormalDataDealType === 1 ? DataResp.UnNormalDataConf.Value : 0,
+        formula_replace: DataResp.UnNormalDataDealType === 2 ? DataResp.UnNormalDataConf.Formula : '=',
+        value_replace: DataResp.UnNormalDataDealType === 2 ? DataResp.UnNormalDataConf.Value : 0,
+        endValue: DataResp.UnNormalDataDealType === 2 ? DataResp.UnNormalDataConf.ReplaceValue : 0,
       }
 
-      this.dataConvert={
-        isConvert: DataResp.DataConvertType===0?false:true,
-        convertType: DataResp.DataConvertType||1,//0不转, 1乘 2除 3对数
-        value: DataResp.DataConvertConf.Value||100,
-        unit: this.$i18nt.locale==='zh'?DataResp.DataConvertConf.Unit:DataResp.DataConvertConf.EnUnit,
+      this.dataConvert = {
+        isConvert: DataResp.DataConvertType === 0 ? false : true,
+        convertType: DataResp.DataConvertType || 1,//0不转, 1乘 2除 3对数
+        value: DataResp.DataConvertConf.Value || 100,
+        unit: this.$i18nt.locale === 'zh' ? DataResp.DataConvertConf.Unit : DataResp.DataConvertConf.EnUnit,
       }
 
-      this.dateList=DataResp.ManualDateConf.map(item=>{
-        return [item.StartDate,item.EndDate]
+      this.dateList = DataResp.ManualDateConf.map(item => {
+        return [item.StartDate, item.EndDate]
       })
 
-      this.yearDateStart=DataResp.YearDateConf.StartDay
-      this.yearDateEnd=DataResp.YearDateConf.EndDay
+      this.yearDateStart = DataResp.YearDateConf.StartDay
+      this.yearDateEnd = DataResp.YearDateConf.EndDay
 
-      if(DataResp.EdbInfoMode===1){//多指标计算
-        this.seriesName=DataResp.SeriesName
-        this.edbList=EdbInfoList.map(_i=>{
+      if (DataResp.EdbInfoMode === 1) {//多指标计算
+        this.seriesName = DataResp.SeriesName
+        this.edbList = EdbInfoList.map(_i => {
           return _i
         })
-      }else{
-        this.edbInfoId=EdbInfoList[0].EdbInfoId
-        this.edbFromType=EdbInfoList[0].EdbInfoType
-        this.searchOptions=EdbInfoList||[]
+      } else {
+        this.edbInfoId = EdbInfoList[0].EdbInfoId
+        this.edbFromType = EdbInfoList[0].EdbInfoType
+        this.searchOptions = EdbInfoList || []
       }
 
     },
+    // 更新指标数据
+    updateEdbListData(arr){
+      if(this.computedType===0){
+        this.edbAxis=arr[0].IsAxis
+      }else{
+        this.edbList.forEach(item => {
+          arr.forEach(_i=>{
+            if(_i.EdbInfoId===item.EdbInfoId){
+              item.IsAxis=_i.IsAxis
+            }
+          })
+        });
+      }
+      console.log(arr,this.edbList);
+      
+    },
   },
 }
 </script>
@@ -716,8 +746,8 @@ export default {
 <style lang="scss" scoped>
 .single-edb-wrap {
   margin-top: 20px;
-  .section{
-    border-top: 1px dashed #DCDFE6;
+  .section {
+    border-top: 1px dashed #dcdfe6;
     margin-top: 20px;
     padding-top: 15px;
   }
@@ -734,15 +764,15 @@ export default {
       flex: 1;
     }
   }
-  .multiple-box{
+  .multiple-box {
     background-color: #f5f5f5;
     display: flex;
     align-items: center;
     padding: 10px;
-    .name{
+    .name {
       flex: 1;
     }
-    .icon{
+    .icon {
       width: 20px;
       height: 20px;
       margin-left: 5px;

src/views/intervalAnalysis/list.vue

@@ -11,13 +11,14 @@
     <div class="data-sheet-main" id="box">
       <div class="main-left left" id="left" v-show="!isSlideLeft">
         <div class="datasheet_top">
-          <el-button type="primary" @click="goAddChart">{{
+          <el-button type="primary" @click="goAddChart" v-permission="permissionBtn.statisticPermission.rangeAnalysis_addChart">{{
             $t("StatisticAnalysis.ChartRelevance.chart_add_btn")
           }}</el-button>
         </div>
 
         <div class="search-cont">
           <el-checkbox
+            v-permission="permissionBtn.statisticPermission.rangeAnalysis_onlyMine"
             v-model="isShowMe"
             @change="
               () => {
@@ -65,7 +66,7 @@
             :allow-drop="canDropHandle"
             :current-node-key="select_node"
             :default-expanded-keys="defaultShowNodes"
-            draggable
+            :draggable="isEdbBtnShow('moveCatalog')"
             :expand-on-click-node="false"
             check-strictly
             empty-text="暂无目录"
@@ -155,7 +156,7 @@
               </span>
             </span>
           </el-tree>
-          <div class="noDepart" @click="addLevelOneHandle">
+          <div class="noDepart" @click="addLevelOneHandle" v-if="isEdbBtnShow('editCatalog')">
             <img
               src="~@/assets/img/set_m/add_ico.png"
               alt=""
@@ -470,6 +471,16 @@ export default {
     };
   },
   methods: {
+    //控制页面按钮权限
+		isEdbBtnShow(type){
+			const {statisticPermission,checkPermissionBtn}=this.permissionBtn
+      const BtnMap={
+        'moveCatalog':statisticPermission.rangeAnalysis_classifyOpt_move,
+        'editCatalog':statisticPermission.rangeAnalysis_classifyOpt_edit,
+        'deleteCatalog':statisticPermission.rangeAnalysis_classifyOpt_delete
+      }
+      return checkPermissionBtn(BtnMap[type])
+    },
 
     /* 添加图表 */
     goAddChart() {
@@ -564,7 +575,7 @@ export default {
       this.select_date = '';
       this.dateTip =/* '请选择时间段' */ this.$t('Chart.choose_time');
 
-      
+      this.getChartInfo()
     },
 
     /* 打开时间段弹窗 */
@@ -620,7 +631,14 @@ export default {
     /* 获取图表详情 */
     getDetailHandle() {
       apiIntervalAnalysis.chartInfo({
-        ChartInfoId: this.select_id
+        ChartInfoId: this.select_id,
+        DateType: this.year_select,
+        StartDate: [5 , 6].includes(this.year_select)
+          ? this.select_date[0]
+          : '',
+        EndDate: this.year_select === 5 ? this.select_date[1] : '',
+        StartYear:this.count_year || 0,
+
       }).then(res => {
         if (res.Ret !== 200) return