Jelajahi Sumber

Merge branch 'hjl' of git.sagacloud.cn:web/ibms into hjl

zhangyu 5 tahun lalu
induk
melakukan
95a6e5bf16

+ 3 - 3
src/components/business_space/lib/uploadImgsName.vue

@@ -193,7 +193,7 @@ export default {
                 if (vm.type == 'image') {
                   vm.imagesArr.push(
                     {
-                      name: uploadKey,
+                      name: uploadKey + '',
                       key: uploadKey + "." + type,
                       systemId: "dataPlatform",
                       type: "image"
@@ -202,7 +202,7 @@ export default {
                 }
                 if (type == 'mp4') {
                   vm.imagesArr.push({
-                    name: uploadKey,
+                    name: uploadKey + '',
                     key: uploadKey + "." + type,
                     systemId: "dataPlatform",
                     type: "video"
@@ -212,7 +212,7 @@ export default {
                 }
                 if (vm.type == "video" && type == "png") {
                   vm.videoPicArr.push({
-                    name: uploadKey,
+                    name: uploadKey + '',
                     key: uploadKey + "." + type,
                     systemId: "dataPlatform",
                     type: "image_video"

+ 2 - 2
src/components/ledger/lib/uploadImgs.vue

@@ -163,7 +163,7 @@ export default {
               if (xhr.status == 200) {
                 if (vm.type == 'image') {
                   vm.imagesArr.push({
-                    name: uploadKey,
+                    name: uploadKey + '',
                     key: uploadKey + "." + type,
                     systemId: "dataPlatform",
                     type: "image"
@@ -171,7 +171,7 @@ export default {
                 }
                 if (type == 'mp4') {
                   vm.imagesArr.push({
-                    name: uploadKey,
+                    name: uploadKey + '',
                     key: uploadKey + "." + type,
                     systemId: "dataPlatform",
                     type: "video"

+ 3 - 3
src/components/ledger/lib/uploadImgsName.vue

@@ -192,7 +192,7 @@ export default {
                 if (vm.type == 'image') {
                   vm.imagesArr.push(
                     {
-                      name: uploadKey,
+                      name: uploadKey + '',
                       key: uploadKey + "." + type,
                       systemId: "dataPlatform",
                       type: "image"
@@ -201,7 +201,7 @@ export default {
                 }
                 if (type == 'mp4') {
                   vm.imagesArr.push({
-                    name: uploadKey,
+                    name: uploadKey + '',
                     key: uploadKey + "." + type,
                     systemId: "dataPlatform",
                     type: "video"
@@ -211,7 +211,7 @@ export default {
                 }
                 if (vm.type == "video" && type == "png") {
                   vm.videoPicArr.push({
-                    name: uploadKey,
+                    name: uploadKey + '',
                     key: uploadKey + "." + type,
                     systemId: "dataPlatform",
                     type: "image_video"

+ 1 - 1
src/components/point/dynamicdata/delRelationDialog.vue

@@ -60,7 +60,7 @@
     </div>
     <span slot="footer" class="dialog-footer">
       <el-button size="small" @click="handleClose">取消</el-button>
-      <el-button size="small" type="primary" v-loading="loading" @click="handleDelete" :disabled="deleDisabled">清除已选</el-button>
+      <el-button size="small" type="primary" @click="handleDelete" :disabled="deleDisabled">清除已选</el-button>
     </span>
   </el-dialog>
 </template>

+ 4 - 1
src/components/point/dynamicdata/equipRules.vue

@@ -8,7 +8,7 @@
           <el-form ref="form" :model="form" :inline="true">
             <el-row>
               <div class="query-item">
-                <el-form-item>
+                <el-form-item class="special">
                   <el-input placeholder="请输入设备标识关键字" v-model="form.EquipmentMark" @keyup.enter.native="queryTableData">
                     <i slot="suffix" class="el-input__icon el-icon-search" @click="queryTableData"></i>
                   </el-input>
@@ -235,6 +235,9 @@ export default {
     & + .query-item {
       margin-left: 10px;
     }
+    /deep/ .special .el-input__inner{
+      width: 220px;
+    }
   }
   /deep/ .table-area {
     width: 100%;

+ 3 - 3
src/views/data_admin/buildGraphy/lib/uploadImgsName.vue

@@ -193,7 +193,7 @@ export default {
                 if (vm.type == 'image') {
                   vm.imagesArr.push(
                     {
-                      name: uploadKey,
+                      name: uploadKey + '',
                       key: uploadKey + "." + type,
                       systemId: "dataPlatform",
                       type: "image"
@@ -202,7 +202,7 @@ export default {
                 }
                 if (type == 'mp4') {
                   vm.imagesArr.push({
-                    name: uploadKey,
+                    name: uploadKey + '',
                     key: uploadKey + "." + type,
                     systemId: "dataPlatform",
                     type: "video"
@@ -212,7 +212,7 @@ export default {
                 }
                 if (vm.type == "video" && type == "png") {
                   vm.videoPicArr.push({
-                    name: uploadKey,
+                    name: uploadKey + '',
                     key: uploadKey + "." + type,
                     systemId: "dataPlatform",
                     type: "image_video"

+ 20 - 4
src/views/point/dynamicdata/addRelation/equipRela/index.vue

@@ -129,7 +129,8 @@
                   <span>{{t.Proximity}}%</span>
                 </p>
                 <p>{{t.EquipLocalName}}</p>
-                <p>{{BuildLocalName&&BuildLocalName!='null'?t.BuildLocalName:''}}-{{t.FloorLocalName&&t.FloorLocalName!='null'?t.FloorLocalName:''}}
+                <p>
+                  {{t.BuildLocalName&&t.BuildLocalName!='null'&&t.FloorLocalName&&t.FloorLocalName!='null'?t.BuildLocalName+'-'+t.FloorLocalName:''}}
                 </p>
                 <p>{{t.RoomLocalName&&t.RoomLocalName!='null'?t.RoomLocalName:''}}</p>
                 <p>{{t.InstallLocation&&t.InstallLocation!='null'?t.InstallLocation:''}}</p>
@@ -474,10 +475,12 @@ export default {
         };
         let param = [];
         param.push(object);
+        setTimeout(() => {
+          this.reGetData();
+        }, 200)
         dynamicCreateRelation(param, res => {
           if (res.Result == "success") {
             this.$message.success("关联成功");
-            this.reGetData();
           }
         });
       }
@@ -491,7 +494,11 @@ export default {
         this.timer = setTimeout(() => {
           let param = []
           n.map(item => {
-            param.push({ Points: [item] })
+            param.push({
+              Points: [item],
+              Top: 3,
+              Proximity: 50
+            })
           })
           dynamicQueryAI(param, res => {
             this.rightRecoList = res.Content[0].Objs;
@@ -511,7 +518,11 @@ export default {
         this.timer = setTimeout(() => {
           let param = []
           n.map(item => {
-            param.push({ Objs: [item] })
+            param.push({
+              Objs: [item],
+              Top: 3,
+              Proximity: 50
+            })
           })
           dynamicQueryAI(param, res => {
             this.leftRecoList = res.Content[0].Points;
@@ -694,3 +705,8 @@ export default {
   }
 }
 </style>
+<style>
+body {
+  overflow-y: hidden;
+}
+</style>