Browse Source

现场任务管理,文案,页面传参修改

yangjunjing 5 years ago
parent
commit
15eb00e0bf

+ 1 - 8
config/index.js

@@ -94,14 +94,7 @@ module.exports = {
                 pathRewrite: {
                     "^/modelapi": "/"
                 }
-            },
-            '/messageapi': {
-                target: 'http://192.168.20.153:8080',
-                changeOrigin: true,
-                pathRewrite: {
-                    "^/messageapi": "/"
-                }
-            },
+            }
         },
 
         // Various Dev Server settings

+ 36 - 36
src/api/data_admin/buildTaskApi.js

@@ -8,97 +8,97 @@ const baseUrl = '/api';
  * 
  */
 export function queryTaskCount(param, success) {
-  let url = `${baseUrl}/datacenter/scan-task-base/count`;
-  http.postJson(url, param, success)
+    let url = `${baseUrl}/datacenter/scan-task-base/count`;
+    http.postJson(url, param, success)
 }
 
 /*************************模型任务接口****************************/
 //创建模型任务
 export function createModelTask(param, success) {
-  let url = `${baseUrl}/datacenter/model-scan-task/create`;
-  http.postJson(url, param, success)
+    let url = `${baseUrl}/datacenter/model-scan-task/create`;
+    http.postJson(url, param, success)
 }
 //根据id删除模型任务
 export function deleteModelTask(param, success) {
-  let url = `${baseUrl}/datacenter/model-scan-task/delete`;
-  http.postJson(url, param, success)
+    let url = `${baseUrl}/datacenter/model-scan-task/delete`;
+    http.postJson(url, param, success)
 }
 //查询模型任务
 export function queryModelTask(param, success) {
-  let url = `${baseUrl}/datacenter/model-scan-task/page-query`;
-  http.postJson(url, param, success)
+    let url = `${baseUrl}/datacenter/model-scan-task/page-query`;
+    http.postJson(url, param, success)
 }
 //更新模型任务
 export function updateModelTask(param, success) {
-  let url = `${baseUrl}/datacenter/model-scan-task/update`;
-  http.postJson(url, param, success)
+    let url = `${baseUrl}/datacenter/model-scan-task/update`;
+    http.postJson(url, param, success)
 }
 //查询设备分类
 export function queryModelCategory(param, success) {
-  let url = `${baseUrl}/datacenter/model-scan-task/model-category-query`;
-  http.postJson(url, param, success)
+    let url = `${baseUrl}/datacenter/model-scan-task/model-category-query`;
+    http.postJson(url, param, success)
 }
 //查询模型文件夹和文件
 export function queryModelFile(param, success) {
-  let url = `${baseUrl}/datacenter/model-scan-task/model-file-query`;
-  http.postJson(url, param, success)
+    let url = `${baseUrl}/datacenter/model-scan-task/model-file-query`;
+    http.postJson(url, param, success)
 }
 
 /*************************设备台账任务接口****************************/
 //创建设备台账任务
 export function createDeviceTask(param, success) {
-  let url = `${baseUrl}/datacenter/equip-scan-task/create`;
-  http.postJson(url, param, success)
+    let url = `${baseUrl}/datacenter/equip-scan-task/create`;
+    http.postJson(url, param, success)
 }
 //根据id删除设备台账任务
 export function deleteDeviceTask(param, success) {
-  let url = `${baseUrl}/datacenter/equip-scan-task/delete`;
-  http.postJson(url, param, success)
+    let url = `${baseUrl}/datacenter/equip-scan-task/delete`;
+    http.postJson(url, param, success)
 }
 //查询设备台账任务
 export function queryDeviceTask(param, success) {
-  let url = `${baseUrl}/datacenter/equip-scan-task/page-query`;
-  http.postJson(url, param, success)
+    let url = `${baseUrl}/datacenter/equip-scan-task/page-query`;
+    http.postJson(url, param, success)
 }
 //更新设备台账任务
 export function updateDeviceTask(param, success) {
-  let url = `${baseUrl}/datacenter/equip-scan-task/update`;
-  http.postJson(url, param, success)
+    let url = `${baseUrl}/datacenter/equip-scan-task/update`;
+    http.postJson(url, param, success)
 }
 //查询设备分类
 export function queryDeviceCategory(param, success) {
-  let url = `${baseUrl}/datacenter/equip-scan-task/equip-category-query`;
-  http.postJson(url, param, success)
+    let url = `${baseUrl}/datacenter/equip-scan-task/equip-category-query`;
+    http.postJson(url, param, success)
 }
 
 /*************************资产台账任务接口****************************/
 //统计数量
 export function countAssetsTask(param, success) {
-  let url = `${baseUrl}/datacenter/property-scan-task/count`;
-  http.postJson(url, param, success)
+    let url = `${baseUrl}/datacenter/property-scan-task/count`;
+    http.postJson(url, param, success)
 }
 //创建设备台账任务
 export function createAssetsTask(param, success) {
-  let url = `${baseUrl}/datacenter/property-scan-task/create`;
-  http.postJson(url, param, success)
+    let url = `${baseUrl}/datacenter/property-scan-task/create`;
+    http.postJson(url, param, success)
 }
 //根据id删除设备台账任务
 export function deleteAssetsTask(param, success) {
-  let url = `${baseUrl}/datacenter/property-scan-task/delete`;
-  http.postJson(url, param, success)
+    let url = `${baseUrl}/datacenter/property-scan-task/delete`;
+    http.postJson(url, param, success)
 }
 //查询设备台账任务
 export function queryAssetsTask(param, success) {
-  let url = `${baseUrl}/datacenter/property-scan-task/page-query`;
-  http.postJson(url, param, success)
+    let url = `${baseUrl}/datacenter/property-scan-task/page-query`;
+    http.postJson(url, param, success)
 }
 //更新设备台账任务
 export function updateAssetsTask(param, success) {
-  let url = `${baseUrl}/datacenter/property-scan-task/update`;
-  http.postJson(url, param, success)
+    let url = `${baseUrl}/datacenter/property-scan-task/update`;
+    http.postJson(url, param, success)
 }
 //查询设备族
 export function queryAssetsFamily(param, success) {
-  let url = `${baseUrl}/datacenter/property-scan-task/property-category-query`;
-  http.postJson(url, param, success)
+    let url = `${baseUrl}/datacenter/property-scan-task/property-category-query`;
+    http.postJson(url, param, success)
 }

