Просмотр исходного кода

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

shaun-sheep 5 лет назад
Родитель
Сommit
ed8eace999

+ 1 - 1
src/components/globaluploader/index.vue

@@ -185,7 +185,7 @@ export default {
         this.statusSet(file.id, 'merging');
         if(file.file.modelId){
           //模型文件合并专用接口
-          request.mergeModelFile({ ModelId: file.file.modelId, UploadId: file.file.uploadId }, res => {
+          request.mergeModelFile({ ModelId: file.file.modelId, UploadId: file.file.uploadId, Md5: file.file.md5 }, res => {
             Bus.$emit('modelStatusChange')
             // 文件合并成功
             Bus.$emit('fileSuccess');

+ 2 - 5
src/views/model/report/index.vue

@@ -188,7 +188,7 @@ export default {
   mounted() { },
   created() {
     this.params = {
-      ProjectId: this.projectId
+      Orders: "Name asc"
     }
     this.getModelFileCount();
     this.getModelFloorCount();
@@ -199,7 +199,7 @@ export default {
   methods: {
     getModelFloorCount() {// 获取楼层模型文件数量,计算出检查出问题的模型文件
       let promise1 = new Promise(resolve => {
-        queryFloorList(this.params, res => {
+        queryFloorList({}, res => {
           resolve(res);
         })
       })
@@ -425,9 +425,6 @@ export default {
   },
   watch: {
     projectId() {
-      this.params = {
-        ProjectId: this.projectId
-      }
       this.getModelFileCount();
       this.getModelFloorCount();
     }

+ 4 - 0
src/views/ready/collectsetting/index.vue

@@ -1120,6 +1120,10 @@
         background-color: #fff;
         border-left: 1px solid #f5f5f5;
 
+        .d_jump {
+          width: calc(100% - 105px);
+        }
+
         .right_main_msg {
           padding-left: 10px;
           padding-top: 200px;