From 3f4df6a03a16891a6d8893929f737dee07763051 Mon Sep 17 00:00:00 2001
From: dawnwinterLiu <1737801684@qq.com>
Date: Wed, 20 Jul 2022 20:11:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BA=91=E6=A3=80=E6=B5=8B=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Dlink/index.js                        |   5 -
 src/utils/request/request.js                  |  10 --
 .../dict/components/dgiotWord.vue             | 158 ++++++++----------
 .../CloudFunction/dict/components/index.vue   |  44 ++---
 src/views/CloudFunction/dict/index.vue        |   7 +
 .../CloudSystem/manage/filemanagement.vue     |  10 +-
 src/views/CloudTest/js/task.js                | 158 +++++-------------
 src/views/CloudTest/task/index.vue            |   4 +-
 .../manage/component/profile/ProfileDict.vue  |   6 -
 src/views/DeviceCloud/manage/js/proddetail.js |   2 +
 src/views/DeviceCloud/manage/proddetail.vue   |   4 +
 11 files changed, 157 insertions(+), 251 deletions(-)

diff --git a/src/api/Dlink/index.js b/src/api/Dlink/index.js
index 4f4922adb5..7196f2491b 100644
--- a/src/api/Dlink/index.js
+++ b/src/api/Dlink/index.js
@@ -71,11 +71,6 @@ export async function postTopic(Topic = '$dg/user/router/') {
         : Topic,
     splitTopicKey: typeof Topic == 'string' ? Topic.split('/')[2] : Topic,
   }
-  console.groupCollapsed(
-    ` href: ${mqttInfo.href} \n topic: ${mqttInfo.topic} \n topicKey: ${mqttInfo.topicKey} \n splitTopicKey: ${mqttInfo.splitTopicKey}`
-  )
-  console.table(mqttInfo)
-  console.groupEnd()
   // MqttSubscribe
   window.mqttInfo = window.dgiot.mqttInfo = mqttInfo
   Vue.prototype.$mqttInfo = mqttInfo