+ 13 - 13
src/api/msgsever.js

@@ -1,5 +1,5 @@
 import http from './scan/httpUtil'
-const baseUrl = '/messageapi';
+const baseUrl = '/api';
 
 /*************************消息中心接口****************************/
 
@@ -8,8 +8,8 @@ const baseUrl = '/messageapi';
  * info: 查询总数量不传参数,查询 已读Read = true,未读 Read = false
  */
 export function messgeCount(param, success) {
-  let url = `${baseUrl}/message-center/message/count`;
-  http.postJson(url, param, success)
+    let url = `${baseUrl}/message-center/message/count`;
+    http.postJson(url, param, success)
 }
 
 /**
@@ -17,24 +17,24 @@ export function messgeCount(param, success) {
  * info: 消息类型:提示(Info)、警告(Warning)、错误(Error)、成功(Success)
  */
 export function messgeCreate(param, success) {
-  let url = `${baseUrl}/message-center/message/create`;
-  http.postJson(url, param, success)
+    let url = `${baseUrl}/message-center/message/create`;
+    http.postJson(url, param, success)
 }
 
 /**
  * title: 删除消息
  */
 export function messgeDelete(param, success) {
-  let url = `${baseUrl}/message-center/message/delete`;
-  http.postJson(url, param, success)
+    let url = `${baseUrl}/message-center/message/delete`;
+    http.postJson(url, param, success)
 }
 
 /**
  * title: 查询消息列表
  */
 export function messgeQuery(param, success) {
-  let url = `${baseUrl}/message-center/message/page-query`;
-  http.postJson(url, param, success)
+    let url = `${baseUrl}/message-center/message/page-query`;
+    http.postJson(url, param, success)
 }
 
 /**
@@ -42,8 +42,8 @@ export function messgeQuery(param, success) {
  * info: 是否读过:未读(f)、已读(t)
  */
 export function messgeUpdate(param, success) {
-  let url = `${baseUrl}/message-center/message/update`;
-  http.postJson(url, param, success)
+    let url = `${baseUrl}/message-center/message/update`;
+    http.postJson(url, param, success)
 }
 
 /**
@@ -51,6 +51,6 @@ export function messgeUpdate(param, success) {
  * info: 已读Read = true,*UserId
  */
 export function messgeUpdateState(param, success) {
-  let url = `${baseUrl}/message-center/message/update-state`;
-  http.postJson(url, param, success)
+    let url = `${baseUrl}/message-center/message/update-state`;
+    http.postJson(url, param, success)
 }

