浏览代码

Merge branch 'dev' of http://39.106.8.246:3003/web/adm into dev

haojianlong 4 年之前
父节点
当前提交
2f55867011

+ 1 - 1
src/components/ledger/handsontables/system.vue

@@ -492,7 +492,7 @@ export default {
         let params = tools.differenceArr(this.tableData, this.copyMain)
         let params = tools.differenceArr(this.tableData, this.copyMain)
         let param = []
         let param = []
         params.map(item => {
         params.map(item => {
-          param.push({ SysID: item.SysID })
+          param.push({ id: item.id })
         })
         })
         this.removeSys(param)
         this.removeSys(param)
       }).catch(() => {
       }).catch(() => {

+ 4 - 1
src/components/model/file/modelLog.vue

@@ -54,8 +54,10 @@ export default {
       modelFile: null,
       modelFile: null,
     };
     };
   },
   },
+  created() {
+  },
   computed: {
   computed: {
-    filterlogData: function() {
+    filterlogData () {
       let newLogData = [];
       let newLogData = [];
       if (this.logData.length) {
       if (this.logData.length) {
         this.logData.forEach(item => {
         this.logData.forEach(item => {
@@ -81,6 +83,7 @@ export default {
         let a = document.createElement("a");
         let a = document.createElement("a");
         a.href = url;
         a.href = url;
         a.download =`${this.modelFolderName}${item.FloorName}模型文件v${item.Version}.rvt`;
         a.download =`${this.modelFolderName}${item.FloorName}模型文件v${item.Version}.rvt`;
+
         a.click();
         a.click();
       } else {
       } else {
         this.$message({
         this.$message({

+ 1 - 1
src/framework/layout/layout-store.js

@@ -25,7 +25,7 @@ export default {
     projectId: 'Pj1101051029',
     projectId: 'Pj1101051029',
     projects: [{
     projects: [{
       id: "Pj1101051029",
       id: "Pj1101051029",
-      name: "北京东坝万达广场",
+      name: "万达广场",
       pwd: "saga123456"
       pwd: "saga123456"
     }],
     }],
     breadcrumb: [],
     breadcrumb: [],

+ 1 - 1
src/views/ledger/cenotelist/cenoteDetail/index.vue

@@ -272,7 +272,7 @@ export default {
         cancelButtonText: '取消',
         cancelButtonText: '取消',
         type: 'warning'
         type: 'warning'
       }).then(() => {
       }).then(() => {
-        deleteCenoteTableData([{ ShaftID: this.params.ShaftID }], res => {
+        deleteCenoteTableData([{ id: this.params.ShaftID }], res => {
           this.$message.success('删除成功')
           this.$message.success('删除成功')
           this.goBack()
           this.goBack()
         })
         })

+ 1 - 1
src/views/ledger/system/systemDetail/index.vue

@@ -501,7 +501,7 @@ export default {
         type: 'warning'
         type: 'warning'
       }).then(() => {
       }).then(() => {
         let pa = [{
         let pa = [{
-          SysID: this.exampleData.SysID
+          id: this.exampleData.id
         }]
         }]
         this.removeSys(pa)
         this.removeSys(pa)
       }).catch(() => {
       }).catch(() => {