Merge branch 'ft_local_dev' into 'main'

pref:优化样式

See merge request huang/yun-teng-iot-front!340

 <template>
 <template>
   <div>
   <div>
-    <BasicModal v-bind="$attrs" width="55rem" :height="heightNum" @register="register" title="执行设备及属性"
-      @cancel="handleCancel" :showOkBtn="false">
+    <BasicModal
+      style="min-height: auto"
+      v-bind="$attrs"
+      width="55rem"
+      @register="register"
+      title="执行设备及属性"
+      @cancel="handleCancel"
+      :showOkBtn="false"
+    >
       <div>
       <div>
         <BasicTable @register="registerTable" :dataSource="tableData" />
         <BasicTable @register="registerTable" :dataSource="tableData" />
       </div>
       </div>
@@ -9,37 +16,39 @@
   </div>
   </div>
 </template>
 </template>
 <script setup lang="ts">
 <script setup lang="ts">
-import { ref, nextTick } from 'vue';
-import { BasicModal, useModalInner } from '/@/components/Modal';
-import { BasicTable, useTable } from '/@/components/Table';
-import { viewDeviceColumn } from './config.data';
-import { reportEditDetailPage } from '/@/api/report/reportManager';
+  import { ref, nextTick } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicTable, useTable } from '/@/components/Table';
+  import { viewDeviceColumn } from './config.data';
+  import { reportEditDetailPage } from '/@/api/report/reportManager';
 
 
-const heightNum = ref(800);
-const tableData: any = ref([]);
-const [registerTable] = useTable({
-  columns: viewDeviceColumn,
-  showIndexColumn: false,
-  clickToRowSelect: false,
-  showTableSetting: false,
-  bordered: true,
-});
-const [register] = useModalInner((data) => {
-  const getTableData = async () => {
-    const res: any = await reportEditDetailPage(data.record.id)
-    const resMap = res.data.executeAttributes.map(d => {
-      return {
-        device: d.name,
-        attribute: d.attributes.join(',')
-      }
-    })
-    tableData.value = resMap
-  };
-  nextTick(() => {
-    getTableData();
+  const tableData: any = ref([]);
+  const [registerTable] = useTable({
+    columns: viewDeviceColumn,
+    showIndexColumn: false,
+    clickToRowSelect: false,
+    showTableSetting: false,
+    bordered: true,
   });
   });
-});
-const handleCancel = () => { };
+  const [register] = useModalInner((data) => {
+    const getTableData = async () => {
+      const res: any = await reportEditDetailPage(data.record.id);
+      const resMap = res.data.executeAttributes.map((d) => {
+        return {
+          device: d.name,
+          attribute: d.attributes.join(','),
+        };
+      });
+      tableData.value = resMap;
+    };
+    nextTick(() => {
+      getTableData();
+    });
+  });
+  const handleCancel = () => {};
 </script>
 </script>
-<style>
+<style lang="less" scoped>
+  :deep(.ant-table-body) {
+    height: 470px !important;
+  }
 </style>
 </style>

@@ -2,6 +2,8 @@ import { BasicColumn, FormSchema } from '/@/components/Table';
 import moment from 'moment';
 import moment from 'moment';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { format } from '../util';
 import { format } from '../util';
+import { h } from 'vue';
+import { Tag } from 'ant-design-vue';
 
 
 //格式化资源类型和操作类型
 //格式化资源类型和操作类型
 let formatText;
 let formatText;
@@ -63,8 +65,12 @@ export const columns: BasicColumn[] = [
     title: '操作状态',
     title: '操作状态',
     dataIndex: 'actionStatus',
     dataIndex: 'actionStatus',
     width: 180,
     width: 180,
-    format: (_, record) => {
-      return record.actionStatus == 'SUCCESS' ? '成功' : '失败';
+    customRender: ({ record }) => {
+      const status = record.actionStatus;
+      const enable = status === 'SUCCESS' ? '成功' : '失败';
+      const color = enable === '成功' ? 'green' : 'red';
+      const text = enable === '成功' ? '成功' : '失败';
+      return h(Tag, { color }, () => text);
     },
     },
   },
   },
   {
   {

@@ -2,6 +2,8 @@ import { BasicColumn, FormSchema } from '/@/components/Table';
 import moment from 'moment';
 import moment from 'moment';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { format } from '../util';
 import { format } from '../util';
+import { Tag } from 'ant-design-vue';
+import { h } from 'vue';
 
 
 //格式化资源类型和操作类型
 //格式化资源类型和操作类型
 let formatText;
 let formatText;
@@ -64,8 +66,12 @@ export const columns: BasicColumn[] = [
     title: '操作状态',
     title: '操作状态',
     dataIndex: 'actionStatus',
     dataIndex: 'actionStatus',
     width: 180,
     width: 180,
-    format: (_, record) => {
-      return record.actionStatus == 'SUCCESS' ? '成功' : '失败';
+    customRender: ({ record }) => {
+      const status = record.actionStatus;
+      const enable = status === 'SUCCESS' ? '成功' : '失败';
+      const color = enable === '成功' ? 'green' : 'red';
+      const text = enable === '成功' ? '成功' : '失败';
+      return h(Tag, { color }, () => text);
     },
     },
   },
   },
   {
   {

@@ -2,6 +2,8 @@ import { BasicColumn, FormSchema } from '/@/components/Table';
 import moment from 'moment';
 import moment from 'moment';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { format } from '../util';
 import { format } from '../util';
+import { h } from 'vue';
+import { Tag } from 'ant-design-vue';
 
 
 // 表格数据
 // 表格数据
 export const columns: BasicColumn[] = [
 export const columns: BasicColumn[] = [
@@ -32,8 +34,12 @@ export const columns: BasicColumn[] = [
     title: '操作状态',
     title: '操作状态',
     dataIndex: 'actionStatus',
     dataIndex: 'actionStatus',
     width: 180,
     width: 180,
-    format: (_, record) => {
-      return record.actionStatus == 'SUCCESS' ? '成功' : '失败';
+    customRender: ({ record }) => {
+      const status = record.actionStatus;
+      const enable = status === 'SUCCESS' ? '成功' : '失败';
+      const color = enable === '成功' ? 'green' : 'red';
+      const text = enable === '成功' ? '成功' : '失败';
+      return h(Tag, { color }, () => text);
     },
     },
   },
   },
   {
   {

@@ -6,7 +6,7 @@ module.exports = {
     'selector-pseudo-class-no-unknown': [
     'selector-pseudo-class-no-unknown': [
       true,
       true,
       {
       {
-        ignorePseudoClasses: ['global'],
+        ignorePseudoClasses: ['global', 'deep'],
       },
       },
     ],
     ],
     'selector-pseudo-element-no-unknown': [
     'selector-pseudo-element-no-unknown': [