+ 42 - 30
src/components/data_admin/buildTask/dialog/addTaskDialog.vue

@@ -5,9 +5,15 @@
         <el-switch v-model="ruleForm.isVerification"></el-switch>
       </el-form-item>
       <el-form-item label="任务类型" prop="taskType">
-        <div><el-radio v-model="ruleForm.taskType" label="model">现场验证模型</el-radio></div>
-        <div><el-radio v-model="ruleForm.taskType" label="device">现场验证设备台账</el-radio></div>
-        <div><el-radio v-model="ruleForm.taskType" label="assets">现场验证资产台账</el-radio></div>
+        <div>
+          <el-radio v-model="ruleForm.taskType" label="model">现场验证模型</el-radio>
+        </div>
+        <div>
+          <el-radio v-model="ruleForm.taskType" label="device">现场验证设备台账</el-radio>
+        </div>
+        <div>
+          <el-radio v-model="ruleForm.taskType" label="assets">现场验证资产台账</el-radio>
+        </div>
       </el-form-item>
     </el-form>
     <!-- <el-row>
@@ -18,21 +24,19 @@
       <div><el-radio v-model="ruleForm.taskType" label="model">现场验证模型</el-radio></div>
       <div><el-radio v-model="ruleForm.taskType" label="device">现场验证设备台账</el-radio></div>
       <div><el-radio v-model="ruleForm.taskType" label="assets">现场验证资产台账</el-radio></div>
-    </el-row> -->
+    </el-row>-->
     <span slot="footer" class="dialog-footer">
-				<el-button type="primary" @click="$emit('update:addTaskDialog',false)">取  消</el-button>
-				<el-button type="primary" @click="toAddTask()">确  认</el-button>
-			</span>
+      <el-button type="primary" @click="$emit('update:addTaskDialog',false)">取 消</el-button>
+      <el-button type="primary" @click="toAddTask()">确 认</el-button>
+    </span>
   </el-dialog>
 </template>
 
 <script>
-import {  } from "@/api/scan/request";
+import {} from "@/api/scan/request";
 import { mapGetters } from "vuex";
 export default {
-  components: {
-    
-  },
+  components: {},
   computed: {
     ...mapGetters("layout", ["projectId"])
   },
@@ -41,45 +45,53 @@ export default {
       title: "添加验证任务",
       dialogVisible: false,
       ruleForm: {
-        isVerification: false,
-        taskType: ''
+        isVerification: true,
+        taskType: ""
       },
       rules: {
         taskType: [
-          { required: true, message: '请选择任务类型', trigger: 'change' }
+          { required: true, message: "请选择任务类型", trigger: "change" }
         ]
       }
     };
   },
