feat(device): rewrite device management interface

dgiot · Apr 28, 2022 · 85ad1b0 · 85ad1b0
1 parent 0fdb3c8
commit 85ad1b0
Show file tree

Hide file tree

Showing 20 changed files with 829 additions and 141 deletions.
diff --git a/src/components/Device/info.vue b/src/components/Device/info.vue
@@ -21,7 +21,7 @@
           {{ $translateTitle('equipment.installationlocation') + ':' }}
         </td>
         <td>
-          {{ devicedetail.detail ? devicedetail.detail.address : '' }}
+          {{ devicedetail.address ? devicedetail.address : '' }}
         </td>
         <td class="cloumn">
           {{ $translateTitle('equipment.state') + ':' }}

diff --git a/src/config/local.config.js b/src/config/local.config.js
@@ -12,12 +12,12 @@ let systemStatic = {
     'lint.css',
     'vditor.css',
     'xterm.css',
+    'aliplayer-min.css',
     'amis/lib/themes/cxd.css',
     'amis/lib/helper.css',
     'amis/lib/themes/antd.css',
   ],
   js: [
-    'aliplayer-min.css',
     'vue.js',
     'mqttws31.js',
     'vue-router.min.js',

diff --git a/src/dgiot/components/DgiotAliplayer/index.vue b/src/dgiot/components/DgiotAliplayer/index.vue
@@ -62,6 +62,11 @@
    * @document https://github.com/langyuxiansheng/vue-aliplayer-v2#31-%E9%85%8D%E7%BD%AE%E9%A1%B9-options-%E5%B1%9E%E6%80%A7
    */
   const VueAliplayerV2 = window['vue-aliplayer-v2'].default
+  Vue.use(VueAliplayerV2, {
+    cssLink:
+      'https://g.alicdn.com/de/prismplayer/2.8.2/skins/default/aliplayer-min.css',
+    // scriptSrc: 'https://g.alicdn.com/de/prismplayer/2.8.2/aliplayer-min.js',
+  })
   // dgiotlog.log('VueAliplayerV2', VueAliplayerV2)
   // import VueAliplayerV2 from 'vue-aliplayer-v2'
   export default {
@@ -73,9 +78,9 @@
        * @param {*} source 视频地址
        */
       playsource: {
-        required: true,
+        required: false,
         type: String,
-        default: '',
+        default: 'http://resource.wangdaodao.com/402670506.mp4',
       },
       /**
        * @param {*} autoplay 是否自动播放

diff --git a/src/dgiot/components/DgiotDialog/index.vue b/src/dgiot/components/DgiotDialog/index.vue
@@ -37,7 +37,7 @@
       },
       title: {
         type: String,
-        default: '提示',
+        default: '',
       },
       appendToBody: {
         // Dialog 自身是否插入至 body 元素上。嵌套的 Dialog 必须指定该属性并赋值为 true

diff --git a/src/dgiot/plugins/vue-audio-visual.js b/src/dgiot/plugins/vue-audio-visual.js
@@ -1,2 +1,6 @@
 import AudioVisual from 'vue-audio-visual'
+import BaiduMap from 'vue-baidu-map'
 Vue.use(AudioVisual)
+Vue.use(BaiduMap, {
+  ak: 'WpeAb6pL4tsX2ZVd56GHbO9Ut6c4HZhG',
+})
diff --git a/src/store/index.js b/src/store/index.js
@@ -73,8 +73,7 @@ function getMessage(tag) {
 window.dashboard = info
 window.dgiot = info
 console.log(
-  `%c dashboard %c version v${dashboard.version} %c`,
-  'background:#35495e ; padding: 1px; border-radius: 3px 0 0 3px;  color: #fff',
-  'background:#41b883 ; padding: 1px; border-radius: 0 3px 3px 0;  color: #fff',
-  'background:transparent'
+  ' %c Design with by Dgiot  %c http://dev.iotn2n.com ' + '\n\n\n',
+  'color: #fadfa3; background: #030307; padding:5px 0;',
+  'background: #fadfa3; padding:5px 0;'
 )
diff --git a/src/utils/utilwen.js b/src/utils/utilwen.js
@@ -521,7 +521,7 @@ export default {
     Vue.prototype.$aclObj = aclObj
     Vue.prototype.$deepClone = deepClone
     Vue.prototype.$ajax = ajax
-    Vue.prototype.$loadsh = _
+    Vue.prototype.$lodash = _
     Vue.prototype.$convertRes2Blob = convertRes2Blob
     Vue.prototype.$bus = Bus
     Vue.prototype.$o2Log = o2Log

diff --git a/src/views/CloudFunction/topo/components/TopoOperation.vue b/src/views/CloudFunction/topo/components/TopoOperation.vue
@@ -34,7 +34,7 @@
           <el-form-item :label="$translateTitle(`konva.${key}`)">
             <!--            判断不同的数据类型,显示不同的控件-->
             <el-input
-              v-if="$loadsh.isString(Shapeconfig.attrs[key])"
+              v-if="$lodash.isString(Shapeconfig.attrs[key])"
               v-model="Shapeconfig.attrs[key]"
               :disabled="disableKey.includes(key)"
             >
@@ -48,12 +48,12 @@
             </el-input>
 
             <el-input-number
-              v-if="$loadsh.isNumber(Shapeconfig.attrs[key])"
+              v-if="$lodash.isNumber(Shapeconfig.attrs[key])"
               v-model="Shapeconfig.attrs[key]"
               style="width: 100%"
             />
             <el-switch
-              v-if="$loadsh.isBoolean(Shapeconfig.attrs[key])"
+              v-if="$lodash.isBoolean(Shapeconfig.attrs[key])"
               v-model="Shapeconfig.attrs[key]"
               :active-text="$translateTitle(`konva.draggable`)"
               :inactive-text="$translateTitle(`konva.undraggable`)"

diff --git a/src/views/CloudOc/MetaData/components/module.vue b/src/views/CloudOc/MetaData/components/module.vue
@@ -128,7 +128,7 @@
             >
               <template #default="{ row }">
                 <el-switch
-                  v-if="$loadsh.isBoolean(row[item.prop])"
+                  v-if="$lodash.isBoolean(row[item.prop])"
                   v-model="row[item.prop]"
                 />
                 <el-select

diff --git a/src/views/CloudSystem/logs/history.vue b/src/views/CloudSystem/logs/history.vue
@@ -20,10 +20,10 @@
               v-model="queryForm.searchDate"
               class="item-time-picker"
               :end-placeholder="$translateTitle('Maintenance.end time')"
-              format="yyyy-MM-dd"
+              format="yyyy-MM-DD HH:mm:ss.SSSSSS"
               :start-placeholder="$translateTitle('Maintenance.start time')"
-              type="daterange"
-              value-format="yyyy-MM-dd"
+              type="datetimerange"
+              value-format="yyyy-MM-DD HH:mm:ss.SSSSSS"
             />
           </el-form-item>
           <el-form-item label="level">
@@ -221,8 +221,8 @@
           topic: '',
           domain: '',
           searchDate: [
-            moment().subtract('days', 7).format('YYYY-MM-DD'),
-            moment(new Date()).format('YYYY-MM-DD'),
+            moment().subtract('days', 7).format('yyyy-MM-DD HH:mm:ss.SSSSSS'),
+            moment(new Date()).format('yyyy-MM-DD HH:mm:ss.SSSSSS'),
           ],
           order: '-createdAt',
           keys: 'count(*)',
@@ -355,18 +355,19 @@
                     $options: 'i',
                   }
                 : { $ne: '3333' },
-              createdAt: {
-                $gte: {
-                  __type: 'Date',
-                  iso: `${this.queryForm.searchDate[0]}T00:00:00.000Z`,
-                },
-                $lte: {
-                  __type: 'Date',
-                  iso: `${this.queryForm.searchDate[1]}T23:59:59.000Z`,
-                },
-              },
+              // time: {
+              //   $get: moment(this.queryForm.searchDate[0]).format('SSS'),
+              //   $lte: moment(this.queryForm.searchDate[1]).format('SSS'),
+              // },
             },
           }
+          console.log(this.queryForm.searchDate)
+          console.log({
+            time: {
+              $get: moment(this.queryForm.searchDate[0]).format('x'),
+              // $lte: moment(this.queryForm.searchDate[1]).format('x'),
+            },
+          })
           const { results = [], count: total = 0 } = await queryLog(params)
           results.forEach((item) => {
             item.time = this.$moment(

diff --git a/src/views/CloudTest/task/index.vue b/src/views/CloudTest/task/index.vue
@@ -452,15 +452,15 @@
       >
         <template #default="{ row }">
           <el-button
-            v-show="row.profile.step == 0 && $loadsh.isEmpty(row.basedata)"
+            v-show="row.profile.step == 0 && $lodash.isEmpty(row.basedata)"
             size="mini"
             type="success"
             @click.native="handleManagement(row)"
           >
             {{ $translateTitle(`task.Configuration`) }}
           </el-button>
           <el-button
-            v-show="row.profile.step == 0 && !$loadsh.isEmpty(row.basedata)"
+            v-show="row.profile.step == 0 && !$lodash.isEmpty(row.basedata)"
             size="mini"
             type="info"
             @click.native="taskStart(row)"

diff --git a/src/views/DeviceCloud/manage/component/SceneLog.vue b/src/views/DeviceCloud/manage/component/SceneLog.vue
@@ -6,7 +6,7 @@
     <dgiot-query-form>
       <dgiot-query-form-top-panel>
         <el-form
-          v-if="!$loadsh.isEmpty(queryForm)"
+          v-if="!$lodash.isEmpty(queryForm)"
           ref="form"
           :inline="true"
           label-width="80px"

diff --git a/src/views/DeviceCloud/manage/devicelist.vue b/src/views/DeviceCloud/manage/devicelist.vue
@@ -162,7 +162,7 @@
         class="map_dialog"
         title="设备位置"
         :visible.sync="dialog_device"
-        width="60%"
+        width="50%"
       >
         <el-card>
           <dgiot-baidu-map