feat(equipmentCloud): konva

修复konva界面无法通讯物模型
dgiot · Jun 30, 2022 · 0685986 · 0685986
1 parent 366a913
commit 0685986
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 28 deletions.
diff --git a/CHANGELOG.EN.md b/CHANGELOG.EN.md
@@ -1,4 +1,4 @@
-## [4.5.4](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.5...v4.5.4) (2022-06-29)
+## [4.5.4](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.5...v4.5.4) (2022-06-30)
 
 
 ### Bug Fixes
@@ -19,7 +19,9 @@
 * **components:** 百度地图 ([2028435](https://github.com/dgiot/dgiot-dashboard/commit/2028435e76e2a7de221266fa54b40d793c9495cb))
 * **components:** 设备管理 ([0a9756c](https://github.com/dgiot/dgiot-dashboard/commit/0a9756cadaa45a0796f345fa064c1f1f239af7ee))
 * **components:** 云压测 ([ed99eee](https://github.com/dgiot/dgiot-dashboard/commit/ed99eee177a5947609cfa35998bdd1f8b3d3a9ab))
+* **dashboard:** 更新设备管理参数条件 ([82f9c58](https://github.com/dgiot/dgiot-dashboard/commit/82f9c58be6101d24c16f038bd0b116c121df3623))
 * **dashboard:** 新增百度统计 ([396c7be](https://github.com/dgiot/dgiot-dashboard/commit/396c7be11d010deae48bd915265a904202df0be2))
+* **equipmentCloud:** 物模型是否展示 ([2b50100](https://github.com/dgiot/dgiot-dashboard/commit/2b50100a58ca61ca1cea563f816e412bb56fadd1))
 * **equipmentCloud:** 修復設備列表查询条件更新后pagination组件不更新 ([28115a9](https://github.com/dgiot/dgiot-dashboard/commit/28115a982d253e11fbd2ec1cfd64b40409c5e122))
 * **projects:** 云压测 ([97a7f62](https://github.com/dgiot/dgiot-dashboard/commit/97a7f62e0b32949dc2bc4d1297a30befa76fe583))
 * **projects:** scripts ([d4566d9](https://github.com/dgiot/dgiot-dashboard/commit/d4566d90c7ca08ef84107f2a7ff3b8b8cf0da6e8))

diff --git a/CHANGELOG.ZH.md b/CHANGELOG.ZH.md
@@ -1,4 +1,4 @@
-## [4.5.4](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.5...v4.5.4) (2022-06-29)
+## [4.5.4](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.5...v4.5.4) (2022-06-30)
 
 
 ### Bug Fixes
@@ -19,7 +19,9 @@
 * **components:** 百度地图 ([2028435](https://github.com/dgiot/dgiot-dashboard/commit/2028435e76e2a7de221266fa54b40d793c9495cb))
 * **components:** 设备管理 ([0a9756c](https://github.com/dgiot/dgiot-dashboard/commit/0a9756cadaa45a0796f345fa064c1f1f239af7ee))
 * **components:** 云压测 ([ed99eee](https://github.com/dgiot/dgiot-dashboard/commit/ed99eee177a5947609cfa35998bdd1f8b3d3a9ab))
+* **dashboard:** 更新设备管理参数条件 ([82f9c58](https://github.com/dgiot/dgiot-dashboard/commit/82f9c58be6101d24c16f038bd0b116c121df3623))
 * **dashboard:** 新增百度统计 ([396c7be](https://github.com/dgiot/dgiot-dashboard/commit/396c7be11d010deae48bd915265a904202df0be2))
+* **equipmentCloud:** 物模型是否展示 ([2b50100](https://github.com/dgiot/dgiot-dashboard/commit/2b50100a58ca61ca1cea563f816e412bb56fadd1))
 * **equipmentCloud:** 修復設備列表查询条件更新后pagination组件不更新 ([28115a9](https://github.com/dgiot/dgiot-dashboard/commit/28115a982d253e11fbd2ec1cfd64b40409c5e122))
 * **projects:** 云压测 ([97a7f62](https://github.com/dgiot/dgiot-dashboard/commit/97a7f62e0b32949dc2bc4d1297a30befa76fe583))
 * **projects:** scripts ([d4566d9](https://github.com/dgiot/dgiot-dashboard/commit/d4566d90c7ca08ef84107f2a7ff3b8b8cf0da6e8))

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## [4.5.4](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.5...v4.5.4) (2022-06-29)
+## [4.5.4](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.5...v4.5.4) (2022-06-30)
 
 
 ### Bug Fixes
@@ -19,7 +19,9 @@
 * **components:** 百度地图 ([2028435](https://github.com/dgiot/dgiot-dashboard/commit/2028435e76e2a7de221266fa54b40d793c9495cb))
 * **components:** 设备管理 ([0a9756c](https://github.com/dgiot/dgiot-dashboard/commit/0a9756cadaa45a0796f345fa064c1f1f239af7ee))
 * **components:** 云压测 ([ed99eee](https://github.com/dgiot/dgiot-dashboard/commit/ed99eee177a5947609cfa35998bdd1f8b3d3a9ab))
+* **dashboard:** 更新设备管理参数条件 ([82f9c58](https://github.com/dgiot/dgiot-dashboard/commit/82f9c58be6101d24c16f038bd0b116c121df3623))
 * **dashboard:** 新增百度统计 ([396c7be](https://github.com/dgiot/dgiot-dashboard/commit/396c7be11d010deae48bd915265a904202df0be2))
+* **equipmentCloud:** 物模型是否展示 ([2b50100](https://github.com/dgiot/dgiot-dashboard/commit/2b50100a58ca61ca1cea563f816e412bb56fadd1))
 * **equipmentCloud:** 修復設備列表查询条件更新后pagination组件不更新 ([28115a9](https://github.com/dgiot/dgiot-dashboard/commit/28115a982d253e11fbd2ec1cfd64b40409c5e122))
 * **projects:** 云压测 ([97a7f62](https://github.com/dgiot/dgiot-dashboard/commit/97a7f62e0b32949dc2bc4d1297a30befa76fe583))
 * **projects:** scripts ([d4566d9](https://github.com/dgiot/dgiot-dashboard/commit/d4566d90c7ca08ef84107f2a7ff3b8b8cf0da6e8))

diff --git a/src/views/CloudOT/maintenance/myticket.vue b/src/views/CloudOT/maintenance/myticket.vue
@@ -557,7 +557,7 @@
           devicename: '',
           statusFlag: false,
           status: '',
-          number: '',
+          number: this.$route.query.id || '',
           product: '',
           type: '',
           pageNo: 1,

diff --git a/src/views/DeviceCloud/manage/component/wmxdetail.vue b/src/views/DeviceCloud/manage/component/wmxdetail.vue
@@ -206,7 +206,7 @@
               <el-col :span="8">
                 <el-form-item label="是否展示">
                   <el-radio-group
-                    v-model="sizeForm.issshow"
+                    v-model="sizeForm.isshow"
                     size="medium"
                     style="width: 100%"
                   >
@@ -1245,7 +1245,7 @@
               trigger: 'change',
             },
           ],
-          issshow: [
+          isshow: [
             {
               required: true,
               message: '请选择是否展示',
@@ -2104,7 +2104,7 @@
               required: true,
               accessMode: sizeForm.isread,
               isshow: sizeForm.isshow,
-              isstorage: sizeForm.isshow,
+              isstorage: sizeForm.isstorage,
               isaccumulate: sizeForm.isaccumulate,
               identifier: sizeForm.identifier,
             }
@@ -2215,6 +2215,8 @@
             delete obj.index
             dgiotlog.log(this.resource.changeData, 'changeData')
             dgiotlog.log('dynamicData', this.resource.addchannel)
+            // 是否展示
+            obj.isstorage = sizeForm.isstorage
             // 新增协议类型参数
             obj.dataForm.protocol = this.resource.value
             // 处理动态数据源

diff --git a/src/views/DeviceCloud/manage/home_index.vue b/src/views/DeviceCloud/manage/home_index.vue
@@ -551,7 +551,7 @@
       </el-table-column>
       <el-table-column
         align="center"
-        label="离线时间"
+        label="最后更新时间"
         show-overflow-tooltip
         sortable
         width="160"
@@ -590,20 +590,33 @@
           >
             {{ $translateTitle('product.details') }}
           </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            @click="showTree(row, row.objectId, row.Company)"
-          >
-            {{ $translateTitle('equipment.move') }}
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleDelete(row.objectId, 2)"
-          >
-            {{ $translateTitle('developer.delete') }}
-          </el-button>
+          <a-dropdown style="margin-left: 10px">
+            <a class="el-icon-more" @click.prevent>
+              <DownOutlined />
+            </a>
+            <template #overlay>
+              <a-menu>
+                <a-menu-item>
+                  <el-button
+                    size="mini"
+                    type="text"
+                    @click="showTree(row, row.objectId, row.Company)"
+                  >
+                    {{ $translateTitle('equipment.move') }}
+                  </el-button>
+                </a-menu-item>
+                <a-menu-item>
+                  <el-button
+                    size="mini"
+                    type="text"
+                    @click="handleDelete(row.objectId, 2)"
+                  >
+                    {{ $translateTitle('developer.delete') }}
+                  </el-button>
+                </a-menu-item>
+              </a-menu>
+            </template>
+          </a-dropdown>
         </template>
       </el-table-column>
     </el-table>
@@ -623,19 +636,14 @@
 
 <script>
   import {
-    addimeidevice,
     putDevice,
     querycompanyDevice,
-    getDevice,
     postDevice,
     delDevice,
   } from '@/api/Device'
-  import { doDelete, getList } from '@/api/Mock/table'
   import { mapActions, mapGetters, mapMutations } from 'vuex'
   import TableEdit from '@/views/DeviceCloud/empty/tableEdit'
   import { queryProduct } from '@/api/Product'
-  import { delDict } from '@/api/Dict'
-  import { returnLogin } from '@/utils/utilwen'
   import {
     BaiduMap,
     BmCityList,
@@ -656,7 +664,7 @@
   } from 'vue-baidu-map'
   import info from '@/components/Device/info'
   import { putView, queryView } from '@/api/View'
-  import topopreview from '@/views/CloudFunction/topo/preview'
+  import topopreview from '@/views/CloudFunction/topo/index'
   export default {
     name: 'Device',
     components: {