+  created() {},
   props: {
-    addTaskDialog: Boolean //是否显示弹窗
-  },
-  created() { 
-    
+    addTaskDialog: Boolean, //是否显示弹窗
+    newTaskTypes: Array
   },
   methods: {
     toAddTask() {
-      this.$refs.ruleForm.validate((valid) => {
+      this.$refs.ruleForm.validate(valid => {
         if (valid) {
-          if (this.ruleForm.taskType == 'model') {
-            this.$router.push({ path: '/floor/addModelTask', query: this.ruleForm });
-          } else if (this.ruleForm.taskType == 'device') {
-            this.$router.push({ path: '/floor/addDeviceTask', query: this.ruleForm });
-          } else if (this.ruleForm.taskType == 'assets') {
-            this.$router.push({ path: '/floor/addAssetsTask', query: this.ruleForm });
+          this.ruleForm.newTaskTypes = this.newTaskTypes;
+          if (this.ruleForm.taskType == "model") {
+            this.$router.push({
+              path: "/floor/addModelTask",
+              query: this.ruleForm
+            });
+          } else if (this.ruleForm.taskType == "device") {
+            this.$router.push({
+              path: "/floor/addDeviceTask",
+              query: this.ruleForm
+            });
+          } else if (this.ruleForm.taskType == "assets") {
+            this.$router.push({
+              path: "/floor/addAssetsTask",
+              query: this.ruleForm
+            });
           }
         } else {
-          console.log('error submit!!');
+          console.log("error submit!!");
           return false;
         }
-      })
+      });
     },
     handleClose() {
-      this.$emit('update:addTaskDialog',this.dialogVisible)
-    },
+      this.$emit("update:addTaskDialog", this.dialogVisible);
+    }
   }
 };
 </script>
 <style lang="less" scoped>
-
 </style>

+ 30 - 29
src/components/data_admin/buildTask/dialog/modelTaskDialog.vue

