浏览代码

模型监控联调

haojianlong 5 年之前
父节点
当前提交
bf06cba0ef
共有 3 个文件被更改,包括 30 次插入7 次删除
  1. 7 0
      src/api/model/file.js
  2. 4 1
      src/components/model/file/floorTable.vue
  3. 19 6
      src/views/model/file/pathcontrol/index.vue

+ 7 - 0
src/api/model/file.js

@@ -2,6 +2,7 @@ import httputils from '@/api/scan/httpUtil'
 import { Message } from 'element-ui';
 import { Message } from 'element-ui';
 import axios from 'axios'
 import axios from 'axios'
 const baseUrl = '/modelapi';
 const baseUrl = '/modelapi';
+const revitUrl = '/schedulerapi';
 
 
 let api = {
 let api = {
     // 新建模型文件夹
     // 新建模型文件夹
@@ -329,4 +330,10 @@ export function querySyncLogCount(param, success) {
 export function modelPathControl(param, success) {
 export function modelPathControl(param, success) {
     let url = `${baseUrl}/model-monitor/query`;
     let url = `${baseUrl}/model-monitor/query`;
     httputils.postJson(url, param, success)
     httputils.postJson(url, param, success)
+}
+
+// 模型流程监控-获取待分配模型数量
+export function unassignQuery(param, success) {
+    let url = `${revitUrl}/task/query`;
+    httputils.postJson(url, param, success)
 }
 }

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

@@ -149,7 +149,10 @@ export default {
     toPathControl(row) {
     toPathControl(row) {
       this.$router.push({
       this.$router.push({
         path: '/model/path',
         path: '/model/path',
-        query: { Id: row.CurrentModelId, Size: row.Size }
+        query: {
+          Id: row.CurrentModelId,
+          Size: row.Size,
+        }
       })
       })
     }
     }
   },
   },

+ 19 - 6
src/views/model/file/pathcontrol/index.vue

@@ -79,7 +79,7 @@
                     <i class="iconfont icon-revit" style="color:#dee6ec;font-size:60px;background:#fff"></i>
                     <i class="iconfont icon-revit" style="color:#dee6ec;font-size:60px;background:#fff"></i>
                   </div>
                   </div>
                   <div class="fixed">
                   <div class="fixed">
-                    <p :title="'XSSSSSSSSSXSSSSSSSSS'">模型文件名称{{'XSSSSSSSSSXSSSSSSSSS'}}</p>
+                    <p :title="Name">模型文件名称{{Name}}</p>
                     <p style="color:#8d9aa3">模型文件大小: {{(Size/1000/1024).toFixed(1)}}M</p>
                     <p style="color:#8d9aa3">模型文件大小: {{(Size/1000/1024).toFixed(1)}}M</p>
                     <p style="color:#8d9aa3">上传时间: {{UploadState.EndTime||'--'}}</p>
                     <p style="color:#8d9aa3">上传时间: {{UploadState.EndTime||'--'}}</p>
                   </div>
                   </div>
@@ -89,7 +89,7 @@
                     <i class="iconfont icon-json" style="color:#dee6ec;font-size:60px;background:#fff"></i>
                     <i class="iconfont icon-json" style="color:#dee6ec;font-size:60px;background:#fff"></i>
                   </div>
                   </div>
                   <div class="fixed">
                   <div class="fixed">
-                    <p>{{'XSSSSSSSSSXSSSSSSSSS'}}json数据压缩包</p>
+                    <p>{{Name}}json数据压缩包</p>
                     <p style="color:#8d9aa3">文件大小: 23M</p>
                     <p style="color:#8d9aa3">文件大小: 23M</p>
                     <p style="color:#8d9aa3">上传时间: {{ModelExport.EndTime||'--'}}</p>
                     <p style="color:#8d9aa3">上传时间: {{ModelExport.EndTime||'--'}}</p>
                   </div>
                   </div>
@@ -204,7 +204,7 @@
             <pathCard class="webServer-item" :title="'建筑模型检查'" :data="MultiFloorCheck" @click="getNodeDes">
             <pathCard class="webServer-item" :title="'建筑模型检查'" :data="MultiFloorCheck" @click="getNodeDes">
               <p>共检查项: --</p>
               <p>共检查项: --</p>
             </pathCard>
             </pathCard>
-            <pathCard class="webServer-item" :title="'处理模型数据格式'" :data="MultiFloorCheck" @click="getNodeDes"></pathCard>
+            <pathCard class="webServer-item" :title="'处理模型数据格式'" :data="SyncDatacenter" @click="getNodeDes"></pathCard>
 
 
             <img v-if="!SaveData.BeginTime" class="status path1 path" src="@/assets/image/model/arrowGray.png" />
             <img v-if="!SaveData.BeginTime" class="status path1 path" src="@/assets/image/model/arrowGray.png" />
             <img v-else-if="SaveData.BeginTime&&!SaveData.EndTime" class="status path1 path" src="@/assets/image/model/arrowBlue.png" />
             <img v-else-if="SaveData.BeginTime&&!SaveData.EndTime" class="status path1 path" src="@/assets/image/model/arrowBlue.png" />
@@ -249,7 +249,7 @@
             </div>
             </div>
           </div>
           </div>
           <el-row id="dataCenterServer">
           <el-row id="dataCenterServer">
-            <pathCard :title="'储存模型数据并记录增删日志'" @click="getNodeDes" :data="Note"></pathCard>
+            <pathCard :title="'储存模型数据并记录增删日志'" @click="getNodeDes" :data="SaveLog"></pathCard>
 
 
             <img v-if="1" class="status path1" src="@/assets/image/model/arrowGray.png" />
             <img v-if="1" class="status path1" src="@/assets/image/model/arrowGray.png" />
             <img v-else-if="2" class="status path1" src="@/assets/image/model/arrowBlue.png" />
             <img v-else-if="2" class="status path1" src="@/assets/image/model/arrowBlue.png" />
@@ -273,7 +273,7 @@
 import { mapGetters } from "vuex";
 import { mapGetters } from "vuex";
 import pathCard from "@/components/model/file/pathCard"
 import pathCard from "@/components/model/file/pathCard"
 import nodeDialog from "@/components/model/file/nodeDialog"
 import nodeDialog from "@/components/model/file/nodeDialog"
-import { modelPathControl } from "@/api/model/file";
+import { modelPathControl, unassignQuery } from "@/api/model/file";
 import Bus from '@/utils/bus.js'
 import Bus from '@/utils/bus.js'
 export default {
 export default {
   components: {
   components: {
@@ -288,6 +288,7 @@ export default {
       loading: false, //
       loading: false, //
       Id: '',
       Id: '',
       Size: 0,
       Size: 0,
+      Name: '--',
       JsonAnalysis: {}, //解压并解析json文件
       JsonAnalysis: {}, //解压并解析json文件
       ModelCheck: {}, //楼层模型检查
       ModelCheck: {}, //楼层模型检查
       ModelExport: {}, //导出模型json数据并压缩存储
       ModelExport: {}, //导出模型json数据并压缩存储
@@ -297,7 +298,10 @@ export default {
       SchedulerCheck: {}, //第一个等待调度器
       SchedulerCheck: {}, //第一个等待调度器
       SchedulerExport: {},//第二个等待调度器
       SchedulerExport: {},//第二个等待调度器
       UploadState: {}, //上传下载功能
       UploadState: {}, //上传下载功能
-      finish: {}
+      finish: {},
+      SyncDatacenter: {}, //
+      SaveLog: {},//
+      timer: null, //定时器
     }
     }
   },
   },
   mounted() {
   mounted() {
@@ -331,6 +335,15 @@ export default {
         this.SchedulerCheck = data.SchedulerCheck || {}
         this.SchedulerCheck = data.SchedulerCheck || {}
         this.SchedulerExport = data.SchedulerExport || {}
         this.SchedulerExport = data.SchedulerExport || {}
         this.UploadState = data.UploadState || {}
         this.UploadState = data.UploadState || {}
+        this.SyncDatacenter = data.SyncDatacenter || {}
+        this.SaveLog = data.SaveLog || {}
+      })
+    },
+    // 
+    getUnassignNum() {
+      let pa = {}
+      unassignQuery(pa, res => {
+
       })
       })
     },
     },
     // 处理时间工具
     // 处理时间工具