浏览代码

Merge branch 'master' into debug

shanbinzhang 5 月之前
父节点
当前提交
2fbbc27baf
共有 100 个文件被更改,包括 86 次插入3973 次删除
  1. 1 5
      src/views/approve_manage/approveEdit.vue
  2. 0 6
      src/views/approve_manage/approveSetting.vue
  3. 0 8
      src/views/approve_manage/components/flowNode/approveNode.vue
  4. 0 4
      src/views/approve_manage/components/rejectDialog.vue
  5. 0 1
      src/views/approve_manage/components/treeTransfer.vue
  6. 1 8
      src/views/chartFrame_manage/common/graph.js
  7. 2 21
      src/views/chartFrame_manage/components/frameContainer.vue
  8. 0 1
      src/views/chartFrame_manage/frameEditor.vue
  9. 0 5
      src/views/chartRelevance_manage/components/chartCard.vue
  10. 1 19
      src/views/chartRelevance_manage/components/fittingEquationSaveDia.vue
  11. 0 2
      src/views/chartRelevance_manage/components/saveEdbToBaseDia.vue
  12. 1 10
      src/views/chartRelevance_manage/components/selectTarget.vue
  13. 1 5
      src/views/chartRelevance_manage/crossVarietyAnalysis/chartEditor.vue
  14. 1 21
      src/views/chartRelevance_manage/crossVarietyAnalysis/components/chartFormSection.vue
  15. 1 51
      src/views/chartRelevance_manage/crossVarietyAnalysis/components/edbTableSection.vue
  16. 0 1
      src/views/chartRelevance_manage/crossVarietyAnalysis/components/tagSetDialog.vue
  17. 1 16
      src/views/chartRelevance_manage/crossVarietyAnalysis/list.vue
  18. 1 17
      src/views/chartRelevance_manage/fittingEquation/fittingEquationChartEditor.vue
  19. 1 25
      src/views/chartRelevance_manage/fittingEquation/fittingEquationList.vue
  20. 1 6
      src/views/chartRelevance_manage/mixins/classifyMixin.js
  21. 1 34
      src/views/chartRelevance_manage/relevance/components/batchSelectFormula.vue
  22. 1 25
      src/views/chartRelevance_manage/relevance/list.vue
  23. 1 17
      src/views/chartRelevance_manage/relevance/relevanceChartEditor.vue
  24. 3 32
      src/views/chartRelevance_manage/statistic/statisticFeatureChartEditor.vue
  25. 0 7
      src/views/chartRelevance_manage/statistic/statisticFeatureList.vue
  26. 3 31
      src/views/classify_manage/chapterSettingV2.vue
  27. 1 33
      src/views/classify_manage/classifylistV2.vue
  28. 1 54
      src/views/dataEntry_manage/addChart.vue
  29. 0 10
      src/views/dataEntry_manage/adjustdata/adjustData.vue
  30. 3 60
      src/views/dataEntry_manage/chartSetting.vue
  31. 1 21
      src/views/dataEntry_manage/coal/index.vue
  32. 1 4
      src/views/dataEntry_manage/codecount/compoments/dataTable.vue
  33. 0 11
      src/views/dataEntry_manage/codecount/index.vue
  34. 0 1
      src/views/dataEntry_manage/components/DateChooseDia.vue
  35. 1 6
      src/views/dataEntry_manage/components/LegendEditDia.vue
  36. 1 1
      src/views/dataEntry_manage/components/addMyClassifyDia.vue
  37. 2 8
      src/views/dataEntry_manage/components/addTarget.vue
  38. 0 14
      src/views/dataEntry_manage/components/chart.vue
  39. 1 32
      src/views/dataEntry_manage/components/editTarget.vue
  40. 1 9
      src/views/dataEntry_manage/components/satterSeriesDia.vue
  41. 0 5
      src/views/dataEntry_manage/components/sectionalCombination/seriesItemWrap.vue
  42. 0 1317
      src/views/dataEntry_manage/dataEntry.vue
  43. 0 913
      src/views/dataEntry_manage/dataList.vue
  44. 0 2
      src/views/dataEntry_manage/databaseComponents/batchComptedDialog.vue
  45. 1 28
      src/views/dataEntry_manage/databaseComponents/chartTrendRender.vue
  46. 0 31
      src/views/dataEntry_manage/databaseComponents/computedDialog.vue
  47. 1 10
      src/views/dataEntry_manage/databaseComponents/createChart.vue
  48. 1 5
      src/views/dataEntry_manage/databaseComponents/dataAssociateChart.vue
  49. 0 1
      src/views/dataEntry_manage/databaseComponents/edbDetailData.vue
  50. 0 2
      src/views/dataEntry_manage/databaseComponents/fittingResidueDia.vue
  51. 1 21
      src/views/dataEntry_manage/databaseComponents/jointTargetDia.vue
  52. 1 9
      src/views/dataEntry_manage/databaseComponents/openDialog.vue
  53. 1 17
      src/views/dataEntry_manage/databaseComponents/operationDialog.vue
  54. 1 18
      src/views/dataEntry_manage/databaseList.vue
  55. 3 68
      src/views/dataEntry_manage/editChart.vue
  56. 0 8
      src/views/dataEntry_manage/mixins/chartPublic.js
  57. 1 8
      src/views/dataEntry_manage/onlineExcelCopy.vue
  58. 5 74
      src/views/dataEntry_manage/targetList.vue
  59. 0 5
      src/views/dataEntry_manage/thirdBase/DatabankBase.vue
  60. 3 21
      src/views/dataEntry_manage/thirdBase/UNdata.vue
  61. 1 13
      src/views/dataEntry_manage/thirdBase/chinaFinancialFutures.vue
  62. 0 5
      src/views/dataEntry_manage/thirdBase/components/batchAddToEdbDialog.vue
  63. 0 1
      src/views/dataEntry_manage/thirdBase/components/batchEditIndexDia.vue
  64. 1 32
      src/views/dataEntry_manage/thirdBase/components/batchFwAddIndicsDia.vue
  65. 2 63
      src/views/dataEntry_manage/thirdBase/components/targetDialog.vue
  66. 1 13
      src/views/dataEntry_manage/thirdBase/dlExchangeData.vue
  67. 1 39
      src/views/dataEntry_manage/thirdBase/lzTargetbase.vue
  68. 0 13
      src/views/dataEntry_manage/thirdBase/shEnergy.vue
  69. 0 11
      src/views/dataEntry_manage/thirdBase/shFutures.vue
  70. 5 60
      src/views/dataEntry_manage/thirdBase/ysTargetBase.vue
  71. 1 13
      src/views/dataEntry_manage/thirdBase/zzExchangeData.vue
  72. 0 39
      src/views/dataSource_manage/accountList.vue
  73. 0 2
      src/views/dataSource_manage/components/DetailTable.vue
  74. 0 15
      src/views/dataSource_manage/components/EDBInfoChangeTable.vue
  75. 2 43
      src/views/dataSource_manage/components/GLRefreshFailDetail.vue
  76. 0 6
      src/views/dataSource_manage/dataSourceListGL.vue
  77. 0 12
      src/views/datasheet_manage/addSheet.vue
  78. 0 4
      src/views/datasheet_manage/balanceSheetEdit.vue
  79. 1 8
      src/views/datasheet_manage/common/option.js
  80. 0 2
      src/views/datasheet_manage/components/BalanceAddChart.vue
  81. 1 8
      src/views/datasheet_manage/components/BalanceSheetChartItem.vue
  82. 2 33
      src/views/datasheet_manage/components/BalanceTable.vue
  83. 1 26
      src/views/datasheet_manage/components/MixedTable.vue
  84. 0 15
      src/views/datasheet_manage/components/SheetExcel.vue
  85. 0 18
      src/views/datasheet_manage/components/calculateEdbDia.vue
  86. 2 10
      src/views/datasheet_manage/components/insertDateDia.vue
  87. 0 14
      src/views/datasheet_manage/components/selectTargetValueDia.vue
  88. 0 5
      src/views/datasheet_manage/components/sheetClassifyDia.vue
  89. 0 6
      src/views/datasheet_manage/components/sheetListWrap.vue
  90. 2 9
      src/views/datasheet_manage/components/toolBarSection.vue
  91. 0 36
      src/views/datasheet_manage/customAnalysis/addAnalysisSheet.vue
  92. 0 44
      src/views/datasheet_manage/customAnalysis/components/bottomSection.vue
  93. 0 4
      src/views/datasheet_manage/customAnalysis/components/rightSection.vue
  94. 3 24
      src/views/datasheet_manage/customAnalysis/list.vue
  95. 2 42
      src/views/datasheet_manage/customSheetEdit.vue
  96. 1 19
      src/views/datasheet_manage/mixedSheetEdit.vue
  97. 0 1
      src/views/datasheet_manage/mixins/classifyMixin.js
  98. 2 29
      src/views/datasheet_manage/sheetList.vue
  99. 0 7
      src/views/futures_manage/chartEditor.vue
  100. 1 24
      src/views/futures_manage/commodityChartBase.vue

+ 1 - 5
src/views/approve_manage/approveEdit.vue

