拉代码

src/components/ledger/lib/buildfloorCascader.vue

@@ -22,6 +22,7 @@ export default {
       default: ''
     }
   },
+
   methods: {
     getCascader() {
       let param = {
@@ -33,6 +34,7 @@ export default {
         PageSize: 50
       }
       buildingQuery(param, res => {
+
         res.Content.map(t => {
           if (t.Floor && t.Floor.length) {
             t.Floor = t.Floor.map(item => {
@@ -91,4 +93,4 @@ export default {
 .el-cascader {
   width: 100%;
 }
-</style>
+</style>

src/components/ledger/lib/editSysFloor.vue

@@ -1,11 +1,13 @@
 <template>
   <el-dialog title="所属建筑楼层" :visible.sync="connectDialogVis" width="50%" id="messageDialog">
-    <el-row>
-      <div style="line-height:32px;">添加{{system.SysLocalName}}所属建筑楼层 : </div>
+    <div class="cascader-row">
+      <div style="line-height:32px;">添加{{system.SysLocalName}}所属建筑楼层 :</div>
       <div style="width:70%">
         <bfCascader ref="bfCascader" :SysID="system.SysID"></bfCascader>
       </div>
-    </el-row>
+    </div>
+
+
     <span slot="footer" class="dialog-footer">
       <el-button size="small" @click="connectDialogVis=false">取消</el-button>
       <el-button size="small" type="primary" @click="save">确认</el-button>
@@ -13,44 +15,45 @@
   </el-dialog>
 </template>
 <script>
-import bfCascader from './buildfloorCascader'
-import { sysRelateBuild, sysRelateFloor } from "@/api/scan/request";
-import { resolve } from 'q';
-export default {
-  data() {
-    return {
-      buildName: '',
-      connectDialogVis: false,
-      system: {}
-    }
-  },
-  components: {
-    bfCascader
-  },
-  props: {
-    isCreate: {
-      default: false
-    }
-  },
-  methods: {
-    showDialog(system) {
-      this.system = system;
-      this.connectDialogVis = true;
-      this.$nextTick(() => {
+  import bfCascader from './buildfloorCascader'
+  import {sysRelateBuild, sysRelateFloor} from "@/api/scan/request";
+
+  export default {
+    data() {
+      return {
+        buildName: '',
+        connectDialogVis: false,
+        system: {}
+      }
+    },
+    components: {
+      bfCascader
+    },
+    props: {
+      isCreate: {
+        default: false
+      }
+    },
+    methods: {
+      showDialog(system) {
+        this.system = system;
+        this.connectDialogVis = true;
+        this.$nextTick(() => {
         this.$refs.bfCascader.getCascader()
         let arr = this.system.BuildingFloorInfoList || [];
         let value = []
-        if (arr.length) {
-          arr.map(t => {
-            if (t.FloorID) {
-              value.push([t.BuildID, t.FloorID]);
-            } else {
-              value.push([t.BuildID])
-            }
-          })
-        }
-        this.$refs.bfCascader.value = value
-      })
+          if (arr.length) {
+            arr.map(t => {
+              if (t.FloorID) {
+                value.push([t.BuildID, t.FloorID]);
+              } else {
+                value.push([t.BuildID])
+              }
+            })
+          }
+          this.$refs.bfCascader.value = value
+          console.log(value)
+        })
     },
     save() {
       // 如果是创建
@@ -100,20 +103,25 @@ export default {
 </script>
 <style lang="less" scoped>
 #messageDialog {
-  .el-row {
-    height: 50px;
+  .cascader-row {
     max-height: 200px;
-    overflow-y: auto;
-    overflow-x: hidden;
-  }
-  .el-row > div {
-    float: left;
-  }
-  .el-row > div + div {
-    margin-left: 10px;
-  }
-  /deep/ .el-input__inner {
-    vertical-align: baseline;
+    overflow: auto;
   }
+
+  /*.el-row {*/
+  /*  !*height: 50px;*!*/
+  /*  max-height: 200px;*/
+  /*  overflow-y: auto;*/
+  /*  overflow-x: hidden;*/
+  /*}*/
+  /*.el-row > div {*/
+  /*  float: left;*/
+  /*}*/
+  /*.el-row > div + div {*/
+  /*  margin-left: 10px;*/
+  /*}*/
+  /*/deep/ .el-input__inner {*/
+  /*  vertical-align: baseline;*/
+  /*}*/
 }
-</style>
+</style>

src/views/data_admin/buildTask/index.vue

@@ -17,9 +17,9 @@
                          @change="changeDeviceCascader"></device-cascader>
         <assets-cascader v-show="taskType == 'assets'" :isWidth="false" ref="assets"
                          @change="changeAssetsCascader"></assets-cascader>
-			</div>
-			<el-button class="add-task" @click="addTaskDialog = true">添加验证任务</el-button>
-		</div>
+      </div>
+      <el-button class="add-task" @click="handleAddTaskDialog">添加验证任务</el-button>
+    </div>
     <div class="tabel-box">
       <model-table :paramsData="{taskState, modelFile, modelCategory}" v-if="taskType == 'model'"></model-table>
       <device-table :paramsData="{buildfloor, taskState, deviceCategory}" v-else-if="taskType == 'device'"
@@ -127,21 +127,29 @@
         this.modelFile = ''
       }
     },
-		changeState(val) {//修改任务执行情况
-			this.taskState = val
-		},
-		changeFloor(val){//修改建筑楼层
-			this.buildfloor = val
-		},
-		changeModelCascader(val){//修改模型-设备类型
-			this.modelCategory = val.Code
-		},
-		changeDeviceCascader(val){//修改设备-设备类型
-			this.deviceCategory = val.Code
-		},
-		changeAssetsCascader(val){//修改设备族
-			this.family = val.Code
-		}
+    changeState(val) {//修改任务执行情况
+      this.taskState = val
+    },
+    changeFloor(val) {//修改建筑楼层
+      this.buildfloor = val
+    },
+    changeModelCascader(val) {//修改模型-设备类型
+      this.modelCategory = val.Code
+    },
+    changeDeviceCascader(val) {//修改设备-设备类型
+      this.deviceCategory = val.Code
+    },
+    changeAssetsCascader(val) {//修改设备族
+      this.family = val.Code
+    },
+    handleAddTaskDialog() {
+      debugger
+      if(this.taskTypes[0] =='tear' ||this.taskTypes[0] =='replace' ) {
+        this.$message.info('产品设计中。。。')
+      } else {
+      this.addTaskDialog = true
+      }
+    }
   }
 }
 </script>

src/views/ledger/system/addsystem.vue

@@ -59,8 +59,8 @@ export default {
       addNum: 1,
       onlyRead: false,
       showTypes: [
-        // { value: "partInfo", label: '隐藏信息点' }, 
-        { value: "all", label: '全部' }, 
+        // { value: "partInfo", label: '隐藏信息点' },
+        { value: "all", label: '全部' },
         { value: "Visible", label: '只看采集信息' }
       ],
       tableHeader: [],

src/views/model/report/index.vue

@@ -27,10 +27,10 @@
       <div class="content-box">
         <div class="button">
           <el-button @click="del" :plain="toBeDelCount?false:true" :disabled="toBeDelCount?false:true"
-                     :title="toBeDelCount ? '没有待删除的设备':''">需从模型中删除的设备
+                     :title="toBeDelCount ? '':'没有待删除的设备'">需从模型中删除的设备
           </el-button>
           <el-button @click="supplement" :plain="toBeSuppCount?false:true" :disabled="toBeSuppCount?false:true"
-                     :title="toBeSuppCount ? '没有待补充的设备':''">模型待补充的设备
+                     :title="toBeSuppCount ? '':'没有待补充的设备'">模型待补充的设备
           </el-button>
           <el-button type="info" :loading="load" @click='getExportReport'>导出模型问题报告</el-button>
         </div>

src/views/ready/buildfloor/index.vue

@@ -204,7 +204,7 @@
         buildingQueryAndCount(bdParam, res => {
           this.buildList = res.Content;
           if (this.buildList.length) {
-            this.changeBuild(this.selectedBuildIndex);
+            this.changeBuild(this .selectedBuildIndex);
           }
         });
       },