0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.2-dev' of https://git.drgyen.cn/0017/iot-ui-vue into 2.2-dev

This commit is contained in:
lmx019 2025-04-22 14:04:56 +08:00
parent d434d1b88f cb2a53ebc9
commit bce56d87e2
8 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@ -5,7 +5,7 @@
<%- favicon %> <%- favicon %>
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title><%- title %></title> <title><%- title %></title>
<script src="/js/liveplayer-lib.min.js"></script> <script async src="/js/liveplayer-lib.min.js"></script>
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>

2
public/js/liveplayer-lib.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/App.vue
View File

@ -2,7 +2,7 @@
<ConfigProvider <ConfigProvider
:locale='zhCN' :locale='zhCN'
:IconConfig="{ :IconConfig="{
scriptUrl: '//at.alicdn.com/t/c/font_4035907_i1jazcune3.js' scriptUrl: '//at.alicdn.com/t/c/font_4897070_smrhto86ewf.js'
}" }"
> >
<router-view /> <router-view />

12
src/components/CardBox/index.vue
View File

@ -208,6 +208,7 @@ const handleClick = () => {
border: 1px solid #e6e6e6; border: 1px solid #e6e6e6;
overflow: hidden; overflow: hidden;
cursor: pointer; cursor: pointer;
border-radius: 10px;
&:hover { &:hover {
box-shadow: 0 0 24px rgba(#000, 0.1); box-shadow: 0 0 24px rgba(#000, 0.1);
@ -281,8 +282,8 @@ const handleClick = () => {
width: 100px; width: 100px;
padding: 2px 0; padding: 2px 0;
background-color: rgba(#5995f5, 0.15); background-color: rgba(#5995f5, 0.15);
transform: skewX(45deg); //transform: skewX(45deg);
border-radius: 15px 0 0 15px;
&.success { &.success {
background-color: @success-color-deprecated-bg; background-color: @success-color-deprecated-bg;
} }
@ -296,7 +297,7 @@ const handleClick = () => {
} }
.card-state-content { .card-state-content {
transform: skewX(-45deg); //transform: skewX(-45deg);
} }
} }
@ -424,8 +425,9 @@ const handleClick = () => {
width: 100%; width: 100%;
border-radius: 0; border-radius: 0;
background: #f6f6f6; background: #f6f6f6;
border: 1px solid #e6e6e6; border: none;
color: #2f54eb; color: #2f54eb;
border-radius: 20px;
&:hover { &:hover {
background-color: @primary-color-hover; background-color: @primary-color-hover;
@ -456,7 +458,7 @@ const handleClick = () => {
:deep(button) { :deep(button) {
background: @error-color-deprecated-bg; background: @error-color-deprecated-bg;
border: 1px solid @error-color-outline; //border: 1px solid @error-color-outline;
span { span {
color: @error-color !important; color: @error-color !important;

17
src/views/device/Instance/Detail/Running/Event/index.vue
View File

@ -82,6 +82,23 @@ const visible = ref<boolean>(false);
const info = ref<Record<string, any>>({}); const info = ref<Record<string, any>>({});
const objectKey = ref<Array>([]); const objectKey = ref<Array>([]);
const componentsType = {
int: 'number',
long: 'number',
float: 'number',
double: 'number',
string: 'string',
array: 'string',
password: 'string',
enum: 'select',
boolean: 'select',
date: 'date',
object: 'string',
geoPoint: 'string',
file: 'string',
time: 'time',
}
const _getEventList = (_params: any) => const _getEventList = (_params: any) =>
getEventList(instanceStore.current.id || '', events.data.id || '', _params); getEventList(instanceStore.current.id || '', events.data.id || '', _params);

2
src/views/home/components/PlatformPicCard.vue
View File

@ -48,7 +48,7 @@ const props = defineProps({
width: 100%; width: 100%;
height: calc(100% - 50px); height: calc(100% - 50px);
margin-top: 40px; margin-top: 40px;
background-size: auto 90%; background-size: 85%;
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;
} }

1
src/views/home/index.vue
View File

@ -164,6 +164,7 @@ if (isNoCommunity) {
} }
} }
.platform-pic-container{ .platform-pic-container{
border-bottom: none;
.title{ .title{
padding-left: 40px; padding-left: 40px;
&::before { &::before {

4
src/views/system/Menu/components/fields.ts
View File

@ -144,6 +144,8 @@ const data = [
'Sliders', 'Sliders',
]; ];
const other = ["AccountBook","Aim","Alert","Apartment","Api","AppstoreAdd","Appstore","Audio","AudioMuted","Audit","Bank","Barcode","Bars","Bell","Block","Book","Border","BorderlessTable","Branches","Bug","Build","Bulb","Calculator","Calendar","Camera","Car","CarryOut","CiCircle","Ci","Clear","CloudDownload","Cloud","CloudServer","CloudSync","CloudUpload","Cluster","Code","Coffee","Comment","Compass","Compress","ConsoleSql","Contacts","Container","Control","CopyrightCircle","Copyright","CreditCard","Crown","CustomerService","Dashboard","Database","DeleteColumn","DeleteRow","DeliveredProcedure","DeploymentUnit","Desktop","Dingtalk","Disconnect","Dislike","DollarCircle","Dollar","Download","Ellipsis","Environment","EuroCircle","Euro","Exception","ExpandAlt","Expand","Experiment","Export","Eye","EyeInvisible","FieldBinary","FieldNumber","FieldString","FieldTime","FileAdd","FileDone","FileExcel","FileExclamation","File","FileGif","FileImage","FileJpg","FileMarkdown","FilePdf","FilePpt","FileProtect","FileSearch","FileSync","FileText","FileUnknown","FileWord","FileZip","Filter","Fire","Flag","FolderAdd","Folder","FolderOpen","FolderView","Fork","FormatPainter","Frown","Function","FundProjectionScreen","FundView","FunnelPlot","Gateway","Gif","Gift","Global","Gold","Group","Hdd","Heart","History","Holder","Home","Hourglass","Idcard","Import","Inbox","InsertRowAbove","InsertRowBelow","InsertRowLeft","InsertRowRight","Insurance","Interaction","Key","Laptop","Layout","Like","Line","Link","Loading3Quarters","Loading","Lock","MacCommand","Mail","Man","MedicineBox","Meh","Menu","MergeCells","Message","Mobile","MoneyCollect","Monitor","More","NodeCollapse","NodeExpand","NodeIndex","Notification","Number","OneToOne","PaperClip","Partition","PayCircle","Percentage","Phone","Picture","PlaySquare","PoundCircle","Pound","Poweroff","Printer","Profile","Project","PropertySafety","PullRequest","Pushpin","Qrcode","Read","Reconciliation","RedEnvelope","Reload","Rest","Robot","Rocket","RotateLeft","RotateRight","SafetyCertificate","Safety","Save","Scan","Schedule","Search","SecurityScan","Select","Send","Setting","Shake","ShareAlt","Shop","ShoppingCart","Shopping","Sisternode","Skin","Smile","Solution","Sound","SplitCells","Star","Subnode","Switcher","Sync","Table","Tablet","Tag","Tags","Team","Thunderbolt","ToTop","Tool","TrademarkCircle","Trademark","Transaction","Translation","Trophy","Ungroup","Unlock","Upload","Usb","UserAdd","UserDelete","User","UserSwitch","UsergroupAdd","UsergroupDelete","Verified","VideoCameraAdd","VideoCamera","Wallet","WhatsApp","Wifi","Woman"]
// const logo = [ // const logo = [
// 'Android', // 'Android',
// 'Apple', // 'Apple',
@ -240,7 +242,7 @@ const data = [
// 'setTwoToneColor', // 'setTwoToneColor',
// ]; // ];
const datum = [...direction, ...suggestion, ...editor, ...data]; const datum = [...direction, ...suggestion, ...editor, ...data, ...other];
const iconKeys = datum.map((item) => item + 'Outlined'); const iconKeys = datum.map((item) => item + 'Outlined');