fix: 8/24测试bug

src/components/TableProV2/index.tsx

@@ -0,0 +1,59 @@
+import { defineComponent, ref } from 'vue'
+
+// interface Methods {
+//   get: string
+//   post: string
+//   put: string
+//   del: string
+// }
+
+export default defineComponent({
+  name: 'table-pro-v2',
+  props: {
+    methods: {
+      type: Object,
+      required: true,
+      default: () => ({
+        get: '',
+        post: '',
+        put: '',
+        del: ''
+      }),
+      validator: function (keys: 'get' | 'post' | 'put' | 'del') {
+        return keys === 'get'
+      }
+    },
+    columns: {
+      type: Array,
+      default: () => [],
+      required: true
+    },
+    pagination: {
+      type: Object || false,
+      required: true,
+      default: false
+      // validator: function (keys: 'page' | 'pageSize' | 'total' | 'delete') {
+      //   return keys === 'page'
+      // }
+    }
+  },
+  setup (props, ctx) {
+    const loading = ref<boolean>(false)
+    // const { get, post, put, del } = props.methods
+    return () => (
+      <>
+        <a-row>
+          <a-col></a-col>
+          <a-col></a-col>
+        </a-row>
+        {/* <a-table
+          columns={props.columns}
+          loading={loading}
+          pagination={props.pagination}
+        >
+
+        </a-table> */}
+      </>
+    )
+  }
+})

src/pages/Iot/device/components/deviceShadow.vue

@@ -58,7 +58,8 @@ const columns = [
   {
     title: '值',
     dataIndex: 'value',
-    key: 'value'
+    key: 'value',
+    ellipsis: true
   }
 ]
 

src/pages/Iot/device/components/live.vue

@@ -13,6 +13,7 @@
       </a-col>
     </a-row>
     <video-player-tsx
+      style="width: 100%;"
       :video-url="state.deviceDetail.rtsPlayUrl"
     />
   </a-card>

src/pages/Iot/device/components/overview.vue

@@ -56,7 +56,11 @@
           <div class="data">
             <div>{{item.key}}</div>
             <div>{{item.keyLabel}}</div>
+            <a-tooltip>
+            <template #title><span> {{item[CommonController.dataTypeByKeyMap.get(item.dataType)]}}</span> <span v-if='item.dataUnit'>{{item.dataUnit}}</span></template>
             <div> <span>{{'<'}} {{item[CommonController.dataTypeByKeyMap.get(item.dataType)]}}</span> <span v-if='item.dataUnit'>{{item.dataUnit}}</span> {{'>'}}</div>
+          </a-tooltip>
+
             <div>{{dayjs(item.ts).format('YYYY/MM/DD HH:MM:ss')}}</div>
           </div>
         </a-col>
@@ -151,7 +155,15 @@ onMounted(async () => {
   justify-content: space-around;
   align-items: center;
   height: 100px;
-
+  margin-bottom: 10px;
+  font-weight: 500;
+  div {
+    white-space: nowrap;
+    overflow: hidden;
+    width: 200px;
+    text-overflow: ellipsis;
+    text-align: center;
+  }
 }
 
 </style>

src/pages/Iot/device/detail.vue

@@ -1,6 +1,8 @@
 <template>
-  <a-card>
-    <a-spin spinning="" >
+  <a-card
+    title="设备详情"
+  >
+    <a-spin :spinning="state.spinning" >
       <a-tabs v-model:activeKey="state.tabsActive">
       <a-tab-pane
         v-for="item in state.tabs"

src/pages/Iot/model/components/modelDefine.vue

@@ -99,7 +99,7 @@
       <a-form-item label="访问权限" v-bind="validateInfos.scope" >
         <a-checkbox-group v-model:value="attrRef.scope" name="checkboxgroup" :options="[{label: '读', value: 'R'}, {label: '写', value: 'W'}]" />
       </a-form-item>
-      <a-form-item label="单位" >
+      <a-form-item label="单位" v-bind="validateInfos.dataUnit">
         <a-input allowClear v-model:value="attrRef.dataUnit"  />
       </a-form-item>
       <a-form-item label="计算表达式" >
@@ -361,6 +361,7 @@ const { resetFields, validate: validateAttr, validateInfos } = useForm(attrRef,
   attributeLabel: [{ required: true, message: '请填写属性名称' }],
   attributeKey: [{ required: true, message: '请填写属性值' }],
   dataType: [{ required: true, message: '请选择数据类型' }],
+  scope: [{ required: true, message: '请选择访问权限' }],
   dataUnit: [{ required: true, message: '请填写数据单位' }]
 }))
 

src/pages/Iot/rule/forwardRule.vue

@@ -594,8 +594,8 @@ const subjectResourceList = Array.from(RuleController.SubjectResourceMap, ([key,
 
 const subjectEventListByResourceMap = new Map([
   [SubjectResourceEnum.DEVICE, [SubjectEventEnum.DEVICE_CREATE, SubjectEventEnum.DEVICE_DELETE]],
-  [SubjectResourceEnum.DEVICE_STATUS, [SubjectEventEnum.DEVICE_ATTRIBUTE_REPORT]],
-  [SubjectResourceEnum.DEVICE_ATTRIBUTE, [SubjectEventEnum.DEVICE_STATUS_UPDATE]],
+  [SubjectResourceEnum.DEVICE_STATUS, [SubjectEventEnum.DEVICE_STATUS_UPDATE]],
+  [SubjectResourceEnum.DEVICE_ATTRIBUTE, [SubjectEventEnum.DEVICE_ATTRIBUTE_REPORT]],
   [SubjectResourceEnum.MODEL, [SubjectEventEnum.MODEL_CREATE, SubjectEventEnum.MODEL_DELETE]]
 ])