Commit 97abdc288adc43c9756b5ab3a3451078e5de5185

Authored by xp.Huang
2 parents 70b63efb d3d167f2

Merge branch 'dev-fix-ww' into 'main_dev'

fix: 修复teambition BUG

See merge request yunteng/thingskit-front!564
... ... @@ -31,7 +31,7 @@ export const step1Schemas: FormSchema[] = [
31 31 },
32 32 {
33 33 field: 'name',
34   - label: '设备名称/SN码',
  34 + label: '设备名称',
35 35 component: 'Input',
36 36 dynamicRules: () => {
37 37 return [
... ...
... ... @@ -23,7 +23,7 @@ export const columns: BasicColumn[] = [
23 23 },
24 24 {
25 25 dataIndex: 'name',
26   - title: '设备名称/设备SN',
  26 + title: '别名/设备名称',
27 27 width: 210,
28 28 slots: { customRender: 'name', title: 'deviceTitle' },
29 29 customRender: ({ record }) => {
... ... @@ -31,14 +31,14 @@ export const columns: BasicColumn[] = [
31 31 h(
32 32 'p',
33 33 {
34   - style: { cursor: 'pointer', color: '#377dff' },
  34 + class: 'cursor-pointer',
35 35 },
36 36 `${record.alias}`
37 37 ),
38 38 h(
39 39 'p',
40 40 {
41   - style: { cursor: 'pointer', color: '#377dff' },
  41 + class: 'cursor-pointer text-blue-500',
42 42 onClick: () => {
43 43 handeleCopy(`${record.name}`);
44 44 },
... ...
1 1 <template>
2   - <div :class="[`${prefixCls}-bottom`, '!dark:bg-dark-900']">
  2 + <div :class="[`${prefixCls}-bottom`, '!dark:bg-dark-900', 'bg-light-50']">
3 3 <Tabs>
4 4 <template v-for="item in achieveList" :key="item.key">
5 5 <TabPane :tab="item.name">
... ...
... ... @@ -124,7 +124,7 @@ const deviceTableColumn: BasicColumn[] = [
124 124 },
125 125 },
126 126 {
127   - title: '设备名称/设备SN',
  127 + title: '别名/设备名称',
128 128 dataIndex: 'name',
129 129 customRender: ({ record }) => {
130 130 return h('div', [
... ... @@ -138,7 +138,7 @@ const deviceTableColumn: BasicColumn[] = [
138 138 },
139 139 },
140 140 [
141   - h('div', { class: 'text-blue-400 truncate' }, record.alias),
  141 + h('div', { class: 'truncate' }, record.alias),
142 142 h('div', { class: 'text-blue-400 truncate' }, record.name),
143 143 ]
144 144 ),
... ...
... ... @@ -109,7 +109,7 @@
109 109 >
110 110 <svg
111 111 t="1682068997810"
112   - class="icon"
  112 + class="icon transform rotate-180"
113 113 viewBox="0 0 1024 1024"
114 114 version="1.1"
115 115 xmlns="http://www.w3.org/2000/svg"
... ...
... ... @@ -487,7 +487,10 @@
487 487 </WidgetWrapper>
488 488 </GridItem>
489 489 </GridLayout>
490   - <Empty v-if="!dataBoardList.length" />
  490 + <Empty
  491 + v-if="!dataBoardList.length"
  492 + class="fixed top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2"
  493 + />
491 494 </Spin>
492 495 </section>
493 496 <DataBindModal
... ...