jwyu преди 1 година
родител
ревизия
2954a48fa3

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

@@ -24,7 +24,6 @@
               emitPath: false,
               checkStrictly: true,
             }"
-            clearable
             :placeholder="$t('OnlineExcelPage.select_table_category')"
             :disabled="isView||isStaticTable"
           />

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

@@ -43,7 +43,7 @@
           <div class="item-tr">
             <!-- 图表类型 -->
             <el-form-item :label="$t('SystemManage.ChartSet.label01')" prop="chartType">
-              <el-select v-model="formData.chartType" style="width: 200px">
+              <el-select v-model="formData.chartType" style="width: 200px" @change="handleChartTypeChange">
                 <el-option
                   :label="item.label"
                   :value="item.key"
@@ -732,6 +732,13 @@ export default {
 			}
 		},
 
+    // 图表类型切换
+    handleChartTypeChange(){
+      this.edbList.forEach(item=>{
+        item.axis=1
+      })
+    },
+
     //添加指标
     handleAddEdb() {
       if (this.edbList.length === MAX_ADD_NUM) {

+ 7 - 0
src/views/datasheet_manage/components/BalanceTable.vue

@@ -555,6 +555,8 @@ export default {
 
 
     startSelection(startRow, startCol) {
+      // 只有添加图标弹窗弹起时有效
+      if(!this.isShowAddChart) return
       if(this.disabled) return
       console.log('开始选择');
       this.startSelectTable=true
@@ -659,6 +661,9 @@ export default {
         }).catch(() => {
           if(this.activeSheetId===0){//当是新增表格时
             this.sheetOpts = this.sheetOpts.filter(e => e.ExcelInfoId)
+            // 自动切换sheet
+            this.changeSheet(this.sheetOpts[this.sheetOpts.length-1])
+
           }else{// 当编辑子表名称时 重置掉好了
             this.sheetOpts.forEach(_e=>{
               _e.isEdit=false
@@ -833,6 +838,8 @@ export default {
     async saveChildSheet(type){
       console.log('执行保存表格操作');
       const item=this.sheetOpts.filter(e=>e.ExcelInfoId===this.activeSheetId)[0]
+      console.log(item);
+      console.log(this.sheetOpts,this.activeSheetId);
       const params={
         ExcelInfoId:this.activeSheetId,
         ExcelName: item.ExcelName,