@@ -162,11 +162,7 @@ export default {
                     if(res.Ret!==200) return 
                     const {FlowName,ReportType,ClassifyFirstId,ClassifySecondId,Nodes,ClassifyThirdId} = res.Data||{}
                     this.approveForm.name = FlowName||''
-                    //递归获取所有父级id
-                    // const classify = this.classifyTree.find(i=>i.ClassifyId===ReportType)||{}
-                    // const tempArr = findParentNode(classify.Children||[],ClassifySecondId)
-                    // tempArr.push(ReportType)
-                    // this.approveForm.classify = tempArr.reverse()
+
                     this.approveForm.classify = ClassifyThirdId 
                         ? [ReportType,ClassifyFirstId,ClassifySecondId,ClassifyThirdId]
                         : ClassifySecondId

+ 0 - 6
src/views/approve_manage/approveSetting.vue

@@ -132,12 +132,6 @@ export default {
         },
         handleSearchChange(){
             if(this.activeMainTab == 'report'){
-                // this.ClassifySecondId = this.classify[this.classify.length-1]||0
-                // if(this.classify.length>=3){
-                //     this.ClassifyFirstId = this.classify[this.classify.length-2]||0
-                // }else{
-                //     this.ClassifyFirstId = 0
-                // }
                 this.ReportType = this.classify[0]||0
                 this.handleReportClassifyId()
             } else {

+ 0 - 8
src/views/approve_manage/components/flowNode/approveNode.vue

@@ -57,14 +57,6 @@
                     <div class="block" style="margin-top:30px;">
                         <p>{{$t('SystemManage.ReportApprove.mutl_person')}}</p>
                         <el-radio-group v-model="approveType">
-                            <!-- <el-radio :label="1">
-                                {{$t('SystemManage.ReportApprove.approval_type01')}}
-                                <el-tooltip effect="dark" placement="top" :content="$t('SystemManage.ReportApprove.des01')" >
-                                    <span class="hint-text">
-                                        <i class="el-icon-info"></i>
-                                    </span>
-                                </el-tooltip>
-                            </el-radio> -->
                             <el-radio :label="2">
                                 {{$t('SystemManage.ReportApprove.approval_type02')}}
                                 <el-tooltip effect="dark" placement="top" :content="$t('SystemManage.ReportApprove.des02')" >

+ 0 - 4
src/views/approve_manage/components/rejectDialog.vue

@@ -53,10 +53,6 @@ export default {
     },
     methods: {
         handleConfirm(){
-            /* if(!this.content.length){
-                this.$message.warning("请输入驳回理由")
-                return
-            } */
            if(this.content.length > 500){
               return this.$message.warning('内容不能超过500字') 
            };

+ 0 - 1
src/views/approve_manage/components/treeTransfer.vue

@@ -148,7 +148,6 @@ export default {
         },
     },
     mounted(){
-        //this.getTreeData()
     }
 };
 </script>

+ 1 - 8
src/views/chartFrame_manage/common/graph.js

@@ -95,14 +95,7 @@ export function myGraph(wrapper,tempThis) {
                 args:{
                 }
             },
-            /*
-            router: {
-                name: 'er',
-                args: {
-                    direction: 'V',
-                },
-            },
-             */
+
             // 定义边样式
             createEdge() {
                 return new Shape.Edge({

+ 2 - 21
src/views/chartFrame_manage/components/frameContainer.vue

@@ -50,16 +50,7 @@ export default {
         this.baseNode = baseNode //默认节点样式
         return {
             graph:null,//画布对象
-            /* contextMenu:[{
-                label: '编辑',
-                key: 'edit',
-                icon: 'el-icon-edit'
-            },
-            {
-                label: '删除',
-                key: 'del',
-                icon: 'el-icon-delete'
-            }], *///右键菜单
+           
             isSelectEdge:false,//是否选择了边
             isSelectNode:false,//是否选择了节点
             currentCell:null,//当前选中的元素
@@ -135,16 +126,7 @@ export default {
                 tempNode.data.id=nodeLink.MyChartClassifyId||0
                 tempNode.label=nodeName
                 tempNode.data.nodeLink = nodeLink
-                /* currentNode.data.id=nodeLink.MyChartClassifyId||0
-                currentNode.label=nodeName
-                currentNode.data.nodeLink = nodeLink
-                currentNode.removeTools()
-                const newId = currentNode.data.id
-                const isSetStyle = (oldId===0&&newId!==0)||(oldId!==0&&newId===0)
-                isSetStyle&&this.setNodeStyle(newId,currentNode)
-                if(!currentNode.data.id) return 
-                const toolOption = this.getToolOption({chartNum:nodeLink.ChartNum,color:currentNode.attrs.label.fill})
-                currentNode.addTools(toolOption) */
+               
             }else{
                 //在视口范围内添加节点
                 const nodeStyle = nodeLink.MyChartClassifyId?baseNode:baseNode2
@@ -258,7 +240,6 @@ export default {
         }
     },
     mounted(){
-        //this.init()
     }
 };
 </script>

+ 0 - 1
src/views/chartFrame_manage/frameEditor.vue

@@ -82,7 +82,6 @@ export default {
             isModifyNodeDialogShow: false,//编辑节点弹窗
             rules: {
                 nodeName: [{ required: true, message:/*  "请输入节点名称" */this.$t('ChartFramePage.vaild_node_name'), trigger: "blur" }],
-                /* nodeLink: [{ required: true, message: "请选择节点链接", trigger: "blur" }] */
             },
             myList:[],//我的图库列表
         };

+ 0 - 5
src/views/chartRelevance_manage/components/chartCard.vue

@@ -253,11 +253,6 @@ export default {
     },
 
     async setImageHandle(form,id) {
-      // let { Data } = await dataBaseInterface.uploadImgSvg(form);
-      // await dataBaseInterface.setChartImage({
-      //   ChartInfoId: id,
-      //   ImageUrl: Data.ResourceUrl,
-      // });
       form.append('ChartInfoId',id)
       await dataBaseInterface.setChartThumbnail(form)
     },

+ 1 - 19
src/views/chartRelevance_manage/components/fittingEquationSaveDia.vue

@@ -173,11 +173,6 @@ export default {
 			classifyOptions:[],//分类列表
 
       checkCharts: [5,6,7],
-      /* chartsType: [
-        { name: '弹性系数a',key: 5 },
-        { name: '截距b',key: 6 },
-        { name: '相关系数r²',key: 7 },
-      ], */
 
       form: {
         aName: '',
@@ -188,20 +183,7 @@ export default {
         bClassify: '',
         relevanceClassify: ''
       },
-/*       formRules: {
-				aName:[
-					{ required: true, message: '图表名称不能为空', trigger: 'blur' },
-				],
-				bName:[
-					{ required: true, message: '图表名称不能为空', trigger: 'blur' },
-				],
-				relevanceName:[
-					{ required: true, message: '图表名称不能为空', trigger: 'blur' },
-				],
-				classify:[
-					{ required: true, message: '图表分类不能为空', trigger: 'blur' },
-				],
-			}, */
+
 		};
 	},
 	methods: {

+ 0 - 2
src/views/chartRelevance_manage/components/saveEdbToBaseDia.vue

@@ -146,11 +146,9 @@ export default {
 			if(this.$route.path==='/statisticFeatureChartEditor'&&this.$parent.oldEdbInfoType) {
         res = await preDictEdbInterface.classifyListV2()
 				if(res.Ret !== 200) return
-				//this.filterNodes(res.Data.AllNodes,1);
       }else {
 				res = await dataBaseInterface.menuListV3({ClassifyType:2})
 				if(res.Ret !== 200) return
-				//this.filterNodes(res.Data.AllNodes,2);
 			}
 			this.filterNodes(res.Data.AllNodes||[]);
 			this.options = res.Data.AllNodes || [];

+ 1 - 10
src/views/chartRelevance_manage/components/selectTarget.vue

@@ -180,16 +180,7 @@ export default {
     data() {
         return {
             targetType:'1',//1:ETA指标 2:ETA预测指标
-            // etaTypeOpt:[
-            //     {
-            //         label:'ETA指标',
-            //         val:'1'
-            //     },
-            //     {
-            //         label:'ETA预测指标',
-            //         val:'2'
-            //     },
-            // ],
+
             search_txt: this.defaultId||'',
             searchOptions: this.defaultOpt||[],
             search_have_more: true,

+ 1 - 5
src/views/chartRelevance_manage/crossVarietyAnalysis/chartEditor.vue

@@ -429,11 +429,7 @@ export default {
       this.setImageHandle(form,data);
     },
     async setImageHandle(form,{ UniqueCode,ChartInfoId }) {
-      // let { Data } = await dataBaseInterface.uploadImgSvg(form);
-      // await dataBaseInterface.setChartImage({
-      //   ChartInfoId: ChartInfoId,
-      //   ImageUrl: Data.ResourceUrl,
-      // });
+      
       form.append('ChartInfoId',ChartInfoId)
       await dataBaseInterface.setChartThumbnail(form)
 			this.$message.success(/* '保存成功' */this.$t('StatisticAnalysis.FittingEquationChart.detail_dialog_save_success'));

+ 1 - 21
src/views/chartRelevance_manage/crossVarietyAnalysis/components/chartFormSection.vue

@@ -223,27 +223,7 @@ export default {
           { DateType: 1,Num: 0,FixDate:'',ShowTips: 1 },
         ],
       },
-      // unitOpt: [
-      //   { label: "年", val: "年" },
-      //   { label: "季", val: "季" },
-      //   { label: "月", val: "月" },
-      //   { label: "周", val: "周" },
-      //   { label: "天", val: "天" },
-      // ],
-
-      // dateOptions: [
-      //   { label: '最新日期',val: 1 },
-      //   { label: 'N天前',val: 2 },
-      // ]
-
-      // percentOptions: [
-      //   { label: '数据个数',val: 1 },
-      //   { label: '数据区间',val: 0 },
-      // ],
-      // tips: {
-      //   'percent':`1、数据个数百分位算法:数据区间第一个(较远日期)和最后一个数据点(较近日期)分别为 (T1,S1),(T2,S2)。T代表时间。S代表对应的值,N=T1到T2时间段指标数据个数。n=小于等于S2的数据个数。个数百分位=(n-1)/(N-1) ,N=1时不计算。<br>
-      //   2、数据区间百分位算法:对所选时间范围内的数据,取最大值Max,最小值Min,计算Max-Min,百分位=(现值-Min)/(Max-Min),Max=Min时不计算`
-      // }
+     
     };
   },
   methods: {

+ 1 - 51
src/views/chartRelevance_manage/crossVarietyAnalysis/components/edbTableSection.vue

@@ -108,57 +108,7 @@ export default {
   },
   data() {
     return {
-      // tableColums: [
-      //   {
-      //     label: '指标名称',
-      //     key: 'EdbName',
-      //     enKey:'EdbNameEn',
-			// 		inputTip:'点击输入英文指标名称',
-      //     minwidthsty: '150px',
-      //   },
-      //   {
-      //     label: '指标ID',
-      //     key: 'EdbCode',
-      //     widthsty: '120px',
-      //   },
-      //   {
-      //     label: '更新频度',
-      //     key: 'Frequency',
-      //     enKey:'FrequencyEn',
-      //     minwidthsty: '60px',
-      //   },
-      //   {
-      //     label: '单位',
-      //     key: 'Unit',
-      //     enKey:'UnitEn',
-			// 		inputTip:'英文单位',
-      //     minwidthsty: '50px',
-      //   },
-      //   {
-      //     label: '起始时间',
-      //     key: 'StartDate',
-      //     minwidthsty: '100px',
-      //   },
-      //   {
-      //     label: '最新日期',
-      //     key: 'LatestDate',
-      //     minwidthsty: '90px',
-      //   },
-      //   {
-      //     label: '最新值',
-      //     key: 'LatestValue',
-      //     minwidthsty: '90px',
-      //   },
-      //   {
-      //     label: '最近更新',
-      //     key: 'ModifyTime',
-      //     minwidthsty: '100px',
-      //   },
-      //   {
-      //     label: '数据来源',
-      //     key: 'SourceName',
-      //   },
-      // ],//表格列
+     
     }
   },
   methods:{

+ 0 - 1
src/views/chartRelevance_manage/crossVarietyAnalysis/components/tagSetDialog.vue

@@ -48,7 +48,6 @@
                 slot="reference"
                 class="el-tag__close el-icon-close" 
               />
-                <!-- @click.stop="closeItemHandle(item)" -->
             </el-popconfirm>
           </span>
         </div>

+ 1 - 16
src/views/chartRelevance_manage/crossVarietyAnalysis/list.vue

@@ -99,14 +99,7 @@
 									@click.stop="editNode(node, data)"
 									v-if="!data.ChartInfoId&&permissionBtn.isShowBtn('statisticPermission','crossVariety_classifyOpt_edit')"
 								/>
-								<!-- <img
-									slot="reference"
-									src="~@/assets/img/set_m/del.png"
-									alt=""
-									style="width: 14px; height: 14px"
-									@click.stop="removeNode(node, data)"
-									v-if="!data.ChartInfoId&&permissionBtn.isShowBtn('statisticPermission','crossVariety_classifyOpt_delete')"
-								/> -->
+
 							</span>
 						</span>
 					</el-tree>
@@ -257,14 +250,6 @@
       :data="chartInfo"
       @ensure="getTreeData"
     />
-
-		<!-- 输入英文指标弹窗 -->
-		<!-- <set-en-name-dia 
-			:isOpenDialog="setEnName" 
-		  :formData="formItemArray"
-			@cancel="setEnName=false"
-   	  @updateEnName="updateEnName"
-		/> -->
 		
     <!-- 设置对应版本信息弹窗 -->
 		<setLangInfoDia

+ 1 - 17
src/views/chartRelevance_manage/fittingEquation/fittingEquationChartEditor.vue

@@ -14,19 +14,7 @@
 					path: '/fittingEquationList',
 					query: $route.query
 				})">{{$t('Dialog.cancel_btn')}}</el-button>
-				<!-- <span style="color: #666;">
-						使用说明
-					<el-tooltip
-						effect="dark"
-					>
-						<div
-							slot="content"
-							v-html="useTip"
-							style="line-height: 20px;width:350px"
-						></div>
-						<i class="el-icon-question" />
-					</el-tooltip>
-				</span> -->
+			
 				<div style="color:#409EFF;font-size: 16px;cursor: pointer;" @click="showExplain = true">
 					<i class="el-icon-document" style="font-size:22px;"></i>
 					{{$t('StatisticAnalysis.ChartRelevance.opt_tip_btn')}}
@@ -224,10 +212,6 @@ export default {
 			activeNames:[0],
 
 			chartBatchData: [],
-	// 		yearSelector: [
-    //     ...yearSelector,
-    //     { name: '自定义',value: 5 }
-    //   ],
 			dateSelector: [
 				{ name: '过去1年',value: 1 },
 				{ name: '过去2年',value: 2 },

+ 1 - 25
src/views/chartRelevance_manage/fittingEquation/fittingEquationList.vue

@@ -13,19 +13,7 @@
 				<div class="datasheet_top">
 						<el-button v-permission="permissionBtn.statisticPermission.fittingEq_addChart"
 							type="primary" @click="goAddChart">{{$t('Chart.add_chart_btn')}}</el-button>
-						<!-- <div style="color: #666">
-							 使用说明
-							<el-tooltip
-								effect="dark"
-							>
-								<div
-									slot="content"
-									v-html="useTip"
-									style="line-height: 20px;width:350px"
-								></div>
-								<i class="el-icon-question" />
-							</el-tooltip>
-						</div> -->
+						
 				</div>
 
 				<div class="search-cont">
@@ -230,14 +218,6 @@
       @ensure="getTreeData"
     />
 
-		<!-- 输入英文指标弹窗 -->
-		<!-- <set-en-name-dia 
-			:isOpenDialog="setEnName" 
-		  :formData="formItemArray"
-			@cancel="setEnName=false"
-   	  @updateEnName="updateEnName"
-		/> -->
-
 		<!-- 设置对应版本信息弹窗 -->
 		<setLangInfoDia
 			:isOpenDialog="isLangInfoDia"
@@ -438,8 +418,6 @@ export default {
 				type: 'error',
 			}) : DeleteStatus === 0
 			?  this.$confirm(this.$t('Chart.OptMsg.classify_del_confirm'), this.$t('Confirm.prompt'), {
-				// confirmButtonText: '确定',
-				// cancelButtonText: '取消',
 				type: 'warning',
 			}).then(() => {
 				this.delApi(ChartClassifyId,ChartInfoId)
@@ -548,8 +526,6 @@ export default {
 		delChartHandle() {
 			const { ChartClassifyId,ChartInfoId } = this.chartInfo;
 			this.$confirm(this.$t('Chart.OptMsg.chart_del_confirm'), this.$t('Confirm.prompt'), {
-        // confirmButtonText: '确定',
-        // cancelButtonText: '取消',
         type: 'warning',
       })
         .then(() => {

+ 1 - 6
src/views/chartRelevance_manage/mixins/classifyMixin.js

@@ -437,12 +437,7 @@ export default {
     },
 
     async setImageHandle(form) {
-      // let { Data } = await dataBaseInterface.uploadImgSvg(form);
-
-      // await dataBaseInterface.setChartImage({
-      //   ChartInfoId: this.select_id,
-      //   ImageUrl: Data.ResourceUrl,
-      // });
+      
       form.append('ChartInfoId',this.select_id)
       await dataBaseInterface.setChartThumbnail(form)
     },

+ 1 - 34
src/views/chartRelevance_manage/relevance/components/batchSelectFormula.vue

@@ -91,39 +91,7 @@ export default {
         }
     },
     computed:{
-        //计算方式列表-改为后端获取
-        /* formulaOption(){
-            return [
-                {
-                    value:5,
-                    label:this.$t('Edb.CalculatesAll.on_year'),//同比值
-                },
-                {
-                    value:7,
-                    label:this.$t('Edb.CalculatesAll.differ'),//同差值
-                },
-                {
-                    value:8,
-                    label:this.$t('Edb.CalculatesAll.rule_move_average'),//N期移动均值
-                },
-                {
-                    value:12,
-                    label:this.$t('Edb.CalculatesAll.period_over_period'),//N期环比值
-                },
-                {
-                    value:13,
-                    label:this.$t('Edb.CalculatesAll.period_difference'),//N期环差值
-                },
-                {
-                    value:35,
-                    label:this.$t('Edb.CalculatesAll.super_seasonal'),//超季节性
-                },
-                {
-                    value:72,
-                    label:this.$t('Edb.CalculatesAll.ex_smooth'),//指数修匀
-                },
-            ]
-        } */
+
     },
     watch:{
         factorData:{
@@ -145,7 +113,6 @@ export default {
     methods: {
         //打开弹窗时,在外层组件调用
         initFormulaList(){
-            //this.formulaForm.CalculateStep = _.cloneDeep(this.dataFormulaList)
             this.getFormulaOption()
         },
         validator(rule,value,callback){

+ 1 - 25
src/views/chartRelevance_manage/relevance/list.vue

@@ -253,7 +253,6 @@
             </el-table-column>
             <el-table-column :label="$t('Edb.Detail.e_opera')" key="Copy" align="center" width="140">
               <template slot-scope="scope" v-if="scope.row.HaveOperaAuth">
-                <!-- <span @click="delTarget(scope.row)" class="deletesty">删除&nbsp;</span> -->
                 <span v-permission="permissionBtn.statisticPermission.corrAnalysis_copyData"
                     class="editsty" @click="copyCode(scope.row)">
                   <i class="el-icon-document-copy" />&nbsp;{{$t('Edb.detail_copydata_btn')}}</span
@@ -283,13 +282,6 @@
       </div>
     </div>
 
-    <!-- 分类弹窗 -->
-    <!-- <classify-dia
-      :isOpenDialog.sync="classifyDia"
-      :title="dialog_title"
-      :form="classifyForm"
-      @successCallback="getTreeData"
-    /> -->
     <modifyClassifyDialog
       :isOpenDialog.sync="classifyDia"
       :type="classifyDiaType"
@@ -316,13 +308,6 @@
       @ensure="getTreeData"
     />
 
-    <!-- 输入英文指标弹窗 -->
-    <!-- <set-en-name-dia
-      :isOpenDialog="setEnName"
-      :formData="formItemArray"
-      @cancel="setEnName = false"
-      @updateEnName="updateEnName"
-    /> -->
 
      <!-- 设置对应版本信息弹窗 -->
 		<setLangInfoDia
@@ -915,8 +900,6 @@ export default {
     delChartHandle() {
       const { ChartClassifyId, ChartInfoId } = this.chartInfo;
       this.$confirm(this.$t('Chart.OptMsg.chart_del_confirm'), this.$t('Confirm.prompt'), {
-        // confirmButtonText: "确定",
-        // cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
@@ -949,12 +932,6 @@ export default {
 
     /* 编辑图表 */
     editChartHandle() {
-      /* this.$router.push({
-        path: "/relevancechartEditor",
-        query: {
-          code: this.chartInfo.UniqueCode,
-        },
-      }); */
       this.$router.push({
         path: "/relevancechartEditorV2",
         query: {
@@ -985,8 +962,7 @@ export default {
             if (it.title.text == "英文单位") it.title.text = "";
           });
         }
-        // widthNum=this.$refs.chartRef.chart.chartWidth*2
-        // heightNum=(this.$refs.chartRef.chart.chartHeight*2)+36
+
         let svg = this.$refs.chartRef.chart.getSVG({
           chart: {
             width: widthNum,

+ 1 - 17
src/views/chartRelevance_manage/relevance/relevanceChartEditor.vue

@@ -481,13 +481,7 @@ export default {
           }
         ]
       },
-      // unitOpt:[
-      //     {label:'年',val:'年'},
-      //     {label:'季',val:'季'},
-      //     {label:'月',val:'月'},
-      //     {label:'周',val:'周'},
-      //     {label:'天',val:'天'},
-      // ],
+
       operationType:'preview',
       chartRules: {
         EdbInfoIdA:[
@@ -591,16 +585,6 @@ export default {
         this.$message.warning(/* '相关性计算窗口必须≥2*分析周期' */this.$t('StatisticAnalysis.ChartRelevance.check_value_hint'))
         checkBool = false
       }
-      // else if(RollingCorrelation[0].CalculateValue*valueMap[RollingCorrelation[0].CalculateUnit] >= Correlation.CalculateValue*valueMap[Correlation.CalculateUnit]) {
-      //   this.chartInfo.RollingCorrelation[0].CalculateValue = '';
-      //   this.$message.warning('滚动相关性1计算窗口必须小于相关性计算窗口')
-      //   checkBool = false
-      // }
-      // else if(RollingCorrelation[1].CalculateValue*valueMap[RollingCorrelation[1].CalculateUnit] >= Correlation.CalculateValue*valueMap[Correlation.CalculateUnit]) {
-      //   this.chartInfo.RollingCorrelation[1].CalculateValue = '';
-      //   this.$message.warning('滚动相关性2计算窗口必须小于相关性计算窗口')
-      //   checkBool = false
-      // }
       
       return checkBool
     },

+ 3 - 32
src/views/chartRelevance_manage/statistic/statisticFeatureChartEditor.vue

@@ -76,14 +76,7 @@
 
         <div class="section">
           <div>{{$t('StatisticAnalysis.StatisticFeatureChart.standard_deviation')}}
-            <!-- <el-tooltip effect="dark" placement="right">
-              <div
-                slot="content"
-                v-html="ruleTips.StandardDeviation"
-                style="line-height: 20px;width:300px"
-              ></div>
-              <i class="el-icon-question" style="color: #666" />
-            </el-tooltip> -->
+
           </div>
           <div class="section-item">
             <div>{{$t('StatisticAnalysis.StatisticFeatureChart.rolling_period')}}:</div>
@@ -99,14 +92,7 @@
 
         <div class="section">
           <div>{{$t('StatisticAnalysis.StatisticFeatureChart.percentile')}}
-            <!-- <el-tooltip effect="dark" placement="right">
-              <div
-                slot="content"
-                v-html="ruleTips.Percentile"
-                style="line-height: 20px;width:300px"
-              ></div>
-              <i class="el-icon-question" style="color: #666" />
-            </el-tooltip> -->
+
           </div>
           <div class="section-item">
             <span style="flex-shrink:0;min-width:70px">{{$t('StatisticAnalysis.StatisticFeatureChart.percentile')}}:</span>
@@ -157,14 +143,7 @@
 
         <div class="section">
           <div>{{$t('StatisticAnalysis.StatisticFeatureChart.frequency_distribution')}}
-            <!-- <el-tooltip effect="dark" placement="right">
-              <div
-                slot="content"
-                v-html="ruleTips.FrequencyDistribution"
-                style="line-height: 20px;width:300px"
-              ></div>
-              <i class="el-icon-question" style="color: #666" />
-            </el-tooltip> -->
+
           </div>
           <div class="section-item">
             <span style="flex-shrink:0;min-width:70px">{{$t('StatisticAnalysis.StatisticFeatureChart.time_period')}}:</span>
@@ -448,14 +427,6 @@ export default {
         FrequencyDistribution: `在所选时间范围内,取最大值和最小值,根据频段数划分多个间距相同的区间(左闭右开,最后一个区间为左闭右闭),统计数据值落在每个区间的数据个数,频率=落在某区间数据个数/所选时间段内数据总个数,累计频率为从最小值所在区间对应的频率开始累加。`
       },
 
-      // percentOptions: [
-      //   { label: '数据个数',val: 1 },
-      //   { label: '数据区间',val: 0 },
-      // ],
-      // tips: {
-      //   'percent':`1、数据个数百分位算法:数据区间第一个(较远日期)和最后一个数据点(较近日期)分别为 (T1,S1),(T2,S2),T代表时间,S代表对应的值。个数百分位=(n-1)/(N-1) ,N=1时不计算, N=T1到T2时间段指标数据个数,n=小于等于S2的数据个数。<br>
-      //   2、数据区间百分位算法:对所选时间范围内的数据,取最大值Max,最小值Min,计算Max-Min,百分位=(现值-Min)/(Max-Min),Max=Min时不计算`
-      // },
 
       /* 图表入库 */
       isSaveChartToBase: false,

+ 0 - 7
src/views/chartRelevance_manage/statistic/statisticFeatureList.vue

@@ -215,13 +215,6 @@
       @ensure="getTreeData"
     />
 
-		<!-- 输入英文指标弹窗 -->
-		<!-- <set-en-name-dia 
-			:isOpenDialog="setEnName" 
-		  :formData="formItemArray"
-			@cancel="setEnName=false"
-   	  @updateEnName="updateEnName"
-		/> -->
 
 		<!-- 设置对应版本信息弹窗 -->
 		<setLangInfoDia

+ 3 - 31
src/views/classify_manage/chapterSettingV2.vue

@@ -68,25 +68,7 @@
                     <el-input  disabled :value="parentClassifyName" style="width: 317px;" 
                     :placeholder="$t('ReportManage.CategoryList.related_variety_inputhint')"></el-input>
                 </el-form-item>
-                <!-- 关联品种 -->
-                <!-- <el-form-item prop="variety" :label="$t('ReportManage.CategoryList.related_variety')" v-if="reportVarietyList.length">
-                    <template slot="label">
-                        <el-tooltip class="item" effect="dark" :content="$t('ReportManage.CategoryList.related_variety_hint')">
-                            <div>
-                                <span>{{ $t('ReportManage.CategoryList.related_variety') }}</span>
-                                <i class="el-icon-info"></i>
-                            </div>
-                        </el-tooltip>
-                    </template>
-                    <el-cascader
-                        :options="reportVarietyList" 
-                        v-model="addForm.ChartPermissionIdList" 
-                        :placeholder="$t('ReportManage.CategoryList.related_variety_inputhint')"
-                        collapse-tags
-                        :props="{value:'PermissionId',label:'PermissionName',children:'Child',multiple: true,emitPath:false}" 
-                        style="width:317px;"
-                    ></el-cascader>
-                </el-form-item> -->
+               
             </el-form>
         </div>
         <div solt="footer" style="padding: 20px 0;text-align: center;">
@@ -125,13 +107,13 @@ export default {
             researchType:'',// day-晨报;week-周报
             parentClassifyName: '',
 
-            // reportVarietyList:[],//中文品种列表
+
         }
     },
     mounted(){
         this.parentClassifyName = this.$route.query.classifyName || ''
         this.getList()
-        // this.getReportVarietyList()
+
     },
     methods: {
         getList(type){
@@ -206,16 +188,6 @@ export default {
         },
         
 
-        // 获取品种数据
-        // getReportVarietyList(){
-        //     reportV2Interface.getClassifyPermissionList({
-        //         ClassifyId: Number(this.$route.query.id),
-        //     }).then(res=>{
-        //         this.reportVarietyList=res.Data||[]
-        //         this.filterNodes(this.reportVarietyList)
-        //     })
-        // },
-
         //启用\禁用设置
         handleEnableSet(item){
             setChapterEnable({

+ 1 - 33
src/views/classify_manage/classifylistV2.vue

@@ -18,7 +18,6 @@
                 </div>
             </div>
             <div style="display:flex;padding:10px;gap:10px">
-                <!-- <el-button type="primary" @click="transferReport">分类报告转移</el-button> -->
                 <!-- 添加分类 -->
                 <el-button 
                     type="primary"
@@ -119,25 +118,7 @@
                         >
                         </el-cascader>
                     </el-form-item>
-                    <!-- 关联品种 -->
-                    <!-- <el-form-item prop="variety" :label="$t('ReportManage.CategoryList.related_variety')" v-if="canSetPermission">
-                        <template slot="label">
-                            <el-tooltip class="item" effect="dark" :content="$t('ReportManage.CategoryList.related_variety_hint')">
-                                <div>
-                                    <span>{{ $t('ReportManage.CategoryList.related_variety') }}</span>
-                                    <i class="el-icon-info"></i>
-                                </div>
-                            </el-tooltip>
-                        </template>
-                        <el-cascader
-                            :options="reportVarietyList" 
-                            v-model="classifyForm.variety" 
-                            :placeholder="$t('ReportManage.CategoryList.related_variety_inputhint')"
-                            collapse-tags
-                            :props="{value:'PermissionId',label:'PermissionName',children:'Child',multiple: true,emitPath:false}" 
-                            style="min-width:400px;"
-                        ></el-cascader>
-                    </el-form-item> -->
+                   
                 </el-form>
                 <div v-html="tips" style="color:#999;"></div>
             </div>
@@ -258,7 +239,6 @@ export default {
     },
     mounted(){
         this.getList()
-        // this.getReportVarietyList()
     },
     methods: {
         /* 报告转移 */
@@ -292,9 +272,6 @@ export default {
             if(!this.classifyForm.classify_id) {
                 let item = this.$refs.classifyRef.getCheckedNodes(true)
                 console.log(item)
-                if(item&&item.length) {
-                    // this.classifyForm.variety = item[0].data.ChartPermissionIdList
-                }
             }
         },
 
@@ -338,7 +315,6 @@ export default {
             let params = {
                 ClassifyName: classify_name,
                 ParentId: parent_id,
-                // ChartPermissionIdList:this.classifyForm.variety||[]
             }
 
             const { Ret,Msg } = classify_id 
@@ -361,14 +337,6 @@ export default {
             this.classifyForm.show = false;
         },
 
-        // 获取品种数据
-        // getReportVarietyList(){
-        //     reportVarietyInterence.filterVarietyOpts().then(res=>{
-        //         console.log(res);
-        //         this.reportVarietyList=res.Data||[]
-        //     })
-        // },
-
         //启用\禁用设置
         handleEnableSet(item){
             // 判断权限

+ 1 - 54
src/views/dataEntry_manage/addChart.vue

@@ -446,54 +446,7 @@
 							</h2>
 
 							<Chart :options="options" :chartInfo="chartInfo" ref="chartRef"/>
-							<!-- <div class="range-cont left" v-if="leftIndex != -1">
-								<el-input
-									style="width: 60px; display: block"
-									size="mini"
-									type="number"
-									placeholder="上限"
-									v-model="tableData[leftIndex].MaxData"
-								/>
-								<el-input
-									class="min-data-input"
-									size="mini"
-									type="number"
-									placeholder="下限"
-									v-model="tableData[leftIndex].MinData"
-								/>
-							</div>
-							<div class="range-cont right" v-if="rightIndex != -1">
-								<el-input
-									style="width: 60px; display: block"
-									size="mini"
-									type="number"
-									placeholder="上限"
-									v-model="tableData[rightIndex].MaxData"
-								/>
-								<el-input
-									class="min-data-input"
-									size="mini"
-									type="number"
-									placeholder="下限"
-									v-model="tableData[rightIndex].MinData"
-								/>
-							</div>
-							<div class="range-cont rightTwo" v-if="rightTwoIndex != -1">
-								<el-input
-									style="width: 60px; display: block"
-									size="mini"
-									type="number"
-									placeholder="上限"
-									v-model="tableData[rightTwoIndex].MaxData"
-								/>
-								<el-input
-									class="min-data-input"
-									size="mini"
-									type="number"
-									placeholder="下限"
-									v-model="tableData[rightTwoIndex].MinData"
-								/>
-							</div> -->
+							
 							<!-- 需求:曲线图、堆积柱状图、组合图加入新指标时上下限自动调整 -->
 							<template v-if="![7,10,11].includes(chartInfo.ChartType)">
 								<div class="range-cont left" v-if="leftIndex !== -1">
@@ -987,12 +940,6 @@ export default {
       this.setImageHandle(form,data);
     },
     async setImageHandle(form,{ UniqueCode,ChartInfoId }) {
-      // let { Data } = await dataBaseInterface.uploadImgSvg(form);
-      // // let { Data } = await dataBaseInterface.uploadImg(form);
-      // await dataBaseInterface.setChartImage({
-      //   ChartInfoId: ChartInfoId,
-      //   ImageUrl: Data.ResourceUrl,
-      // });
       form.append('ChartInfoId',ChartInfoId)
       await dataBaseInterface.setChartThumbnail(form)
 			// this.$message.success('添加成功');

+ 0 - 10
src/views/dataEntry_manage/adjustdata/adjustData.vue

@@ -262,16 +262,6 @@ export default {
             // 禁止更新第一行
             if(r===0) return false
             
-            // if(c===0&&value) {
-            //   console.log(value)
-            //   console.log(isNaN(value)&&!isNaN(Date.parse(value)))
-            //   if(isNaN(value)&&!isNaN(Date.parse(value))) {
-            //     return true
-            //   }else {
-            //     bus.$message.warning('请输入正确的日期格式')
-            //     return false
-            //   }
-            // }
           },
           cellMousedownBefore(e,{r,c}){
             if(r===0) return false

+ 3 - 60
src/views/dataEntry_manage/chartSetting.vue

@@ -27,9 +27,6 @@
             @click="$router.push({path: '/addchart'})" type="primary"
           ><!-- 添加图表 -->{{$t('Chart.add_chart_btn')}}</el-button>
 
-          <!-- <change-lang v-permission="permissionBtn.chartLibPermission.chartLib_switchEn"
-            :lang="currentLang" @changeLang="changeLanguage" style="margin-left: 10px;"/> -->
-
         </div>
         
         <ul class="left-tab">
@@ -369,16 +366,7 @@
                     dateTip
                   }}</el-button>
                 </template>
-                <!-- 季节性图选择年份区间 -->
-                <!-- <date-picker
-                  v-else-if="chartInfo.ChartType === 2"
-                  v-model="season_year"
-                  type="month"
-                  value-type="format"
-                  range
-                  placeholder="年份日期选择"
-                  @change="seasonYearChange"
-                /> -->
+
                 <div v-else-if="chartInfo.ChartType === 2" @click="openDateDia" class="date-setting">
                   {{ season_year && season_year.length>0 ? season_year[0]+'~'+season_year[1]:"年份日期选择" }}
                 </div>
@@ -827,17 +815,6 @@
       @ensure="getTreeData"
     />
 
-    <!-- 输入英文指标弹窗 -->
-		<!-- <set-en-name-dia 
-      :isOpenDialog="setEnName" 
-      @cancel="setEnName=false" 
-      @updateEnName="updateEnName" 
-      :formData="formItemArray"
-      :chartType="chartInfo.ChartType"
-      :datainfo="chartInfo.ChartType===10?JSON.parse(chartInfo.ExtraConfig):null"
-      :edblist="chartInfo.ChartType===10?tableData:[]"
-    /> -->
-
     <!-- 设置对应版本信息弹窗 -->
 		<setLangInfoDia
 			:isOpenDialog="isLangInfoDia"
@@ -1123,12 +1100,9 @@ export default {
   },
   methods: {
     getTreeData(params) {
-      // dataBaseInterface.chartTree({IsShowMe:this.isOnlyMe}).then((res) => {
       dataBaseInterface.chartClassify({IsShowMe:this.isOnlyMe}).then((res) => {
         if (res.Ret === 200) {
           this.showData = true;
-          // this.currentLang = res.Data.Language === 'EN' ? 'en' : 'ch';
-					// this.setLangIntoStore();
 
           const arr=res.Data.AllNodes || [];
           this.treeData = arr.map(item=>{
@@ -1576,17 +1550,7 @@ export default {
           ? (e.target.childNodes[0].style.backgroundColor = '#409eff')
           : (e.target.style.backgroundColor = '#409eff');
       }
-      // if (
-      // 	node2.level === 2 &&
-      // 	(e.target.childNodes[0].className.includes(
-      // 		'el-tree-node__content'
-      // 	) ||
-      // 		e.target.className.includes('el-tree-node__content'))
-      // ) {
-      // 	e.target.childNodes[0].className.includes('el-tree-node__content')
-      // 		? (e.target.childNodes[0].style.backgroundColor = '#409eff')
-      // 		: (e.target.style.backgroundColor = '#409eff');
-      // }
+     
     },
     /* 拖拽离开/拖拽完成重置背景色 */
     dropMouseLeave(node1, node2, e) {
@@ -2277,18 +2241,7 @@ export default {
           }
         })
       })
-      // 遍历取父级code push数组
-      // for (let i of arr) {
-      //   if (i.ChartInfoId === id) {
-      //     return i;
-      //   }
-      //   if (i.Children) {
-      //     let node = this.findNode(i.Children, id);
-      //     if (node) {
-      //       return node;
-      //     }
-      //   }
-      // }
+     
     },
     /* 点击表格行展开配置项 */
     rowClickHandle(row) {
@@ -2401,13 +2354,7 @@ export default {
         this.setImageHandle(form);
     },
     async setImageHandle(form) {
-      // let { Data } = await dataBaseInterface.uploadImgSvg(form);
 
-      // // let { Data } = await dataBaseInterface.uploadImg(form);
-      // await dataBaseInterface.setChartImage({
-      //   ChartInfoId: this.selected_chartid,
-      //   ImageUrl: Data.ResourceUrl,
-      // });
       form.append('ChartInfoId',this.selected_chartid)
       await dataBaseInterface.setChartThumbnail(form)
     },
@@ -2514,10 +2461,6 @@ export default {
       }
     },
 
-    /* 存储中英文状态 */
-		// setLangIntoStore() {
-		// 	this.$store.commit('edb/SET_CAHRT_LANG',this.currentLang)
-		// },
     /* 获取标签列表 */
     getlabelList(){
         const List = JSON.parse(sessionStorage.getItem('etachart'))||[]

+ 1 - 21
src/views/dataEntry_manage/coal/index.vue

@@ -9,7 +9,6 @@
     </span>
     <div class="left-cont minHeight" v-show="isLeftWrapShow">
       <div class="left-top">
-        <!-- <el-button type="primary" plain size="medium" @click="exportClick" :loading="btnload">导出Excel</el-button> -->
         <el-button
           v-permission="permissionBtn.dataSourcePermission.zgmtData_export"
           style="width: 100%"
@@ -41,19 +40,7 @@
           </template>
         </el-autocomplete>
       </div>
-      <!-- <ul class="classify-list">
-				<li
-					:class="[
-						'classify-item',
-						{ act: select_classify === item.BreedShortName },
-					]"
-					v-for="item in classifyList"
-					:key="item.BreedShortName"
-					@click="changeClassify(item.BreedShortName)"
-				>
-					{{ item.BreedShortName }}
-				</li>
-			</ul> -->
+     
       <div>
         <el-tree
           class="filter-tree"
@@ -398,9 +385,6 @@ export default {
 
     /* 改变品种 */
     clickClassify(node, parentNode) {
-      // console.info("node")
-      // console.info(node)
-      // console.info(parentNode)
       if (parentNode.level == 1) return;
       this.isAuto = true;
 
@@ -441,10 +425,6 @@ export default {
     /* 钢联数据导出 */
     exportClick() {
       this.btnload = true;
-      // var iframe = document.createElement("iframe")
-      // iframe.style.display = "none";
-      // iframe.src = this.exportLzapi;
-      // document.body.appendChild(iframe);
 
       const link = document.createElement("a");
       link.href = this.exportCoalApi;

+ 1 - 4
src/views/dataEntry_manage/codecount/compoments/dataTable.vue

@@ -16,10 +16,7 @@ const tableOptions = {
 export default {
   name: '',
   props: {
-    // show: {
-    //   type: Boolean,
-    //   required: true
-    // },
+
     columns: {
       type: Array,
       default: [

+ 0 - 11
src/views/dataEntry_manage/codecount/index.vue

@@ -99,17 +99,6 @@
 								clearable
 								style="width:220px"
 								:placeholder="$t('Edb.Detail.source')"/>
-								<!-- <el-select 
-								v-model="fromType" 
-								placeholder="请选择来源"
-								style="width:220px">
-									<el-option
-										v-for="item in allFromArr"
-										:key="item.key"
-										:label="item.name"
-										:value="item.key">
-									</el-option>
-								</el-select> -->
 							</el-form-item>
 							<el-form-item :label="$t('Edb.InputHolderAll.input_name_orid')">
 								<el-select

+ 0 - 1
src/views/dataEntry_manage/components/DateChooseDia.vue

@@ -118,7 +118,6 @@ export default {
 				this.$message.warning(/* '请输入正确的数字' */this.$t('EtaBasePage.time_duration_num'))
 				return 
 			}
-			// console.log(this.radioType,this.dateType,this.start_date,this.end_date,this.dates,this.count_year);
 
 			if(this.radioType == 2 && (!this.start_date || (!this.end_date && this.dateType === 2))) {
 				this.$message.warning(/* '请选择正确的时间段' */this.$t('EtaBasePage.time_duration_type'))

+ 1 - 6
src/views/dataEntry_manage/components/LegendEditDia.vue

@@ -48,12 +48,7 @@ data () {
   };
 },
 watch: {
-  // isEditLegend(val) {
-  //   if(val) {
-  //     // 数据没加载出来时 打开弹窗 legendListCopy 会为空
-  //     this.legendListCopy = _.cloneDeep(this.legendList)
-  //   }
-  // },
+
   legendList(val){
     if(val){
       this.legendListCopy = _.cloneDeep(this.legendList)

+ 1 - 1
src/views/dataEntry_manage/components/addMyClassifyDia.vue

@@ -11,7 +11,7 @@
       v-dialogDrag
     >
       <div slot="title" style="display: flex; alignitems: center">
-        <!-- <img :src="title=='添加'?$icons.add:title=='编辑'?$icons.edit:''" style="color:#fff;width:16px;height:16px;marginRight:5px;"> -->
+
         <span style="font-size: 16px">{{$t('Chart.select_my_chart_classify')}}</span>
       </div>
       <div class="dialog-min">

+ 2 - 8
src/views/dataEntry_manage/components/addTarget.vue

@@ -337,8 +337,7 @@ import {dataInterence} from 'api/api.js';
 										type: 'success'
 									});	
 									this.$emit('addOver',this.formData.type)
-									// // 重置分类id
-									// this.classify_id = sessionStorage.getItem('default_id') || '';
+
 								}else {
 									this.$message({
 										message: res.Msg,
@@ -347,12 +346,7 @@ import {dataInterence} from 'api/api.js';
 								}
 							})
 						}else {
-							// let notice_time = this.formData.frequency === '日度'?this.formData.up_time
-							// :this.formData.frequency === '周度'?this.formData.up_week+' ' + this.formData.up_time
-							// :this.formData.frequency === '月度'?this.formData.up_day+' ' + this.formData.up_time
-							// :this.formData.frequency === '季度'?this.formData.up_day+' ' + this.formData.up_time
-							// :this.formData.frequency === '半年度'?this.formData.up_day+' ' + this.formData.up_time
-							// :this.formData.frequency === '年度'?this.formData.up_day+' ' + this.formData.up_time:''
+
 							
 							let notice_time=''
 							if(this.formData.frequency==='日度'){

+ 0 - 14
src/views/dataEntry_manage/components/chart.vue

@@ -125,20 +125,6 @@ export default {
 			}else {
 				$(`#container${this.index}`)[0].style.height = this.height || '440px';
 			}
-			// if(this.options.isRelevanceChart){//相关性图表设置x轴在y轴0刻度
-			// 	this.$nextTick(()=>{
-			// 		const h=$(`#container${this.index}`)[0].style.height
-			// 		if(h=='500px'){
-			// 			this.options.xAxis.offset=-200.5
-			// 		}else if(h=='440px'){
-			// 			this.options.xAxis.offset=-170.5
-			// 		}else if(h=='350px'){
-			// 			this.options.xAxis.offset=-125.5
-			// 		}
-			// 		// let h = $('.highcharts-yaxis .highcharts-axis-line')[0].getBoundingClientRect().height;
-			// 		// this.options.xAxis.offset=-h/2;
-			// 	})
-			// }
 
 		}
 	},

+ 1 - 32
src/views/dataEntry_manage/components/editTarget.vue

@@ -249,20 +249,7 @@ import {dataInterence} from 'api/api.js';
 				},
 			  deep: true
 			},
-			// // 指标值发生变化时
-			// 'formData.target': {
-			// 		handler() {
-			// 			this.getTargetlist();
-			// 		},
-			// },
-			// // 指标分类发生变化时
-			// 'formData.type': {
-			// 		handler() {
-			// 			//重置指标值
-			// 			// this.$emit('resetTarget');
-			// 			this.getTargetlist();
-			// 		},
-			// }
+
 		},
 		computed:{
 			days() {
@@ -296,18 +283,6 @@ import {dataInterence} from 'api/api.js';
 				}
 			},
 
-			// 获取指标列表
-			// getTargetlist() {
-				// console.log(this.is_editData,this.edit_dataId)
-				// dataInterence.searchTarget({
-				// 	classify_id:this.is_editData?this.edit_dataId:this.classify_id,
-				// 	key_word:this.formData.target||''
-				// }).then(res => {
-				// 	if(res.Ret === 200) {
-				// 		this.targetList = res.data;
-				// 	}
-				// })
-			// },
 			// 点击确定
 			editHandle(type) {
 				this.$refs.formD.validate((valid) => {
@@ -365,12 +340,6 @@ import {dataInterence} from 'api/api.js';
 								
 						}else {
 							
-						// 	let notice_time = this.formData.frequency === '日度'?this.formData.up_time
-						// 	:this.formData.frequency === '周度'?this.formData.up_week+' ' + this.formData.up_time
-						// 	:this.formData.frequency === '月度'?this.formData.up_day+' ' + this.formData.up_time
-						// 	:this.formData.frequency === '季度'?this.formData.up_day+' ' + this.formData.up_time
-						// 	:this.formData.frequency === '半年度'?this.formData.up_day+' ' + this.formData.up_time
-						// 	:this.formData.frequency === '年度'?this.formData.up_day+' ' + this.formData.up_time:''
 
 							let notice_time=''
 							if(this.formData.frequency==='日度'){

+ 1 - 9
src/views/dataEntry_manage/components/satterSeriesDia.vue

@@ -1,5 +1,5 @@
 <template>
-		<!-- :modal-append-to-body='false' -->
+
   <el-dialog
 		:visible.sync="show"
 		:close-on-click-modal="false"
@@ -345,14 +345,6 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <!-- <el-form-item label="数据日期">
-            <el-date-picker
-                v-model="replaceForm.item.date"
-                type="date"
-                style="width: 200px"
-                :clearable="false"
-              />
-          </el-form-item> -->
         </el-form>
         <div style="display: flex;justify-content: center;margin-top:50px;">
           <el-button

+ 0 - 5
src/views/dataEntry_manage/components/sectionalCombination/seriesItemWrap.vue

@@ -141,11 +141,6 @@ export default {
   },
   data() {
     return {
-      // chartItemStyleArr: [
-      //   { label: '曲线图', key: 1, value: 'spline' },
-      //   { label: '折线图', key: 2, value: 'line' },
-      //   { label: '柱状图', key: 4, value: 'column' },
-      // ],//可选样式
       showBatchModifyDate:false,// 批量设置日期
 
       compData:this.value,

+ 0 - 1317
src/views/dataEntry_manage/dataEntry.vue

@@ -1,1317 +0,0 @@
-<template>
-  <div>
-    <div class="data-entry-wrap" @click="rightMouseMenu.show = false">
-        <span
-            class="slide-btn-icon"
-            :class="{'slide-left':isLeftWrapShow,'slide-right':!isLeftWrapShow}"
-            @click="isLeftWrapShow = !isLeftWrapShow"
-        >
-            <i :class="{'el-icon-d-arrow-left':isLeftWrapShow,'el-icon-d-arrow-right':!isLeftWrapShow}"></i>
-        </span>
-      <div class="left-wrap wrap-box" v-show="isLeftWrapShow">
-        <div
-          style="display: flex; justify-content: space-between; flex-wrap: wrap"
-          v-if="role != 'special_researcher'"
-        >
-          <el-button
-            v-permission="permissionBtn.dataSourcePermission.manualDataWrite_import"
-            type="primary"
-            style="width: 47%"
-            @click="isShowinsert = true"
-            ><!-- 导入excel数据 -->{{$t('Common.imp_excel')}}</el-button
-          >
-          <el-button v-permission="permissionBtn.dataSourcePermission.manualDataWrite_copy"
-          type="primary" style="width: 47%" @click="copyExcelNew"
-            ><!-- 复制excel数据 -->{{$t('Common.copy_excel')}}</el-button
-          >
-          <a style="width: 100%" :href="exportUrl" download>
-            <el-button
-              v-permission="permissionBtn.dataSourcePermission.manualDataWrite_export"
-              type="primary"
-              style="width: 100%; margin-top: 14px"
-              plain
-              ><!-- 导出Excel -->{{$t('Common.exp_excel')}}</el-button
-            >
-          </a>
-        </div>
-        <div style="margin: 20px 0">
-          <!-- <el-input placeholder="请输入内容" prefix-icon="el-icon-search" v-model="leftSearchVal"> </el-input> -->
-          <el-autocomplete
-            clearable
-            prefix-icon="el-icon-search"
-            v-model="leftSearchVal"
-            :fetch-suggestions="handleLeftSearch"
-            :placeholder="$t('Edb.InputHolderAll.input_name_orid')"
-            @select="handleSelectLeftSearchval"
-            popper-class="el-autocomplete-suggestion-data-entry"
-          >
-            <template slot-scope="scope">
-              <div v-if="scope.item.nodata" style="text-align: center">
-                <!-- 暂无数据 -->{{$t('Table.prompt_slogan')}}0
-              </div>
-              <div v-else>
-                {{ scope.item.SecName }}
-              </div>
-            </template>
-          </el-autocomplete>
-        </div>
-        <ul class="classify-list">
-          <li
-            :class="[
-              'classify-item',
-              {
-                'active-classify': selectClassifyId === item.ClassifyId,
-              },
-            ]"
-            v-for="item in classifyList"
-            :key="item.ClassifyId"
-            @click="handleClassifyChange(item)"
-          >
-            {{ item.ClassifyName }}({{ item.EdbInfoTotal }})
-          </li>
-        </ul>
-      </div>
-      <div
-        class="right-wrap wrap-box"
-        v-loading="loading"
-        :element-loading-text="$t('Table.data_loading')"
-        element-loading-spinner="el-icon-loading"
-      >
-        <el-button
-          v-permission="permissionBtn.dataSourcePermission.manualDataWrite_edit"
-          type="primary"
-          style="
-            font-size: 16px;
-            margin-bottom: 20px;
-            width: 120px;
-            padding: 10px 8px;
-          "
-          @click="copyExcel"
-          ><!-- 编辑 -->{{$t('Table.edit_btn')}}</el-button
-        >
-        <div
-          class="table-con"
-          v-infinite-scroll="handleOnScroll"
-          :infinite-scroll-immediate="false"
-          @scroll="rightMouseMenu.show = false"
-        >
-          <table width="auto" border="0">
-            <thead>
-              <tr v-for="(item, index) in tableHeadArr" :key="item">
-                <td class="sticky" style="left: 0">
-                  {{ tableHeadMap.get(item) }}
-                </td>
-                <td v-for="(data, sub_index) in tableHeadData" :key="sub_index">
-                  <div v-if="item !== 'SecName'">
-                    <template v-if="item === 'Status'">
-                      <span
-                        v-if="data[item] === '未完成'"
-                        style="color: #ff0000"
-                        >{{ $t('ManualEntryPage.col_status_2') }}</span
-                      >
-                      <span
-                        v-else-if="data[item] === '完成'"
-                        style="color: #4ac526"
-                        >{{$t('ManualEntryPage.col_status_1')}}</span
-                      >
-                      <span v-else>{{ data[item] }}</span>
-                    </template>
-                    <template v-else-if="item === 'Frequency'">
-                        {{ frequencyList.find(i=>i.value===data[item])?frequencyList.find(i=>i.value===data[item]).label:'' }}
-                    </template>
-                    <template v-else>{{ data[item] }}</template>
-                  </div>
-                  <div v-else>
-                    <div v-if="data[item]">{{ data[item] }}</div>
-                    <div v-else>
-                      <el-select
-                        v-model="data[item]"
-                        filterable
-                        remote
-                        :placeholder="$t('Edb.InputHolderAll.input_keyword')"
-                        :remote-method="handleTableHeadSearch"
-                        @change="handleTableSelect(sub_index, $event)"
-                        @visible-change="handleTableSelectshow"
-                        :disabled="
-                          leftSearchTradeCode || role == 'special_researcher'
-                        "
-                      >
-                        <el-option
-                          v-for="item in searchList"
-                          :key="item.TradeCode"
-                          :label="item.SecName"
-                          :value="item"
-                        >
-                        </el-option>
-                      </el-select>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-            </thead>
-            <tbody @contextmenu.prevent="rightClick($event)">
-              <tr v-for="(item, rindex) in tableData" :key="rindex">
-                <td
-                  class="sticky"
-                  style="left: 0"
-                  :data-rindex="rindex"
-                  :data-cindex="-1"
-                  :class="
-                    rindex === rightMouseMenu.rindex &&
-                    -1 === rightMouseMenu.cindex
-                      ? 's-td'
-                      : null
-                  "
-                >
-                  <!-- <span v-if="item.timeVal" :data-rindex="rindex" :data-cindex="-1">{{item.timeVal}}</span> -->
-                  <el-date-picker
-                    v-model="item.timeVal"
-                    type="date"
-                    :data-rindex="rindex"
-                    :data-cindex="-1"
-                    :placeholder="$t('Edb.InputHolderAll.input_date')"
-                    :clearable="false"
-                    :editable="false"
-                    value-format="yyyy-MM-dd"
-                    :readonly="readonly || role == 'special_researcher'"
-                    @mousedown.native="mousedown($event)"
-                    prefix-icon="none"
-                    @input="handleTimeChange(rindex, item)"
-                    @focus="handleTimeFocus(rindex, item)"
-                  ></el-date-picker>
-                </td>
-                <td
-                  v-for="(data, cindex) in item.list"
-                  :key="cindex"
-                  :data-rindex="rindex"
-                  :data-cindex="cindex"
-                  :class="
-                    rindex === rightMouseMenu.rindex &&
-                    cindex === rightMouseMenu.cindex
-                      ? 's-td'
-                      : null
-                  "
-                >
-                  <input
-                    @focus="handleInputFocus(data, rindex, cindex)"
-                    @blur="handleInputChange(data)"
-                    @input="handleInput(data)"
-                    class="input-val-box"
-                    type="number"
-                    v-model="data.item.Close"
-                    :data-rindex="rindex"
-                    :data-cindex="cindex"
-                    :disabled="role == 'special_researcher'"
-                  />
-                  <!--  -->
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-        <div class="frequency-wrap" v-if="showFrequency">
-          <span
-            :class="['item', { active: frequency === item.value }]"
-            v-for="item in frequencyList"
-            :key="item.value"
-            @click="handleFrequencyChange(item.value)"
-            >{{ item.label }}</span>
-        </div>
-      </div>
-    </div>
-
-    <!-- 鼠标右键菜单 -->
-    <div
-      class="right-mouse-menu"
-      v-if="rightMouseMenu.show"
-      :style="{
-        left: rightMouseMenu.left,
-        top: rightMouseMenu.top,
-      }"
-    >
-      <div class="item" @click="handleOptTable('插入行')"><!-- 插入行 -->{{$t('ManualEntryPage.right_op_insertrow')}}</div>
-      <div class="item" @click="handleOptTable('插入列')"><!-- 插入列 -->{{$t('ManualEntryPage.right_op_insertcol')}}</div>
-      <div class="item" @click="handleOptTable('删除行')"><!-- 删除行 -->{{$t('ManualEntryPage.right_op_delrow')}}</div>
-      <div class="item" @click="handleOptTable('删除列')"><!-- 删除列 -->{{$t('ManualEntryPage.right_op_delcol')}}</div>
-    </div>
-
-    <!-- 导入数据弹窗 -->
-    <insert-data
-      :isShowinsert="isShowinsert"
-      @cancelHandle="cancelHandle"
-      @importSuccess="importSuccess"
-      source="dataEntry"
-    >
-    </insert-data>
-  </div>
-</template>
-
-<script>
-import { dataAuthInterface, dataInterence } from "@/api/api.js";
-import insertData from "./components/insertData";
-import http from "@/api/http";
-import { router } from "../../main";
-import {frequencySelectList} from '@/utils/defaultOptions';
-export default {
-  name: "dataEntry",
-  components: { insertData },
-  data() {
-    return {
-      isLeftWrapShow:true,
-      timeArr: [],
-      TradeCode: "",
-      exportDataurl: process.env.VUE_APP_API_ROOT + "/entry/export/dataList", //导出数据
-      tableHeadArr: [
-        "SecName",
-        "TradeCode",
-        "Frequency",
-        "Unit",
-        "ModifyDate",
-        "Status",
-      ],
-      tableHeadMap: new Map([
-        ["SecName", /* "指标名称" */ this.$t('Edb.Detail.e_name')],
-        ["TradeCode", /* "指标ID" */this.$t('Edb.Detail.e_id')],
-        ["Frequency", /* "频度" */this.$t('Edb.Detail.e_fre')],
-        ["Unit", /* "单位" */this.$t('Edb.Detail.e_unit')],
-        ["ModifyDate", /* "待更新日期" */this.$t('ManualEntryPage.col_modify_date')],
-        ["Status", /* "更新状态" */this.$t('ManualEntryPage.col_update_status')],
-      ]),
-      tableHeadData: [], // 表头数据
-      tableData: [], //表格数据
-
-      classifyList: [],
-      selectClassifyId: null,
-      //frequencyList: ["日度", "周度", "旬度", "月度", "季度", "半年度", "年度"],
-      frequency: "日度",
-      showFrequency: true,
-
-      rightMouseMenu: {
-        show: false,
-        left: null,
-        top: null,
-        rindex: null,
-        cindex: null,
-      }, //鼠标右键
-
-      readonly: false,
-      loading: false,
-
-      isShowinsert: false,
-
-      searchList: [], //头部搜索的值
-
-      temInputVal: {}, // 点击某个input 获取焦点则存放在此
-
-      beforeInputVal: {}, // 失焦时的input 数据
-
-      leftSearchVal: "", //左侧搜索值
-      // leftSearchList:[],
-      leftSearchTradeCode: null, //如果是搜索选择的 则有此code
-
-      currentIndex: 0,
-      pageSize: 50,
-      finished: false,
-
-      tempTime: "", // 存放更改日期前的日期
-      sessionParams: {}, //sessionStorage 的缓存参数
-    };
-  },
-  computed: {
-    exportUrl() {
-      let str = `${this.exportDataurl}?Frequency=${this.frequency}&ClassifyId=${
-        this.selectClassifyId
-      }&KeyWord=${
-        !this.leftSearchTradeCode ? "" : this.leftSearchVal
-      }&TradeCode=${
-        !this.leftSearchTradeCode ? "" : this.leftSearchTradeCode
-      }&StartDate=&EndDate=&Mobile=&${localStorage.getItem("auth")}`;
-      return str.replace(/#/g, escape("#")).replace(/;/g, escape(";"));
-    },
-    role() {
-      return localStorage.getItem("Role") || "";
-    },
-    frequencyList(){
-        return frequencySelectList()
-    },
-  },
-
-  watch: {
-    "rightMouseMenu.show": {
-      handler(nval) {
-        if (!nval) {
-          this.readonly = false;
-        }
-      },
-    },
-  },
-
-  created() {
-    // sessionStorage 缓存 从复制excel页面过来
-    if (sessionStorage.getItem("onlineExcelBack")) {
-      this.sessionParams = JSON.parse(
-        sessionStorage.getItem("onlineExcelBack")
-      );
-    }
-    this.getClassify();
-  },
-  beforeRouteEnter(to, from, next) {
-    if (from.path != "/onlineExcelCopy") {
-      // 不是复制excel过来的 清除缓存
-      sessionStorage.removeItem("onlineExcelBack");
-    }
-    next();
-  },
-  methods: {
-    // 监听滚动
-    handleOnScroll() {
-      console.log("触底了");
-      if (this.currentIndex >= 1) {
-        this.handleMore();
-      }
-    },
-    copyExcel() {
-      // 找二级ID 对应的一级ID
-      let parentClassifyId = this.classifyList.find(
-        (item) => item.ClassifyId == this.selectClassifyId
-      ).ParentId;
-      router.push({
-        path: "/onlineExcelCopy",
-        query: {
-          Frequency: this.frequency,
-          ClassifyId: this.selectClassifyId,
-          parentClassifyId,
-          TradeCode: this.leftSearchTradeCode || "",
-          TradeName: this.leftSearchVal || "",
-          isEdit: true,
-        },
-      });
-    },
-    copyExcelNew() {
-      let parentClassifyId = this.classifyList.find(
-        (item) => item.ClassifyId == this.selectClassifyId
-      ).ParentId;
-      router.push({
-        path: "/onlineExcelCopy",
-        query: {
-          Frequency: this.frequency,
-          ClassifyId: this.selectClassifyId,
-          parentClassifyId,
-          TradeCode: this.leftSearchTradeCode || "",
-          TradeName: this.leftSearchVal || "",
-          isEdit: false,
-        },
-      });
-    },
-    //左侧搜索
-    async handleLeftSearch(query, cb) {
-      cb([]);
-      if (!query) return;
-      const res = await dataInterence.getTargetListByName({
-        Frequency: "",
-        ClassifyId: "",
-        Keyword: query,
-        EdbShowType: 0,
-      });
-      if (res.Ret === 200) {
-        let arr = res.Data.List || [];
-        if (!arr.length) {
-          cb([{ nodata: true }]);
-        } else {
-          cb(arr);
-        }
-      }
-    },
-
-    // 选中左侧搜索值
-    handleSelectLeftSearchval(e) {
-      console.log(e);
-      if (!e.TradeCode) return;
-      this.showFrequency = false;
-      this.frequency = "";
-      this.selectClassifyId = "";
-      this.leftSearchTradeCode = e.TradeCode;
-      this.leftSearchVal = e.SecName;
-      this.getTableList(e.TradeCode);
-      this.selectClassifyId = e.ClassifyId;
-      this.$nextTick(() => {
-        this.handleScrollLeftWrap();
-      });
-    },
-
-    // 左侧滚动
-    handleScrollLeftWrap() {
-      let top = $(".active-classify")[0].offsetTop;
-      $(".classify-list").animate({
-        scrollTop: top - 200,
-      });
-    },
-
-    // 日期改变
-    async handleTimeChange(index, e) {
-      // 判断选择的日期是否重复
-      let flag = this.timeArr.some((item) => item == e.timeVal);
-      if (flag) {
-        if (!this.tempTime) {
-          // 如果是新增行的
-          e.timeVal = "";
-        } else {
-          e.timeVal = this.tempTime;
-        }
-        this.$message.warning(/* "该日期已存在"  */this.$t('Edb.MsgPrompt.date_haved_msg'));
-      } else {
-        if (!this.tempTime) {
-          // 新增行
-          this.timeArr.splice(index, 0, e.timeVal);
-          this.tableData[index].list.forEach((item) => {
-            item.item.Dt = e.timeVal;
-          });
-          this.currentIndex++;
-        } else {
-          // 修改日期
-          let arr = [];
-          this.tableData[index].list.forEach((item) => {
-            item.item.Dt = e.timeVal;
-            if (item.TradeCode && item.item.Close) {
-              arr.push({ Close: item.item.Close, TradeCode: item.TradeCode });
-            }
-          });
-          let params = {
-            CreateDate: e.timeVal, //新录入日期
-            OldCreateDate: this.tempTime, //之前日期
-            List: arr,
-          };
-          const res = await dataInterence.modifyTargetDate(params);
-          if (res.Ret === 200) {
-            this.$message.success("修改成功");
-            // 将timeArr 修改掉
-            this.timeArr.splice(index, 1, e.timeVal);
-          }
-        }
-      }
-    },
-
-    // 日期获取焦点存放日期
-    handleTimeFocus(index, e) {
-      if (this.role == "special_researcher") return;
-      this.tempTime = e.timeVal;
-      this.rightMouseMenu.rindex = index;
-      this.rightMouseMenu.cindex = -1;
-    },
-
-    // input 获取焦点 每次获取焦点则存一次
-    handleInputFocus(e, rindex, cindex) {
-      this.rightMouseMenu.rindex = rindex;
-      this.rightMouseMenu.cindex = cindex;
-      this.temInputVal = JSON.parse(JSON.stringify(e));
-    },
-
-    // input 值改变 失去焦点
-    async handleInputChange(e) {
-      console.log(e);
-      // console.log(e.item.Close.test(/^(\d+|\d+\.\d{1,4})$/));
-      // e.item.Close.replace(/^(\d+|\d+\.\d{1,4})$/,'')
-      // 存储改变的input rindex cindex 等数据
-      this.beforeInputVal = {
-        rindex: this.rightMouseMenu.rindex,
-        cindex: this.rightMouseMenu.cindex,
-        frequency: this.tableHeadData[this.rightMouseMenu.cindex].Frequency,
-      };
-
-      // 如果input 为改变 且 之前也为空
-      if (!this.temInputVal.item.Close && !e.item.Close) {
-        // console.log('之前之后都是空');
-        return;
-      }
-      // 在没有选择指标的列操作
-      if (!e.TradeCode) {
-        e.item.Close = "";
-        this.$message.warning(/* "请选择指标"  */this.$t('Edb.InputHolderAll.input_select_edb'));
-        return;
-      }
-
-      // 没有选择日期
-      if (!e.item.Dt) {
-        e.item.Close = "";
-        this.$message.warning(/* "请选择日期" */this.$t('Edb.InputHolderAll.input_date'));
-        return;
-      }
-      // 判断值是否改变
-      if (
-        this.temInputVal.TradeCode === e.TradeCode &&
-        this.temInputVal.item.Close === e.item.Close
-      ) {
-        console.log("值未改变");
-        return;
-      }
-
-      // 删除情况
-      if (!e.item.Close) {
-        this.handleDelete(e);
-        return;
-      }
-
-      // 修改情况
-      // 检查该日期下是否存在数据
-      let checkRes = await dataInterence.checkData({
-        TradeCode: e.TradeCode,
-        CreateDate: e.item.Dt,
-      });
-      if (checkRes.Data.Status === 0) {
-        const editRes = await dataInterence.editData({
-          TradeCode: e.TradeCode,
-          CreateDate: e.item.Dt,
-          Close: e.item.Close,
-          OldCreateDate: "",
-        });
-        if (editRes.Ret === 200) {
-          // 判断是否需要改变待更新状态
-          this.handleChangeTradeStatus(e);
-          this.handleUpdateClassify();
-          this.$message({
-            message: /* "新增成功" */this.$t('MsgPrompt.add_msg'),
-            type: "success",
-          });
-        } else {
-          this.$message({
-            message: editRes.msg,
-            type: "warning",
-          });
-          this.getTableList();
-        }
-      } else if (checkRes.Data.Status === 1) {
-        this.$confirm(
-          this.$t('Edb.MsgPrompt.date_have_value_msg',{val:checkRes.Data.Close}),
-          /* "提示" */this.$t('Dialog.warn_tit'),
-          {
-            type: "warning",
-          }
-        )
-          .then(async () => {
-            const editRes = await dataInterence.editData({
-              TradeCode: e.TradeCode,
-              CreateDate: e.item.Dt,
-              Close: e.item.Close,
-              OldCreateDate: e.item.Dt,
-            });
-            if (editRes.Ret === 200) {
-              this.$message({
-                message: /* "修改成功" */this.$t('MsgPrompt.edit_msg'),
-                type: "success",
-              });
-            } else {
-              this.$message({
-                message: editRes.msg,
-                type: "warning",
-              });
-              this.getTableList();
-            }
-          })
-          .catch(() => {
-            this.getTableList();
-          });
-      }
-    },
-
-    // 只允许输入整数或者小数点后四位
-    handleInput(e) {
-      if (e.item.Close.indexOf(".") > 0) {
-        e.item.Close = e.item.Close.slice(0, e.item.Close.indexOf(".") + 5);
-      }
-    },
-
-    // 更新左侧分类数量统计
-    handleUpdateClassify() {
-      this.getClassify("update");
-    },
-
-    // 指标更新状态改变以及待更新日期变更
-    async handleChangeTradeStatus(e) {
-      console.log(e);
-
-      let res = await dataInterence.getTargetList({
-        Frequency: "",
-        ClassifyId: "",
-        TradeCode: e.TradeCode,
-        EdbShowType: 0,
-      });
-      if (res.Ret === 200) {
-        if (res.Data.List) {
-          this.tableHeadData[this.beforeInputVal.cindex].Status =
-            res.Data.List[0].Status;
-          this.tableHeadData[this.beforeInputVal.cindex].ModifyDate =
-            res.Data.List[0].ModifyDate;
-        }
-      }
-
-      // let t1=this.tableHeadData[this.beforeInputVal.cindex].ModifyDate
-      // let t2=e.item.Dt
-      // // 日度
-      // if(this.beforeInputVal.frequency==='日度'){
-      //   if(new Date(t2)>=new Date(t1)){
-      //     this.tableHeadData[this.beforeInputVal.cindex].Status='完成'
-      //     // 待更新日期 推后一天
-      //     let nextDay=(http.dateFormatter(new Date(new Date(t1).getTime()+(1000*60*60*24)),false)).replace(/\./g,'-')
-      //     this.tableHeadData[this.beforeInputVal.cindex].ModifyDate=nextDay
-      //   }
-      // }
-
-      // // 周度
-      // if(this.beforeInputVal.frequency==='周度'){
-      //   const week=new Date(t1).getDay()===0?7:new Date(t1).getDay()  //  1-7
-      //   // 判断修改的日期是否在待更新这周内
-      //   const mint=new Date(t1).getTime()-(week*1000*60*60*24)
-      //   const maxt=new Date(t1).getTime()+((7-week)*1000*60*60*24)
-      //   if(new Date(t2).getTime()>mint&&new Date(t2).getTime()<maxt){
-      //     this.tableHeadData[this.beforeInputVal.cindex].Status='完成'
-      //     let nextDay=(http.dateFormatter(new Date(new Date(t1).getTime()+(1000*60*60*24*7)),false)).replace(/\./g,'-')
-      //     this.tableHeadData[this.beforeInputVal.cindex].ModifyDate=nextDay
-      //   }
-      // }
-
-      // // 月度
-      // if(this.beforeInputVal.frequency==='月度'){
-      //   // 判断修改的日期是否在本月内
-      //   const arr1=t1.split('-')
-      //   const arr2=t2.split('-')
-      //   if(arr1[0]===arr2[0]&&arr1[1]===arr2[1]){
-      //     this.tableHeadData[this.beforeInputVal.cindex].Status='完成'
-      //     let year=arr1[0]
-      //     let month=''
-      //   }
-      // }
-    },
-
-    // 删除指标
-    async handleDelete(e) {
-      // console.log(e);
-      const res = await dataInterence.delData({
-        TradeCode: e.TradeCode,
-        CreateDate: e.item.Dt,
-      });
-      if (res.Ret === 200) {
-        this.$message.success("删除成功!");
-      } else {
-        this.$message(res.msg);
-      }
-    },
-
-    //   表格头部搜索
-    async handleTableHeadSearch(query) {
-      this.searchList = [];
-      let res = await dataInterence.getTargetListByName({
-        Frequency: this.frequency,
-        ClassifyId: this.selectClassifyId,
-        Keyword: query,
-        EdbShowType: 2,
-      });
-      if (res.Ret === 200) {
-        this.searchList = res.Data.List || [];
-      }
-    },
-
-    // 表头搜索结果选择
-    handleTableSelect(index, e) {
-      console.log(index, e);
-      this.tableHeadData[index] = e;
-      this.tableData.forEach((item) => {
-        item.list[index].SecName = e.SecName;
-        item.list[index].TradeCode = e.TradeCode;
-      });
-      this.searchList = [];
-    },
-
-    // 表头搜索选择 下拉框收起时 将搜索结果列表置空
-    handleTableSelectshow(e) {
-      if (!e) {
-        this.searchList = [];
-      }
-    },
-
-    // 获取表格数据
-    async getTableList(code) {
-      this.loading = true;
-      this.timeArr = [];
-      this.tableData = [];
-      this.tableHeadData = [];
-      this.currentIndex = 0;
-      this.finished = false;
-      // 缓存存在
-      if (this.sessionParams.secondClassify) {
-        this.frequency = this.sessionParams.frequency;
-        this.selectClassifyId = this.sessionParams.secondClassify;
-        code = this.leftSearchTradeCode = this.sessionParams.tradeCode;
-        this.leftSearchVal = this.sessionParams.tradeName;
-        this.showFrequency = code ? false : true;
-        // 滚动到对应的分类
-        this.$nextTick(() => {
-          this.handleScrollLeftWrap();
-        });
-        // 清除缓存 用完即弃
-        this.sessionParams = {};
-        sessionStorage.removeItem("onlineExcelBack");
-      }
-      let res = await dataInterence.getTargetList({
-        Frequency: code ? "" : this.frequency,
-        ClassifyId: code ? "" : this.selectClassifyId,
-        TradeCode: code,
-        EdbShowType: code ? 0 : 1,
-      });
-      if (res.Ret !== 200) return;
-      this.tableHeadData = res.Data.List || [];
-      if (code)
-        this.frequency = res.Data.FrequencyList
-          ? res.Data.FrequencyList[0]
-          : "";
-      //  不满6列 追加 到6列
-      if (this.tableHeadData.length < 6) {
-        let min = 5 - this.tableHeadData.length;
-        for (let i = 0; i < min; i++) {
-          this.tableHeadData.push({
-            SecName: "",
-            TradeCode: "",
-            Frequency: "",
-            Unit: "",
-            ModifyDate: "",
-            Status: "",
-            DataList: [],
-          });
-        }
-      }
-
-      // 处理日期 合并所有日期 去重排序
-      let temArr =
-        this.tableHeadData &&
-        this.tableHeadData.map((item) => item.DataList).flat();
-      let temTimeArr = temArr.map((item) => item.Dt);
-      let Arr = [...new Set(temTimeArr)].sort().reverse();
-      // 如果第一项不是今天 则增加一个今日日期 --- 判断错误 可能会存在 未来日期 真是神奇Arr[0]!==nowDay
-      // 如果第一项小于今日 则增加今日日期
-      let nowDay = http.dateFormatter(new Date(), false).replace(/\./g, "-");
-      if (new Date(Arr[0]) < new Date(nowDay) && res.Data.List) {
-        Arr = [nowDay, ...Arr];
-      }
-      this.timeArr = Arr;
-
-      // let arr2 = Arr.map((item) => {
-      //   let obj = {
-      //     timeVal: item,
-      //     list: [],
-      //   };
-      //   this.tableHeadData.forEach((item2) => {
-      //     let obj2 = {
-      //       SecName: item2.SecName,
-      //       TradeCode: item2.TradeCode,
-      //       item: {
-      //         Close:'',
-      //         Dt:item||''
-      //       },
-      //     };
-      //     obj2.item = item2.DataList.find((time) => time.Dt === item)||{Close:'',Dt:item}
-      //     obj.list.push(obj2);
-      //   });
-      //   return obj;
-      // });
-      // this.tableData = arr2;
-
-      // // 时间少于12行 则 增加到12
-      // if (this.tableData.length < 12) {
-      //   let min = 12 - this.tableData.length;
-      //   let temList = this.tableHeadData.map((item) => {
-      //     let obj={ SecName: item.SecName, TradeCode: item.TradeCode, item: { Close: "",Dt:'' } }
-      //     return obj;
-      //   });
-      //   // 此处JSON 转换不可省去  有拷贝复制问题
-      //   for (let i = 0; i < min; i++) {
-      //     this.tableData.push({ timeVal: "", list: JSON.parse(JSON.stringify(temList)) });
-      //   }
-      // }
-      this.handleMore();
-      setTimeout(() => {
-        this.loading = false;
-      }, 200);
-    },
-
-    // 分页
-    handleMore() {
-      if (this.finished) return;
-      // this.page++
-      // const startIndex=(this.page-1)*this.pageSize
-      // const endIndex=this.page*this.pageSize
-      const startIndex = this.currentIndex;
-      const endIndex = this.currentIndex + this.pageSize;
-      this.currentIndex = endIndex;
-      if (endIndex >= this.timeArr.length) {
-        this.finished = true;
-      } else {
-        this.finished = false;
-      }
-      const temTimeArr = this.timeArr.slice(startIndex, endIndex);
-      let arr = temTimeArr.map((item) => {
-        let obj = {
-          timeVal: item,
-          list: [],
-        };
-        this.tableHeadData.forEach((item2) => {
-          let obj2 = {
-            SecName: item2.SecName,
-            TradeCode: item2.TradeCode,
-            item: {
-              Close: "",
-              Dt: item || "",
-            },
-          };
-          obj2.item = item2.DataList.find((time) => time.Dt === item) || {
-            Close: "",
-            Dt: item,
-          };
-          obj.list.push(obj2);
-        });
-        return obj;
-      });
-      this.tableData = [...this.tableData, ...arr];
-
-      // 不满12行 补行
-      if (this.currentIndex <= this.pageSize && this.tableData.length < 12) {
-        let min = 12 - this.tableData.length;
-        let temList = this.tableHeadData.map((item) => {
-          let obj = {
-            SecName: item.SecName,
-            TradeCode: item.TradeCode,
-            item: { Close: "", Dt: "" },
-          };
-          return obj;
-        });
-        // 此处JSON 转换不可省去  有拷贝复制问题
-        for (let i = 0; i < min; i++) {
-          this.tableData.push({
-            timeVal: "",
-            list: JSON.parse(JSON.stringify(temList)),
-          });
-        }
-      }
-    },
-
-    // 获取频度
-    // async getFrequencyList() {
-    //   let res = await dataInterence.getFrequencyList({
-    //     ClassifyId: this.selectClassifyId,
-    //   });
-    //   if (res.Ret === 200) {
-    //     this.frequencyList = res.Data || [];
-    //     this.frequency = this.frequencyList.length ? this.frequencyList[0] : "";
-    //     this.getTableList();
-    //   }
-    // },
-
-    /* 获取分类 */
-    async getClassify(e) {
-      // dataAuthInterface.classifyList().then((res) => {
-      //   if (res.Ret === 200) {
-      //     this.classifyList = res.Data || [];
-      //     this.selectClassifyId = this.classifyList.length ? this.classifyList[0].ClassifyId : "";
-      //     // this.getFrequencyList();
-      //     this.getTableList()
-      //   }
-      // });
-      let res = await dataInterence.getClassify();
-      if (res.Ret === 200) {
-        let arr = [];
-        let arr2 = [];
-        res.Data.List &&
-          res.Data.List.forEach((item) => {
-            item.Child.forEach((_item) => {
-              if (
-                _item.ClassifyName === "利率债" ||
-                _item.ClassifyName === "宏观经济"
-              ) {
-                arr2.push(_item);
-              } else {
-                arr.push(_item);
-              }
-            });
-            // arr.push(...item.Child)
-          });
-        this.classifyList = [...arr, ...arr2];
-        if (e === "update") return;
-        this.selectClassifyId = this.classifyList.length
-          ? this.classifyList[0].ClassifyId
-          : "";
-        this.getTableList();
-      }
-    },
-
-    // 左侧分类切换
-    handleClassifyChange(e) {
-      this.selectClassifyId = e.ClassifyId;
-      this.frequency = "日度";
-      this.showFrequency = true;
-      this.leftSearchVal = "";
-      this.leftSearchTradeCode = null;
-      this.searchList = [];
-      // this.leftSearchList=[]
-      this.getTableList();
-    },
-
-    //频度切换
-    handleFrequencyChange(e) {
-      this.frequency = e;
-      this.getTableList();
-    },
-
-    // 此处 处理在日期选择组件上右键 显示菜单bug
-    mousedown(event) {
-      // event.button 0左键 2右键
-      if (event.button === 2) {
-        this.readonly = true;
-      } else {
-        this.readonly = false;
-      }
-    },
-
-    //鼠标右键
-    rightClick(e) {
-      if (this.role == "special_researcher") return;
-      // console.log(e.target.dataset);
-      // console.log(e.target.parentNode.dataset)
-      let rindex = e.target.dataset.rindex;
-      let cindex = e.target.dataset.cindex;
-      if (!rindex) {
-        rindex = e.target.parentNode.dataset.rindex;
-        cindex = e.target.parentNode.dataset.cindex;
-      }
-
-      this.rightMouseMenu.show = true;
-      this.rightMouseMenu.left = e.clientX + "px";
-      this.rightMouseMenu.top = e.clientY + "px";
-      this.rightMouseMenu.rindex = Number(rindex);
-      this.rightMouseMenu.cindex = Number(cindex);
-    },
-
-    //删除整行
-    async handleDeleteTargetByDate() {
-      // 判断该行是否有日期 有则 将timeArr 中该日期去除
-      if (this.tableData[this.rightMouseMenu.rindex].timeVal) {
-        this.timeArr = this.timeArr.filter(
-          (item) => item != this.tableData[this.rightMouseMenu.rindex].timeVal
-        );
-        this.currentIndex--;
-      }
-
-      //判断该行是否有数据 没有直接删除 不请求接口
-      let valArr = [];
-      this.tableData[this.rightMouseMenu.rindex].list.forEach((item) => {
-        if (item.item.Close) {
-          valArr.push(item.item.Close);
-        }
-      });
-      if (!valArr.length) {
-        this.tableData.splice(this.rightMouseMenu.rindex, 1);
-        return;
-      }
-
-      let codeArr = [];
-      this.tableData[this.rightMouseMenu.rindex].list.forEach((item) => {
-        if (item.TradeCode) {
-          codeArr.push(item.TradeCode);
-        }
-      });
-      console.log(codeArr);
-
-      const res = await dataInterence.deleteTargetByDate({
-        CreateDate: this.tableData[this.rightMouseMenu.rindex].timeVal,
-        TradeCodeList: codeArr,
-      });
-      if (res.Ret === 200) {
-        this.$message.success(/* "删除成功" */this.$t('MsgPrompt.delete_msg'));
-        this.tableData.splice(this.rightMouseMenu.rindex, 1);
-      } else {
-        this.$message(res.msg);
-      }
-    },
-
-    //删除列
-    async handleDeleteTargetByCode() {
-      if (this.rightMouseMenu.cindex < 0) {
-        this.$message.warning("该列不可删除");
-        return;
-      }
-
-      let TradeCode = this.tableHeadData[this.rightMouseMenu.cindex].TradeCode;
-      // 删除的是没有数据的列
-      if (!TradeCode) {
-        this.tableHeadData.splice(this.rightMouseMenu.cindex, 1);
-        this.tableData.forEach((item) => {
-          item.list.splice(this.rightMouseMenu.cindex, 1);
-        });
-        this.$message.success(/* "删除成功" */this.$t('MsgPrompt.delete_msg'));
-        return;
-      }
-
-      // 删除的是新增的列 但未填写数据
-      const dataList = this.tableHeadData[this.rightMouseMenu.cindex].DataList;
-      if (!dataList || dataList.length === 0) {
-        this.tableHeadData.splice(this.rightMouseMenu.cindex, 1);
-        this.tableData.forEach((item) => {
-          item.list.splice(this.rightMouseMenu.cindex, 1);
-        });
-        this.$message.success(/* "删除成功" */this.$t('MsgPrompt.delete_msg'));
-        return;
-      }
-
-      const res = await dataInterence.deleteTargetByCode({
-        TradeCode: TradeCode,
-      });
-      if (res.Ret === 200) {
-        this.$message.success(/* "删除成功" */this.$t('MsgPrompt.delete_msg'));
-        this.tableHeadData.splice(this.rightMouseMenu.cindex, 1);
-        this.tableData.forEach((item) => {
-          item.list.splice(this.rightMouseMenu.cindex, 1);
-        });
-        this.handleUpdateClassify();
-      } else {
-        this.$message(res.msg);
-      }
-    },
-
-    //新增列
-    handleInsertCol() {
-      let temHeadDataItem = {
-        SecName: "",
-        TradeCode: "",
-        Frequency: "",
-        Unit: "",
-        ModifyDate: "",
-        Status: "",
-        DataList: [],
-      };
-      this.tableHeadData.splice(
-        this.rightMouseMenu.cindex + 1,
-        0,
-        temHeadDataItem
-      );
-      this.tableData.forEach((item) => {
-        let tem = {
-          SecName: "",
-          TradeCode: "",
-          item: { Close: "", Dt: item.timeVal },
-        };
-        item.list.splice(this.rightMouseMenu.cindex + 1, 0, tem);
-      });
-    },
-
-    // 新增/删除 行列
-    handleOptTable(e) {
-      this.rightMouseMenu.show = false;
-      if (e === "插入行") {
-        let temList = this.tableHeadData.map((item) => {
-          let obj = {
-            SecName: item.SecName,
-            TradeCode: item.TradeCode,
-            item: { Close: "", Dt: "" },
-          };
-          return obj;
-        });
-        let temItem = {
-          timeVal: "",
-          list: JSON.parse(JSON.stringify(temList)),
-        };
-        this.tableData.splice(this.rightMouseMenu.rindex + 1, 0, temItem);
-      } else if (e === "删除行") {
-        this.handleDeleteTargetByDate();
-      } else if (e === "删除列") {
-        this.handleDeleteTargetByCode();
-      } else if (e === "插入列") {
-        this.handleInsertCol();
-      }
-    },
-
-    //取消导入
-    cancelHandle() {
-      this.isShowinsert = false;
-    },
-
-    //导入成功
-    importSuccess() {
-      this.isShowinsert = false;
-      this.getTableList();
-      this.handleUpdateClassify();
-    },
-  },
-};
-</script>
-
-<style>
-.data-entry-wrap .right-wrap .el-date-editor.el-input {
-  width: auto;
-}
-.data-entry-wrap .right-wrap .el-date-editor .el-input__inner {
-  border: none;
-  text-align: center;
-}
-.data-entry-wrap .right-wrap .el-select .el-input--suffix .el-input__inner {
-  background: transparent;
-  border: none;
-  text-align: center;
-  padding: 0;
-}
-</style>
-
-<style lang="scss" scoped>
-.data-entry-wrap {
-  display: flex;
-  position: relative;
-    .slide-btn-icon{
-        &.slide-left{
-            left:285px;
-        }
-        &.slide-right{
-            left: 0;
-        }
-    }
-  .wrap-box {
-    background: #ffffff;
-    border: 1px solid #ececec;
-    box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.05);
-    border-radius: 4px;
-    padding: 15px;
-    height: calc(100vh - 120px);
-    box-sizing: border-box;
-  }
-  .left-wrap {
-    min-width: 300px;
-    width: 300px;
-    margin-right: 20px;
-    box-sizing: border-box;
-    .classify-list {
-      padding: 0 10px;
-      height: calc(100% - 176px);
-      overflow-y: scroll;
-      /* &::-webkit-scrollbar {
-        width: 0px !important;
-      } */
-      .classify-item {
-        text-align: left;
-        font-size: 15px;
-        // height: 40px;
-        margin-bottom: 20px;
-        cursor: pointer;
-        color: #666;
-      }
-      .active-classify {
-        color: #409eff;
-      }
-    }
-  }
-  .right-wrap {
-    flex:1;
-    overflow-x: auto;
-    .sticky {
-      position: sticky;
-      border-right: 1px solid #dcdfe6;
-    }
-    .table-con {
-      overflow: auto;
-      height: calc(100% - 124px);
-      &::-webkit-scrollbar {
-        width: 5px !important;
-      }
-    }
-    table {
-      border-color: #dcdfe6;
-      border-bottom: 1px solid #dcdfe6;
-      border-right: 1px solid #dcdfe6;
-      border-collapse: separate;
-    }
-    thead {
-      position: sticky;
-      z-index: 2;
-      top: 0;
-      background-color: #f0f2f5;
-      td {
-        background-color: #f0f2f5;
-      }
-    }
-    td {
-      min-width: 220px;
-      max-width: 220px;
-      height: 40px;
-      text-align: center;
-      color: #666;
-      box-sizing: border-box;
-      padding: 0 5px;
-      background-color: #fff;
-      border-top: 1px solid #dcdfe6;
-      border-left: 1px solid #dcdfe6;
-    }
-    .s-td {
-      border: 2px solid #409eff;
-    }
-
-    .frequency-wrap {
-      margin-top: 20px;
-      display: flex;
-      flex-wrap: wrap;
-      gap:20px;
-      .item {
-        cursor: pointer;
-        width: 105px;
-        height: 40px;
-        background: #ecf5ff;
-        border: 1px solid #b3d8ff;
-        border-radius: 4px;
-        color: #409eff;
-        display: inline-block;
-        line-height: 40px;
-        text-align: center;
-      }
-      .active {
-        color: #fff;
-        background: #409eff;
-        box-shadow: 0px 3px 6px rgba(49, 78, 223, 0.16);
-      }
-    }
-    .input-val-box {
-      border: none;
-      text-align: center;
-      color: #666;
-      height: 100%;
-    }
-    .input-val-box:disabled {
-      background: transparent;
-    }
-    input::-webkit-outer-spin-button,
-    input::-webkit-inner-spin-button {
-      -webkit-appearance: none !important;
-      margin: 0;
-    }
-    input[type="number"] {
-      -moz-appearance: textfield;
-    }
-  }
-}
-
-.right-mouse-menu {
-  position: fixed;
-  z-index: 999;
-  background: #ffffff;
-  border: 1px solid #ececec;
-  box-shadow: 0px 3px 6px rgba(143, 143, 143, 0.16);
-  border-radius: 4px;
-  color: #333;
-  font-size: 15px;
-  padding: 13px 0;
-  .item {
-    line-height: 30px;
-    padding: 0 20px;
-    cursor: pointer;
-    &:hover {
-      background-color: #f5f7fa;
-    }
-  }
-}
-.left-wrap /deep/ .el-button {
-  font-size: 16px;
-  padding: 10px 8px;
-}
-</style>

+ 0 - 913
src/views/dataEntry_manage/dataList.vue

@@ -1,913 +0,0 @@
-<template>
-  <div class="dataEntry-container">
-    <div class="data-top-container">
-      <!-- 筛选条件 -->
-      <el-form :inline="true" class="elForm">
-        <el-form-item style="marginright: 10px">
-          <!-- <el-button type="primary" size="medium" @click="insertData(1)">录入数据</el-button> -->
-          <el-button
-            type="primary"
-            size="medium"
-            style="marginright: 10px"
-            @click="handleImport"
-            >导入数据</el-button
-          >
-          <a
-            :href="`${exportDataurl}?StartDate=${exportParams.start_date}&EndDate=${exportParams.end_date}&Mobile=${exportParams.mobile}`"
-            download
-          >
-            <el-button
-              type="primary"
-              plain
-              size="medium"
-              style="marginright: 10px"
-              >导出数据</el-button
-            >
-          </a>
-          <!-- <el-button type="primary" plain size="medium" @click="exportClick(1)" style="marginRight:10px;" :loading="btnload">隆众石化数据导出</el-button>
-						<el-button type="primary" plain size="medium" @click="exportClick(2)" :loading="btnload2">隆众价格数据导出</el-button> -->
-        </el-form-item>
-      </el-form>
-      <!-- 品种列表 -->
-      <ul class="classifyList" v-if="roleClassifyList.length">
-        <li
-          v-for="item in roleClassifyList"
-          :key="item.ClassifyId"
-          :class="{ act: item.ClassifyId === select_classify }"
-          @click="toggleClassify(item)"
-        >
-          {{ item.ClassifyName }} ({{ item.Total }})
-        </li>
-      </ul>
-      <!-- 人员列表 -->
-      <!-- <ul class="roleList" v-if="roleList.length">
-				<li v-for="item in roleList" :key="item.AdminId" :class="{'act':item.AdminId===default_role}" @click="toggleRole(item)">
-					{{item.RealName}}({{item.TargetCount}})
-				</li>
-			</ul> -->
-    </div>
-    <div class="data-bot-container">
-      <!-- 左侧指标表格 -->
-      <div style="width: 50%; marginright: 5px">
-        <el-table
-          ref="tableTarget"
-          :data="tableTarget"
-          @row-click="chooseTarget"
-          :header-cell-style="{ height: '59px' }"
-          :row-style="{ height: '52px' }"
-          :empty-text="'暂无指标'"
-          height="536"
-          highlight-current-row
-          border
-        >
-          <el-table-column prop="TradeCode" label="指标ID" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.TradeCode }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="SecName" label="指标名称" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.SecName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="Frequency" label="频度" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.Frequency }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="Unit" label="单位" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.Unit }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="ModifyDate" label="待更新日期" align="center">
-            <template slot-scope="scope">
-              <!-- <span>{{scope.row.frequency==='日度'?today:scope.row.modify_date}}</span> -->
-              <span>{{ scope.row.ModifyDate | formatTime }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="Status" label="状态" align="center">
-            <template slot-scope="scope">
-              <span
-                :style="
-                  scope.row.Status === '完成' ? 'color:#2BA400' : 'color:red'
-                "
-                >{{ scope.row.Status }}</span
-              >
-            </template>
-          </el-table-column>
-          <div
-            slot="empty"
-            style="lineheight: 25px; margin: 10px 0; color: #95a9c5"
-          >
-            <tableNoData text="暂无指标" size="mini"/>
-          </div>
-        </el-table>
-      </div>
-      <!-- 右侧展示表格 -->
-      <div style="width: 50%">
-        <el-col
-          :span="24"
-          style="
-            height: 59px;
-            padding: 9px 12px;
-            display: flex;
-            justifycontent: space-between;
-            border: solid 1px #ebeef5;
-            borderbottom: none;
-          "
-        >
-          <span></span>
-          <el-date-picker
-            v-model="date"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            @change="dateChange"
-            value-format="yyyy-MM-dd"
-          >
-          </el-date-picker>
-        </el-col>
-        <el-table
-          :data="tableData"
-          height="476"
-          v-loading="isShowloadding"
-          @cell-dblclick="clickCell"
-          :element-loading-text="$t('Table.data_loading')" 
-          :default-sort="{ prop: 'date', order: 'descending' }"
-          :header-cell-style="{ background: '#fff!important' }"
-          border
-        >
-          <!-- 数据表格 -->
-          <el-table-column prop="Dt" label="日期" sortable align="center">
-            <template slot-scope="scope">
-              <el-date-picker
-                style="width: 140px"
-                ref="editDate"
-                type="date"
-                placeholder="录入日期"
-                v-model="scope.row.Dt"
-                value-format="yyyy-MM-dd"
-                v-if="scope.row.edit_date"
-                @blur="changeDate(scope.row)"
-              ></el-date-picker>
-              <template v-else>
-                <span style="position: relative">
-                  {{ scope.row.Dt | formatTime }}
-                  <span
-                    v-if="scope.$index === 0 && page_no == 1"
-                    class="new-tag"
-                    >新</span
-                  >
-                </span>
-              </template>
-            </template>
-          </el-table-column>
-          <!-- <el-table-column
-					prop="SEC_NAME"
-					label="指标名称"
-					align="center">
-						<template slot-scope="scope"> <span>{{scope.row.SEC_NAME}}</span> </template>
-					</el-table-column>
-					<el-table-column
-					prop="frequency"
-					label="频度"
-					align="center">
-						<template slot-scope="scope"> <span>{{scope.row.frequency}}</span> </template>
-					</el-table-column>
-					<el-table-column
-					prop="classify_name"
-					label="分类"
-					align="center">
-						<template slot-scope="scope"> <span>{{scope.row.classify_name}}</span> </template>
-					</el-table-column> -->
-          <el-table-column prop="Close" label="值" align="center">
-            <template slot-scope="scope">
-              <el-input
-                ref="editVal"
-                style="width: 140px"
-                placeholder="请输入值"
-                v-if="scope.row.edit_val"
-                v-model="scope.row.Close"
-                @blur="changeValue(scope.row)"
-              ></el-input>
-              <span v-else>{{ scope.row.Close }}</span>
-              <!-- <span>{{scope.row.Close}}</span> -->
-            </template>
-          </el-table-column>
-          <!-- <el-table-column
-					prop="UNIT"
-					label="单位"
-					align="center">
-						<template slot-scope="scope"> <span>{{scope.row.UNIT}}</span> </template>
-					</el-table-column> -->
-          <el-table-column label="操作" align="center">
-            <template slot-scope="scope">
-              <div style="color: #4099ef; font-size: 24px">
-                <!-- <span class="editsty" @click="editHandle(scope.row)" style="marginRight:20px;">编辑</span> -->
-                <span class="editsty" @click="addHandle(scope.row)">插入</span>
-                <span
-                  class="deletesty"
-                  @click="delHandle(scope.row)"
-                  v-if="total != 0"
-                  style="marginleft: 20px"
-                  >删除</span
-                >
-              </div>
-            </template>
-          </el-table-column>
-          <div
-            slot="empty"
-            style="lineheight: 25px; margin: 10px 0; color: #95a9c5"
-          >
-            <tableNoData text="暂无搜索结果" size="mini"/>
-          </div>
-        </el-table>
-        <el-col :span="24" class="toolbar">
-          <el-pagination
-            layout="total,prev,pager,next,jumper"
-            background
-            :current-page="page_no"
-            @current-change="handleCurrentChange"
-            :page-size="pageSize"
-            @size-change="handleSizeChange"
-            :total="total"
-            style="float: right"
-          >
-          </el-pagination>
-        </el-col>
-      </div>
-    </div>
-    <!-- 导入数据弹窗 -->
-    <insert-data
-      :isShowinsert="isShowinsert"
-      @cancelHandle="cancelHandle"
-      @importSuccess="importSuccess"
-    >
-    </insert-data>
-  </div>
-</template>
-
-<script>
-import insertData from "./components/insertData";
-import { dataInterence, downloadFile, dataAuthInterface } from "api/api.js";
-import http from "@/api/http.js";
-export default {
-  name: "dataList",
-  data() {
-    return {
-      today: http.dateFormatter(new Date(), false),
-      exportDataurl: process.env.VUE_APP_API_ROOT + "/entry/export/dataList", //导出数据
-      exportLzurl: process.env.VUE_APP_API_ROOT + "/entry/export/longzhong", //隆众石化数据导出接口
-      exportLzprice:
-        process.env.VUE_APP_API_ROOT + "/entry/export/longzhong/price", //隆众价格数据导出接口
-      exportLzapi:
-        process.env.VUE_APP_API_ROOT + "/entry/export/longzhong/survey", //隆众数据导出接口
-      dialogTitle: "录入数据",
-      tabs: ["录入数据", "指标管理"],
-      tab_act: 0,
-      isShowloadding: false, //loading
-      classifyList: [], //分类列表
-      fillterClassifyList: [], //筛选分类列表
-      classifyProps: {
-        label: "classify_name",
-        value: "classify_id",
-        children: "child",
-      },
-      frequencyList: [
-        {
-          value: "日度",
-          label: "日度",
-        },
-        {
-          value: "周度",
-          label: "周度",
-        },
-        {
-          value: "月度",
-          label: "月度",
-        },
-      ], //频度列表
-      tableData: [],
-      total: 1, //总条数
-      page_no: 1, //当前页
-      pageSize: 8, //每页条数
-      date: "",
-      frequency: "", //频度
-      classify_id: 0, //分类id
-      search_txt: "", //关键字搜索
-      isShowdialog: false, //显示新增指标
-      isShowinsert: false, //导入弹窗
-      formData: {
-        type: "宏观",
-        date: http.dateFormatter(new Date(), false), //日期
-        target: "", //指标
-        value: "", //值
-        frequency: "日度", //频度
-        unit: "", //单位
-        targetName: "", //指标名称
-        trade_code: "", //指标标识
-        up_week: "", //更新时间周
-        up_time: "", //更新时间
-        up_day: "", //更新时间日
-      }, //指标弹窗数据
-      editFormData: {}, //修改表单数据
-      isShowedit: false, //显示编辑弹窗
-      editTitle: "修改录入数据",
-      is_editData: false, //是否是编辑数据
-      edit_dataId: "", //编辑分类id
-      edit_old_date: "", //修改数据的老日期,
-      tableTarget: [], //指标表格
-      roleList: [], //研究员列表
-      default_role: "", //默认角色id
-      default_mobile: "", //默认电话
-      default_target: "", //默认指标
-      old_date: "",
-      isDateChange: false, //标识筛选日期 非清空
-      btnload: false,
-      btnload2: false,
-      roleClassifyList: [], //账号品种权限
-      select_classify: "", //选中的分类
-    };
-  },
-  components: {
-    // addtarget,
-    insertData,
-    // editTarget
-  },
-  computed: {
-    //导出参数
-    exportParams() {
-      return {
-        start_date: this.date ? this.date[0] : "",
-        end_date: this.date ? this.date[1] : "",
-        mobile: this.default_mobile || "",
-        // frequency: this.frequency,
-        // classify_id:this.classify_id,
-        // key_word: this.search_txt,
-      };
-    },
-  },
-  watch: {
-    // 切换指标时
-    default_target() {
-      this.page_no = 1; //当前页
-      this.getTableData();
-    },
-    default_mobile() {
-      this.getTarget();
-    },
-    select_classify() {
-      this.getTarget();
-    },
-  },
-  methods: {
-    /* 隆众数据导出 */
-    exportClick(type) {
-      // if(type == 1) {
-      // 	this.btnload = true;
-      // 	var iframe = document.createElement("iframe")
-      // 	iframe.style.display = "none";
-      // 	iframe.src = this.exportLzurl;
-      // 	document.body.appendChild(iframe);
-      // 	setTimeout(()=> {
-      // 		this.btnload = false;
-      // 	},10000)
-      // }else {
-      // 	this.btnload2 = true;
-      // 	var iframe = document.createElement("iframe")
-      // 	iframe.style.display = "none";
-      // 	iframe.src = this.exportLzprice;
-      // 	document.body.appendChild(iframe);
-      // 	setTimeout(()=> {
-      // 		this.btnload2 = false;
-      // 	},10000)
-      // }
-      this.btnload = true;
-      var iframe = document.createElement("iframe");
-      iframe.style.display = "none";
-      iframe.src = this.exportLzapi;
-      document.body.appendChild(iframe);
-      setTimeout(() => {
-        this.btnload = false;
-      }, 5000);
-    },
-    // 隐藏弹框
-    cancelHandle(bol) {
-      if (bol === 1) {
-        this.isShowdialog = false;
-        this.$refs.Atarget.$refs.formD.resetFields();
-        this.formData = {
-          type: "宏观",
-          date: http.dateFormatter(new Date(), false), //日期
-          target: "", //指标
-          value: "", //值
-          frequency: "日度", //频度
-          unit: "", //单位
-          targetName: "", //指标名称
-          trade_code: "", //指标标识
-          up_week: "", //更新时间周
-          up_time: "", //更新时间
-          up_day: "", //更新时间日
-        };
-      } else {
-        this.isShowinsert = false;
-      }
-    },
-    // 获取数据表格
-    getTableData(tab = 0) {
-      //取分类id
-      let classify_id;
-      if (this.classify_id instanceof Array) {
-        let arr = JSON.parse(JSON.stringify(this.classify_id));
-        classify_id = arr.pop();
-      } else {
-        classify_id = this.classify_id;
-      }
-      this.classify_id = classify_id;
-      let parmas = {
-        CurrentIndex: this.page_no,
-        PageSize: this.pageSize,
-        StartDate: this.date ? this.date[0] : "",
-        EndDate: this.date ? this.date[1] : "",
-        Frequency: this.frequency,
-        ClassifyId: classify_id,
-        KeyWord: this.search_txt,
-        TradeCode: this.default_target /* 指标筛选接口 */,
-      };
-      if (this.default_target) {
-        //获取数据表格
-        this.isShowloadding = true;
-        dataInterence.getDatalist(parmas).then((res) => {
-          if (res.Ret === 200) {
-            let arr = [];
-            if (res.Data.List.length) {
-              res.Data.List.forEach((item) => {
-                item.ModifyTime = item.ModifyTime.substr(0, 10);
-                let obj = {
-                  ...item,
-                  edit_val: false,
-                  edit_date: false,
-                };
-                arr.push(obj);
-              });
-              this.tableData = arr;
-            } else {
-              this.tableData = [];
-              if (!this.isDateChange) {
-                let insert_obj = {
-                  Close: "",
-                  Dt: "",
-                  edit_val: true,
-                  edit_date: true,
-                };
-                this.tableData.push(insert_obj);
-              }
-            }
-            this.total = parseInt(res.Data.Paging.Totals);
-          }
-          this.isShowloadding = false;
-        });
-      } else {
-        this.tableData = [];
-      }
-    },
-    /* 获取账号关联品种 */
-    getOwnClassify() {
-      dataAuthInterface.classifyList().then((res) => {
-        if (res.Ret === 200) {
-          this.roleClassifyList = res.Data || [];
-          this.select_classify = this.roleClassifyList.length
-            ? this.roleClassifyList[0].ClassifyId
-            : "";
-        }
-      });
-    },
-    // 导入数据
-    handleImport() {
-      this.isShowinsert = true;
-    },
-    // 导入数据成功
-    importSuccess() {
-      this.isShowinsert = false;
-      this.getTableData();
-    },
-    // 页码改变
-    handleCurrentChange(page) {
-      this.page_no = page;
-      this.getTableData();
-    },
-    // 页数改变
-    handleSizeChange(size) {
-      this.pageSize = size;
-      this.getTableData();
-    },
-    // 日期改变
-    dateChange(e) {
-      this.page_no = 1; //当前页
-      if (e) {
-        //标识日期改变
-        this.isDateChange = true;
-      } else {
-        this.isDateChange = false;
-      }
-      this.getTableData();
-    },
-    // 新增成功
-    addOver(type) {
-      // this.tab_act = 0;
-      // this.isShowdialog = false;
-      this.$refs.Atarget.$refs.formD.resetFields(); //重置校验
-      this.formData = {
-        // type:'宏观',
-        type: type,
-        date: http.dateFormatter(new Date(), false), //日期
-        target: "", //指标
-        value: "", //值
-        frequency: "日度", //频度
-        unit: "", //单位
-        targetName: "", //指标名称
-        trade_code: "", //指标标识
-        up_week: "", //更新时间周
-        up_time: "", //更新时间
-        up_day: "", //更新时间日
-      };
-      this.getTableData();
-    },
-    // 编辑中修改分类
-    changeEditForm(name) {
-      this.$set(this.editFormData, "type", name);
-    },
-    // 编辑
-    editHandle(item) {
-      this.isShowedit = true;
-      this.edit_dataId = item.ClassifyId;
-      if (this.tab_act === 0) {
-        this.editTitle = "修改录入数据";
-        //编辑数据
-        this.editFormData = {
-          type: item.ClassifyName,
-          date: item.Dt,
-          target: item.SecName,
-          value: item.Close,
-          trade_code: item.TradeCode,
-        };
-        this.edit_old_date = item.Dt;
-      }
-    },
-    // 编辑数据成功
-    editDataOver(tab = 0) {
-      this.tab = tab;
-      this.isShowedit = false;
-      this.getTableData(tab);
-    },
-    // 取消编辑
-    cancelEdit() {
-      this.isShowedit = false;
-    },
-    // 删除
-    delHandle(item) {
-      if (item.Close !== "" && item.Dt) {
-        this.$confirm("是否确认删除该条数据?", "提示", {
-          type: "warning",
-        })
-          .then(() => {
-            dataInterence
-              .delData({
-                TradeCode: item.TradeCode,
-                CreateDate: item.Dt,
-              })
-              .then((res) => {
-                if (res.Ret === 200) {
-                  this.$message.success("删除成功!");
-                  this.getTableData();
-                } else {
-                  this.$message(res.msg);
-                }
-              });
-          })
-          .catch(() => {});
-      } else {
-        let index = this.tableData.indexOf(item);
-        this.$confirm("该行未录入数据,是否确认删除该行?", "提示", {
-          type: "warning",
-        })
-          .then(() => {
-            this.tableData.splice(index, 1);
-          })
-          .catch(() => {});
-      }
-    },
-    // 获取研究员列表
-    getResearcherList() {
-      dataInterence.getResearcher().then((res) => {
-        if (res.Ret === 200) {
-          this.roleList = res.Data.List || [];
-          this.default_role = res.Data.List[0].AdminId;
-          this.default_mobile = res.Data.List[0].Mobile;
-        }
-      });
-    },
-    // 获取指标列表
-    getTarget() {
-      dataInterence
-        .getTarget({
-          Mobile: this.default_mobile || "",
-          ClassifyId: this.select_classify || 0,
-        })
-        .then((res) => {
-          if (res.Ret === 200) {
-            this.tableTarget = res.Data.List ? res.Data.List : [];
-            this.default_target =
-              res.Data.List && res.Data.List.length
-                ? res.Data.List[0].TradeCode
-                : ""; //默认指标
-            this.$nextTick(() => {
-              this.$refs.tableTarget.setCurrentRow(this.tableTarget[0]);
-            });
-          }
-        });
-    },
-    // 插入行
-    addHandle(e) {
-      // 新增数据 清空old_date
-      this.old_date = "";
-      let index = this.tableData.indexOf(e);
-      let insert_obj = {
-        Close: "",
-        Dt: "",
-        edit_val: true,
-        edit_date: true,
-      };
-      if (e.Close !== "" && e.Dt) {
-        this.tableData.splice(index, 0, insert_obj);
-      } else {
-        this.$message.warning("录入日期和录入值不能为空!");
-      }
-    },
-    // 双击单元格
-    clickCell(e, e2) {
-      // 编辑数据
-      // 获取修改之前的日期
-      this.old_date = e.Dt;
-      if (e2.label === "值") {
-        e.edit_val = true;
-        setTimeout(() => {
-          this.$refs.editVal.focus();
-        }, 200);
-      } else if (e2.label === "日期") {
-        e.edit_date = true;
-        setTimeout(() => {
-          this.$refs.editDate.focus();
-        }, 200);
-      }
-    },
-    // 改变录入值
-    changeValue(e, val) {
-      if (e.Close) {
-        e.edit_val = false;
-      }
-      this.dataHandle(e);
-    },
-    // 改变录入日期
-    changeDate(e, val) {
-      if (e.Dt) {
-        e.edit_date = false;
-      }
-      this.dataHandle(e);
-    },
-    // 新增或修改数据
-    dataHandle(e) {
-      if (!e.Dt) {
-        // this.$message.warning("录入日期不能为空!");
-      } else if (!e.Close) {
-        // this.$message.warning("录入值不能为空!");
-      } else {
-        // 检查录入日期数据是否已存在
-        dataInterence
-          .checkData({
-            TradeCode: this.default_target,
-            CreateDate: e.Dt,
-          })
-          .then((res) => {
-            if (res.Data.Status == 0) {
-              dataInterence
-                .editData({
-                  TradeCode: this.default_target,
-                  CreateDate: e.Dt,
-                  Close: e.Close,
-                  OldCreateDate: this.old_date,
-                })
-                .then((res) => {
-                  if (res.Ret === 200) {
-                    this.$message({
-                      message: this.$t('ETable.Msg.insertion_success_msg'),
-                      type: "success",
-                    });
-                    this.page_no = 1;
-                    this.getTableData();
-                  } else {
-                    this.$message({
-                      message: res.msg,
-                      type: "warning",
-                    });
-                  }
-                });
-            } else if (res.Data.Status == 1) {
-              this.$confirm(
-                "该日期已存在数据值" + res.Data.Close + ",确认修改?",
-                "提示",
-                {
-                  type: "warning",
-                }
-              ).then(() => {
-                //编辑数据
-                dataInterence
-                  .editData({
-                    TradeCode: this.default_target,
-                    CreateDate: e.Dt,
-                    Close: e.Close,
-                    OldCreateDate: this.old_date,
-                  })
-                  .then((res) => {
-                    if (res.Ret === 200) {
-                      this.$message({
-                        message: "修改成功",
-                        type: "success",
-                      });
-                      this.page_no = 1;
-                      this.getTableData();
-                    } else {
-                      this.$message({
-                        message: res.msg,
-                        type: "warning",
-                      });
-                    }
-                  });
-              });
-            } else {
-              console.log(res.msg);
-            }
-          });
-      }
-    },
-    // 切换人员
-    toggleRole(item) {
-      this.default_role = item.AdminId;
-      this.default_mobile = item.Mobile;
-    },
-    toggleClassify(item) {
-      this.select_classify = item.ClassifyId;
-    },
-    // 切换指标
-    chooseTarget(e) {
-      this.default_target = e.TradeCode;
-    },
-  },
-  created() {
-    // this.getResearcherList();
-    this.getOwnClassify();
-  },
-  mounted() {},
-};
-</script>
-<style lang="scss">
-.dataEntry-container {
-  background: #fff;
-  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-  .data-top-container {
-    padding: 35px 40px 15px;
-    box-shadow: 0 3px 6px rgba(37, 37, 239, 0.1);
-    .type-list {
-      max-width: 100px;
-    }
-    .rigth-cont {
-      margin: 0 auto;
-    }
-    .bot-handle {
-      margin: 80px auto 0;
-    }
-    .classifyList {
-      display: flex;
-      flex-wrap: wrap;
-      // margin-top: 18px;
-      color: #707070;
-      font-size: 15px;
-      margin-top: 20px;
-      li {
-        width: 88px;
-        height: 38px;
-        line-height: 38px;
-        text-align: center;
-        border: 1px solid #dcdfe6;
-        border-radius: 4px;
-        margin-right: 30px;
-        margin-bottom: 10px;
-        transition: all 0.3s;
-        cursor: pointer;
-        &:last-child {
-          margin-right: 0;
-        }
-        &.act {
-          border-color: #409eff;
-          color: #409eff;
-        }
-      }
-    }
-    .roleList {
-      display: flex;
-      flex-wrap: wrap;
-      // margin-top: 18px;
-      color: #707070;
-      font-size: 15px;
-      margin-top: 20px;
-      li {
-        width: 88px;
-        height: 38px;
-        line-height: 38px;
-        text-align: center;
-        border: 1px solid #dcdfe6;
-        border-radius: 4px;
-        margin-right: 30px;
-        margin-bottom: 10px;
-        transition: all 0.3s;
-        cursor: pointer;
-        &:last-child {
-          margin-right: 0;
-        }
-        &.act {
-          border-color: #409eff;
-          color: #409eff;
-        }
-        &:hover {
-          border-color: #409eff;
-          color: #409eff;
-        }
-      }
-    }
-  }
-  .data-bot-container {
-    padding: 30px 40px 40px;
-    display: flex;
-    .el-table__body tr.current-row > td {
-      background-color: #deedff !important;
-      color: #666;
-    }
-    /*修改滚动条样式*/
-    div::-webkit-scrollbar {
-      width: 10px;
-      height: 10px;
-    }
-    div::-webkit-scrollbar-track {
-      background: rgb(239, 239, 239);
-      border-radius: 2px;
-    }
-    div::-webkit-scrollbar-thumb {
-      background: #ccc;
-      border-radius: 10px;
-    }
-    div::-webkit-scrollbar-thumb:hover {
-      background: #888;
-    }
-    div::-webkit-scrollbar-corner {
-      background: #179a16;
-    }
-    /**/
-    .tabs-cont {
-      display: flex;
-      justify-content: space-around;
-      align-items: center;
-      margin-bottom: 60px;
-      color: #1f2e4d;
-      font-size: 16px;
-      .tab-item {
-        width: 20%;
-        text-align: center;
-        cursor: pointer;
-        padding-bottom: 10px;
-        transition: all 0.3s;
-        border-bottom: 2px solid transparent;
-        &.act {
-          border-bottom: 2px solid #5882ef;
-          color: #5882ef;
-        }
-      }
-    }
-    .new-tag {
-      width: 22px;
-      height: 22px;
-      border-radius: 50%;
-      background: #ff1d1d;
-      text-align: center;
-      line-height: 22px;
-      color: #fff;
-      font-size: 13px;
-      position: absolute;
-      top: 50%;
-      transform: translateY(-50%);
-      left: -30px;
-    }
-  }
-}
-</style>

+ 0 - 2
src/views/dataEntry_manage/databaseComponents/batchComptedDialog.vue

@@ -402,8 +402,6 @@ export default {
 				? await preDictEdbInterface.classifyListV2()
 				: await dataBaseInterface.menuListV3({ClassifyType:2})
 				if (res.Ret !== 200) return
-				//this.edbSource !== 'predict' && this.filterNodes(res.Data.AllNodes);
-				// this.options = res.Data.AllNodes || [];
 				
 				this.filterNodes(res.Data.AllNodes||[]);
 				this.options = res.Data.AllNodes || [];

+ 1 - 28
src/views/dataEntry_manage/databaseComponents/chartTrendRender.vue

@@ -2,16 +2,6 @@
 	<div class="chart-trend-render">
 		<div class="header">
 			<template v-if="chart_type===1">
-				<!-- <el-button
-					type="primary"
-					v-for="item in yearSelector"
-					:key="item.value"
-					size="mini"
-					:plain="item.value !== year_select"
-					class="year-btn"
-					@click.native="changeYear(item)"
-					>{{ item.name }}</el-button
-				> -->
 				<el-popover 
 					placement="bottom" 
 					trigger="click" 
@@ -38,17 +28,7 @@
 					{{ isShowOnyearData ? $t('Edb.hide_yearonyear') : $t('Edb.show_yearonyear')}}
 				</el-button>
 			</template>
-			<!-- 季节图时间选择 -->
-			<!-- <template v-else-if="chart_type===2">
-				<date-picker
-						v-model="season_year"
-						type="month"
-						value-type="format"
-						range
-						placeholder="年份日期选择"
-						@change="getDataByPath"
-				/>
-			</template> -->
+		
 			<div v-else-if="chart_type === 2" @click="openDateDia" class="date-setting">
 				{{ season_year && season_year.length>0 ? season_year[0]+'~'+season_year[1]:"年份日期选择" }}
 			</div>
@@ -298,13 +278,6 @@ export default {
 			form.append('EdbInfoId',EdbInfo.EdbInfoId)
       await dataBaseInterface.saveEdbChartThumbnail(form)
 			
-			// let { Data,Ret } = await dataBaseInterface.uploadImgSvg(form);
-
-			// if(Ret!==200 || !Data) return 
-			// await dataBaseInterface.saveEdbChartImg({
-			// 	EdbInfoId: EdbInfo.EdbInfoId,
-			// 	ImageUrl: Data.ResourceUrl,
-			// });
 		},
 
 		/* 获取装置指标数据 */

+ 0 - 31
src/views/dataEntry_manage/databaseComponents/computedDialog.vue

@@ -145,8 +145,6 @@
 							<i class="el-icon-question"/>
 						</el-tooltip>
 					</label>
-					<!-- <el-input placeholder="请输入公式" v-model="formula" clearable :disabled="calulateForm.view">
-					</el-input> -->
 					<ul class="formula-list">
 						<li style="margin-bottom: 15px;">
 							<el-input :placeholder="$t('EtaBasePage.input_formula_msg')" v-model="formulaList[0].formula" clearable :disabled="calulateForm.view" style="width: 600px"/>
@@ -275,7 +273,6 @@ import {generateSeriesArray} from './util'
 const MAXEDBNUM=50//最大可添加的指标数量
 const tag_arr = generateSeriesArray();
 
-// for(let i=0;i<26;i++) tag_arr.push(String.fromCharCode(65+i));
 export default {
 	name: '',
 	props: {
@@ -484,37 +481,9 @@ export default {
 				nullValueWay: 0,
 				maxNullWay: 1
 			},//空值处理
-			/* nullWayOptions: [
-				{ label: '查找前后35天最近值',value: 0 },
-				{ label: '不计算',value: 1 },
-				{ label: '前值填充',value: 2 },
-				{ label: '后值填充',value: 3 },
-				{ label: '等于0',value: 4 },
-			], */
 
 			selectTimeSeriesVal:'',
 
-			/* formTips: {
-				'null-val': `1、查找前后35天最近值:在参与计算的日期序列上某指标无值时,该指标往前/往后找距离最近的值作为当天的值进行计算,遍历允许跨年,往前最多35天,往后最多35天<br>
-				2、不计算:只要有一个指标在某个日期没有值(即空值),则计算指标在该日期没有值 <br>
-				3、前值填充:空值优先以最近的前值填充,没有前值时,用后值填充 <br>
-				4、后值填充:空值优先以最近的后值填充,没有前值时,用后值填充 <br>
-				5、等于0:空值以0值参与计算 <br>
-				注意:此处缺失值的处理,作用于数据全部时间段`,
-				'max-null-val': `MAX、MIN公式中指标存在空值时按如下规则处理:<br>
-				1、等于0,空值用0参与计算;<br>
-				2、跳过空值,去除空值指标,剩余指标进行计算,若该日期所有指标均为空值,则该日期无值;`,
-				'formula':`1、支持新增分段,实现不同分段使用不同的计算公式,若未新增分段,则所有日期序列用统一公式计算<br>
-				2、新增分段需配置新公式和时间节点,在时间节点之前(不含)使用新公式,在时间节点之后(含)使用已配置公式,每个分段公式支持修改<br>
-				3、分段时间节点不允许重复,不允许超出第一个指标的日期区间`
-			}, */
-
-			/* titleMap: new Map([
-				['计算指标',this.$t('EtaBasePage.calculate_title')],
-				['编辑计算指标',this.$t('EtaBasePage.calculate_edit_title')],
-				['查看计算指标',this.$t('EtaBasePage.calculate_view_title')],
-			]) */
-
 		};
 	},
 	methods: {

+ 1 - 10
src/views/dataEntry_manage/databaseComponents/createChart.vue

@@ -32,16 +32,7 @@
 				<el-button type="text" class="btn-sty" @click="showOnChart('toggle')" v-if="!isOnlyShowBaseChart">{{ isShowOnyearData ? '隐藏同比图' : '展示同比图'}}</el-button>
 			</template>
 			<!-- 季节图时间选择 -->
-			<!-- <template v-else-if="chart_type===2"> -->
-				<!-- <date-picker
-						v-model="season_year"
-						type="month"
-						value-type="format"
-						range
-						placeholder="年份日期选择"
-						@change="getDataByPath"
-				/> -->
-			<!-- </template> -->
+			
 			<div v-else-if="chart_type === 2" @click="openDateDia" class="date-setting">
 				{{ season_year && season_year.length>0 ? season_year[0]+'~'+season_year[1]:"年份日期选择" }}
 			</div>

+ 1 - 5
src/views/dataEntry_manage/databaseComponents/dataAssociateChart.vue

@@ -22,11 +22,7 @@
                         :style="{background: `no-repeat top/cover url('${!chart.HaveOperaAuth ? $icons.lock_big : chart.ChartImage}')`}"></div>
                     <div class="chart-item-bottom">
                         <span>{{$t('Chart.list_chart_time')}}: {{ chart.CreateTime.slice(0,10) }}</span>
-                        <!-- <span class="join_txt" @click="addMychartHandle(chart)" v-if="chart.HaveOperaAuth">
-                            <img :src="$icons.chart_join_ico"
-                                style="width: 13px; height: 12px; vertical-align: middle"/>
-                            {{$t('Chart.chart_addmy_btn')}}
-                        </span> -->
+                      
                     </div>
                 </div>
 

+ 0 - 1
src/views/dataEntry_manage/databaseComponents/edbDetailData.vue

@@ -10,7 +10,6 @@
 				:min-width="item.minwidthsty"
 				align="center">
 				<template slot="header" slot-scope="scope">
-					<!-- <div class="chartEn-mark" style="top: -10px;" v-show="scope.$index ==0 && tableData[0] && tableData[0].IsEnEdb" >En</div> -->
 					<span>{{item.label}}</span>
 				</template>	
 				<template slot-scope="scope">

+ 0 - 2
src/views/dataEntry_manage/databaseComponents/fittingResidueDia.vue

@@ -235,8 +235,6 @@ export default {
 					self_move_type: backData.from_arr[0].MoveValue === 0 ? 0 : 1,
 					self_move_val: backData.from_arr[0].MoveValue,
 					depend_variate: backData.from_arr[1].FromEdbInfoId,
-					// depend_move_type: backData.from_arr[1].MoveValue === 0 ? 0 : 1,
-					// depend_move_val: backData.from_arr[1].MoveValue,
 					depend_edb_date: [backData.from_arr[1].StartDate,backData.from_arr[1].EndDate],
 					self_edb_date: [backData.from_arr[0].StartDate,backData.from_arr[0].EndDate],
 				}

+ 1 - 21
src/views/dataEntry_manage/databaseComponents/jointTargetDia.vue

@@ -424,32 +424,12 @@ export default {
 				frequency: '',
 				unit: '',
 			},
-			// tips: new Map([
-			// 	[1,`
-			// 		直接拼接说明:<br>
-			// 		1、选取拼接日期<br>
-			// 		2、在拼接日期之前的数据选择指标A<br>
-			// 		3、拼接日期之后的数据选择指标B<br>
-			// 		4、新指标的起始日期为A的开始日期,更新时间跟随指标B进行更新<br>
-			// 		5、指标A和B可以是原始指标,也可以是计算指标
-			// 	`],
-			// 	[2,`
-			// 		累计值同比拼接说明:<br>
-			// 		1、只支持月频度的指标进行累计值同比拼接<br>
-			// 		2、如果出现有空值运算,则返回空值<br>
-			// 		3、选取待拼接指标A和同比值指标B<br>
-			// 		4、搜索到指标A最后一个12月31日有值的年份,并且向前回溯12个值(12个月),分别乘以下一年同期对应的同比增长率(B),公式为【A*(1+同期增长率(B)/100)】,得到下一年每个月的绝对值,再用新得到的下一年的12个月的值再乘以再下一年同期对应的同比增长率,得到再下一年每个月的绝对值<br>
-			// 		5、以此类推,直到运算至指标B的最新值,得到新的序列C<br>
-			// 		6、新指标是将序列C和指标A进行直接拼接,拼接日期选取指标A中有值的年份的年末最后一天即12月31日,再与序列C的起始日期做拼接<br>
-			// 		7、新指标跟随指标B进行更新
-			// 	`],
-			// ]),
+			
 			searchOptions: [],
 			searchMonthOptions: [],
 			searchMonthConcatOptions:[],
 			unitArr,
 			menuOptions: [],
-			/* frequencyArr, */
 
 			search_page: 1,
 			search_have_more: false,

+ 1 - 9
src/views/dataEntry_manage/databaseComponents/openDialog.vue

@@ -130,15 +130,7 @@ export default {
 				levelVal:[
 					{ required: true, message: this.$t('EtaBasePage.input_menu_msg'), trigger: 'blur' },
 				],
-				// level_2:[
-				// 	{ required: true, message: '目录名称不能为空', trigger: 'blur' },
-				// ],
-				// level_3:[
-				// 	{ required: true, message: '目录名称不能为空', trigger: 'blur' },
-				// ],
-				// level_4:[
-				// 	{ required: true, message: '指标名称不能为空', trigger: 'blur' },
-				// ],
+			
 				level_menu:[
 					{ required: true, message: this.$t('Edb.Valids.menu_msg'), trigger: 'blur' },
 				],

+ 1 - 17
src/views/dataEntry_manage/databaseComponents/operationDialog.vue

@@ -521,29 +521,13 @@ export default {
 				children: 'Children',
 				checkStrictly: true
 			},
-			/* frequencyArr, */
-			/* fre_options: ['天','周','月','季','年'], */
-			/* moveTypeOpions: [
-				{
-					label: '领先',
-					key: 1
-				},
-				{
-					label: '滞后',
-					key: 2
-				},
-			], */
+
 			loading:false,
 			
 			search_have_more: false,
 			search_page: 1,
 			current_search: '',
 
-			/* calendarOptions: [
-				{label: '公历',key: 1},
-				{label: '农历',key: 2},
-			], */
-
 			sourceList: [],
 
 			hasNewValueOpt:true,//最新值处理的选项

+ 1 - 18
src/views/dataEntry_manage/databaseList.vue

@@ -1474,8 +1474,7 @@ export default {
 								this.computed_type = data.Source;
 								break
 						}
-						// this.computed_type = [23,24].includes(data.Source) ? 'joint' : data.Source;
-						// this.computed_type = [72,73].includes(data.Source)? 'alpha': data.Source;
+
 					}
 				})
 
@@ -1807,17 +1806,6 @@ export default {
 			const containerDom = document.getElementById('detail-container')
 			containerDom&&(containerDom.scrollTop = 0)
 			
-			 //滚动到高亮节点位置
-			/* this.$nextTick(()=>{
-				setTimeout(() => {
-					let node = document.getElementById(`node${this.select_node}`)||{}
-					let parent = document.getElementsByClassName('tree-cont')[0];
-					//console.log('滚动',node,parent);
-					if(node.offsetTop > parent.offsetHeight) {
-						parent.scrollTop =  node.offsetTop - parent.offsetHeight/2
-					}
-				},400)
-			}) */
 		},
 		// 查找树节点所有父节点
 		findParentNodeHandle(arr, id) {
@@ -2173,11 +2161,6 @@ export default {
 		},
 		changeTreeNode(){
 			this.$refs.menuTree.setCurrentKey(this.select_node);
-			// this.$nextTick(()=>{
-			// 	const _node = this.$refs.menuTree.getCurrentNode()
-			// 	this.dynamicNode = _node;
-			// 	this.dynamicNode&&this.resetNodeStyle(this.dynamicNode)
-			// })
 		},
 		//只看我的
 		onlyMeHandler(){

+ 3 - 68
src/views/dataEntry_manage/editChart.vue

@@ -34,20 +34,7 @@
 				>
 					<el-form-item :label="$t('EtaChartAddPage.label_chart_type')" prop="ChartType">
 						<chartTypeSelect v-model="chartInfo.ChartType" style="width:90%" @change="needWatch=true;"/>
-						<!-- <el-select
-							v-model="chartInfo.ChartType"
-							placeholder="请选择生成样式"
-							style="width: 90%"
-							@change="needWatch=true;"
-						>
-							<el-option
-								v-for="item in styleArr"
-								:key="item.key"
-								:label="item.label"
-								:value="item.key"
-							>
-							</el-option>
-						</el-select> -->
+					
 					</el-form-item>
 
 					<el-form-item :label="$t('EtaChartAddPage.label_chart_theme')" prop="Theme">
@@ -465,54 +452,7 @@
 								{{ chartInfo.ChartName }}
 							</h2>
 							<Chart :options="options" :chartInfo="chartInfo" ref="chartRef" />
-							<!-- <div class="range-cont left" v-if="leftIndex != -1">
-								<el-input
-									style="width: 60px; display: block"
-									size="mini"
-									type="number"
-									placeholder="上限"
-									v-model="tableData[leftIndex].MaxData"
-								/>
-								<el-input
-									class="min-data-input"
-									size="mini"
-									type="number"
-									placeholder="下限"
-									v-model="tableData[leftIndex].MinData"
-								/>
-							</div>
-							<div class="range-cont right" v-if="rightIndex != -1">
-								<el-input
-									style="width: 60px; display: block"
-									size="mini"
-									type="number"
-									placeholder="上限"
-									v-model="tableData[rightIndex].MaxData"
-								/>
-								<el-input
-									class="min-data-input"
-									size="mini"
-									type="number"
-									placeholder="下限"
-									v-model="tableData[rightIndex].MinData"
-								/>
-							</div>
-							<div class="range-cont rightTwo" v-if="rightTwoIndex != -1">
-								<el-input
-									style="width: 60px; display: block"
-									size="mini"
-									type="number"
-									placeholder="上限"
-									v-model="tableData[rightTwoIndex].MaxData"
-								/>
-								<el-input
-									class="min-data-input"
-									size="mini"
-									type="number"
-									placeholder="下限"
-									v-model="tableData[rightTwoIndex].MinData"
-								/>
-							</div> -->
+							
 							<!-- 需求:曲线图、堆积柱状图、组合图加入新指标时上下限自动调整 -->
 							<template v-if="![7,10,11].includes(chartInfo.ChartType)">
 								<div class="range-cont left" v-if="leftIndex !== -1">
@@ -952,11 +892,7 @@ export default {
     setDefaultPreviewOption(){
       if(this.chartInfo.ChartType==2){
 				this.count_year = this.chartInfo.StartYear
-				// if(!(this.chartInfo.SeasonEndDate && this.chartInfo.SeasonStartDate)){
-				// 	// 获取最近日期的年
-				// 	let latestYear = parseInt(this.latestDate.substring(0,4))
-				// 	this.season_year=[`${latestYear-this.count_year+1}-01-01`,`${latestYear}-12-31`]
-				// }
+				
         if(this.chartInfo.SeasonExtraConfig){
           this.SeasonExtraConfig = JSON.parse(this.chartInfo.SeasonExtraConfig)
 					// console.log(this.SeasonExtraConfig);
@@ -1107,7 +1043,6 @@ export default {
 					}
 					//如果是季节性图,在这里加上同期/右轴的参数
 					if(this.chartInfo.ChartType===2){
-						//const {MaxMinLimits={},SamePeriodAverage={},SamePeriodStandardDeviation={}} = this.chartInfo.SeasonAverageConfig||{}
 						const {SeasonRightConfig={}} = this.chartInfo
 						const tempData = _.cloneDeep(this.chartInfo.SeasonAverageConfig||{})
 						const {MaxMinLimits={},SamePeriodAverage={},SamePeriodStandardDeviation={}} = tempData||{}

+ 0 - 8
src/views/dataEntry_manage/mixins/chartPublic.js

@@ -1287,14 +1287,6 @@ export const chartSetMixin = {
         }
       }
     
-      // 目前指标限制死2个 为了简单 配置项直接关联第一个指标算了  自定义极值只在新增时用
-      //ETA1.5.8 增加数据转换功能,不用第一个指标了
-      /* if(!this.chartInfo.ChartInfoId) {
-        let maxYData = Math.max(...real_data.map(_ => _.y));
-        let minYData = Math.min(...real_data.map(_ => _.y));
-        newval[0].MaxData = maxYData;
-        newval[0].MinData = minYData;
-      } */
 
 
       //获取对应轴的上下限

+ 1 - 8
src/views/dataEntry_manage/onlineExcelCopy.vue

@@ -173,14 +173,7 @@ export default {
     }
   },
 created() {
-    // this.dataForm.firstClassify = parseInt(this.$route.query.parentClassifyId) || ''
-    // this.dataForm.secondClassify = parseInt(this.$route.query.ClassifyId) || ''
-    // this.dataForm.frequency = this.$route.query.Frequency || ''
-    // this.dataForm.tradeCode = this.$route.query.TradeCode || ''
-    // this.dataForm.tradeName = this.$route.query.TradeName || ''
-    // this.copyDataForm = JSON.parse(JSON.stringify(this.dataForm))
-    // // 字符串
-    // this.isEdit = this.$route.query.isEdit.toString()
+    
     this.initExcelOptions()
     // 监听折叠导航栏事件
     EventBus.$off('collapseHandle')

+ 5 - 74
src/views/dataEntry_manage/targetList.vue

@@ -1,17 +1,13 @@
 <template>
 	<div class="dataEntry-container2">
 		<div class="data-top-container">
-			<!-- <el-button type="primary" size="medium" style="marginRight:20px;" @click="insertData(1)">录入数据</el-button>
-			<el-button type="primary" size="medium" style="marginRight:20px;" @click="insertData(2)">新增指标</el-button>
-			<el-button type="primary" size="medium" style="marginRight:20px;" @click="handleImport">导入数据</el-button>
-			<el-button size="medium" @click="handleExport">导出数据</el-button> -->
 			<el-button 
 				v-permission="permissionBtn.dataSourcePermission.manualData_add"
         type="primary"
 				size="medium" 
 				@click="insertData(2)"
 			><!-- 新增指标 -->{{$t('ManualEdbListPage.add_edb_btn')}}</el-button>
-			<!-- <el-button type="primary" size="medium" @click="handleImport">导入新指标</el-button> -->
+
 			<el-input
 				:placeholder="$t('ManualEdbListPage.ph_search')"
 				v-model="search_txt"
@@ -191,36 +187,7 @@ export default {
 				value: "ClassifyId",
 				children: "Child"
 			},
-			/* frequencyList:[
-				{
-					value: '日度',
-					label: this.$t('Edb.FreAll.day'),
-				},
-				{
-					value: '周度',
-					label: this.$t('Edb.FreAll.week'),
-				},
-				{
-					value: '旬度',
-					label: this.$t('Edb.FreAll.dekad'),
-				},
-				{
-					value: '月度',
-					label: this.$t('Edb.FreAll.month'),
-				},
-				{
-					value: '季度',
-					label:  this.$t('Edb.FreAll.quarter'),
-				},
-				{
-					value: '半年度',
-					label:  this.$t('Edb.FreAll.month'),
-				},
-				{
-					value: '年度',
-					label:  this.$t('Edb.FreAll.year'),
-				}
-			], *///频度列表
+		
 			tableData: [],
 			total:1,//总条数
 			page_no:1,//当前页
@@ -363,19 +330,7 @@ export default {
 				ClassifyId:classify_id,
 				KeyWord: this.search_txt
 			}
-			// if(tab === 0) {
-				//获取数据表格
-				// this.isShowloadding = true;
-				// dataInterence.getDatalist(parmas).then(res => {
-				// 	// console.log(res)
-				// 	if(res.Ret === 200 && res.data.list) {
-				// 		this.tableData = res.data.list;
-				// 		this.total = parseInt(res.data.total_num);
-				// 	}
-				// 	this.isShowloadding = false;
-				// })
-			// }else {
-				// 获取指标表格
+		
 				this.isShowloadding = true;
 				dataInterence.targetList(parmas).then(res => {
 					if(res.Ret === 200 && res.Data.List) {
@@ -386,7 +341,6 @@ export default {
 					}
 					this.isShowloadding = false;
 				})
-			// }
 		},
 		// 获取分类
 		getClassify() {
@@ -448,57 +402,34 @@ export default {
 		handleCurrentChange(page) {
 			// console.log(e)
 			this.page_no = page;
-			// if(this.tab_act === 0) {
-			// 	this.getTableData();
-			// }else {
 				this.getTableData(1);
-			// }
 		},
 		// 页数改变
 		handleSizeChange(size) {
 			this.pageSize = size;
-			// if(this.tab_act === 0) {
-			// 	this.getTableData();
-			// }else {
 				this.getTableData(1);
-			// }
 		},
 		// 日期改变
 		dateChange() {
-			// if(this.tab_act === 0) {
-			// 	this.getTableData();
-			// }else {
 				this.page_no = 1;//当前页
 				this.getTableData(1);
-			// }
 		},
 		// 筛选分类改变
 		classifyChange(e) {
-			// console.log(this.classify_id,e)
-			// if(this.tab_act === 0) {
-			// 	this.getTableData();
-			// }else {
 				this.page_no = 1;//当前页
 				this.getTableData(1);
-			// }
 		},
 		// 频度改变
 		frequencyChange() {
-			// if(this.tab_act === 0) {
-			// 	this.getTableData();
-			// }else {
+
 				this.page_no = 1;//当前页
 				this.getTableData(1);
-			// }
 		},
 		// 关键字搜索
 		searchHandle() {
-			// if(this.tab_act === 0) {
-			// 	this.getTableData();
-			// }else {
+
 				this.page_no = 1;//当前页
 				this.getTableData(1);
-			// }
 		},
 		// 新增成功
 		addOver(type) {

+ 0 - 5
src/views/dataEntry_manage/thirdBase/DatabankBase.vue

@@ -2,11 +2,6 @@
     <!-- 数据宝页面 -->
     <div class="data-bank-base-wrap">
         <div class="select-box">
-            <!-- <el-radio-group v-model="choosedSource" size="medium" @input="handleCurrentChange(1)">
-                <el-radio-button v-for="source in sourceList" 
-                    :key="source.EdbSourceId" 
-                    :label="source.EdbSourceId">{{source.SourceName}}</el-radio-button>
-            </el-radio-group> -->
             <el-select v-model="choosedSource">
                 <el-option v-for="source in sourceList" 
                 :key="source.EdbSourceId"

+ 3 - 21
src/views/dataEntry_manage/thirdBase/UNdata.vue

@@ -11,20 +11,13 @@
       style="margin: 0 0 10px 30px;" clearable>
         <el-option :label="item.label" :value="item.id" v-for="item in flowToData" :key="item.id" ></el-option>
       </el-select>
-      <!-- <el-select v-model="searchParams.exportCountry" placeholder="请选择报告国" filterable clearable
-      style="width: 286px;margin: 0 0 10px 30px;" multiple collapse-tags @change="(value)=>changeCountry(value,'exportCountry')">
-        <el-option :label="item.ThirdId==0?item.Name:item.NameCn" :value="item.ThirdId" v-for="item in countryData" :key="item.code"></el-option>  
-      </el-select> -->
+     
       <el-select v-model="searchParams.ReporterCode" :placeholder="$t('UnDataPage.ph_reportCode')" filterable clearable
       style="width: 286px;margin: 0 0 10px 30px;" @change="searchList">
         <el-option :label="item.ThirdId==0?item.Name:item.NameCn" :value="item.ThirdId" 
         v-for="item in [...this.countryData.slice(0,1),...this.countryData.slice(2)]" :key="item.code"></el-option>  
       </el-select>
-      <!-- <el-select v-model="searchParams.importCountry" placeholder="请选择对手国" filterable clearable
-      style="width: 286px;margin: 0 0 10px 30px;" multiple collapse-tags @change="(value)=>changeCountry(value,'importCountry')">
-        <el-option :label="item.NameCn" :value="item.ThirdId" 
-        v-for="item in [...this.countryData.slice(0,1),...this.countryData.slice(2)]" :key="item.code"></el-option>  
-      </el-select> -->
+     
       <el-select v-model="searchParams.PartnerCode" :placeholder="$t('UnDataPage.ph_partcode')" filterable clearable
       style="width: 286px;margin: 0 0 10px 30px;" @change="searchList">
         <el-option :label="item.NameCn" :value="item.ThirdId" 
@@ -167,18 +160,7 @@ import { dataInterence } from "@/api/api.js";
       }
     },
     methods: {
-      // changeCountry(value,props){
-      //   console.log(value,props);
-      //   // 全部 是单选 其他是多选
-      //   if(value[value.length-1]==-1){
-      //     // 最后一个是全部 有其他选项是点击全部
-      //     this.searchParams[props]=[-1]
-      //   }else if(value[0]==-1){
-      //     // 第一个是全部 点击全部之后再点击其他选项
-      //     this.searchParams[props]=value.slice(1)
-      //   }
-      //   this.searchList()
-      // },
+
       //获取UN数据列表
       getList(){
         this.tableLoading = true

+ 1 - 13
src/views/dataEntry_manage/thirdBase/chinaFinancialFutures.vue

@@ -52,19 +52,7 @@
                           </td>
                       </tr>
                   </tbody>
-                  <!-- <tfoot>
-                      <tr>
-                          <td v-for="(val,key) in labelArr" :key="val">
-                                {{
-                                    val === "名次"
-                                        ? "合计"
-                                        : val === "会员简称" || val === "指标ID"
-                                        ? ""
-                                        : handleValCount(item.Item,key)
-                                }}
-                          </td>
-                      </tr>
-                  </tfoot> -->
+               
               </table>
             </div>
             <div class="empty-wrap" v-else>

+ 0 - 5
src/views/dataEntry_manage/thirdBase/components/batchAddToEdbDialog.vue

@@ -75,11 +75,6 @@
           <template
             slot="header"
             slot-scope="scope"
-            style="
-              display: flex;
-              align-items: center;
-              justify-content: space-between;
-            "
           >
             <el-radio-group
               v-model="classifyType"

+ 0 - 1
src/views/dataEntry_manage/thirdBase/components/batchEditIndexDia.vue

@@ -114,7 +114,6 @@ export default {
       if(!nval) return
 
       this.classifyOpt = _.cloneDeep(this.classifyList)
-      // this.filterNodes(this.classifyOpt)
 
       console.log(this.list)
       this.tableData = this.list.map(_=>({

+ 1 - 32
src/views/dataEntry_manage/thirdBase/components/batchFwAddIndicsDia.vue

@@ -331,41 +331,10 @@ export default {
                     return this.showHintDialog('all',edbList)
                 }
                 this.batchAddEdb(edbList,beforeAddList)
-                // //剩余指标进行重名校验
-                // this.batchNameCheck(afterAddList,beforeAddList)
             })
             
         },
-        //重名检测
-        // batchNameCheck(afterAddList,beforeAddList){
-        //     const indexCodeList = beforeAddList.map(i=>i.IndexCode)
-        //     let checkList = []
-        //     indexCodeList.forEach(i=>{
-        //         const item = this.selectEdbList.find(s=>s.edbId===i)
-        //         item&&checkList.push(item)
-        //     })
-        //     fwmtInterface.batchCheckEdbName(checkList.map(i=>{
-        //         return {
-        //             EdbCode:i.edbId,
-        //             EdbName:i.edbName,
-        //             Frequency:i.frequency
-        //         }
-        //     })).then(res=>{
-        //         if(res.Ret!==200) return (this.btnloading=false)
-        //         const checkedList = res.Data.filter(i=>i.Exist)
-        //         if(checkedList.length){
-        //             checkedList.forEach(i=>{
-        //                 const item = this.selectEdbList.find(s=>s.edbId===i.EdbCode)
-        //                 item&&(item.isHighlight = true)
-        //             })
-        //             return this.$message.warning(/* '部分指标名称已存在,请重新填写' */this.$t('SteelChemicalPage.batch_add_hint2'))&&(this.btnloading=false)
-        //         }else{
-        //             //通过重名校验后添加进指标库
-        //             this.batchAddEdb(afterAddList,checkList)
-        //         }
-        //     })
-            
-        // },
+      
         checkEdbData(edbData){
             return edbData.edbName&&edbData.frequency&&edbData.unit&&(this.classifyType===1?edbData.classify:true)
         },

+ 2 - 63
src/views/dataEntry_manage/thirdBase/components/targetDialog.vue

@@ -49,55 +49,7 @@
               :disabled="edbForm.edb_id"
             />
           </el-form-item>
-          <!-- <el-form-item>
-            <template slot="label">
-              <span>
-                更新频度
-                <el-tooltip
-                  effect="dark"
-                  content="非必填,未选择更新频度时按照日度刷新的规则定时更新指标"
-                  placement="top"
-                >
-                  <i class="el-icon-question" />
-                </el-tooltip>
-              </span>
-            </template>
-            <div>
-              <el-select
-                v-model="formData.frequency"
-                placeholder="请选择频度"
-                clearable
-                style="width: 45%"
-              >
-                <el-option
-                  v-for="item in frequencyArr"
-                  :key="item"
-                  :label="item"
-                  :value="item"
-                >
-                </el-option>
-              </el-select>
-              <el-select
-                v-model="formData.update_time"
-                placeholder="请选择时间"
-                multiple
-                clearable
-                style="width: 45%"
-              >
-                <el-option
-                  v-for="item in timeArr"
-                  :key="item"
-                  :label="item"
-                  :value="item"
-                  :disabled="
-                    formData.update_time.length > 1 &&
-                    !formData.update_time.includes(item)
-                  "
-                >
-                </el-option>
-              </el-select>
-            </div>
-          </el-form-item> -->
+          
         </el-form>
       </div>
       <div class="dia-bot">
@@ -148,19 +100,7 @@ export default {
     currentLang() {
       return this.$store.state.lang;
     },
-    // timeArr() {
-    //   //30间隔的时间数组
-    //   const timeArrays = new Array(48).fill("").map((item, index) => {
-    //     let time_val = index * 30;
-    //     let hour = Math.floor(time_val / 60);
-    //     let min = time_val % 60;
-    //     let time =
-    //       (hour < 10 ? "0" + hour : hour) + ":" + (min === 0 ? "00" : min);
-
-    //     return time;
-    //   });
-    //   return timeArrays;
-    // },
+   
   },
   data() {
     return {
@@ -180,7 +120,6 @@ export default {
           { required: true, message: /* "指标ID不能为空" */this.$t('SteelChemicalPage.ph_edbid'), trigger: "blur" },
         ],
       },
-      // frequencyArr: ["周一", "周二", "周三", "周四", "周五", "周六", "周日"],
     };
   },
   methods: {

+ 1 - 13
src/views/dataEntry_manage/thirdBase/dlExchangeData.vue

@@ -42,19 +42,7 @@
                             <td v-for="(val,key) in labelArr" :key="key">{{item.Rank==999&&key=='Rank'?'合计':item[key]}}</td>
                         </tr>
                     </tbody>
-                    <!-- <tfoot>
-                        <tr>
-                            <td v-for="(val,key) in labelArr" :key="key">
-                                {{
-                                    val === "名次"
-                                        ? "合计"
-                                        : val === "会员简称" || val === "指标ID"
-                                        ? ""
-                                        : handleValCount(key)
-                                }}
-                            </td>
-                        </tr>
-                    </tfoot> -->
+                   
                 </table>
             </div>
             <div class="empty-wrap" style="height:90%" v-else>

+ 1 - 39
src/views/dataEntry_manage/thirdBase/lzTargetbase.vue

@@ -118,14 +118,7 @@ export default {
       select_classify: "",
       classifyList: [],
       select_frequency: "",
-      /* frequencyType: new Map([
-        [1, "日度"],
-        [2, "周度"],
-        [3, "月度"],
-        [4, "季度"],
-        [5, "年度"],
-        [99, "无固定频率"],
-      ]), */
+
       frequencyList: [],
       tableOption: [],
       dateArr: [], //最长的日期数组
@@ -188,37 +181,6 @@ export default {
           if (res.Ret !== 200) return;
           // 设置表格数据
           this.setDataList(res.Data);
-          // this.tableOption = res.Data;
-          // /* 不满6个追加6个空的显示一排 别问 问就是为了美观  */
-          // if(res.Data.length < 6) for( let i = 0; i < 6;i++ ) {
-          // 	this.tableOption.push({
-          // 		DataList:[]
-          // 	})
-          // 	if(this.tableOption.length >= 6) break;
-          // }
-          // // 找出所有指标中数据的日期做多的那个 拆出日期数组 用来遍历表格行 ---错误逻辑
-          // // 合并所有指标中的日期 作为日期数组
-          // let arr = res.Data.map((item) => {
-          // 	return item.DataList;
-          // });
-          // // let obj = arr.sort((a, b) => b.length - a.length)[0];
-          // // console.log(arr,obj)
-          // // this.dateArr = obj.map((item) => item.DataTime);
-          // // let obj = arr.map((item) => item.DataTime);
-          // let obj = [];
-          // for(let i of arr) {
-          // 	for(let j of i) {
-          // 		obj.push(j.DataTime)
-          // 	}
-          // }
-          // let arr2 = [...new Set(obj)].sort().reverse()
-          // this.dateArr = arr2;
-
-          // //数据最大长度小于12个 追加数据满12个 别问 问就是为了美观
-          // if(this.dateArr.length < 12) for( let i = 0; i < 12;i++ ) {
-          // 	this.dateArr.push('')
-          // 	if(this.dateArr.length >= 12) break;
-          // }
 
           this.$nextTick(() => {
             this.initWidth();

+ 0 - 13
src/views/dataEntry_manage/thirdBase/shEnergy.vue

@@ -48,19 +48,6 @@
                           </td>
                       </tr>
                   </tbody>
-                  <!-- <tfoot>
-                      <tr>
-                          <td v-for="(val,key) in labelArr" :key="val">
-                                {{
-                                    val === "名次"
-                                        ? "合计"
-                                        : val === "会员简称" || val === "指标ID"
-                                        ? ""
-                                        : handleValCount(item.Item,key)
-                                }}
-                          </td>
-                      </tr>
-                  </tfoot> -->
               </table>
             </div>
             <div class="empty-wrap" v-else>

+ 0 - 11
src/views/dataEntry_manage/thirdBase/shFutures.vue

@@ -66,17 +66,6 @@
                                 {{item3.Rank==999&&key=='Rank'?$t('SqEnergyPage.col_total'):item3[key]}}
                             </td>
                         </tr>
-                        <!-- <tr>
-                            <td v-for="(val, key) in labelArr" :key="val">
-                                {{
-                                    val === "名次"
-                                        ? "合计"
-                                        : val === "会员简称" || val === "指标ID"
-                                        ? ""
-                                        : handleValCount(item2.Item, key)
-                                }}
-                            </td>
-                        </tr> -->
                     </tbody>
                 </table>
             </div>

+ 5 - 60
src/views/dataEntry_manage/thirdBase/ysTargetBase.vue

@@ -20,13 +20,7 @@
         </el-select>
         <el-input v-model="searchParams.Keyword" :placeholder="$t('Edb.InputHolderAll.input_name_orid')"  class="search-item" clearable 
         @blur="searchListDelay(!keyWordChanged)" @keyup.enter.native="searchListDelay(!keyWordChanged)" @clear="searchList"></el-input>
-        <!-- <el-select v-model="edbCheckList" multiple filterable remote clearable collapse-tags class="search-item edb-filter"
-          reserve-keyword placeholder="指标ID/指标名称" :remote-method="remoteMethod" 
-          v-loadMore="searchLoad" @clear="searchList" @remove-tag="removeEdbFilterTag" ref="edbFilterRef" >
-          <el-option v-for="item in edbFilterDataList" :key="item.IndexCode"
-            :label="item.IndexName" :value="item.IndexCode">
-          </el-option>
-        </el-select> -->
+       
         <el-checkbox :label="$t('YsDataPage.label_all_check')" v-model="isCheckAll" :indeterminate="isCheckIndeterminate" style="margin: 0 20px 10px 0;"
         @change="listCheckAllChange"></el-checkbox>
       </div>
@@ -223,17 +217,7 @@ import {frequencySelectList} from '@/utils/defaultOptions';
           {value:'ceased',label:this.$t('YsDataPage.col_status_close')},
           {value:'irregular',label:this.$t('YsDataPage.col_status_irr')}
         ],
-        // forSearchParams:{
-        //   Keyword:'',
-        //   CurrentIndex:1,
-        //   PageSize:20,
-        // },
-        // searchHaveMore: false,
-        // edbFilterDataList:[],
-        // 选择的指标名称筛选项
-        // edbCheckList:[],
-        // edb的过滤选项是否有变化,用于失焦是判断是否需要请求
-        // hasEdbFilterChange:false,
+        
         selectionReactCancel:false, // 是否不触发 selection的逻辑
         tableData:[],
         tableDataIds:[],
@@ -310,13 +294,7 @@ import {frequencySelectList} from '@/utils/defaultOptions';
       this.getYsClassifyList()
     },
     mounted(){
-      // el-select 的@blur绑定事件不生效代替方法
-      // this.$refs.edbFilterRef.$refs.input.blur=()=>{
-      //   if(this.hasEdbFilterChange){
-      //     this.searchList()
-      //     this.hasEdbFilterChange=false
-      //   }
-      // }
+     
     },
     methods: {
       //获取有色数据库数据列表
@@ -324,11 +302,7 @@ import {frequencySelectList} from '@/utils/defaultOptions';
         // return 
         // 无权限查看
         if(!this.isCanView) return 
-        // if(this.edbCheckList && this.edbCheckList.length>0){
-        //   this.searchParams.IndexCodes = this.edbCheckList.join(',')
-        // }else{
-        //   this.searchParams.IndexCodes = ''
-        // }
+     
         this.searchParams.Keyword = this.searchParams.Keyword.trim()
         this.listLoading=true
 
@@ -374,36 +348,7 @@ import {frequencySelectList} from '@/utils/defaultOptions';
         })
 
       },
-      // // 指标名称的远程搜索方法
-      // remoteMethod(text){
-      //   this.forSearchParams.Keyword = text.trim()
-      //   this.forSearchParams.CurrentIndex = 1;
-      //   if(this.forSearchParams.Keyword){
-      //     this.searchApi()
-      //   }else{
-      //     this.edbFilterDataList = [];
-      //   }
-      // },
-      // searchApi(){
-      //   // 无权限查看
-      //   if(!this.isCanView) return 
-      //   smmDataInterface.getYsDataList(this.forSearchParams).then(res=>{
-      //     if(res.Ret == 200){
-      //       let arr=res.Data.List || []
-      //       let {Paging}=res.Data
-      //       this.searchHaveMore = this.forSearchParams.CurrentIndex < Paging.Pages;
-      //       this.edbFilterDataList = this.forSearchParams.CurrentIndex === 1 ? arr : this.edbFilterDataList.concat(arr);
-      //     }
-      //   })
-      // },
-      // searchLoad(){
-      //   if(!this.searchHaveMore) return;
-      //   this.forSearchParams.CurrentIndex++
-			//   this.searchApi();
-      // },
-	    // removeEdbFilterTag: _.throttle(function() {
-      //   this.searchList()
-		  // },1000),
+     
       // watch回调是异步的 延迟执行搜索 
       searchListDelay(cancel){
         if(cancel+'' == 'true') return 

+ 1 - 13
src/views/dataEntry_manage/thirdBase/zzExchangeData.vue

@@ -42,19 +42,7 @@
                             <td v-for="(val,key) in labelArr" :key="key">{{item.Rank==999&&key=='Rank'?$t('SqEnergyPage.col_total'):item[key]}}</td>
                         </tr>
                     </tbody>
-                    <!-- <tfoot>
-                        <tr>
-                            <td v-for="(val,key) in labelArr" :key="key">
-                                {{
-                                    val === "名次"
-                                        ? "合计"
-                                        : val === "会员简称" || val === "指标ID"
-                                        ? ""
-                                        : handleValCount(key)
-                                }}
-                            </td>
-                        </tr>
-                    </tfoot> -->
+                   
                 </table>
             </div>
             <div class="empty-wrap" v-else>

+ 0 - 39
src/views/dataSource_manage/accountList.vue

@@ -114,45 +114,6 @@ export default {
     data() {
         return {
             tableData:[],
-            // tableColOpts:[
-            //     {
-            //         name:'终端编码',
-            //         key:'TerminalCode',
-            //     },
-            //     {
-            //         name:'终端名称',
-            //         key:'Name',
-            //     },
-            //     {
-            //         name:'文件夹路径',
-            //         key:'DirPath',
-            //     },
-            //     {
-            //         name:'终端地址',
-            //         key:'ServerUrl',
-            //     },
-            //     {
-            //         name:'终端token',
-            //         key:'Value',
-            //     },
-            //     {
-            //         name:'数据源类型',
-            //         key:'Source',
-            //     },
-            //     {
-            //         name:'状态',
-            //         key:'Status',
-            //     },
-            //     {
-            //         name:'指标数据量',
-            //         key:'Num',
-            //     },
-            //     {
-            //         name:'更新时间',
-            //         key:'ModifyTime',
-            //         sortable:true
-            //     },
-            // ],
 
             showEditAccount:false,
             activeTermId:0,

+ 0 - 2
src/views/dataSource_manage/components/DetailTable.vue

@@ -131,7 +131,6 @@
 
 <script>
 import {apiDataSource} from '@/api/modules/dataSource'
-/* import {frequencyOpt} from '../utils/config' */
 import SetTableCols from './SetTableCols.vue'
 import { departInterence } from "@/api/api.js";
 import {frequencySelectList} from '@/utils/defaultOptions';
@@ -140,7 +139,6 @@ export default {
     data() {
         return {
             tipsKeysArr:['EdbNameSource','DataUpdateTime','ErDataUpdateDate','NeedRefresh','HasRefresh','UpdateTime'],
-            /* frequencyOpt, */
             terminalCodeOpts:[],
             sysUserOpts:[],
             props: {

+ 0 - 15
src/views/dataSource_manage/components/EDBInfoChangeTable.vue

@@ -110,20 +110,6 @@ export default {
                 sortType:'',
                 changeType:''
             },
-            // changeTypeOpt:[
-            //     {
-            //         label:'基础信息变更',
-            //         value:1,
-            //     },
-            //     {
-            //         label:'数据明细变更',
-            //         value:0,
-            //     },
-            //     {
-            //         label:'新增指标',
-            //         value:2,
-            //     }
-            // ],
 
             showSetTableCols:false,
         }
@@ -172,7 +158,6 @@ export default {
                     const arr=res.Data.List||[]
                     this.tableColOpts=arr.filter(item=>item.IsShow===1)
                     this.$nextTick(()=>{
-                        // this.$refs.tableIns.doLayout()
                         this.tableLoading=false
                     })
                     this.getTableList()

+ 2 - 43
src/views/dataSource_manage/components/GLRefreshFailDetail.vue

@@ -67,11 +67,7 @@
             width="500px"
         > 
             <div style="padding-bottom:30px;line-height:2;color:#333" :v-html="$t('DataReportManage.GlStatisticTable.reason_html')">
-                <!-- <div>1、在钢联终端上,用指标编码查询下是否存在该指标,避免因为指标编码变更的原因导致刷新失败。</div>
-                <div>2、核实钢联终端账号处于登录状态。</div>
-                <div>3、打开Excel,如果“钢联数据2.0”插件不存在,则需要先退出所有Excel和WPS,在钢联终端:最上面的导航栏选择工具->Excel插件修复->点击一键修复,完成钢联数据2.0插件安装。</div>
-                <div>4、打开Excel,选中“钢联数据2.0”插件,查看登录状态是否正常。</div>
-                <div>5、打开文件目录下的一个Excel,选中“钢联数据2.0”插件,点击“更新所有页”按钮后,等待十几秒,查看Excel左下角是否提示额度超限。</div> -->
+               
             </div>
         </el-dialog>
 
@@ -200,44 +196,7 @@ export default {
 
             showEDBList:false,
             edbList:[],
-            // edbListTableCol:[
-            //     {
-            //         label:'指标全称',
-            //         key:'EdbName'
-            //     },
-            //     {
-            //         label:'指标编码',
-            //         key:'EdbCode'
-            //     },
-            //     {
-            //         label:'起始时间',
-            //         key:'StartDate'
-            //     },
-            //     {
-            //         label:'最新日期',
-            //         key:'LatestDate'
-            //     },
-            //     {
-            //         label:'最新值',
-            //         key:'LatestValue'
-            //     },
-            //     {
-            //         label:'终端编码',
-            //         key:'TerminalCode'
-            //     },
-            //     {
-            //         label:'创建人',
-            //         key:'SysUserRealName'
-            //     },
-            //     {
-            //         label:'频度',
-            //         key:'Frequency'
-            //     },
-            //     {
-            //         label:'单位',
-            //         key:'Unit'
-            //     },
-            // ],
+    
             activeFrequency:'',
             activeReason:'',
             page:1,

+ 0 - 6
src/views/dataSource_manage/dataSourceListGL.vue

@@ -52,12 +52,6 @@ export default {
     },
     data() {
         return {
-            // navOpt:[
-            //     {name:'数据源明细表',key:'DetailTable'},
-            //     {name:'数据源统计表',key:'StatisticTable'},
-            //     {name:'删除指标表',key:'DelEDBTable'},
-            //     {name:'指标信息变更表',key:'EDBInfoChangeTable'}
-            // ],
             activeNav:'DetailTable',
             time:this.$moment().format('YYYY-MM-DD')||''
         }

+ 0 - 12
src/views/datasheet_manage/addSheet.vue

@@ -90,7 +90,6 @@ export default {
   },
   computed:{
     hasPermission(){
-      // console.log(this.sheetButton,'sheetButton');
       return this.sheetButton?
             this.permissionBtn.isShowBtn('etaTablePermission','etaTable_excel_save')&&this.sheetButton.OpButton:
             this.permissionBtn.isShowBtn('etaTablePermission','etaTable_excel_save')
@@ -99,7 +98,6 @@ export default {
   methods: {
 
     backHandle() {
-      // window.close();
       this.$router.back()
     },
 
@@ -239,16 +237,6 @@ export default {
         this.cancelAutoSave=true
       }
 
-
-      // const { ExcelInfoId, UniqueCode } = res.Data;
-      
-      // this.$router.replace({
-      //   path: '/sheetList',
-      //   query: {
-      //     code: UniqueCode,
-      //     id: ExcelInfoId
-      //   }
-      // })
     },300),
     markFinishStatus(){
       if((!this.sheetId) || (!this.isCanEdit)) return

+ 0 - 4
src/views/datasheet_manage/balanceSheetEdit.vue

@@ -83,7 +83,6 @@
         >
         </span>
         <div>
-          <!-- {{ $t("OnlineExcelPage.table_explaination_text") }} -->
           <el-tooltip effect="dark">
             <div
               slot="content"
@@ -101,7 +100,6 @@
         >
         <!-- 预览页面操作按钮 -->
         <template v-if="isView">
-          <!-- <div> -->
           <span
             class="editsty"
             @click="itemHandle(excelInfo, 'edit')"
@@ -137,9 +135,7 @@
             v-if="isSheetBtnShow('del')&&excelInfo.Button&&excelInfo.Button.DeleteButton"
             >{{ $t("Table.delete_btn") }}</span
           >
-          <!-- </div> -->
         </template>
-        <!-- icon="el-icon-refresh-right" -->
         <el-button
           type="primary"
           size="medium"

+ 1 - 8
src/views/datasheet_manage/common/option.js

@@ -44,14 +44,7 @@ export function initSheet(container,options={},sheetInfo={},limit,callbackItems)
           return false
         }
       },
-      // rangeCopyBefore:(range,data)=>{
-      //   // 不触发
-      //   console.log(range,data,'range,data','rangeCopyBefore');
-      // },
-      // rangeCopyAfter:(range,data)=>{
-      //   // 不触发
-      //   console.log(range,data,'range,data','rangeCopyAfter');
-      // },
+      
       updated: (a,b,c,d,e)=> {
         /**
          * lucksheet 本身没有完美的禁止用户编辑的功能,只能自己控制了,用户操作后撤销,用户撤销后重做

+ 0 - 2
src/views/datasheet_manage/components/BalanceAddChart.vue

@@ -723,8 +723,6 @@ export default {
         minData=Math.min(...numArr)
       }
 
-      // console.log(numArr);
-      // console.log(minData,maxData);
       return{
         valueArr,
         maxData,

+ 1 - 8
src/views/datasheet_manage/components/BalanceSheetChartItem.vue

@@ -14,8 +14,7 @@
             <span v-if="JSON.parse(chartInfo.SourcesFrom).isShow">{{$t('Chart.Detail.source')}}:{{ JSON.parse(chartInfo.SourcesFrom).text}}</span>
             <span></span>
             <div>
-                <!-- 加入我的图库 -->
-                <!-- <span class="btn-o" @click="handleAddMyChart" v-if="!isStaticTable">{{$t('Chart.chart_addmy_btn')}}</span> -->
+                
                 <!-- 编辑 -->
                 <span class="btn-o" v-if="!disabled" @click="handleEditChart">{{$t('Chart.chart_edit_btn')}}</span>
                 <!-- 删除 -->
@@ -119,12 +118,6 @@ export default {
             });
             let form = new FormData();
             form.append('Img', svg);
-            // let { Data } = await dataBaseInterface.uploadImgSvg(form);
-
-            // await dataBaseInterface.setChartImage({
-            //     ChartInfoId: this.chartInfo.ChartInfoId,
-            //     ImageUrl: Data.ResourceUrl,
-            // });
             form.append('ChartInfoId',this.chartInfo.ChartInfoId)
             await dataBaseInterface.setChartThumbnail(form)
         },

+ 2 - 33
src/views/datasheet_manage/components/BalanceTable.vue

@@ -20,7 +20,6 @@
           @change="updateValueByFormula"
         />
       </div>
-      <!-- startSelectTable?'text-select-disabled111':'' -->
       <div class="table-content-wrap">
         <div class="left-wrap">
           <div style="padding:20px;background-color: #fff;" @mouseleave="endSelection">
@@ -188,10 +187,6 @@
                         }
                       "
                     >
-                      <!-- @select="selectTarget($event,cell)"
-                  @click="clickCell($event, cell)"
-                :highlight-first-item="cell.DataType===2"
-                 -->
                       <template slot-scope="scope">
                         <edbDetailPopover :info="scope.item">
                           <div
@@ -690,8 +685,6 @@ export default {
       if(!this.isShowAddChart) return
       if(this.disabled) return
       console.log('结束选择');
-      // console.log(this.selectedCells);
-      // console.log(this.selectionStart,this.selectionEnd);
       if(this.selectionStart){
         // 找到当前sheet 数据
         const sobj=this.sheetOpts.filter(_e=>_e.ExcelInfoId===this.activeSheetId)[0]
@@ -876,23 +869,10 @@ export default {
       }
 
       if(res.Ret !== 200)  return
-      // this.isCanEdit = res.Data.CanEdit
-      // if(!res.Data.CanEdit){
-      //   this.$message.warning(`${res.Data.Editor}${this.$t('OnlineExcelPage.currently_editing_msg') }`)
-      //   setTimeout(()=>{
-      //     this.backHandle()
-      //   },2000)
-      //   return 
-      // }
+     
 
       const { ExcelName,ExcelClassifyId,TableData,ModifyTime,Button } = res.Data;
-      // this.sheetButton=Button
-      // this.sheetForm.name=ExcelName
-      // this.sheetForm.classify=ExcelClassifyId
-
-      // this.$nextTick(()=>{
-      //   this.sheetInit=true
-      // })
+     
       this.updateTime =  this.$moment(ModifyTime).format('YYYY-MM-DD HH:mm:ss')
       this.initData(TableData);
 
@@ -1328,7 +1308,6 @@ export default {
       if(res.Ret !==200) return
 
       //现在日期无值也不清除关系了
-      // !res.Data && this.clearInsertCell(relation.key);
       
       this.config.data.forEach(row => {
         row.forEach(cell => {
@@ -1536,7 +1515,6 @@ export default {
         'insert-value': this.insertValue,//插入值
         'choose-target': this.selectTargetOpen,//选择指标插入值
         'insert-date': this.insertDateOpen,//导入系统日期
-        // 'insert-edb-date': this.insertDateOpen,//导入指标日期
         'insert-date-calculate': this.insertDateCalculateOpen,//日期计算弹窗
         'reset': this.clearCell, //清空
         'cell-edit': this.selectCell ? editHandlesMap[this.selectCell.DataType] : null,
@@ -2075,8 +2053,6 @@ export default {
         e.target.nodeName && e.target.blur();
         this.$refs[`inputRef${e.target.dataset.key}`] && this.$refs[`inputRef${e.target.dataset.key}`][0].close()
 
-        // cell.DataType===6 && this.$set(cell,'CanEdit',false)
-        // this.$set(cell,'CanEdit',false)
       }
     },
 
@@ -2111,13 +2087,6 @@ export default {
       }
     },
 
-    /* 改变单元格显示文本 */
-    // updateCellStyle({ ShowStyle, ShowFormatValue }) {
-
-    //   this.$set(this.selectCell, 'ShowStyle', ShowStyle)
-    //   this.$set(this.selectCell, 'ShowFormatValue', ShowFormatValue)
-    // },
-
     // ==================================================合并单元格
     // 选区开始
     selectCellHandle(e) {

+ 1 - 26
src/views/datasheet_manage/components/MixedTable.vue

@@ -612,24 +612,6 @@ export default {
 
     },
 
-    /* 选择指标 单元格类型为2 已经是指标单元格了就重置单元格 否则就视为选择指标*/
-    // selectTarget(e,cell) {
-    //   const { EdbName,EdbInfoId }  = e;
-
-    //   //如果已经是指标单元格了再次点击就清空
-    //   if(cell.DataType===2&&cell.EdbInfoId) {
-    //     this.clearCell()
-    //   }else {
-    //     cell.DataType = 2;
-    //     cell.DataTime = '';
-    //     cell.ShowValue = EdbName;
-    //     cell.Value = EdbName;
-    //     cell.EdbInfoId = EdbInfoId;
-    //   }
-
-    //   this.checkCellRelation(cell)
-    // },
-
     /* 输入框失焦 设置单元格类型 处理关联关系 */
     async changeVal(e, cell) {
       // 是日期格式 DataType为1
@@ -976,7 +958,6 @@ export default {
         'insert-value': this.insertValue,//插入值
         'choose-target': this.selectTargetOpen,//选择指标插入值
         'insert-date': this.insertDateOpen,//导入系统日期
-        // 'insert-edb-date': this.insertDateOpen,//导入指标日期
         'insert-date-calculate': this.insertDateCalculateOpen,//日期计算弹窗
         'reset': this.clearCell, //清空
         'cell-edit': this.selectCell ? editHandlesMap[this.selectCell.DataType] : null,
@@ -1518,8 +1499,6 @@ export default {
         e.target.nodeName && e.target.blur();
         this.$refs[`inputRef${e.target.dataset.key}`]&&this.$refs[`inputRef${e.target.dataset.key}`][0].close()
 
-        // cell.DataType===6 && this.$set(cell,'CanEdit',false)
-        // this.$set(cell,'CanEdit',false)
       }
     },
 
@@ -1554,11 +1533,7 @@ export default {
       }
     },
 
-    // /* 改变单元格显示文本 */
-    // updateCellStyle({ShowStyle,ShowFormatValue}) {
-    //   this.$set(this.selectCell,'ShowStyle',ShowStyle)
-    //   this.$set(this.selectCell,'ShowFormatValue',ShowFormatValue)
-    // },
+
     // 更新数据来源
     updateSourceFrom(source){
       if(!source) return

+ 0 - 15
src/views/datasheet_manage/components/SheetExcel.vue

@@ -51,21 +51,6 @@ export default {
         return false
       }
     },
-    // 原本用于复制时,可以粘贴到腾讯文档中。后由于官方版本更新,修复了这个问题
-    // copyData() {
-    //   let rangeArr = luckysheet.getRangeValue();
-    //   console.log(rangeArr)
-    //   let str = ''
-    //   rangeArr.forEach((item,r_index) => {
-    //     let row = ''
-    //     item.forEach((cell,index) => {
-    //       row+= `${index!==0?'\t':''}${cell?(cell.m||this.getCellContent(cell.ct.s)):''}`
-    //     })
-    //     str+= r_index===rangeArr.length-1 ? row : `${row}\n`
-    //   });
-      
-    //   copyFit(str)
-    // },
 
     // 单元格内的文字分段
     getCellContent(arr) {

+ 0 - 18
src/views/datasheet_manage/components/calculateEdbDia.vue

@@ -195,23 +195,6 @@
           </ul>
         </section>
 
-        <!-- 计算结果 -->
-        <!-- <section class="result-section" v-if="showResult">
-          <label>计算结果:</label>
-          <ul class="data-cont" v-if="calculateShowData.length">
-              <li 
-                v-for="(item,index) in calculateShowData" 
-                :key="index" 
-                :class="[{'choose': item.DataTime===chooseItem.Date || (!chooseItem.Date&&index===0)},'data-li']"
-              >
-                <span>{{item.DataTime}}</span>
-                <span style="min-width:150px">{{item.Value}}</span>
-              </li>
-          </ul>
-
-          <tableNoData text="无对应的数据" size="mini" v-else/>
-        </section> -->
-
         <section class="bot">
           <el-button type="primary" @click="calculateHandle">{{$t('ETableChildren.calculation_btn')}}</el-button>
           <el-button type="primary" plain @click="cancelHandle">{{$t('ETable.Btn.cancel_btn')}}</el-button>
@@ -470,7 +453,6 @@ export default {
         sourceName:baseSourceName||''
       }
 
-      // if(!this.calculateShowData.length) return this.$message.warning('该日期无数据')
       
       this.$emit('insert',this.chooseItem)
       this.cancelHandle();

+ 2 - 10
src/views/datasheet_manage/components/insertDateDia.vue

@@ -150,9 +150,7 @@ export default {
       
       let backData = {}
       //插入系统日期
-      // if(this.info.key==='insert-sys-date') {
-        // console.log(this.selectEdbInfo,'this.selectEdbInfo');
-        // return 
+     
         let valueParam = {
           EdbInfoId: this.selectEdbInfo.EdbInfoId||0,
           MoveForward: this.formData.MoveForward,
@@ -183,13 +181,7 @@ export default {
           str: JSON.stringify(valueParam),
           sourceName:baseSourceName||''
         }
-      // }else { //指标日期
-      //   backData = {
-      //     insertValue: this.selectEdbInfo.LatestDate,
-      //     dataTimeType: 2,
-      //     str:  JSON.stringify({EdbInfoId: this.selectEdbInfo.EdbInfoId})
-      //   }
-      // }
+   
       this.$emit('insert',backData)
       this.cancelHandle()
     },

+ 0 - 14
src/views/datasheet_manage/components/selectTargetValueDia.vue

@@ -12,20 +12,6 @@
         @select="chooseEdb"
       />
 
-      <!-- <ul class="data-cont">
-        <template v-if="result.List&&result.List.length">
-          <li 
-            v-for="(item,index) in result.List" 
-            :key="index" 
-            :class="[{'choose': item.DataTime===result.Date},'data-li']"
-          >
-            <span>{{item.DataTime}}</span>
-            <span style="min-width:150px">{{item.Value}}</span>
-          </li>
-        </template>
-        <tableNoData size="mini" v-else/>
-      </ul> -->
-
       <!-- 依赖日期选择方式 -->
       <ul class="date-select-cont">
         <li class="flex">

+ 0 - 5
src/views/datasheet_manage/components/sheetClassifyDia.vue

@@ -79,11 +79,6 @@ export default {
 	data () {
 		return {			
 			formData: {},
-    //   formRules: {
-    //     classify_name:[
-    //       { required: true, message: '分类名称不能为空', trigger: 'blur' },
-    //     ]
-    //   },
 
 		};
 	},

+ 0 - 6
src/views/datasheet_manage/components/sheetListWrap.vue

@@ -36,12 +36,6 @@
                 @click="$emit('downloadExcel',cell)"
                 >{{$t('ETable.Btn.download_btn')}}</span
               >
-              <!-- <span
-                v-if=" $parent.isSheetBtnShow('del')"
-                class="deletesty"
-                @click="$emit('delSheetHandle',{cell, type:'del-list'})"
-                >删除</span
-              > -->
             </div>
           </div>
         </el-card>

+ 2 - 9
src/views/datasheet_manage/components/toolBarSection.vue

@@ -363,11 +363,7 @@ export default {
 
       cell.ShowFormatValue = transDecimalPlace(cell.ShowValue,{...cellValueStyle,pn:cellValueStyle.pn})
       cell.ShowStyle = JSON.stringify({...cellValueStyle,pn:cellValueStyle.pn})
-      // console.log(nval)
-      // this.$emit('updateCell',{
-      //   ShowStyle: JSON.stringify({...this.option,cellValueStyle.pn}),
-      //   ShowFormatValue: nval
-      // })
+
     },
     changeCellsType(){
       this.cellArray.map(item =>{
@@ -389,10 +385,7 @@ export default {
       item.ShowFormatValue = transNumPercentType(item.ShowValue,this.option.nt)
       const styleCss = item.ShowStyle ? JSON.parse(item.ShowStyle) : {};
       item.ShowStyle = JSON.stringify({...this.option,last:this.option.nt!='percent'?styleCss.last=='nt'?!isNaN(parseFloat(this.option.decimal)) && isFinite(this.option.decimal)?'decimal':'':styleCss.last:styleCss.last?styleCss.last:'nt'})
-      // this.$emit('updateCell',{
-      //   ShowStyle: JSON.stringify(this.option),
-      //   ShowFormatValue: nval
-      // })
+
     },
     cellMergeHandle(){
       this.$emit('cellMerge')

+ 0 - 36
src/views/datasheet_manage/customAnalysis/addAnalysisSheet.vue

@@ -231,36 +231,8 @@ export default {
         return tree.filter(dfs)
     },
 
-    loadDataSync() {
-      let len = this.sheetConfig.data.length;
-      for(let i =0;i<len;i++) {
-        if(this.allSheetData[i].celldata[this.currentPage*this.pageSize]) {
-          let concatData = this.allSheetData[i].celldata.slice(this.currentPage*this.pageSize, (this.currentPage+1)*this.pageSize);
-
-          // this.sheetConfig.data[i].celldata = this.sheetConfig.data[i].celldata.concat(concatData) 
-          // this.$refs.sheetRef.init()
-        }
-        continue
-
-      }
-
-      if (this.currentPage<this.maxPage) {
-        this.currentPage++
-        requestAnimationFrame(this.loadDataSync());
-      }
-    },
-
     /* 分割数据 */
     splitSheetData(sheets) {
-      // this.allSheetData = sheets.map(_ => ({
-      //   index: _.index, //工作表索引
-      //   order: _.order, //工作表的下标
-      //   name: _.name,
-      //   calcChain: _.calcChain,
-      //   celldata: _.celldata,
-      //   config: _.config
-      // }));
-      // this.maxPage = Math.max(...sheets.map(_ =>  Math.ceil(_.celldata.length / this.pageSize)))
       console.log(sheets)
 
       this.sheetConfig.data = sheets.map(_ => ({
@@ -272,8 +244,6 @@ export default {
         celldata: _.celldata,
       }));
       
-      //辣鸡插件连更新数据的api都没有
-       //  this.loadDataSync();
       
       this.isLoading = false;
     },
@@ -338,15 +308,9 @@ export default {
       if(res.Ret !== 200) return
 
       this.$message.success(res.Msg);
-
-      // const { ExcelInfoId, UniqueCode } = res.Data;
       
       this.$router.replace({
         path: '/sheetAnalysisList',
-        // query: {
-        //   code: UniqueCode,
-        //   id: ExcelInfoId
-        // }
       })
     },300),
 

+ 0 - 44
src/views/datasheet_manage/customAnalysis/components/bottomSection.vue

@@ -11,19 +11,6 @@
       </div>
 
       <div>
-        <!-- <el-select 
-          v-model="select_classify"
-          :placeholder="$t('OnlineExcelPage.select_table_contents')"
-          clearable
-          style="width:350px;"
-        >
-          <el-option
-            v-for="item in classifyArr"
-            :key="item.ExcelClassifyId"
-            :label="item.ExcelClassifyName"
-            :value="item.ExcelClassifyId"
-          />
-        </el-select> -->
         <el-cascader
           v-model="select_classify"
           :options="classifyArr"
@@ -45,37 +32,6 @@
       </div>
     </div>
 
-    <!-- 有同名文件 -->
-    <!-- <div>
-      <div class="same-page-item">
-        <label>
-          <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
-            <path d="M14.7136 12.8013L9.22087 2.90725C8.54904 1.69758 7.45106 1.69758 6.77941 2.90725L1.28669 12.8013C0.615035 14.0122 1.16452 15 2.5069 15H13.4933C14.8357 15 15.3846 14.0121 14.7136 12.8013ZM7.2457 5.71459C7.44308 5.49263 7.69402 5.38164 8.00006 5.38164C8.30627 5.38164 8.55698 5.49146 8.75456 5.71015C8.95086 5.92933 9.04898 6.20343 9.04898 6.53305C9.04898 6.81664 8.63924 8.902 8.50257 10.4191H7.51565C7.39579 8.90199 6.95119 6.81664 6.95119 6.53305C6.95122 6.20844 7.0495 5.93546 7.2457 5.71459ZM8.74074 12.9285C8.53313 13.1387 8.28608 13.2435 8.00013 13.2435C7.71426 13.2435 7.46714 13.1387 7.25956 12.9285C7.05256 12.7186 6.94967 12.4645 6.94967 12.166C6.94967 11.8691 7.05256 11.6123 7.25956 11.397C7.46714 11.1816 7.71426 11.0739 8.00013 11.0739C8.28608 11.0739 8.53313 11.1816 8.74074 11.397C8.94761 11.6123 9.05074 11.8691 9.05074 12.166C9.05074 12.4645 8.94761 12.7186 8.74074 12.9285Z" fill="#E37318"/>
-          </svg>
-          下列sheet页同名,勾选可替换页面内容
-          <span style="color:#999">(不勾选则拼接原内容+上传内容,不去重)</span>
-        </label>
-        <div class="page-list">
-          <el-radio v-model="item.checked" v-for="item in sheetPages" :key="item">{{item}}</el-radio>
-        </div>
-      </div>
-      <div class="same-page-item">
-        <label>
-          <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
-            <path d="M14.7136 12.8013L9.22087 2.90725C8.54904 1.69758 7.45106 1.69758 6.77941 2.90725L1.28669 12.8013C0.615035 14.0122 1.16452 15 2.5069 15H13.4933C14.8357 15 15.3846 14.0121 14.7136 12.8013ZM7.2457 5.71459C7.44308 5.49263 7.69402 5.38164 8.00006 5.38164C8.30627 5.38164 8.55698 5.49146 8.75456 5.71015C8.95086 5.92933 9.04898 6.20343 9.04898 6.53305C9.04898 6.81664 8.63924 8.902 8.50257 10.4191H7.51565C7.39579 8.90199 6.95119 6.81664 6.95119 6.53305C6.95122 6.20844 7.0495 5.93546 7.2457 5.71459ZM8.74074 12.9285C8.53313 13.1387 8.28608 13.2435 8.00013 13.2435C7.71426 13.2435 7.46714 13.1387 7.25956 12.9285C7.05256 12.7186 6.94967 12.4645 6.94967 12.166C6.94967 11.8691 7.05256 11.6123 7.25956 11.397C7.46714 11.1816 7.71426 11.0739 8.00013 11.0739C8.28608 11.0739 8.53313 11.1816 8.74074 11.397C8.94761 11.6123 9.05074 11.8691 9.05074 12.166C9.05074 12.4645 8.94761 12.7186 8.74074 12.9285Z" fill="#E37318"/>
-          </svg>
-          下列sheet页不同名,勾选可新增sheet页
-          <span style="color:#999">(不勾选则不新增)</span>
-        </label>
-        <div class="page-list">
-          <el-radio v-model="item.checked" v-for="item in sheetPages" :key="item">{{item}}</el-radio>
-          
-        </div>
-      </div>
-
-      <el-button type="primary">保存</el-button>
-    </div> -->
-
   </div>
 </template>
 <script>

+ 0 - 4
src/views/datasheet_manage/customAnalysis/components/rightSection.vue

@@ -15,7 +15,6 @@
         <li :class="['edb-item',{'selected':selectEdb.EdbInfoId===item.EdbInfoId}]" v-for="(item,index) in edbList" :key="index" @click="chooseEdb(item)">
           <span>{{item.EdbName}}</span>
           <div class="item-right">
-            <!-- <i class="el-icon-edit" style="margin-right:10px" @click.stop="editEdbSettingHandle"/> -->
             <img :src="$icons.jupm_icon" class="jump-icon" @click.stop="linkToEdbBase(item)">
           </div>
         </li>
@@ -44,9 +43,6 @@ export default {
     }
   },
   watch: {
-    /* list(nval) {
-      this.edbList = nval;
-    }, */
     sheetDetailInfo(newVal){
         if(newVal&&newVal.ExcelInfoId)
             this.getTargetList('init')

+ 3 - 24
src/views/datasheet_manage/customAnalysis/list.vue

@@ -28,8 +28,7 @@
           </el-tooltip>
           
           <input type="file" @change="fileSelected" id="file"  style="display: none;">
-          <!-- 只看我的 -->
-          <!-- <el-checkbox v-model="isShowMe"  @change="() => { getTreeData();getPublicList() }">{{$t('Chart.only_see_mine')}}</el-checkbox> -->
+
         </div>
         <div class="search-cont">
           <el-select
@@ -248,14 +247,7 @@
                             <img src="~@/assets/img/icons/save_blue_new.png"/>
                             <span>{{$t('ETable.Btn.save_btn')}}</span>
                         </li>
-                        <!-- <li
-                            class="editsty"
-                            @click="goEdit"
-                            v-if="(sheetDetailInfo.Button && sheetDetailInfo.Button.OpButton&&isSheetBtnShow('edit'))"
-                        >
-                            <img src="~@/assets/img/icons/edit_blue_new.png" v-if="!editButtonText"/>
-                            <span>{{ editButtonText?editButtonText:'编辑' }}</span> 
-                        </li> -->
+
                         <li
                             class="editsty"
                             @click="saveOtherHandle(null)"
@@ -811,20 +803,7 @@ export default {
     },
 
     downLoad(url, filename) {
-      /* const request = new window.XMLHttpRequest();
-      request.open("GET", url, true);
-      request.responseType = "blob";
-      request.onload = () => {
-        const url = window.URL.createObjectURL(request.response);
-        const a = document.createElement("a");
-        a.href = url;
-        a.target = "_blank";
-        a.download = filename;
-        a.style.display = "none";
-        document.body.append(a);
-        a.click();
-      };
-      request.send(); */
+     
       this.handleDownloadResource(url,filename)
     },
     /* 保存表格 */

+ 2 - 42
src/views/datasheet_manage/customSheetEdit.vue

@@ -31,20 +31,6 @@
             </el-input>
           </li>
           <li>
-            <!-- <el-select 
-              v-model="sheetForm.classify" 
-              :placeholder="$t('OnlineExcelPage.select_table_category')"
-              style="width:240px;"
-              clearable
-            >
-                <el-option
-                  v-for="item in classifyArr"
-                  :key="item.ExcelClassifyId"
-                  :label="item.ExcelClassifyName"
-                  :value="item.ExcelClassifyId"
-                />
-              </el-select> -->
-
 
             <el-cascader
               v-model="sheetForm.classify"
@@ -159,7 +145,6 @@ export default {
   },
   computed:{
     hasPermission(){
-      // console.log(this.sheetButton,'sheetButton');
       return this.sheetButton?
             this.permissionBtn.isShowBtn('etaTablePermission','etaTable_customize_data_save')&&this.sheetButton.OpButton:
             this.permissionBtn.isShowBtn('etaTablePermission','etaTable_customize_data_save')
@@ -174,12 +159,6 @@ export default {
       ]
     }
   },
-  // beforeRouteLeave(to,from,next){
-  //   if(to.path!='/addMixedSheet'){
-  //     this.markFinishStatus()
-  //   }
-  //   next()
-  // },
   data() {
     return {
       sheetId: this.$route.query.id || '',
@@ -244,7 +223,6 @@ export default {
           Decimal:el.Decimal
         }
       })
-      // console.log(this.$refs.customTableRef.DecimalConfig)
       if(flagSet){
         this.$refs.customTableRef.colMap=res.Data.map(el=>{
           return {
@@ -258,7 +236,7 @@ export default {
       this.$refs.customTableRef.config.data=[]
       this.$refs.customTableRef.config.textRowData = [];
       this.$refs.customTableRef.clearStyle()
-      // console.log(this.$refs.customTableRef.config.data)
+
       this.$nextTick(()=>{
         res.Data.forEach((Data,index)=>{
           this.updateSourceFrom(Data.ExcelSource)
@@ -454,20 +432,8 @@ export default {
       
       isAdd && this.$router.replace({path:'/addCustomSheet',query:{id:this.sheetId}})
 
-      // this.$router.replace({
-      //   path: '/sheetList',
-      //   query: {
-      //     code: UniqueCode,
-      //     id: ExcelInfoId
-      //   }
-      // })
     },300),
-    // markFinishStatus(){
-    //   if((!this.sheetId) || (!this.isCanEdit)) return
-    //   sheetInterface.markSheetEditStatus({ExcelInfoId: +this.sheetId,Status:2}).then(res=>{
-    //     if(res.Ret != 200) return 
-    //   })
-    // },
+
     updateSheetSource(value){
       if(value){
         this.sheetSourceFrom={...this.sheetSourceFrom,...value}
@@ -486,12 +452,6 @@ export default {
     this.getClassify();
     this.getDetail();
   },
-  // mounted(){
-  //   window.addEventListener('beforeunload',this.markFinishStatus)
-  // },
-  // beforeDestroy(){
-  //   window.removeEventListener('beforeunload',this.markFinishStatus)
-  // }
 }
 </script>
 <style scoped lang="scss">

+ 1 - 19
src/views/datasheet_manage/mixedSheetEdit.vue

@@ -126,12 +126,6 @@ export default {
       ]
     }
   },
-  // beforeRouteLeave(to,from,next){
-  //   if(to.path!='/addMixedSheet'){
-  //     this.markFinishStatus()
-  //   }
-  //   next()
-  // },
   data() {
     return {
       sheetId: this.$route.query.id || '',
@@ -313,13 +307,6 @@ export default {
       this.getDetail('refresh')
     },
     
-
-    // markFinishStatus(){
-    //   if((!this.sheetId) || (!this.isCanEdit)) return
-    //   sheetInterface.markSheetEditStatus({ExcelInfoId: +this.sheetId,Status:2}).then(res=>{
-    //     if(res.Ret != 200) return 
-    //   })
-    // }
     updateSheetSource(value){
       if(value){
         this.sheetSourceFrom={...this.sheetSourceFrom,...value}
@@ -334,12 +321,7 @@ export default {
     this.getClassify();
     this.getDetail();
   },
-  // mounted(){
-  //   window.addEventListener('beforeunload',this.markFinishStatus)
-  // },
-  // beforeDestroy(){
-  //   window.removeEventListener('beforeunload',this.markFinishStatus)
-  // }
+
 }
 </script>
 <style scoped lang="scss">

+ 0 - 1
src/views/datasheet_manage/mixins/classifyMixin.js

@@ -85,7 +85,6 @@ export default {
 		editNodeLabel(data,type='') {
       if(type === 'edit-tit') {
         if([2,3].includes(this.sheetDetailInfo.Source)) return
-        // if(!this.permissionBtn.isShowBtn('etaTablePermission','etaTable_classifyOpt_edit')) return
 
         if(!this.isSheetBtnShow('classifyOpt_edit')) return
         this.$set(data,'isEditTit',true)

+ 2 - 29
src/views/datasheet_manage/sheetList.vue

@@ -210,9 +210,7 @@
                 {{ sheetDetailInfo.ExcelName }}
                 <i class="el-icon-edit" v-if="sheetDetailInfo.Source === 1 && onlineExcelEditing" />
               </span>
-              <!-- <div class="sheet-name">
-                {{ sheetDetailInfo.ExcelName }}
-              </div> -->
+
               <div class="sheet-anothor-info">
                 <span class="author">{{$t('OnlineExcelPage.author_info')}}{{ sheetDetailInfo.SysUserRealName }}</span>
                 <ul class="action-ul">
@@ -481,10 +479,6 @@ export default {
       return url;
     },
     classifyOptions() {
-      // let options = this.treeData.map((_) => ({
-      //   ExcelClassifyId: _.ExcelClassifyId,
-      //   ExcelClassifyName: _.ExcelClassifyName,
-      // }));
       return this.balanceClassifyOpts;
     },
     saveOtherFormRule(){
@@ -688,12 +682,7 @@ export default {
         3: "/addMixedSheet",
       };
 
-      // if(type === 1) {
-      //   const { href } = this.$router.resolve({ path: path[type] });
-      //   window.open(href, "_blank");
-      // }else {
         this.$router.push({ path: path[type] })
-      // }
     },
 
     /* 获取表格分类 */
@@ -913,20 +902,6 @@ export default {
     },
 
     downLoad(url, filename) {
-      /* const request = new window.XMLHttpRequest();
-      request.open("GET", url, true);
-      request.responseType = "blob";
-      request.onload = () => {
-        const url = window.URL.createObjectURL(request.response);
-        const a = document.createElement("a");
-        a.href = url;
-        a.target = "_blank";
-        a.download = filename;
-        a.style.display = "none";
-        document.body.append(a);
-        a.click();
-      };
-      request.send(); */
       this.handleDownloadResource(url,filename)
     },
 
@@ -971,7 +946,6 @@ export default {
         return 
       }
       this.$message.success(this.$t('MsgPrompt.saved_msg') );
-      // this.markFinishStatus()
 
       if(this.autoSaveType == "nameEdit"){
         this.getTreeData();
@@ -986,7 +960,7 @@ export default {
         this.cancelAutoSave=false
         return
       }
-      // luckysheet.exitEditMode();
+
       //结构类型乱飘 强制定义下
       let data = {...luckysheet.getAllSheets()[0],status:Number(luckysheet.getAllSheets()[0].status)}
       if (!data.celldata.length) return this.$message.warning(this.$t('OnlineExcelPage.input_content_msg') );
@@ -1220,7 +1194,6 @@ export default {
       this.onlineExcelEditing=false
     },
     unloadMark(){
-      // sheetInterface.markSheetEditStatus({ExcelInfoId: this.select_id,Status:2}) 
       if((!this.onlineExcelEditing) || (!this.select_id) || this.select_id=='0'){
         this.onlineExcelEditing=false
         return

+ 0 - 7
src/views/futures_manage/chartEditor.vue

@@ -370,7 +370,6 @@ export default {
 						XDataList=DataResp.XDataList
 					}
 
-					// this.tableData = [EdbInfoList[0]];
 					this.tableData=EdbInfoList.filter(_e=>_e.Source).map((_e,index)=>{
 						return{
 							EdbInfoId:_e.EdbInfoId,
@@ -406,7 +405,6 @@ export default {
     /* 选择指标 获取指标详情并push到表格中*/
 		selectTarget(edb) {
 			if(!edb){
-				// this.tableData = [];
 				return
 			} 
 			// 不允许添加重复的指标
@@ -814,11 +812,6 @@ export default {
     },
     
     async setImageHandle(form,{ UniqueCode,ChartInfoId }) {
-      // let { Data } = await dataBaseInterface.uploadImgSvg(form);
-      // await dataBaseInterface.setChartImage({
-      //   ChartInfoId: ChartInfoId,
-      //   ImageUrl: Data.ResourceUrl,
-      // });
 			form.append('ChartInfoId',ChartInfoId)
 			await dataBaseInterface.setChartThumbnail(form)
 			this.$message.success(this.chart_code ? this.$t('MsgPrompt.add_msg2')||'添加成功' : this.$t('MsgPrompt.saved_msg')||'保存成功');

+ 1 - 24
src/views/futures_manage/commodityChartBase.vue

@@ -243,14 +243,6 @@
       @ensure="getTreeData"
     />
 
-		<!-- 输入英文指标弹窗 -->
-		<!-- <set-en-name-dia 
-			:isOpenDialog="setEnName" 
-		  :formData="formItemArray"
-			@cancel="setEnName=false"
-   	  @updateEnName="updateEnName"
-		/> -->
-
 		<!-- 设置对应版本信息弹窗 -->
 		<setLangInfoDia
 			:isOpenDialog="isLangInfoDia"
@@ -348,7 +340,6 @@ export default {
 		/* 图表id */
 		select_id(newval) {
 			if(newval) {
-				// this.currentLang = 'zh';
 				this.getDetailHandle();
 			}else {
 				this.chartInfo = {};
@@ -447,9 +438,7 @@ export default {
 			this.search_txt = '';
 			this.select_node = UniqueCode;
 			this.select_classify = !ChartInfoId ? ChartClassifyId : 0;
-			// if(this.select_id !== ChartInfoId) {
-				this.select_id = ChartInfoId || 0;
-			// }
+			this.select_id = ChartInfoId || 0;
 			this.resetNodeStyle(node);
 			this.dynamicNode = node;
 		},
@@ -489,8 +478,6 @@ export default {
 				type: 'error',
 			}) : DeleteStatus === 0
 			?  this.$confirm(this.$t('Chart.OptMsg.classify_del_confirm'), this.$t('Confirm.prompt'), {
-				// confirmButtonText: '确定',
-				// cancelButtonText: '取消',
 				type: 'warning',
 			}).then(() => {
 				this.delApi(ChartClassifyId,ChartInfoId)
@@ -575,12 +562,6 @@ export default {
     },
 
     async setImageHandle(form) {
-      // let { Data } = await dataBaseInterface.uploadImgSvg(form);
-
-      // await dataBaseInterface.setChartImage({
-      //   ChartInfoId: this.selected_chartid,
-      //   ImageUrl: Data.ResourceUrl,
-      // });
 			form.append('ChartInfoId',this.chartInfo.ChartInfoId)
 			await dataBaseInterface.setChartThumbnail(form)
     },
@@ -594,8 +575,6 @@ export default {
 				if(!this.chartInfo.ChartNameEn || !this.chartInfo.UnitEn) flag = false;
 				if(!flag){
 					this.$confirm(/* '英文名称未输入完整,分享图表上可能出现空名称的情况,确定继续分享吗?' */this.$t('Chart.OptMsg.copy_noenough_en'), /* '提示' */this.$t('Dialog.warn_tit'), {
-							/* confirmButtonText: '确定',
-							cancelButtonText: '取消', */
 							type: 'warning',
 					})
 					.then(() => {
@@ -729,8 +708,6 @@ export default {
 		delChartHandle() {
 			const { ChartClassifyId,ChartInfoId } = this.chartInfo;
 			this.$confirm(this.$t('Chart.OptMsg.chart_del_confirm'), this.$t('Confirm.prompt'), {
-        // confirmButtonText: '确定',
-        // cancelButtonText: '取消',
         type: 'warning',
       })
         .then(() => {

部分文件因为文件数量过多而无法显示