Merge branch 'master' of http://47.110.251.215:3000/web/saber into master

src/api/exctab/editelement.js

@@ -12,7 +12,7 @@ export const getElementInfoByTabId = (params) => {
 //新增修改
 export const submit = (data) => {
     return request({
-        url: '/api/blade-manager/linkdatainfo/submit',
+        url: '/api/blade-manager/linkdatainfo/saveTabColInfo',
         method: 'post',
         data
     })
@@ -42,4 +42,4 @@ export const submitBatch = (data) => {
         method: 'post',
         data
     })
-}
+}

src/api/exctab/excelmodel.js

@@ -144,4 +144,4 @@ export const getLazytree = (params) => {
         method: 'get',
         params
     })
-}
+}

src/views/manager/projectinfo/editElement/editElement.vue

@@ -265,7 +265,7 @@ export default {
         type: 'warning'
       }).then(() => {
         _that.submit({
-          name: '/',
+          colName: '/',
           tabId: this.$route.query.pkeyId,
           tdIndex: this.table.td,
           trIndex: this.table.tr,
@@ -322,6 +322,7 @@ export default {
           tabId: this.$route.query.pkeyId,
           tdIndex: this.table.td,
           trIndex: this.table.tr,
+          colName:"",
         })
       } else {
         this.$message({
@@ -341,7 +342,7 @@ export default {
       const { data: res } = await submit(da)
       console.log(res);
       if (res.code == 200) {
-        const { data: res } = await getExcelHtml({ excelId: this.$route.query.excelId })
+        const { data: res } = await getExcelHtml({ pkeyId: this.$route.query.pkeyId })
         console.log(res);
         if (res.code === 200) {
           this.tag = false
@@ -456,4 +457,4 @@ export default {
     text-decoration: none;
   }
 }
-</style>
+</style>

src/views/manager/projectinfo/tree.vue

@@ -2204,7 +2204,7 @@ export default {
     },
     async setParameterName () {//设置参数名称中添加节点参数按钮
       // wbsId: this.jiedianId
-      this.namelists.unshift({ name: '', remark: '', k: '', type: 0, })
+       this.namelists.unshift({ name: '', remark: '', k: '', type: 0, })
     },
     async nodeInfoSave () {//节点参数弹框保存按钮
       if (this.nodeInfoTable) {
@@ -2286,10 +2286,10 @@ export default {
     //#region 调整表单
     adjustExcel (pkeyId, excelId) {//调整表单
       this.GLExcelFrom.id = pkeyId
-      this.getExcelHtml(excelId)
+      this.getExcelHtml(pkeyId)
     },
-    async getExcelHtml (excelId) {
-      const { data: res } = await getExcelHtml({ excelId })
+    async getExcelHtml (pkeyId) {
+      const { data: res } = await getExcelHtml({ pkeyId })
       console.log(res);
       if (res.code === 200) {
         localStorage.setItem('excelHtml', res.data)
@@ -2304,7 +2304,7 @@ export default {
 
     //#region 编辑元素
     async rightClick (pkeyId, excelId, id, initTableName) {
-      await this.getExcelHtml2(excelId)
+      await this.getExcelHtml2(pkeyId)
       this.$router.push({
         path: '/project/editElement',
         query: {
@@ -2315,8 +2315,8 @@ export default {
         }
       })
     },
-    async getExcelHtml2 (excelId) {
-      const { data: res } = await getExcelHtml({ excelId })
+    async getExcelHtml2 (pkeyId) {
+      const { data: res } = await getExcelHtml({ pkeyId })
       console.log(res);
       if (res.code === 200) {
         localStorage.setItem('editElement', res.data)