改些交互

src/views/datasheet_manage/customAnalysis/addAnalysisSheet.vue

@@ -1,7 +1,11 @@
 <template>
   <div class="addSheet-wrap">
     
-    <createTargetForm ref="createTargetRef" @save="handleCreateTarget" v-if="$route.path==='/createTaregtBySheet'"/>
+    <createTargetForm 
+      v-if="$route.path==='/createTaregtBySheet'"
+      ref="createTargetRef" 
+      @save="handleCreateTarget" 
+    />
 
 
     <div class="main">
@@ -23,7 +27,6 @@
           <dataLoading :loading="isLoading"/>
         </div>
 
-        <!-- <tableNoData text="暂无数据" v-else/> -->
       </div>
 
       <!-- 指标列表 -->
@@ -65,10 +68,10 @@ export default {
       return this.$route.path==='/createTaregtBySheet' 
         ? {
             showsheetbar: true,
-            allowCopy:false,
-            allowEdit:false,
-            allowUpdate:false,
-            enableAddRow:false,
+            // allowCopy:false,
+            // allowEdit:false,
+            // allowUpdate:false,
+            // enableAddRow:false,
             data: null,
             hook: {
               //选区时
@@ -104,8 +107,21 @@ export default {
   },
   methods: {
 
-    backHandle() {
-      this.$router.go(-1);
+    backHandle(scence=null) {
+      if(scence === 'into-detail') {
+        const { ExcelInfoId, UniqueCode } = this.sheetDetailInfo;
+        
+        this.$router.replace({
+          path: '/sheetAnalysisList',
+          query: {
+            code: UniqueCode,
+            id: ExcelInfoId
+          }
+        })
+      }else {
+        this.$router.go(-1);
+      }
+
     },
 
     /* 切换表格 */
@@ -252,7 +268,7 @@ export default {
 
         this.sheetDetailInfo = res.Data.ExcelInfo;
         this.dataToalPage =  Math.max(...res.Data.SheetList.map(_ => _.PageNum));
-        this.sheetAllcellData = res.Data.SheetList.map(_ => JSON.parse(_.Data.Data));
+        this.sheetAllcellData = res.Data.SheetList.map(_ => _.Data ? JSON.parse(_.Data.Data): []);
 
         this.getCellData(res.Data.SheetList)
       });
@@ -344,6 +360,25 @@ export default {
     /* 生成指标 */
     async handleCreateTarget() {
       console.log(this.$refs.createTargetRef.formData)
+      this.loading = this.$loading({
+				target:'.addSheet-wrap',
+				lock: true,
+				text: '保存中...',
+				spinner: 'el-icon-loading',
+				background: 'rgba(255, 255, 255, 0.6)'
+			});
+
+      let data = luckysheet.getAllSheets();
+      data.luckysheet_select_save = [];
+      const { ExcelInfoId, ExcelName, ExcelClassifyId } = this.sheetDetailInfo;
+      await sheetInterface.sheetAnalysisInterface.sheetEdit({
+        ExcelInfoId,
+        ExcelName,
+        ExcelClassifyId,
+        // ExcelImage: Data.ResourceUrl,
+        Content: JSON.stringify(data)
+      });
+      
       const { edbInfoId,
         dateSeries,
         valueSeries,
@@ -355,7 +390,7 @@ export default {
 				unit } = this.$refs.createTargetRef.formData;
       let params = {
         EdbName: edbName,
-        ExcelInfoId: this.sheetDetailInfo.ExcelInfoId,
+        ExcelInfoId: ExcelInfoId,
         ClassifyId: classify,
         Frequency: frequency,
         Unit: unit,
@@ -368,6 +403,7 @@ export default {
         ? await sheetInterface.sheetAnalysisInterface.edbEditBysheet({...params,EdbInfoId: edbInfoId})
         : await sheetInterface.sheetAnalysisInterface.edbAddBysheet(params)
 
+      this.loading.close();
       if(res.Ret !== 200) return
 
       this.$message.success(res.Msg)

src/views/datasheet_manage/customAnalysis/components/createTargetDia.vue

@@ -1,107 +0,0 @@
-<template>
-  <div v-dialogDrag v-show="isShow" >
-    <div class="create-target-wrapper">
-      <div class="header el-dialog__header">
-        <span>编辑指标区域</span>
-        <i class="el-icon-close" @click="cancelHandle"/>
-      </div>
-
-      <div class="main">
-        <el-form
-          ref="diaForm"
-          label-position="left"
-          hide-required-asterisk
-          label-width="80px"
-          :model="formData"
-        >
-          <el-form-item label="分类名称" prop="dateSeries">
-            <el-input v-model="formData.dateSeries"></el-input>
-          </el-form-item>
-          <el-form-item label="数值序列" prop="valueSeries">
-            <el-input v-model="formData.valueSeries"></el-input>
-          </el-form-item>
-        </el-form>
-      </div>
-
-      <div class="dia-bot">
-        <el-button type="primary">保存</el-button>
-        <el-button>取消</el-button>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  data() {
-    return {
-      formData: {
-        dateSeries: '',
-        valueSeries: '',
-				edbName:'',
-				menu:'',
-				frequency: '',
-				unit:''
-			}
-    }
-  },
-  mounted(){
-
-  },
-  methods:{
-
-  },
-}
-</script>
-<style scoped lang='scss'>
-@import "~@/styles/theme-vars.scss";
-.create-target-wrapper {
-  background: #fff;
-  position: fixed;
-  top: 20%;
-  left: 55%;
-  width: 500px;
-  border-radius: 2px;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
-  z-index: 999;
-  .header { 
-    height: 50px;
-    font-size: 16px;
-    background: $theme-color;
-    color: #fff;
-    padding: 0 15px;
-    display: flex;
-    align-content: center;
-    justify-content: space-between;
-    span {
-      line-height: 50px;
-    }
-    .el-icon-close {
-      font-size: 20px;
-      line-height: 50px;
-      cursor: pointer;
-    }
-  }
-  .main {
-    padding: 20px 15px;
-    .data-cont {
-      margin: 15px 0;
-      border: 1px solid #DCDFE6;
-      /* padding: 20px; */
-      .data-li {
-        display: flex;
-        padding: 15px;
-        text-align: center;
-        justify-content: space-around;
-        &.choose {
-          background: #ECF5FF;
-        }
-      }
-    }
-    .dia-bot {
-      margin-top: 20px; 
-      display: flex;
-      justify-content: center;
-    }
-  }
-}
-</style>

src/views/datasheet_manage/customAnalysis/components/createTargetForm.vue

@@ -59,6 +59,7 @@
       
       <el-form-item>
         <el-button type="primary" @click="handleSaveTarget">保存</el-button>
+        <el-button type="primary" plain @click="$parent.backHandle('into-detail')">返回</el-button>
       </el-form-item>
     </el-form>
   </div>
@@ -210,14 +211,14 @@ export default {
     },
 
     /* 保存 */
-    async handleSaveTarget() {
+    handleSaveTarget: _.debounce(async function() {
       if(!this.formData.dateSeries) return this.$message.warning('日期序列不能为空')
       if(!this.formData.valueSeries) return this.$message.warning('数值序列不能为空')
 
       await this.$refs.formRef.validate();
       this.initSelect();
       this.$emit('save')
-    },
+    },300),
   },
   
   mounted() {

src/views/datasheet_manage/customAnalysis/list.vue

@@ -163,8 +163,11 @@
               <i class="el-icon-edit"/>
             </span>
             <ul class="action-ul" v-if="sheetDetailInfo.Button">
+
               <li class="editsty" @click="HandleToPath" v-if="isSheetBtnShow('createedb')&&sheetDetailInfo.Button.OpEdbButton">生成指标</li>
+
               <li class="editsty" @click="refreshSheet" v-if="isSheetBtnShow('refresh')&&sheetDetailInfo.Button.RefreshEdbButton">刷新指标</li>
+              
               <li class="editsty" @click="saveHandle" v-if="isSheetBtnShow('save')&&sheetDetailInfo.Button.OpButton">保存</li>
               <li
                 class="editsty"
@@ -626,8 +629,6 @@ export default {
       if (res.Ret !== 200) return;
       this.$message.success("保存成功");
       this.getTreeData();
-
-      // this.getDetailHandle();
     }, 300),
 
     /* 获取表格列表 */
@@ -709,13 +710,11 @@ export default {
         this.sheetDataPage++;
         this.getCellData(sheets)
       }else {
-        console.log(this.sheetAllcellData)
         this.sheetConfigOpt.data = sheets.map((_,index) => ({
           index: _.Index, //工作表id
           order: _.Sort, //工作表的下标
           name: _.SheetName,
           calcChain: _.CalcChain?JSON.parse(_.CalcChain):[],
-          // calcChain: _.CalcChain?[{r:27,c:4,index:1}]:[],
           config: JSON.parse(_.Config),
           celldata: this.sheetAllcellData[index],
         }))