diff --git a/src/utils/request/request.js b/src/utils/request/request.js
index b14f9f3698..13f83d4caa 100644
--- a/src/utils/request/request.js
+++ b/src/utils/request/request.js
@@ -163,16 +163,6 @@ instance.interceptors.request.use(
       config.url.indexOf('/classes/') == 0 &&
       !ignoreApi.some((item) => config.url.includes(item))
     ) {
-      console.groupCollapsed(
-        `%c部门切换token拦截url日志`,
-        'color:black; font-size: 18px; font-weight: 300'
-      )
-      dgiotlog.log(
-        'src/utils/Request/request.js',
-        `拦截的url为${config.url}\n当前请求使用了部门token：为${departmentToken}\n用户登录token为${usertoken}`,
-        'color:black; font-size: 18px; font-weight: 300'
-      )
-      console.groupEnd()
       config.headers[`${tokenName}`] = departmentToken
       if (ignoreApi.some((item) => config.url.includes(item))) {
         console.groupCollapsed(
diff --git a/src/views/CloudFunction/dict/components/dgiotWord.vue b/src/views/CloudFunction/dict/components/dgiotWord.vue
index 9540466d52..5f1cec6520 100644
--- a/src/views/CloudFunction/dict/components/dgiotWord.vue
+++ b/src/views/CloudFunction/dict/components/dgiotWord.vue
@@ -8,94 +8,80 @@
 * @DocumentLink:
 -->
 <template>
-  <div>
-    <el-tabs v-model="activeName">
-      <el-tab-pane
-        :label="$translateTitle('developer.dictinfo')"
-        name="字典管理"
+  <div style="margin-left: 30px; margin-right: 30px">
+    <el-button
+      class="mt-3"
+      icon="el-icon-plus"
+      size="small"
+      type="primary"
+      @click.native="addparam"
+    >
+      <!-- 新增 -->
+      {{ $translateTitle('product.newlyadded') }}
+    </el-button>
+    <h1></h1>
+    <el-form
+      ref="dataform"
+      class="demo-ruleForm"
+      label-width="100px"
+      :model="dataform"
+      size="mini"
+      status-icon
+    >
+      <el-table
+        border
+        :cell-style="{ 'text-align': 'center' }"
+        :data="dataform.params"
+        :header-cell-style="{ 'text-align': 'center' }"
+        style="width: 100%"
       >
-        <el-form ref="dataform" label-width="100px" :model="dataform">
-          <el-button
-            class="mt-3"
-            icon="el-icon-plus"
-            size="small"
-            type="primary"
-            @click.native="addparam"
-          >
-            <!-- 新增 -->
-            {{ $translateTitle('product.newlyadded') }}
-          </el-button>
-          <el-table
-            :data="dataform.params"
-            style="width: 100%; text-align: center"
-          >
-            <el-table-column
-              :label="$translateTitle('equipment.serialnumber')"
-              prop="order"
-            />
-            <el-table-column
-              :label="$translateTitle('deviceLog.identifier')"
-              prop="identifier"
-            />
-            <el-table-column
-              :label="$translateTitle('equipment.name')"
-              prop="name"
-            />
-            <el-table-column
-              :label="$translateTitle('rule.Type')"
-              prop="type"
-            />
-            <el-table-column
-              :label="$translateTitle('cloudTest.datasources')"
-              prop="sources"
-            />
-            <el-table-column
-              align="center"
-              :label="$translateTitle('task.Operation')"
-              width="160"
+        <el-table-column
+          :label="$translateTitle('equipment.serialnumber')"
+          prop="order"
+        />
+        <el-table-column
+          :label="$translateTitle('deviceLog.identifier')"
+          prop="identifier"
+        />
+        <el-table-column
+          :label="$translateTitle('equipment.name')"
+          prop="name"
+        />
+        <el-table-column :label="$translateTitle('rule.Type')" prop="type" />
+        <el-table-column
+          :label="$translateTitle('cloudTest.datasources')"
+          prop="sources"
+        />
+        <el-table-column
+          align="center"
+          :label="$translateTitle('task.Operation')"
+          width="160"
+        >
+          <template #default="{ row, $index }">
+            <el-button
+              plain
+              size="mini"
+              :title="$translateTitle('task.Edit')"
+              type="info"
+              @click.native="editRow($index, row)"
             >
-              <template #default="{ row, $index }">
-                <el-button
-                  plain
-                  size="mini"
-                  :title="$translateTitle('task.Edit')"
-                  type="info"
-                  @click.native="editRow($index, row)"
-                >
-                  <!-- 编辑 -->
-                  {{ $translateTitle('task.Edit') }}
-                </el-button>
-                <el-button
-                  plain
-                  size="mini"
-                  :title="$translateTitle('task.Delete')"
-                  type="danger"
-                  @click.native="delRow($index)"
-                >
-                  <!-- 删除 -->
-                  {{ $translateTitle('task.Delete') }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-form>
-      </el-tab-pane>
-      <el-tab-pane label="Json" name="Json">
-        <el-form ref="dataform" label-width="100px" :model="dataform">
-          <el-form-item :label="$translateTitle('task.data')" prop="data">
-            <div style="height: 30vh; overflow: auto">
-              <dgiot-monaco-plus
-                ref="monacoCode"
-                :codes="dataform.data"
-                :lang="'json'"
-                :read-only="false"
-                :theme="'vs-dark'"
-              />
-            </div>
-          </el-form-item>
-        </el-form>
-      </el-tab-pane>
-    </el-tabs>
+              <!-- 编辑 -->
+              {{ $translateTitle('task.Edit') }}
+            </el-button>
+            <el-button
+              plain
+              size="mini"
+              :title="$translateTitle('task.Delete')"
+              type="danger"
+              @click.native="delRow($index)"
+            >
+              <!-- 删除 -->
+              {{ $translateTitle('task.Delete') }}
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-form>
     <el-drawer
       ref="param"
       v-drawerDrag
diff --git a/src/views/CloudFunction/dict/components/index.vue b/src/views/CloudFunction/dict/components/index.vue
index 0467cc3acf..f4a64d6a98 100644
--- a/src/views/CloudFunction/dict/components/index.vue
+++ b/src/views/CloudFunction/dict/components/index.vue
@@ -9,25 +9,31 @@
 -->
 <template>
   <div class="index-container">
-    <el-drawer
-      ref="dgiotDict"
-      v-drawerDrag
-      append-to-body
-      size="50%"
-      title="字典"
-      :visible.sync="dictFlag"
-    >
-      <dgiot-dict :object-id="dictId" />
-    </el-drawer>
-    <el-drawer
-      ref="dgiotWord"
-      v-drawerDrag
-      append-to-body
-      size="50%"
-      :visible.sync="wordFlag"
-    >
-      <dgiot-word :data="data" :object-id="dictId" />
-    </el-drawer>
+    <div class="drawerCode-content">
+      <el-drawer
+        ref="dgiotDict"
+        v-drawerDrag
+        append-to-body
+        size="50%"
+        title="字典"
+        :visible.sync="dictFlag"
+      >
+        <dgiot-dict :object-id="dictId" />
+      </el-drawer>
+    </div>
+    <div class="drawerCode-content">
+      <el-drawer
+        ref="dgiotWord"
+        v-drawerDrag
+        append-to-body
+        size="50%"
+        title="文档字典"
+        top="5vh"
+        :visible.sync="wordFlag"
+      >
+        <dgiot-word :data="data" :object-id="dictId" />
+      </el-drawer>
+    </div>
   </div>
 </template>
 
diff --git a/src/views/CloudFunction/dict/index.vue b/src/views/CloudFunction/dict/index.vue
index 04fe429a83..a713529c22 100644
--- a/src/views/CloudFunction/dict/index.vue
+++ b/src/views/CloudFunction/dict/index.vue
@@ -21,6 +21,7 @@
             <el-select
               v-model="queryForm.title"
               allow-create
+              clearable
               default-first-option
               filterable
               placeholder="请选择"
@@ -39,6 +40,7 @@
             <el-select
               v-model="queryForm.type"
               allow-create
+              clearable
               default-first-option
               filterable
               :placeholder="$translateTitle('rule.Type')"
@@ -286,6 +288,11 @@
       async fetchData(params) {
         if (_.isEmpty(params)) params = this.queryPayload
         this.queryPayload.where = {}
+        if (this.$route.query.id) {
+          this.queryForm.class = 'Product'
+          this.queryForm.key = this.$route.query.id
+          this.queryPayload.where.key = this.$route.query.id
+        }
         this.queryForm.class
           ? (this.queryPayload.where.class = { $regex: this.queryForm.class })
           : ''
diff --git a/src/views/CloudSystem/manage/filemanagement.vue b/src/views/CloudSystem/manage/filemanagement.vue
index 36804f8a0b..36f0fc4321 100644
--- a/src/views/CloudSystem/manage/filemanagement.vue
+++ b/src/views/CloudSystem/manage/filemanagement.vue
@@ -265,12 +265,16 @@
         })
       },
       get_fileinfo(row) {
+        console.log(row)
         this.detailView = true
         this.ViewLoading = true
         file_info('files/' + row.path + '/' + row.name).then((res) => {
-          this.detailinfo = res.data
-          this.detailinfo.url =
-            this.$FileServe + '/' + row.path + '/' + row.name
+          this.detailinfo = {}
+          if (res.data) {
+            this.detailinfo = res.data
+            this.detailinfo.url =
+              this.$FileServe + '/' + row.path + '/' + row.name
+          }
           this.ViewLoading = false
         })
       },
diff --git a/src/views/CloudTest/js/task.js b/src/views/CloudTest/js/task.js
index 99ae1fd2d4..cf6a2cbdb2 100644
--- a/src/views/CloudTest/js/task.js
+++ b/src/views/CloudTest/js/task.js
@@ -15,6 +15,7 @@ import {
 } from '@/api/Evidence'
 import { getDevice } from '../../../api/Device'
 import moment from 'moment'
+
 export default {
   name: 'TaskIndex',
   filters: {
@@ -236,44 +237,18 @@ export default {
         })
     },
     async subRealtimedata(params) {
+      this.router = this.$dgiotBus.router(location.href + this.$route.fullPath)
       let subtopic = `$dg/user/realtimecard/${params.parentId.objectId}/report` // 设备实时数据topic
-      let router = this.$dgiotBus.router(location.href + this.$route.fullPath)
-      // let topicKey = this.$dgiotBus.topicKey(router, subtopic) // dgiot-mqtt topicKey 唯一标识
       try {
-        // 订阅mqtt
-        // this.$dgiotBus.$emit('MqttSubscribe', {
-        //   router: router,
-        //   topic: subtopic,
-        //   qos: 0,
-        //   ttl: 1000 * 60 * 60 * 3,
-        // })
         // mqtt 消息回调
-        console.groupCollapsed(
-          `%c mqtt 订阅日志`,
-          'color:#009a61; font-size: 28px; font-weight: 300'
-        )
-        console.log('topic:', subtopic)
-        console.log('router:', router)
-        console.groupEnd()
-
-        this.$dgiotBus.$off(subtopic) // dgiotBus 关闭事件
-        this.$dgiotBus.$on(subtopic, (mqttMsg) => {
-          // mqtt 消息回调
-          console.groupCollapsed(
-            `%c mqttMsg消息回调`,
-            'color:#009a61; font-size: 28px; font-weight: 300'
-          )
-          console.log(mqttMsg)
-          console.log(Base64.decode(mqttMsg.payloadString))
-          console.log(JSON.parse(Base64.decode(mqttMsg.payloadString)).data)
-          console.log(
-            'Base64.decode(payload):',
-            Base64.decode(mqttMsg.payloadString)
-          )
-          console.groupEnd()
+        await this.$subscribe(subtopic)
+        this.$dgiotBus.$off(this.$mqttInfo.topicKey) // dgiotBus 关闭事件
+        this.$dgiotBus.$on(this.$mqttInfo.topicKey, (mqttMsg) => {
           const { data = [] } = JSON.parse(Base64.decode(mqttMsg.payloadString))
+          this.renderCard(data)
           if (data) {
-            this.renderCard(data)
+            this.collectiontable(data)
+            // this.renderCard(data)
           } else {
             this.CardDevice()
           }
@@ -287,11 +262,30 @@ export default {
         )
       }
     },
+    collectiontable(resData) {
+      let _this = this
+      let thingdata = {}
+      resData.forEach((item) => {
+        // thingdata[item.identifier] = item.number
+        this.$set(thingdata, item.identifier, item.number)
+        this.$set(thingdata, 'timestamp', item.time)
+      })
+      // mqtt 消息回调
+      if (!_.isEmpty(thingdata) && thingdata?.dgiotcollectflag == 0) {
+        _this.thingdata = []
+        console.log(thingdata)
+        _this.thingdata[0] = thingdata // 只显示一条
+      } else {
+        //实时数据
+        _this.realtimedata.unshift(thingdata) // 最新数据放在最前面
+      }
+      // _this.getSummaries({ columns: [], data: _this.thingdata }) // 计算平均值
+    },
     renderCard(resData) {
       var vm = this
       let array = []
       resData.forEach((item) => {
-        if (item.devicetype) {
+        if (item.devicetype && item.identifier != 'dgiotcollectflag') {
           array.push(item.devicetype)
         }
       })
@@ -815,13 +809,6 @@ export default {
             }
           }
         }
-        // mqtt 消息回调
-        console.groupCollapsed(
-          '%c send mqttMsg items',
-          'color:#009a61; font-size: 28px; font-weight: 300'
-        )
-        console.log(items)
-        console.groupEnd()
         const { table = [] } = await postHead({
           items: items,
           productid: params.parentId.product.objectId,
@@ -857,14 +844,7 @@ export default {
               items.push(basedata[key])
           }
         }
-        // mqtt 消息回调
-        console.groupCollapsed(
-          '%c send mqttMsg items',
-          'color:#009a61; font-size: 28px; font-weight: 300'
-        )
-        console.log(items)
-        console.groupEnd()
-        const pubTopic = `/${row.parentId.product.objectId}/${row.parentId.devaddr}/device/event` // 读取opc属性topic
+        const pubTopic = `$dg/thing/${row.parentId.objectId}/properties/get/request_id=opc_items` // 读取opc属性topic
         const message = {
           cmd: 'opc_items',
           groupid: row.parentId.objectId, //'设备ID',
@@ -872,14 +852,6 @@ export default {
             basedata.dgiot_testing_opcserver ?? 'Kepware.KEPServerEX.V6',
           items: items, //要读取到属性列表
         } // 下发的消息内容
-        // mqtt 消息回调
-        console.groupCollapsed(
-          '%c 下发消息',
-          'color:#009a61; font-size: 28px; font-weight: 300'
-        )
-        console.log(message)
-        console.log(pubTopic)
-        console.groupEnd()
         await this.$dgiotBus.$emit(
           `MqttPublish`,
           pubTopic,
@@ -887,6 +859,13 @@ export default {
           0,
           false
         ) // 开始任务
+        console.groupCollapsed(
+          `%c 发送开始任务`,
+          'color:#009a61; font-size: 28px; font-weight: 300'
+        )
+        console.log('message', message)
+        console.log('pubTopic', pubTopic)
+        console.groupEnd()
       } catch (error) {
         console.log(error)
         this.$baseMessage(
@@ -909,30 +888,8 @@ export default {
       _this.collectionInfo = params
       _this.featHistoryEvidence(this.collectionInfo.objectId)
       try {
-        const thingcolumns = {}
-        const items = []
-        _this.thingdata = []
-        // _this.thingcolumns = []
         const { basedata = [] } = await getDevice(params.objectId)
-        if (!_.isEmpty(basedata)) {
-          /**
-           * @description 判断下发组态topic的item
-           * @description 必须以 标识符 dgiot_testing_equipment_ 开头
-           */
-          for (let key in basedata) {
-            if (key.indexOf('dgiot_testing_equipment_') == 0)
-              items.push(basedata[key])
-          }
-        }
-        // mqtt 消息回调
-        console.groupCollapsed(
-          '%c send mqttMsg items',
-          'color:#009a61; font-size: 28px; font-weight: 300'
-        )
-        console.log(items)
-        console.groupEnd()
-        _this.subtopic = `topo/${params.parentId.product.objectId}/${params.parentId.devaddr}/post` // 组态上报topic
-        const pubTopic = `/${params.parentId.product.objectId}/${params.parentId.devaddr}/device/event` // 读取opc属性topic
+        const pubTopic = `$dg/thing/${params.parentId.objectId}/properties/get/request_id=opc_report` // 读取opc属性topic
         const message = {
           cmd: 'opc_report', // 采集条数
           duration: Number(basedata.dgiot_sampling_parametric_frequency) ?? 5, //条数
@@ -952,45 +909,6 @@ export default {
           0,
           false
         ) // 开始采集
-        _this.topicKey = _this.$dgiotBus.topicKey(_this.router, _this.subtopic) // dgiot-mqtt topicKey 唯一标识
-        _this.$dgiotBus.$off(_this.topicKey) // dgiotBus 关闭事件
-        _this.$dgiotBus.$on(_this.topicKey, (mqttMsg) => {
-          // mqtt 消息回调
-          console.groupCollapsed(
-            `%c mqttMsg消息回调 \n${_this.topicKey}`,
-            'color:#009a61; font-size: 28px; font-weight: 300'
-          )
-          console.log(mqttMsg)
-          console.log('payload:', mqttMsg.payloadString)
-          console.groupEnd()
-          // _this.thingdata = []
-          // this.realtimedata = []
-          if (mqttMsg?.payload) {
-            const { thingdata = {}, timestamp } = JSON.parse(
-              mqttMsg.payloadString
-            )
-            thingdata.timestamp = moment(Number(timestamp)).format(
-              'YYYY-MM-DD HH:mm:ss'
-            )
-            if (!_.isEmpty(thingdata) && thingdata?.dgiotcollectflag == 0) {
-              console.log(thingdata)
-              _this.thingdata[0] = thingdata // 只显示一条
-              // _this.thingdata.unshift(thingdata) // 最新数据放在最前面
-            } else {
-              //实时数据
-              // _this.realtimedata.push(thingdata) // 只显示一条
-              _this.realtimedata.unshift(thingdata) // 最新数据放在最前面
-            }
-            // _this.getSummaries({ columns: [], data: _this.thingdata }) // 计算平均值
-          }
-        })
-        console.log('_this.thingdata', _this.thingdata)
-        // _this.$dgiotBus.$emit('MqttSubscribe', {
-        //   router: _this.router,
-        //   topic: _this.subtopic,
-        //   qos: 0,
-        //   ttl: 1000 * 60 * 60 * 3,
-        // })
       } catch (error) {
         console.log(error)
         _this.$baseMessage(
@@ -999,7 +917,7 @@ export default {
           'dgiot-hey-message-error'
         )
       }
-      _this.subRealtimedata(params)
+      // _this.subRealtimedata(params)
     },
     /**
      * @Author: dext7r
diff --git a/src/views/CloudTest/task/index.vue b/src/views/CloudTest/task/index.vue
index a487e2e17a..7861a62dad 100644
--- a/src/views/CloudTest/task/index.vue
+++ b/src/views/CloudTest/task/index.vue
@@ -30,7 +30,7 @@
                 align="center"
                 :label="$translateTitle('cloudTest.number')"
                 show-overflow-tooltip
-                width="auto"
+                width="50"
               >
                 <template #default="{ $index }">
                   {{ $index + 1 }}
@@ -118,7 +118,7 @@
                 align="center"
                 :label="$translateTitle('cloudTest.number')"
                 show-overflow-tooltip
-                width="auto"
+                width="50"
               >
                 <template #default="{ $index }">
                   {{ $index + 1 }}
diff --git a/src/views/DeviceCloud/manage/component/profile/ProfileDict.vue b/src/views/DeviceCloud/manage/component/profile/ProfileDict.vue
index d0827b9f20..08170b7bb3 100644
--- a/src/views/DeviceCloud/manage/component/profile/ProfileDict.vue
+++ b/src/views/DeviceCloud/manage/component/profile/ProfileDict.vue
@@ -82,12 +82,6 @@
                     <span v-else>否</span>
                   </template>
                 </el-table-column>
-                <!--                  <el-table-column prop="readonly" label="是否只读">-->
-                <!--                    <template #default="{ row }">-->
-                <!--                      <span v-if="row.readonly">是</span>-->
-                <!--                      <span v-else>否</span>-->
-                <!--                    </template>-->
-                <!--                  </el-table-column>-->
                 <el-table-column align="center" label="操作" width="160">
                   <template #default="{ row, $index }">
                     <el-button
diff --git a/src/views/DeviceCloud/manage/js/proddetail.js b/src/views/DeviceCloud/manage/js/proddetail.js
index 7511c2cf95..3b85599c1b 100644
--- a/src/views/DeviceCloud/manage/js/proddetail.js
+++ b/src/views/DeviceCloud/manage/js/proddetail.js
@@ -18,6 +18,7 @@ import {dgiotlog} from '../../../../utils/dgiotLog'
 import {queryView} from '@/api/View'
 import dgiotViews from '@/views/CloudFunction/lowcode'
 import {getProtocol} from '@/api/Protocol'
+import dgiotDict from '@/views/CloudFunction/dict'
 import {
   BaiduMap,
   BmCityList,
@@ -52,6 +53,7 @@ export default {
   components: {
     mqttLog,
     dgiotViews,
+    dgiotDict,
     'dgiot-wmx': wmxdetail,
     'dgiot-profile': profile,
     'thing-form': thingForm,
diff --git a/src/views/DeviceCloud/manage/proddetail.vue b/src/views/DeviceCloud/manage/proddetail.vue
index a58d3943f7..6d9263d9a2 100644
--- a/src/views/DeviceCloud/manage/proddetail.vue
+++ b/src/views/DeviceCloud/manage/proddetail.vue
@@ -2936,6 +2936,10 @@
         >
           <dgiot-views :view-form="viewForm" />
         </el-tab-pane>
+        <!--字典-->
+        <el-tab-pane :label="$translateTitle('product.dict')" name="dict">
+          <dgiot-dict :dict-form="dictForm" />
+        </el-tab-pane>
       </el-tabs>
     </div>