wanggang
/
iot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source 
Former-commit-id: 282d214c0bd15fd4aa1271f9b453ef6d2b2f424e
Former-commit-id: 776cc137c72063940e96448c239c7bd5b38a20a9
1.0
wanggang 5 years ago
parent ee5233bcc0
commit 5e37daef12
4 changed files with 151 additions and 6 deletions
Show Stats Download Patch File Download Diff File

6
projects/Application/Domain/IoTCenter/IoTData.cs
Unescape View File

@ -2,7 +2,9 @@ using Infrastructure.Domain;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.Text.Encodings.Web;
using System.Text.Json; using System.Text.Json;
using System.Text.Unicode;
namespace Application.Domain.Entities namespace Application.Domain.Entities
{ {
@ -57,7 +59,9 @@ namespace Application.Domain.Entities
public void SetEnumValues(Dictionary<int, string> values) public void SetEnumValues(Dictionary<int, string> values)
{ {
this.EnumValues = JsonSerializer.Serialize(values); this.EnumValues = JsonSerializer.Serialize(values,new JsonSerializerOptions {
Encoder= JavaScriptEncoder.Create(UnicodeRanges.All)
});
} }
public dynamic GetValue() public dynamic GetValue()

8
projects/Platform/Views/Shared/_Layout.cshtml
Unescape View File

@ -30,8 +30,8 @@
<link rel="stylesheet" href="~/lib/toastr/toastr.min.css"> <link rel="stylesheet" href="~/lib/toastr/toastr.min.css">
<link rel="stylesheet" href="~/lib/jqcron/jqCron.css"> <link rel="stylesheet" href="~/lib/jqcron/jqCron.css">
<link rel="stylesheet" href="~/lib/jstree/themes/default/style.min.css" /> <link rel="stylesheet" href="~/lib/jstree/themes/default/style.min.css" />
@*<link rel="stylesheet" href="~/lib/element-ui/theme-chalk/index.min.css"> <link rel="stylesheet" href="~/lib/element-ui/theme-chalk/index.min.css">
<link rel="stylesheet" href="~/lib/ant-design-vue/antd.min.css">*@ @*<link rel="stylesheet" href="~/lib/ant-design-vue/antd.min.css">*@
<link rel="stylesheet" href="~/css/site.css" asp-append-version="true"> <link rel="stylesheet" href="~/css/site.css" asp-append-version="true">
<title>@HtmlTitle</title> <title>@HtmlTitle</title>
@RenderSection("styles", required: false) @RenderSection("styles", required: false)
@ -182,9 +182,9 @@
<script src="~/lib/jqcron/jqCron.js"></script> <script src="~/lib/jqcron/jqCron.js"></script>
<script src="~/lib/jqcron/jqCron.cn.js"></script> <script src="~/lib/jqcron/jqCron.cn.js"></script>
<script src="~/lib/jstree/jstree.min.js"></script> <script src="~/lib/jstree/jstree.min.js"></script>
@*<script src="~/lib/element-ui/index.min.js"></script> <script src="~/lib/element-ui/index.min.js"></script>
<script src="~/lib/element-ui/locale/zh-CN.min.js"></script> <script src="~/lib/element-ui/locale/zh-CN.min.js"></script>
<script src="~/lib/ant-design-vue/antd.min.js"></script>*@ @*<script src="~/lib/ant-design-vue/antd.min.js"></script>*@
@RenderSection("scripts", required: false) @RenderSection("scripts", required: false)
<script src="~/js/site.js" asp-append-version="true"></script> <script src="~/js/site.js" asp-append-version="true"></script>
</body> </body>

69
projects/Platform/wwwroot/temp/a-tree.html
Unescape View File

@ -0,0 +1,69 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<link rel="stylesheet" href="/lib/element-ui/theme-chalk/index.min.css">
<link rel="stylesheet" href="/lib/ant-design-vue/antd.min.css">
<title>前端测试页</title>
</head>
<body>
<div id="app">
<a-tree :tree-data="treeData"
block-node
show-line
:default-expanded-keys="['0-0-0']"
:default-selected-keys="['0-0-0-1']"
@select="onSelect">
<span slot="title0010" style="color: #1890ff">sss</span>
</a-tree>
<script>
const treeData = [
{
title: 'parent 1',
key: '0-0',
children: [
{
title: 'parent 1-0',
key: '0-0-0',
children: [
{ title: 'leaf', key: '0-0-0-0' },
{ title: 'leaf', key: '0-0-0-1' },
],
},
{
title: 'parent 1-1',
key: '0-0-1',
children: [{ key: '0-0-1-0', slots: { title: 'title0010' } }],
},
],
},
];
</script>
</div>
<script src="/lib/jquery/jquery.min.js"></script>
<script src="/lib/linq/linq.min.js"></script>
<script src="/lib/vue/vue.min.js"></script>
<script src="/lib/element-ui/index.min.js"></script>
<script src="/lib/element-ui/locale/zh-CN.min.js"></script>
<script src="/lib/element-ui/index.min.js"></script>
<script src="/lib/element-ui/locale/zh-CN.min.js"></script>
<script src="/lib/ant-design-vue/antd.min.js"></script>
<script>
var app = new Vue({
el: '#app',
data() {
return {
treeData,
};
},
methods: {
onSelect(selectedKeys, info) {
console.log('selected', selectedKeys, info);
}
}
});
</script>
</body>
</html>

72
projects/Platform/wwwroot/temp/el-tree.html
Unescape View File

@ -0,0 +1,72 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<link rel="stylesheet" href="/lib/element-ui/theme-chalk/index.min.css">
<link rel="stylesheet" href="/lib/ant-design-vue/antd.min.css">
<title>前端测试页</title>
</head>
<body>
<div id="app">
<el-tree :data="treeData"
highlight-current
node-key="key"
:expand-on-click-node="false"
:current-node-key="'0-0-0-1'"
:default-expanded-keys="['0-0-0']"
:props="defaultProps">
</el-tree>
<script>
const treeData = [
{
title: 'parent 1',
key: '0-0',
children: [
{
title: 'parent 1-0',
key: '0-0-0',
children: [
{ title: 'leaf', key: '0-0-0-0' },
{ title: 'leaf', key: '0-0-0-1' },
],
},
{
title: 'parent 1-1',
key: '0-0-1',
children: [{ key: '0-0-1-0', slots: { title: 'title0010' } }],
},
],
},
];
</script>
</div>
<script src="/lib/jquery/jquery.min.js"></script>
<script src="/lib/linq/linq.min.js"></script>
<script src="/lib/vue/vue.min.js"></script>
<script src="/lib/element-ui/index.min.js"></script>
<script src="/lib/element-ui/locale/zh-CN.min.js"></script>
<script src="/lib/element-ui/index.min.js"></script>
<script src="/lib/element-ui/locale/zh-CN.min.js"></script>
<script src="/lib/ant-design-vue/antd.min.js"></script>
<script>
var app = new Vue({
el: '#app',
data() {
return {
treeData,
defaultProps: {
children: 'children',
label: 'title'
}
};
},
methods: {
onSelect(selectedKeys, info) {
console.log('selected', selectedKeys, info);
}
}
});
</script>
</body>
</html>
Write Preview
Loading…
Cancel
Save