Browse Source

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

haojianlong 5 years ago
parent
commit
313fca04fe

+ 4 - 3
src/components/data_admin/buildTask/dialog/modelTaskDialog.vue

@@ -62,10 +62,10 @@ export default {
       title: "确认创建任务",
       options: [{//方案
         value: '1',
-        label: '标准'
+        label: '极简'
       }, {
         value: '2',
-        label: '极简'
+        label: '标准'
       }],
       tableData: [],
       loading: false,
@@ -164,7 +164,8 @@ export default {
         item.FolderId = this.params.modelFolderId
         item.FileName = this.params.modelFileName
         item.FileId = this.params.CurrentModelId
-        item.SchemeId = "1"
+        // 后端定义默认值(前端取消默认值设定)
+        // item.SchemeId = "1"
         return item
       })
       this.page.total = res.Total

+ 2 - 1
src/components/ledger/cenote/elevationMap.vue

@@ -58,6 +58,7 @@
   },
   methods: {
     init () { //获取数据并格式化数据
+      this.elevationData = [];
       //根据isAI判断请求参数是否包含AI推介数据(暂未完成)
       this.params.AiSwitch = this.isAI
       console.log(this.params)
@@ -163,7 +164,7 @@
     //   }
     // },
     params: {
-      handler(val,ccc) {
+      handler() {
         if (this.params.BuildingId && this.params.ObjectType && this.params.ShaftId) {
           this.init();
         }

+ 2 - 2
src/components/model/file/versionDialog.vue

@@ -5,7 +5,7 @@
         <span>上传人:{{versionData.userName}}</span>
         <span style="marginLeft:30px;">上传时间:{{versionData.acceptTime}}</span>
         <p style="marginTop:15px;">更新内容:</p>
-        <div v-if="Object.keys(versionData.createData).length || Object.keys(versionData.deleteData).length">
+        <div v-if="Object.keys(versionData.createData).length || Object.keys(versionData.deleteData).length || versionData.buildList.length">
           <!-- 新增设备概要内容 -->
           <el-divider v-if="Object.keys(versionData.createData).length">新增设备概要内容</el-divider>
           <p v-if="Object.keys(versionData.createData).length" style="marginBottom:10px;">于【{{versionData.acceptTime}}】上传模型文件,新增设备实例如下:</p>
@@ -133,7 +133,7 @@ export default {
           })
         })
         let promise2 = new Promise((resolve, reject) => {
-            getAllEqPaType({}, res => {
+            getAllEqPaType({PageNumber: 1,PageSize: 1000,}, res => {
                 resolve(res)
             })
         })

+ 4 - 3
src/views/data_admin/buildTask/addTask/addDeviceTask.vue

@@ -91,10 +91,10 @@ export default {
       },
       options: [{//方案
         value: '1',
-        label: '标准'
+        label: '极简'
       }, {
         value: '2',
-        label: '极简'
+        label: '标准'
       }],
       tableData: [],
       multipleSelection:[],
@@ -177,7 +177,8 @@ export default {
               }
             })
           }
-          item.SchemeId = "1"
+          // 后端定义默认值(前端取消默认值设定)
+          // item.SchemeId = "1"
           return item
         })
         this.page.total = res.Total