Browse Source

fix: 优化需求240设置小数位数

ldong 7 months ago
parent
commit
ab3359a7c0

+ 10 - 10
src/views/datasheet_manage/components/CustomTable.vue

@@ -746,9 +746,9 @@ export default {
 
     /* 右键事件 */
     async handleContext(key) {
-      console.log(key)
+      // console.log(key)
       let { rindex,cindex } = this.rightClickCell;
-      console.log(rindex,cindex)
+      // console.log(rindex,cindex)
       if(rindex==='-1') { //删除列
         console.log('删除列',cindex)
         let index = this.columnHeader.findIndex(_ => _ === cindex);
@@ -777,7 +777,7 @@ export default {
       }else if(cindex === '-1') { //删除行
         console.log('删除行',rindex)
         let index = this.rowHeader.findIndex(_ => _ === rindex)
-        console.log(index)
+        // console.log(index)
         if(key=='del'){
           if(this.dateArr.length === 1) return this.$message.warning(this.$t('OnlineExcelPage.please_keep_one_msg') )
             const configIndex=this.DecimalConfig.findIndex(el=>el.Row==this.config.data[0].Data[index].DataTime)
@@ -831,7 +831,7 @@ export default {
     saveDecima(){
       if(!isNaN(parseFloat(this.ruleForm.Decimal)) && isFinite(this.ruleForm.Decimal)){
         if(this.setType=='col'){
-          console.log(this.ruleForm,this.config.data[this.setDecimalIndex])
+          // console.log(this.ruleForm,this.config.data[this.setDecimalIndex])
           const index=this.colMap.findIndex(el=>el.EdbInfoId==this.ruleForm.EdbInfoId)
           if(index>-1){
             this.colMap[index].Decimal=this.ruleForm.Decimal
@@ -845,7 +845,7 @@ export default {
             el.Decimal=this.ruleForm.Decimal
           })
           this.config.data[this.setDecimalIndex]=JSON.parse(JSON.stringify(this.ruleForm))
-          console.log(this.colMap)
+          // console.log(this.colMap)
           const configIndex=this.DecimalConfig.findIndex(el=>el.Col==this.ruleForm.EdbInfoId)
           if(configIndex>-1){
             this.DecimalConfig.splice(configIndex,1)
@@ -855,7 +855,7 @@ export default {
             Col:this.ruleForm.EdbInfoId,
             Decimal:this.ruleForm.Decimal
           })
-          console.log(this.DecimalConfig)
+          // console.log(this.DecimalConfig)
         }else{
           const cell=this.config.data[0].Data[this.setDecimalIndex]
           this.dateMap[cell.DataTime]=this.ruleForm.Decimal
@@ -871,7 +871,7 @@ export default {
             Col:0,
             Decimal:this.ruleForm.Decimal
           })
-          console.log(this.DecimalConfig)
+          // console.log(this.DecimalConfig)
         }
         this.isSetDecimalDialog=false
       }else{
@@ -880,7 +880,7 @@ export default {
           type: 'warning'
         });
       }
-      console.log(this.config.data)
+      // console.log(this.config.data)
     },
 
     /* 保存时处理参数 */
@@ -893,7 +893,7 @@ export default {
           RelationEdbInfoList: cell.DataType===4?this.dealFormulaConstruction(cell.Value):[]
         }))
       })
-      console.log(data)
+      // console.log(data)
       let Data = data.map((_,index) => {
         return {
           EdbInfoId: _.EdbInfoId,
@@ -915,7 +915,7 @@ export default {
         Data,
         DecimalConfig:this.DecimalConfig
       }
-      console.log(params)
+      // console.log(params)
       return params
     },
 

+ 1 - 1
src/views/datasheet_manage/components/addDateCellDia.vue

@@ -116,7 +116,7 @@ export default {
       
       let earliestDate = this.$moment(Math.min(...dateArr)).format('YYYY-MM-DD');
       let latestDate  = this.$moment(Math.max(...dateArr)).format('YYYY-MM-DD');
-      console.log(this.$parent.config.data)
+      // console.log(this.$parent.config.data)
       let res = this.formData.dateType === 1
         ? await sheetInterface.getCustomPastData({
           EdbInfoIdList: this.$parent.config.data.map(_ => _.EdbInfoId),

+ 3 - 4
src/views/datasheet_manage/customSheetEdit.vue

@@ -208,11 +208,10 @@ export default {
     
     // 批量设置
     async moreSetSave(list,firstId,decimalVal){
-      console.log(list,firstId,decimalVal)
+      // console.log(list,firstId,decimalVal)
       //false 第一项没发生变化
       let tag=false
       let Decimal=[]
-      console.log()
       const colMap=this.$refs.customTableRef.colMap
       const flagSet=!isNaN(parseFloat(decimalVal)) && isFinite(decimalVal)
       list.forEach(el=>{
@@ -237,7 +236,7 @@ export default {
       // console.log(res);
       if (res.Ret !== 200) return;
       this.$refs.customTableRef.dateMap={}
-      console.log(res.Data)
+      // console.log(res.Data)
       this.$refs.customTableRef.DecimalConfig=res.Data.map(el=>{
         return {
           Row:"",
@@ -245,7 +244,7 @@ export default {
           Decimal:el.Decimal
         }
       })
-      console.log(this.$refs.customTableRef.DecimalConfig)
+      // console.log(this.$refs.customTableRef.DecimalConfig)
       if(flagSet){
         this.$refs.customTableRef.colMap=res.Data.map(el=>{
           return {

+ 3 - 3
src/views/datasheet_manage/mixins/conditionTableMixin.js

@@ -131,7 +131,7 @@ export default {
                                         ? "Value"
                                         : "ShowValue"
                                     ];
-                        console.log(leftVal)
+                        // console.log(leftVal)
                         const rightVal = Number.isFinite(+el.RightValue)
                             ? el.RightValue
                             : this.config.data[
@@ -187,7 +187,7 @@ export default {
                                 default:
                                     break;
                             }
-                            console.log(tag);
+                            // console.log(tag);
                             const showStyle =
                                 this.config.data[item.row - 1][item.column - 1].ShowStyle;
                             const styleCss = showStyle
@@ -271,7 +271,7 @@ export default {
         },
         // 是否展示小数
         isShowDecimal(cell) {
-            console.log(cell,111)
+            // console.log(cell,111)
             const styleCss = cell.ShowStyle ? JSON.parse(cell.ShowStyle) : {};
             let tag = !isNaN(parseFloat(cell.ShowValue)) && isFinite(cell.ShowValue)
             return tag ? !isNaN(parseFloat(styleCss.decimal)) && isFinite(styleCss.decimal) : false