@@ -82,40 +82,35 @@ export default {
   },
   props: {
     dialogVisible: Boolean,//是否显示弹窗
-    params: Object //模型和设备的信息
+    params: Object, //模型和设备的信息
+    newTaskTypes: Array
   },
   created() { },
   methods: {
     getTableData() {
       let params = {
         Cascade: [
-          {
-            Name: "equipCategory",
-            Projection: ["EquipCode", "EquipName"]
-          },
-          {
-            Name: "component",
-            Cascade: [{Name: "equipCategory"}]
-          },
-          {
-            Name: "building",
-            Projection: [ "BuildLocalName", "BuildName", "BuildID" ]
-          },
-          {
-            Name: "floor",
-            Projection: [ "FloorLocalName", "FloorName", "FloorID" ]
-          }
-        ],
-        Filters: `ProjectId='${this.projectId}'`,
-        Orders: "CreateTime desc, EquipID asc",
-        PageNumber: this.page.pageNumber,
-        PageSize: this.page.pageSize
-      }
-
-      if(this.params.spaceList && this.params.spaceList.length){
-        //通过平面图区域查询(接口未支持)
-      } else {
-        params.Filters += `;ModelId='${this.params.CurrentModelId}'`
+        {
+          Name: "equipCategory",
+          Projection: ["EquipCode", "EquipName"]
+        },
+        {
+          Name: "component",
+          Cascade: [{Name: "equipCategory"}]
+        },
+        {
+          Name: "building",
+          Projection: [ "BuildLocalName", "BuildName", "BuildID" ]
+        },
+        {
+          Name: "floor",
+          Projection: [ "FloorLocalName", "FloorName", "FloorID" ]
+        }
+      ],
+      Filters: `ProjectId='${this.projectId}'`,
+      Orders: "CreateTime desc, EquipID asc",
+      PageNumber: this.page.pageNumber,
+      PageSize: this.page.pageSize
       }
 
       if(this.params.isVerification){
@@ -126,6 +121,12 @@ export default {
         params.Filters += `;Category='${this.params.category}'`
       }
 
+      if(this.params.spaceList && this.params.spaceList.length){
+        //通过平面图区域查询(接口未支持)paramsQuery:{listId:[]}
+      } else {
+        params.Filters += `;ModelId='${this.params.CurrentModelId}'`
+      }
+
       queryEquip(params, res => {
         this.tableData = res.Content.map(item => {
           if(item.Component && item.Component.length){
@@ -176,7 +177,7 @@ export default {
         createModelTask(params, res => {
           this.$emit('update:dialogVisible',false)
           this.$message.success('创建成功!')
-          this.$router.push({name:'buildTask'})//跳转回首页
+          this.$router.push({name:'buildTask',query:{ newTaskTypes:this.newTaskTypes } })//跳转回首页
         })
       }else {
         this.$message('请选择要创建的任务!')

+ 78 - 4
src/components/data_admin/buildTask/draw/drawModel.vue

@@ -1,6 +1,10 @@
 <template>
   <div :id="`drawFloor${id}`" class="drawFloor" v-loading="canvasLoading">
     <canvas :id="`floorCanvas${id}`" :width="cadWidth" :height="cadHeight" ref="canvas" tabindex="0"></canvas>
+      <!-- <div class="operate" v-if="showTools">
+      <canvasFun @savePng="savePng" @saveSvg="saveSvg" @divide="divide" @clearDivide="clearDivide" :scale="scale" @undo="undo" @redo="redo"
+        @changeAbsorb="changeAbsorb" ref="canvasFun" isEdit="true"></canvasFun>
+    </div> -->
   </div>
 </template>
 
@@ -12,7 +16,7 @@ import canvasFun from "@/components/business_space/newGraphy/canvasFun"
 import { floorQuery } from "@/api/scan/request";
 export default {
   components: {
-    
+    canvasFun
   },
   data() {
     return {
@@ -25,6 +29,8 @@ export default {
       modelId: '',
       FloorID: '',
       Outline: [],
+      buttonContent:"",
+      showTools: false
     };
   },
   props: {
@@ -56,6 +62,7 @@ export default {
           this.view.scene = this.scene
           this.view.fitSceneToView();
           this.canvasLoading = false;
+          this.showTools = true;
           this.view.maxScale = this.view.scale * 10;
           this.view.minScale = this.view.scale;
           this.scene.click(this, this.canvasClick);
@@ -96,9 +103,76 @@ export default {
       let id = `floorCanvas${this.id}`;
       this.view = new SGraphyView(id)
     },
-    canvasClick(item,eventObj){//点击平面图事件
-      
-    }
+    canvasClick(item,eventObj){//点击平面图事件 
+      this.view.scene.getSelectedSpaces().length?this.$emit("changeButtonContent","通过模型空间创建"):this.$emit("changeButtonContent","通过模型创建")
+    },
+    getGraphtSuc(res) {
+      this.canvasLoading = false;
+      if (res == 'error') {
+        this.FloorMap = '';
+        this.$message.warning('数据解析异常');
+        return;
+      }
+      if (res.Result == 'failure') {
+        this.showTools = false;
+        this.$message.warning(res.Message);
+        return;
+      }
+      this.view.scene = this.drawMainScene;
+      this.view.fitSceneToView();
+      this.drawMainScene.isSpaceSelectable = false;
+
+      if (this.$refs.canvasFun) {
+        this.view.maxScale = this.view.scale * 10;
+        this.view.minScale = this.view.scale;
+        this.$refs.canvasFun.everyScale = this.view.scale;
+      }
+      if (this.floorData.Outline && this.floorData.Outline.length) {
+        let newArr = this.floorData.Outline.map(t => {
+          return new SPoint(t.X, t.Y);
+        })
+        this.drawMainScene.addSceneMark(newArr)
+      }
+    },
+    // focus() {
+    //   document.getElementById(`floorCanvas${this.id}`).focus()
+    // },
+    // // 工具栏操作
+    // fit() {
+    //   this.view.fitSceneToView()
+    // },
+    // // 保存png
+    // savePng() {
+    //   this.view.saveImage(`${this.floor}.png`, 'png');
+    // },
+    //  saveSvg() {
+    //   this.view.saveSceneSvg(`${this.floor}.svg`, 6400, 4800);
+    // },
+    //  divide() {
+    //   this.drawMainScene.isMarking = true;
+    // },
+    // // 清除切割划分
+    // clearDivide() {
+    //   this.drawMainScene.clearSceneMark()
+    // },
+    // // 吸附
+    // changeAbsorb(isAbsorbing) {
+    //   this.drawMainScene.isAbsorbing = isAbsorbing;
+    // },
+    // // 撤销
+    // undo() {
+
+    // },
+    // // 反撤销
+    // redo() { },
+    // // 缩放
+    // scale(val) {
+    //   if (!this.view) {
+    //     return;
+    //   }
+    //   let scale = this.view.scale;
+    //   this.view.scaleByPoint(val / scale, this.cadWidth / 2, this.cadHeight / 2)
+    // }
   },
   watch: {
     CurrentModelId: {

+ 1 - 1
src/components/data_admin/buildTask/table/deviceTable.vue

@@ -213,7 +213,7 @@ export default {
   watch: {
     paramsData: {
       handler(newName, oldName) {
-        this.page.pageNumber = 1
+        // this.page.pageNumber = 1
         this.getTableData()
       },
       immediate: true,

+ 1 - 1
src/components/data_admin/buildTask/table/modelTable.vue

@@ -16,7 +16,7 @@
         </el-table-column>
         <el-table-column prop="EquipLocalID" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="EquipCategory.EquipName" :label="`${inSpaceType}类型`" show-overflow-tooltip min-width="80"></el-table-column>
-        <el-table-column prop="BIMID" label="BIM ID" show-overflow-tooltip min-width="190"></el-table-column>
+        <el-table-column prop="BIMID" label="BIM ID" show-overflow-tooltip min-width="220"></el-table-column>
         <el-table-column prop="TaskState" label="任务执行情况" show-overflow-tooltip min-width="60"></el-table-column>
         <el-table-column prop="action" label="操作" min-width="100">
           <template slot-scope="scope">

+ 7 - 7
src/router/system.js

@@ -55,8 +55,8 @@ import partsadd from '@/views/ledger/facility/partsmanage/addparts'
 import deviceadd from '@/views/ledger/facility/addfacility'
 import propertyadd from '@/views/ledger/property/addproperty'
 import propertyLedger from '@/views/ledger/property'
-import spacelist from '@/views/ledger/spacelist'//业务空间台账
-import addPropertys from '@/views/ledger/property/addpropertys'//根据未关联资产的设备或部件批量创建设备
+import spacelist from '@/views/ledger/spacelist' //业务空间台账
+import addPropertys from '@/views/ledger/property/addpropertys' //根据未关联资产的设备或部件批量创建设备
 import batchlinkAssets from '@/views/ledger/facility/batchlink' //批量关联资产
 import cenotelist from '@/views/ledger/cenotelist' //竖井清单
 import cenoteadd from '@/views/ledger/cenotelist/cenoteadd' //添加竖井
@@ -80,7 +80,7 @@ import dataUtil from '@/views/business_space/dataUtil'
 
 /**市场及商务 */
 const OwnerManage = () =>
-    import('@/views/market/owner/manage')
+    import ('@/views/market/owner/manage')
 
 export default [
     { path: '/', name: '', component: LayoutMain, children: [{ path: '', name: 'blank', component: Dasboard }] },
@@ -88,7 +88,7 @@ export default [
     { path: '/auth', name: 'auth', component: auth },
     { path: '/noUser', name: 'noUser', component: noUser },
     // 业务空间数据导入工具
-    { path: '/dataUtil', name: 'dataUtil', component: LayoutMain,children:[{path:'index',component: dataUtil}] },
+    { path: '/dataUtil', name: 'dataUtil', component: LayoutMain, children: [{ path: 'index', component: dataUtil }] },
     // 平台管理
     {
         path: '/platform',
@@ -110,7 +110,7 @@ export default [
             // { path: 'buildfloor', name: 'buildFloor', component: Dasboard, meta: { keepAlive: false, breadcrumbs: [{ label: '建筑楼层管理' }] } },
             { path: 'collectsetting', name: 'collectsetting', component: collectsetting, meta: { keepAlive: false, breadcrumbs: [{ label: '需采集的信息点' }] } },
             { path: 'appuser', name: 'buildUser', component: buildUser, meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼App用户管理' }] } },
-            { path: 'repetitionGraphy', name: 'repetitionGraphy', component: repetitionGraphy, meta: { keepAlive: false, breadcrumbs: [{ label: '建筑楼层管理', path: '/ready/buildfloor' }, { label:'平面图维护' }] }}
+            { path: 'repetitionGraphy', name: 'repetitionGraphy', component: repetitionGraphy, meta: { keepAlive: false, breadcrumbs: [{ label: '建筑楼层管理', path: '/ready/buildfloor' }, { label: '平面图维护' }] } }
         ]
     },
     //模型管理
@@ -322,7 +322,7 @@ export default [
                 path: 'systemDetail',
                 name: 'systemDetail',
                 component: systemDetail,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '系统台账', path: '/ledger/facility' }, { label: '系统详情'}] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '系统台账', path: '/ledger/facility' }, { label: '系统详情' }] }
             },
             {
                 path: 'systemadd',
@@ -340,7 +340,7 @@ export default [
                 path: 'spaceDetail',
                 name: 'spaceDetail',
                 component: spaceDetail,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '业务空间台账',path: '/ledger/spacelist' }, {label:'业务空间详情'}] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '业务空间台账', path: '/ledger/spacelist' }, { label: '业务空间详情' }] }
             },
             {
                 path: 'cenotelist',

+ 1 - 1
src/views/data_admin/buildTask/addTask/addAssetsTask.vue

@@ -211,7 +211,7 @@ export default {
       }
       createAssetsTask(param, res => {
         this.$message.success("创建成功!")
-        this.$router.push({ name: "buildTask" })
+        this.$router.push({ name: "buildTask",query:{ newTaskTypes:this.$route.query.newTaskTypes } })
       })
     }
   }

+ 11 - 8
src/views/data_admin/buildTask/addTask/addDeviceTask.vue

@@ -23,15 +23,17 @@
               </el-form>
             </template>
           </el-table-column>
-          <el-table-column label="所属建筑楼层" width="200">
-            <template slot-scope="scope">
+          <el-table-column label="所属建筑楼层" width="200"></el-table-column>
+          <el-table-column prop="EquipLocalName" label="设备本地名称" show-overflow-tooltip>
+             <template slot-scope="scope">
               <div>
-                {{scope.row.Building?scope.row.Building.BuildLocalName?scope.row.Building.BuildLocalName:'':''}} -
-                {{scope.row.Floor?scope.row.Floor.FloorLocalName?scope.row.Floor.FloorLocalName:'':''}}
+                {{scope.row.EquipLocalName}}
+                <el-badge v-if="scope.row.Component&&scope.row.Component.length?true:false" 
+                  :value="scope.row.Component&&scope.row.Component.length?scope.row.Component.length:0" class="item" type="warning">
+                </el-badge>
               </div>
-          </template>
+            </template>
           </el-table-column>
-          <el-table-column prop="EquipLocalName" label="设备本地名称" show-overflow-tooltip></el-table-column>
           <el-table-column prop="EquipLocalID" label="设备本地编码" show-overflow-tooltip width="200"></el-table-column>
           <el-table-column prop="EquipCategory.EquipName" label="设备类"></el-table-column>
           <el-table-column prop="LedgerParam.Siteinstall.InstallLocation" label="安装位置"></el-table-column>
@@ -109,6 +111,7 @@ export default {
   },
   created() {
     this.params = this.$route.query
+    console.log(this.params)
   },
   mounted() {
     this.getTableData()
@@ -228,7 +231,6 @@ export default {
       } else if (this.params.floorId && this.params.floorId != "all") {
         params.Filters += `;FloorId='${this.params.floorId}'`
       }
-
       return params
     },
     //选择的设备或部件
@@ -256,7 +258,8 @@ export default {
       }
       createDeviceTask(param, res => {
         this.$message.success("创建成功!")
-        this.$router.push({ name: "buildTask" })
+        console.log(this.$route.query.newTaskTypes,1234567)
+        this.$router.push({ name: "buildTask",query:{ newTaskTypes:this.$route.query.newTaskTypes } })
       })
     }
   }

+ 11 - 4
src/views/data_admin/buildTask/addTask/addModelTask.vue

@@ -4,7 +4,7 @@
       <el-button style="float:left;margin-right:20px;" size="small" type="default" icon="el-icon-back" @click="goBack"></el-button>
       <model-folder ref="modelFolder" @change="handleChangeModelFolder" style="margin-right:10px;"></model-folder>
       <my-cascader :isWidth="false" ref="cascader" @change="changeDevice"></my-cascader>
-      <el-button style="float:right;margin-top:1px;" @click="handleClickCreate">创建所选</el-button>
+      <el-button style="float:right;margin-top:1px;" @click="handleClickCreate">{{buttonContent}}</el-button>
     </div>
     <el-row>
       <div class="l-list">
@@ -18,10 +18,10 @@
         </div>
       </div>
       <div class="r-model">
-        <draw-model ref="drawModel" :id="1" :CurrentModelId="CurrentModelId"></draw-model>
+        <draw-model ref="drawModel" :id="1" :CurrentModelId="CurrentModelId" @changeButtonContent="changeButtonContent"></draw-model>
       </div>
     </el-row>
-    <modelTask-dialog :dialogVisible.sync="dialogVisible" :params="params"></modelTask-dialog>
+    <modelTask-dialog :dialogVisible.sync="dialogVisible" :params="params" :newTaskTypes="newTaskTypes"></modelTask-dialog>
   </div>
 </template>
 
@@ -50,7 +50,9 @@ export default {
       modelFileList: [],
       CurrentModelId: '',//模型文件id
       device: '',//设备类别
-      spaceList: []//选中的空间
+      spaceList: [],//选中的空间
+      newTaskTypes: [],
+      buttonContent: "通过模型创建",// 按钮文案
     };
   },
   computed: {
@@ -93,6 +95,7 @@ export default {
       } else {
         this.resetSelected()
       }
+      console.log("handleChangeModelFolder")
     },
     resetSelected(){
       this.modelFileList = []
@@ -112,6 +115,7 @@ export default {
       this.CurrentModelId = file.CurrentModelId
       this.modelFolderId = file.FolderId
       this.modelFileName = file.FloorName
+      this.newTaskTypes = this.$route.query.newTaskTypes
     },
     changeDevice(val){//切换设备类别
       this.device = val.code
@@ -125,6 +129,9 @@ export default {
         return item.data.SourceId
       })
       this.dialogVisible = true
+    },
+    changeButtonContent(val){// 通过判断是否选中模型空间调整文案
+      this.buttonContent = val
     }
   },
   watch: {

+ 9 - 5
src/views/data_admin/buildTask/index.vue

@@ -21,7 +21,7 @@
 			<tear-table v-else-if="taskType == 'tear'"></tear-table>
 			<replace-table v-else-if="taskType == 'replace'"></replace-table>
 		</div>
-		<add-task :addTaskDialog.sync="addTaskDialog"></add-task>
+		<add-task :addTaskDialog.sync="addTaskDialog" :newTaskTypes="newTaskTypes"></add-task>
 	</div>
 </template>
 
@@ -94,14 +94,18 @@ export default {
 			deviceCategory: '',//设备-设备类型
 			family: '',//设备族
 			buildfloor: ['all'],//建筑楼层
-			taskTypes: ['verification','model'],
+			taskTypes: [],
 			addTaskDialog: false, //是否显示添加任务弹窗
+			newTaskTypes:''
     }
-  },
-  mounted() { },
+	},
+	created(){
+		this.$route.query.newTaskTypes?this.newTaskTypes = this.$route.query.newTaskTypes:this.newTaskTypes = ['verification','model']
+		this.taskTypes = this.newTaskTypes
+	},
   methods: {
 		handleChangeTask(val){//切换任务类型
-			
+			this.newTaskTypes = val
 		},
 		handleChangeModel(val) {//修改模型文件
 			if(val[1]){

+ 8 - 1
src/views/model/file/index.vue

@@ -20,7 +20,9 @@
             </div>
           </div>
           <div class="folder-list">
-            <div class="head">模型文件夹</div>
+            <div class="head">建筑模型文件夹
+              <span>(建议按建筑模型进行命名)</span>
+            </div>
             <ul class="lists">
               <el-scrollbar style="height:100%;">
                 <li @click="openFolder(index,item)" v-for="(item,index) in navigationModel" :key="index"
@@ -595,6 +597,11 @@ export default {
       justify-content: left;
       align-items: center;
       font-weight: bold;
+      span{
+        font-weight: normal;
+        font-size: 12px;
+        color: #606266;
+      }
     }
     .lists {
       width: 100%;