Skip to content

D
device-new-platform
Commit 8b1ae536 authored by 赵啸非's avatar 赵啸非
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents d286341b 3234e8d6
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3337 additions and 1424 deletions
device-manager-ui/admin/src/assets/fonts/demo.css 0 → 100644
View file @ 8b1ae536
/* Logo 字体 */
@font-face {
font-family: "iconfont logo";
src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
}
.logo {
font-family: "iconfont logo";
font-size: 160px;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
/* tabs */
.nav-tabs {
position: relative;
}
.nav-tabs .nav-more {
position: absolute;
right: 0;
bottom: 0;
height: 42px;
line-height: 42px;
color: #666;
}
#tabs {
border-bottom: 1px solid #eee;
}
#tabs li {
cursor: pointer;
width: 100px;
height: 40px;
line-height: 40px;
text-align: center;
font-size: 16px;
border-bottom: 2px solid transparent;
position: relative;
z-index: 1;
margin-bottom: -1px;
color: #666;
}
#tabs .active {
border-bottom-color: #f00;
color: #222;
}
.tab-container .content {
display: none;
}
/* 页面布局 */
.main {
padding: 30px 100px;
width: 960px;
margin: 0 auto;
}
.main .logo {
color: #333;
text-align: left;
margin-bottom: 30px;
line-height: 1;
height: 110px;
margin-top: -50px;
overflow: hidden;
*zoom: 1;
}
.main .logo a {
font-size: 160px;
color: #333;
}
.helps {
margin-top: 40px;
}
.helps pre {
padding: 20px;
margin: 10px 0;
border: solid 1px #e7e1cd;
background-color: #fffdef;
overflow: auto;
}
.icon_lists {
width: 100% !important;
overflow: hidden;
*zoom: 1;
}
.icon_lists li {
width: 100px;
margin-bottom: 10px;
margin-right: 20px;
text-align: center;
list-style: none !important;
cursor: default;
}
.icon_lists li .code-name {
line-height: 1.2;
}
.icon_lists .icon {
display: block;
height: 100px;
line-height: 100px;
font-size: 42px;
margin: 10px auto;
color: #333;
-webkit-transition: font-size 0.25s linear, width 0.25s linear;
-moz-transition: font-size 0.25s linear, width 0.25s linear;
transition: font-size 0.25s linear, width 0.25s linear;
}
.icon_lists .icon:hover {
font-size: 100px;
}
.icon_lists .svg-icon {
/* 通过设置 font-size 来改变图标大小 */
width: 1em;
/* 图标和文字相邻时，垂直对齐 */
vertical-align: -0.15em;
/* 通过设置 color 来改变 SVG 的颜色/fill */
fill: currentColor;
/* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
normalize.css 中也包含这行 */
overflow: hidden;
}
.icon_lists li .name,
.icon_lists li .code-name {
color: #666;
}
/* markdown 样式 */
.markdown {
color: #666;
font-size: 14px;
line-height: 1.8;
}
.highlight {
line-height: 1.5;
}
.markdown img {
vertical-align: middle;
max-width: 100%;
}
.markdown h1 {
color: #404040;
font-weight: 500;
line-height: 40px;
margin-bottom: 24px;
}
.markdown h2,
.markdown h3,
.markdown h4,
.markdown h5,
.markdown h6 {
color: #404040;
margin: 1.6em 0 0.6em 0;
font-weight: 500;
clear: both;
}
.markdown h1 {
font-size: 28px;
}
.markdown h2 {
font-size: 22px;
}
.markdown h3 {
font-size: 16px;
}
.markdown h4 {
font-size: 14px;
}
.markdown h5 {
font-size: 12px;
}
.markdown h6 {
font-size: 12px;
}
.markdown hr {
height: 1px;
border: 0;
background: #e9e9e9;
margin: 16px 0;
clear: both;
}
.markdown p {
margin: 1em 0;
}
.markdown>p,
.markdown>blockquote,
.markdown>.highlight,
.markdown>ol,
.markdown>ul {
width: 80%;
}
.markdown ul>li {
list-style: circle;
}
.markdown>ul li,
.markdown blockquote ul>li {
margin-left: 20px;
padding-left: 4px;
}
.markdown>ul li p,
.markdown>ol li p {
margin: 0.6em 0;
}
.markdown ol>li {
list-style: decimal;
}
.markdown>ol li,
.markdown blockquote ol>li {
margin-left: 20px;
padding-left: 4px;
}
.markdown code {
margin: 0 3px;
padding: 0 5px;
background: #eee;
border-radius: 3px;
}
.markdown strong,
.markdown b {
font-weight: 600;
}
.markdown>table {
border-collapse: collapse;
border-spacing: 0px;
empty-cells: show;
border: 1px solid #e9e9e9;
width: 95%;
margin-bottom: 24px;
}
.markdown>table th {
white-space: nowrap;
color: #333;
font-weight: 600;
}
.markdown>table th,
.markdown>table td {
border: 1px solid #e9e9e9;
padding: 8px 16px;
text-align: left;
}
.markdown>table th {
background: #F7F7F7;
}
.markdown blockquote {
font-size: 90%;
color: #999;
border-left: 4px solid #e9e9e9;
padding-left: 0.8em;
margin: 1em 0;
}
.markdown blockquote p {
margin: 0;
}
.markdown .anchor {
opacity: 0;
transition: opacity 0.3s ease;
margin-left: 8px;
}
.markdown .waiting {
color: #ccc;
}
.markdown h1:hover .anchor,
.markdown h2:hover .anchor,
.markdown h3:hover .anchor,
.markdown h4:hover .anchor,
.markdown h5:hover .anchor,
.markdown h6:hover .anchor {
opacity: 1;
display: inline-block;
}
.markdown>br,
.markdown>p>br {
clear: both;
}
.hljs {
display: block;
background: white;
padding: 0.5em;
color: #333333;
overflow-x: auto;
}
.hljs-comment,
.hljs-meta {
color: #969896;
}
.hljs-string,
.hljs-variable,
.hljs-template-variable,
.hljs-strong,
.hljs-emphasis,
.hljs-quote {
color: #df5000;
}
.hljs-keyword,
.hljs-selector-tag,
.hljs-type {
color: #a71d5d;
}
.hljs-literal,
.hljs-symbol,
.hljs-bullet,
.hljs-attribute {
color: #0086b3;
}
.hljs-section,
.hljs-name {
color: #63a35c;
}
.hljs-tag {
color: #333333;
}
.hljs-title,
.hljs-attr,
.hljs-selector-id,
.hljs-selector-class,
.hljs-selector-attr,
.hljs-selector-pseudo {
color: #795da3;
}
.hljs-addition {
color: #55a532;
background-color: #eaffea;
}
.hljs-deletion {
color: #bd2c00;
background-color: #ffecec;
}
.hljs-link {
text-decoration: underline;
}
/* 代码高亮 */
/* PrismJS 1.15.0
https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
/**
* prism.js default theme for JavaScript, CSS and HTML
* Based on dabblet (http://dabblet.com)
* @author Lea Verou
*/
code[class*="language-"],
pre[class*="language-"] {
color: black;
background: none;
text-shadow: 0 1px white;
font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
text-align: left;
white-space: pre;
word-spacing: normal;
word-break: normal;
word-wrap: normal;
line-height: 1.5;
-moz-tab-size: 4;
-o-tab-size: 4;
tab-size: 4;
-webkit-hyphens: none;
-moz-hyphens: none;
-ms-hyphens: none;
hyphens: none;
}
pre[class*="language-"]::-moz-selection,
pre[class*="language-"] ::-moz-selection,
code[class*="language-"]::-moz-selection,
code[class*="language-"] ::-moz-selection {
text-shadow: none;
background: #b3d4fc;
}
pre[class*="language-"]::selection,
pre[class*="language-"] ::selection,
code[class*="language-"]::selection,
code[class*="language-"] ::selection {
text-shadow: none;
background: #b3d4fc;
}
@media print {
code[class*="language-"],
pre[class*="language-"] {
text-shadow: none;
}
}
/* Code blocks */
pre[class*="language-"] {
padding: 1em;
margin: .5em 0;
overflow: auto;
}
:not(pre)>code[class*="language-"],
pre[class*="language-"] {
background: #f5f2f0;
}
/* Inline code */
:not(pre)>code[class*="language-"] {
padding: .1em;
border-radius: .3em;
white-space: normal;
}
.token.comment,
.token.prolog,
.token.doctype,
.token.cdata {
color: slategray;
}
.token.punctuation {
color: #999;
}
.namespace {
opacity: .7;
}
.token.property,
.token.tag,
.token.boolean,
.token.number,
.token.constant,
.token.symbol,
.token.deleted {
color: #905;
}
.token.selector,
.token.attr-name,
.token.string,
.token.char,
.token.builtin,
.token.inserted {
color: #690;
}
.token.operator,
.token.entity,
.token.url,
.language-css .token.string,
.style .token.string {
color: #9a6e3a;
background: hsla(0, 0%, 100%, .5);
}
.token.atrule,
.token.attr-value,
.token.keyword {
color: #07a;
}
.token.function,
.token.class-name {
color: #DD4A68;
}
.token.regex,
.token.important,
.token.variable {
color: #e90;
}
.token.important,
.token.bold {
font-weight: bold;
}
.token.italic {
font-style: italic;
}
.token.entity {
cursor: help;
}
device-manager-ui/admin/src/assets/fonts/demo_index.html 0 → 100644
View file @ 8b1ae536
This diff is collapsed.
device-manager-ui/admin/src/assets/fonts/iconfont.css 0 → 100644
View file @ 8b1ae536
@font-face {
font-family: "iconfont"; /* Project id 3597207 */
src: url('iconfont.woff2?t=1660811949301') format('woff2'),
url('iconfont.woff?t=1660811949301') format('woff'),
url('iconfont.ttf?t=1660811949301') format('truetype');
}
.iconfont {
font-family: "iconfont" !important;
font-size: 16px;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.icon-xitongguanli:before {
content: "\e627";
}
.icon-shouye:before {
content: "\e751";
}
.icon-shezhi:before {
content: "\e64b";
}
.icon-xiaoxi:before {
content: "\e60d";
}
.icon-gaojing:before {
content: "\ec34";
}
.icon-dalou:before {
content: "\e6bc";
}
.icon-xitongguanli1:before {
content: "\e632";
}
device-manager-ui/admin/src/assets/fonts/iconfont.js 0 → 100644
View file @ 8b1ae536
This diff is collapsed.
device-manager-ui/admin/src/assets/fonts/iconfont.json 0 → 100644
View file @ 8b1ae536
{
"id": "3597207",
"name": "物联网",
"font_family": "iconfont",
"css_prefix_text": "icon-",
"description": "",
"glyphs": [
{
"icon_id": "12889883",
"name": "系统管理-部门管理",
"font_class": "xitongguanli",
"unicode": "e627",
"unicode_decimal": 58919
},
{
"icon_id": "577364",
"name": "首页",
"font_class": "shouye",
"unicode": "e751",
"unicode_decimal": 59217
},
{
"icon_id": "629333",
"name": "设置",
"font_class": "shezhi",
"unicode": "e64b",
"unicode_decimal": 58955
},
{
"icon_id": "1311632",
"name": "消息",
"font_class": "xiaoxi",
"unicode": "e60d",
"unicode_decimal": 58893
},
{
"icon_id": "5764445",
"name": "告警",
"font_class": "gaojing",
"unicode": "ec34",
"unicode_decimal": 60468
},
{
"icon_id": "8361756",
"name": "大楼",
"font_class": "dalou",
"unicode": "e6bc",
"unicode_decimal": 59068
},
{
"icon_id": "12820187",
"name": "系统管理",
"font_class": "xitongguanli1",
"unicode": "e632",
"unicode_decimal": 58930
}
]
}
device-manager-ui/admin/src/assets/images/home.svg 0 → 100644
View file @ 8b1ae536
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12">
<image id="首页" y="0.5" width="12" height="11" xlink:href="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAALCAYAAABLcGxfAAAA1UlEQVQokYWOsUqCYRSGH/+iEMpoqEncEhrE3VXcuoDuQ6IL0ckuoKEhaBMXaXFLWrqA0HBwbAt85MAX/HwoHjh857zneT9e1Ly76lz9UB/yew4/qhv1Xm2qa3WyzzBOwG1JK9SpulLr/4aG+q7OErAr5kBdqL1YvtXfHVDeT6rHwBDocLh+gJcC+AROMvwKuMm0S2AZhhpQyeBn4A3olfQNUA1DxPorHdrAF/AK3JX0YI4CDmcLOEviOXAKGECao+pAUVEj0ihlDEPsF+mjqGV6r4H+FhxB2YcETV9JAAAAAElFTkSuQmCC"/>
</svg>
device-manager-ui/admin/src/assets/images/告警管理.svg 0 → 100644
View file @ 8b1ae536
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12">
<image id="告警管理" x="-1" y="-1" width="14" height="14" xlink:href="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAABS0lEQVQokX3Sv0vXYRAH8Nc3ysoQCyohI2moISfRfyDBIWhrCUFCaBKKGoSmmvoDmqIc+gcsCIkgaFLQMRpcBLPIsR+TOFQXp/eFJ60O7vN87t539zz3vutEhH/IFfTi+d/g/yW+xjkM70NwoM4+LGGiwd7gRWNfxEq3UDexg4NYxxje4TrGsYqrWKv4zk5GPrXRidiVhxExGBGnIuJu+e60sfnpi4gTpSlTe4qljhV2ISKOR0R/kvO2SMgn/cA1nMcrHMUklvEMIziE7ezrRhn3cLJ6nsdi9foSp/ENXzGtCPlcwekcqv8nmMElPC7fMXzHx5bVrvys8yk+oR8PyvfHwPPGdqZHGjvp32rsntLd+dXm3MZs9fqhsLNVeKOxD2MO9zPxDDZxC+8xUIFJRj69S9iX2t0FXM7EvOURRvFrby+N5MYktombvwGs+p53uBB4fAAAAABJRU5ErkJggg=="/>
</svg>
device-manager-ui/admin/src/assets/images/平台设置.svg 0 → 100644
View file @ 8b1ae536
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12">
<image id="平台设置" width="12" height="12" xlink:href="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAABH0lEQVQokV2RPSjFYRTGf66v2x0sDFIXg2sQIaOFUWazRcrHoEzKakPJ4ApZlLLcQcqgTAwyW2wykFISZfHTe++Rf06d932ec07nvOd5UbO+oB6pnRFbV8tqy29NXTqAJmAt7iegH3gHvoBXYBBYBe6y3Stqe+CC2pXJHasTCeeoWStQDzQE/wQe+bMPoFhl6qJ6o05FtzH1RN1TZyNWUi/UjUSuI5BwUT1T+9TmwJORy6mb6UlXwH0MT2PfqsvVFr4FBiL3DZSTSpVQYimUSWp1AA9Ab8SfgWVgPI1KGm+ruxlV5tUVNR98Tr1Uh7Ky7md2+e8H6khW1kagB+gGCsAWsAOUgDwwDLSlwt+fTjYKzADtwDnwAkzHn5wCh4A/YfIQmkKOjGcAAAAASUVORK5CYII="/>
</svg>
device-manager-ui/admin/src/assets/images/生产厂商.svg 0 → 100644
View file @ 8b1ae536
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12">
<image id="生产厂商" width="12" height="12" xlink:href="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAABG0lEQVQokW3QPUsQUBTG8Z/iS1lBomtzU5NCNiRuQQ5+gVAIitYWl8APIDS6uURDTYWrm0a7RmAO4hItLiIFRtQTp45g4YFz7z333ufe/3kkqVxOcphkv/MgyfM++ydrmEpynGQ6yZXOW0mOksz8LxjCTWzgA+76G++whqd4i+89/xF8wzHu4RkGsdJ7t3EDl/EEC/XNQpKtC3jfJHlwrq6+Foca4RNmsYQBvMAORrGK7Ua6dib42YcTLRjBj8a7XhcxjNMzpO0LkDaSPD5XbyZ5VC9U7OI+ttqhebzHL7zGQ3ysupBOMdai9X6g+MuhL3iFfUyXvSUo2+7gBC9bcBVzvS6LL2EGnwfKvlYfdcMVhTLejX/t/Uns/Qb8YcvTPw2WuQAAAABJRU5ErkJggg=="/>
</svg>
device-manager-ui/admin/src/assets/images/站点分布图标.svg 0 → 100644
View file @ 8b1ae536
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="14" height="12" viewBox="0 0 14 12">
<image id="图层_19" data-name="图层 19" width="14" height="12" xlink:href="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAMCAYAAABSgIzaAAABCElEQVQokW2SP0sDQRDFf4mamEaIIJc2zV2wtLWQtNaC6VKkChH8Bgd3nUXIB4jphJAvIAgWIf5pBVMdNuly16oQUp0MjrJ3tw+m2LfzZubNbilNU0x4YdIChkBN6RUwiHxnY+btUsQFcJ5jR8DSJMoFmb1YgbMJH4EPYAt8Aq86bhbi0RZuEN+7QXxtu5P4X44XJuLtWGoBsogb9TUFqsq9RL4jE/wKvTA5BZ6BhXA60hrYB+pa7Ag4jHynYZre0WpnBS8GvDB5+zuW3CDuAZfAiY41jnznPScQGx2gDcyAO+l4a+RcAQdAN9dsorygDzRtz1GxcNnvBXsifAK+Nb70nMdDJgfmP68GamceNFjdAAAAAElFTkSuQmCC"/>
</svg>
device-manager-ui/admin/src/assets/images/站点设备地点.svg 0 → 100644
View file @ 8b1ae536
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="11" height="14" viewBox="0 0 11 14">
<image id="地点" width="11" height="14" xlink:href="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAAOCAYAAAD5YeaVAAABMUlEQVQokWWSvy9EQRSFv92oKFcyOkGy0+gkKhKVAgUq8SOio1aIwk12oqbwH1CIQkOiV4hiJUIkTCEiSEyi0InCPrnMvLy8vdXMPd87c+7Mq2RZRirrwhqwAvQDr8C+F7OT9By2LhwCc7TXmRczqd1qBKcK4DYwDGzE/YR1YUkXHbGRwBMvZiv2mtaFQUDBeeCgGoUUvFUK0SrqybkJLALT1gXRE4Cx6Jp0kvNpwa0BXAO7Bf04h72YJ+C87R7+686LuS06ay0D3yVQsy6kTQ57Mc/ARQm+Sa5alXrjvRvYA7qANx0S6AE+gaO4/gHW1fkhCrNejD73CPCij+HFrAIzwL1mV1gn16/HrQsDXswjMOTFXFoX+rQP9Cr392/Eux2NA30BH0AN6NSowJUXs/kLKj9euCTXiIAAAAAASUVORK5CYII="/>
</svg>
device-manager-ui/admin/src/assets/images/系统管理.svg 0 → 100644
View file @ 8b1ae536
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12">
<image id="系统管理" width="12" height="12" xlink:href="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAA80lEQVQokY2RsUoDQBBEnxICMaKSSg1WgtgGLP0EwUI7IT8hduYjUmol1taSSgujoK2FnZWFEBBiI6jwZHUDpynMwMHu7c7s3tyU+gQ0mQyDIAicAP1/KDWggz/YDN4E53o62XNjeuOYB1YrQKy0BDSKlpciDrEPYAjsxJihvzFQG2ozV4z6ulpTqzFhFjgAesACUAdWgHPgNiccA8vA2ejRfXVfbaXqjHqXtcNii8Uonqq9vLhJwmfm7UIg8FZaeak+ZLwXFuaUNbWrvqu7o+arVLjIvKK+/jEjsBU/HdZtAFXgGXgEWkAbOALuge1vI6D+BQSZFivDzo07AAAAAElFTkSuQmCC"/>
</svg>
device-manager-ui/admin/src/assets/images/设备管理.svg 0 → 100644
View file @ 8b1ae536
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12">
<image id="设备管理" width="12" height="12" xlink:href="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAA/klEQVQokYWRPysFUBiHH6KuZJE/oWSQxWKx+BpKhsvNRzAYfABfwIQyKJPFoEyK6JZYsIliuINkMFwmt0dv96jjGLx1hvP+3l/n95y3QyWrYWADGAJawCmwmQ908rvmgWXgHvgA1gudruI+BuwBa+l+8Z/hFtgHepK5vzQQDMWZVl/VHbWv1PMX5hJsA/gEmsAMMAjcAY8x9PNLi8AWUI9eMnSnyL3AKDCVM4wDh8DKn8ztuswZdtUn9U09UgeyzDX1XG2qJ2o1mu/qrDqpNtSFzFBXt9UJ9Vg9i8W9ANcJ6gGoZFG+kvYM3MT2gyE2GrAhBstVkX0VWAJGgINvUm2gs7a/fSsAAAAASUVORK5CYII="/>
</svg>
device-manager-ui/admin/src/assets/less/base.less
View file @ 8b1ae536
...@@ -150,9 +150,18 @@ ins,a { ...@@ -150,9 +150,18 @@ ins,a {
} }
} }
} }
.table-foot{
display: flex;
justify-content: flex-end;
}
.el-table th { .el-table th {
user-select: all; user-select: all;
} }
/* el-table列数据为空自动显示-- */
.cell:empty::before{
content:'--';
color:gray;
}
.el-progress-bar{ .el-progress-bar{
padding-right: 70px; padding-right: 70px;
margin-right: -70px; margin-right: -70px;
......
device-manager-ui/admin/src/components/AMap.vue
View file @ 8b1ae536
<template lang="html"> <template lang="html">
<div style="width:100%;height:800px;"> <div style="width:100%;height:100%;">
<div class="container"> <div class="container">
<!-- <div class="search-box"> <!-- <div class="search-box">
<input <input
...@@ -33,22 +33,22 @@ ...@@ -33,22 +33,22 @@
</template> </template>
<script> <script>
import { AMapManager, lazyAMapApiLoaderInstance } from 'vue-amap' import { AMapManager, lazyAMapApiLoaderInstance } from "vue-amap";
let amapManager = new AMapManager() let amapManager = new AMapManager();
export default { export default {
name:'AMap', name: "AMap",
data() { data() {
let self = this let self = this;
return { return {
address: null, address: null,
searchKey: '', searchKey: "",
amapManager, amapManager,
markers: [], markers: [],
searchOption: { searchOption: {
city: '全国', city: "全国",
citylimit: true citylimit: true,
}, },
center: [112.938888,28.228272], center: [112.938888, 28.228272],
zoom: 17, zoom: 17,
lng: 0, lng: 0,
lat: 0, lat: 0,
...@@ -56,153 +56,153 @@ export default { ...@@ -56,153 +56,153 @@ export default {
events: { events: {
init() { init() {
lazyAMapApiLoaderInstance.load().then(() => { lazyAMapApiLoaderInstance.load().then(() => {
self.initSearch() self.initSearch();
}) });
}, },
// 点击获取地址的数据 // 点击获取地址的数据
click(e) { click(e) {
self.markers = [] self.markers = [];
let { lng, lat } = e.lnglat let { lng, lat } = e.lnglat;
self.lng = lng self.lng = lng;
self.lat = lat self.lat = lat;
self.center = [lng, lat] self.center = [lng, lat];
self.markers.push([lng, lat]) self.markers.push([lng, lat]);
// 这里通过高德 SDK 完成。 // 这里通过高德 SDK 完成。
let geocoder = new AMap.Geocoder({ let geocoder = new AMap.Geocoder({
radius: 1000, radius: 1000,
extensions: 'all' extensions: "all",
}) });
geocoder.getAddress([lng, lat], function(status, result) { geocoder.getAddress([lng, lat], function (status, result) {
if (status === 'complete' && result.info === 'OK') { if (status === "complete" && result.info === "OK") {
if (result && result.regeocode) { if (result && result.regeocode) {
console.log(result.regeocode.formattedAddress) //控制台打印地址 console.log(result.regeocode.formattedAddress); //控制台打印地址
self.address = result.regeocode.formattedAddress self.address = result.regeocode.formattedAddress;
self.searchKey = result.regeocode.formattedAddress self.searchKey = result.regeocode.formattedAddress;
self.$nextTick() self.$nextTick();
} }
} }
}) });
} },
}, },
// 一些工具插件 // 一些工具插件
plugin: [ plugin: [
{ {
pName: 'Geocoder', pName: "Geocoder",
events: { events: {
init (o) { init(o) {
//console.log("一些工具插件--地址"+o.getAddress()) //console.log("一些工具插件--地址"+o.getAddress())
} },
} },
}, },
{ {
// 定位 // 定位
pName: 'Geolocation', pName: "Geolocation",
events: { events: {
init(o) { init(o) {
// o是高德地图定位插件实例 // o是高德地图定位插件实例
o.getCurrentPosition((status, result) => { o.getCurrentPosition((status, result) => {
if (result && result.position) { if (result && result.position) {
// 设置经度 // 设置经度
self.lng = result.position.lng self.lng = result.position.lng;
// 设置维度 // 设置维度
self.lat = result.position.lat self.lat = result.position.lat;
// 设置坐标 // 设置坐标
self.center = [self.lng, self.lat] self.center = [self.lng, self.lat];
self.markers.push([self.lng, self.lat]) self.markers.push([self.lng, self.lat]);
// load // load
self.loaded = true self.loaded = true;
// 页面渲染好后 // 页面渲染好后
self.$nextTick() self.$nextTick();
}
})
}
} }
});
},
},
}, },
{ {
// 工具栏 // 工具栏
pName: 'ToolBar', pName: "ToolBar",
events: { events: {
init(instance) { init(instance) {
//console.log("工具栏:"+instance); //console.log("工具栏:"+instance);
} },
} },
}, },
{ {
// 鹰眼 // 鹰眼
pName: 'OverView', pName: "OverView",
events: { events: {
init(instance) { init(instance) {
//console.log("鹰眼:"+instance); //console.log("鹰眼:"+instance);
} },
} },
}, },
{ {
// 地图类型 // 地图类型
pName: 'MapType', pName: "MapType",
defaultType: 0, defaultType: 0,
events: { events: {
init(instance) { init(instance) {
//console.log("地图类型:"+instance); //console.log("地图类型:"+instance);
} },
} },
}, },
{ {
// 搜索 // 搜索
pName: 'PlaceSearch', pName: "PlaceSearch",
events: { events: {
init(instance) { init(instance) {
//console.log("搜索:"+instance) //console.log("搜索:"+instance)
} },
} },
} },
] ],
} };
}, },
methods: { methods: {
initSearch() { initSearch() {
let vm = this let vm = this;
let map = this.amapManager.getMap() let map = this.amapManager.getMap();
AMapUI.loadUI(['misc/PoiPicker'], function(PoiPicker) { AMapUI.loadUI(["misc/PoiPicker"], function (PoiPicker) {
var poiPicker = new PoiPicker({ var poiPicker = new PoiPicker({
input: 'search', input: "search",
placeSearchOptions: { placeSearchOptions: {
map: map, map: map,
pageSize: 10 pageSize: 10,
}, },
suggestContainer: 'searchTip', suggestContainer: "searchTip",
searchResultsContainer: 'searchTip' searchResultsContainer: "searchTip",
}) });
vm.poiPicker = poiPicker vm.poiPicker = poiPicker;
// 监听poi选中信息 // 监听poi选中信息
poiPicker.on('poiPicked', function(poiResult) { poiPicker.on("poiPicked", function (poiResult) {
// console.log(poiResult) // console.log(poiResult)
let source = poiResult.source let source = poiResult.source;
let poi = poiResult.item let poi = poiResult.item;
if (source !== 'search') { if (source !== "search") {
poiPicker.searchByKeyword(poi.name) poiPicker.searchByKeyword(poi.name);
} else { } else {
poiPicker.clearSearchResults() poiPicker.clearSearchResults();
vm.markers = [] vm.markers = [];
let lng = poi.location.lng let lng = poi.location.lng;
let lat = poi.location.lat let lat = poi.location.lat;
let address = poi.cityname + poi.adname + poi.name let address = poi.cityname + poi.adname + poi.name;
vm.center = [lng, lat] vm.center = [lng, lat];
vm.markers.push([lng, lat]) vm.markers.push([lng, lat]);
vm.lng = lng vm.lng = lng;
vm.lat = lat vm.lat = lat;
vm.address = address vm.address = address;
vm.searchKey = address vm.searchKey = address;
} }
}) });
}) });
}, },
searchByHand() { searchByHand() {
if (this.searchKey !== '') { if (this.searchKey !== "") {
this.poiPicker.searchByKeyword(this.searchKey) this.poiPicker.searchByKeyword(this.searchKey);
}
} }
} },
} },
};
</script> </script>
<style lang="css"> <style lang="css">
......
device-manager-ui/admin/src/components/MapDetail.vue
View file @ 8b1ae536
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
<template> <template>
<div class="my-map"> <div class="my-map">
<el-amap <el-amap
ref="map" ref="map"
vid="amapDetail" vid="amapDetail"
...@@ -32,8 +31,6 @@ ...@@ -32,8 +31,6 @@
:extData="marker" :extData="marker"
> >
</el-amap-marker> </el-amap-marker>
</el-amap> </el-amap>
</div> </div>
</template> </template>
...@@ -73,10 +70,12 @@ export default { ...@@ -73,10 +70,12 @@ export default {
}, },
methods: { methods: {
formatterDate, formatterDate,
contentRender(h, params){ contentRender(h, params) {
//console.log(params.extData.extData.productId) //console.log(params.extData.extData.productId)
let value="el-icon-location-information location"+params.extData.extData.productId let value =
return (<i class={value} />) "el-icon-location-information location" +
params.extData.extData.productId;
return <i class={value} />;
}, },
getDeviceDetial() { getDeviceDetial() {
//获取设备列表 //获取设备列表
...@@ -86,15 +85,14 @@ export default { ...@@ -86,15 +85,14 @@ export default {
console.log("刷新数据", data); console.log("刷新数据", data);
// this.markersGroupData = data; // this.markersGroupData = data;
//this.$refs.map.clear(); //this.$refs.map.clear();
let map = this.amapManager.getMap() let map = this.amapManager.getMap();
map.clearMap() map.clearMap();
for(let group of data){ for (let group of data) {
for(let item of group.deviceList){ for (let item of group.deviceList) {
//console.log("marker", item); //console.log("marker", item);
this.setMarker(item); this.setMarker(item);
} }
} }
}, },
...@@ -116,7 +114,6 @@ export default { ...@@ -116,7 +114,6 @@ export default {
events: { events: {
click: (e) => { click: (e) => {
console.log("getExtData", e.target.getExtData()); console.log("getExtData", e.target.getExtData());
}, },
}, },
}; };
...@@ -135,7 +132,7 @@ export default { ...@@ -135,7 +132,7 @@ export default {
}, },
data() { data() {
return { return {
markersGroupData:[], markersGroupData: [],
mapData: {}, mapData: {},
info: {}, info: {},
markers: [], markers: [],
...@@ -171,7 +168,7 @@ export default { ...@@ -171,7 +168,7 @@ export default {
.rightTop { .rightTop {
width: 200px; width: 200px;
top: 0px; top: 0px;
right:0px; right: 0px;
position: absolute; position: absolute;
float: right; float: right;
...@@ -184,11 +181,12 @@ export default { ...@@ -184,11 +181,12 @@ export default {
overflow: auto; overflow: auto;
} }
.my-map { .my-map {
width: 100%;
height: 100vh;
.amap-demo { .amap-demo {
position: relative; position: relative;
width: 100%; width: 100%;
min-height: 650px; height: 100%;
.map-marker { .map-marker {
position: relative; position: relative;
width: 30px; width: 30px;
......
device-manager-ui/admin/src/main.js
View file @ 8b1ae536
...@@ -21,6 +21,12 @@ Vue.use(Filter); ...@@ -21,6 +21,12 @@ Vue.use(Filter);
Vue.use(GlobalComponents); // 全局组件 Vue.use(GlobalComponents); // 全局组件
Vue.use(VueClipboard) Vue.use(VueClipboard)
Vue.use(VueAMap) Vue.use(VueAMap)
// 引入iconfont
import './assets/fonts/iconfont.css'
// moment 时间处理
import moment from 'moment';
Vue.prototype.$moment = moment;
VueAMap.initAMapApiLoader({ VueAMap.initAMapApiLoader({
key: 'f45cca59553214543a5a77e50a7e04df', key: 'f45cca59553214543a5a77e50a7e04df',
plugin: ['AMap.Scale', 'AMap.OverView', 'AMap.ToolBar', 'AMap.MapType', 'AMap.PlaceSearch', 'AMap.Geolocation', 'AMap.Geocoder'], plugin: ['AMap.Scale', 'AMap.OverView', 'AMap.ToolBar', 'AMap.MapType', 'AMap.PlaceSearch', 'AMap.Geolocation', 'AMap.Geocoder'],
......
device-manager-ui/admin/src/router.js
View file @ 8b1ae536
...@@ -39,25 +39,18 @@ const router = new Router({ ...@@ -39,25 +39,18 @@ const router = new Router({
...restBuilder('param', 'system/param'), // 系统管理--参数管理 ...restBuilder('param', 'system/param'), // 系统管理--参数管理
...restBuilder('task', 'system/task'), // 系统管理--任务管理 ...restBuilder('task', 'system/task'), // 系统管理--任务管理
builder('site/list', 'system/site/index'),//站点 builder('site/list', 'system/site/index'),//站点
...restBuilder('sitestat', 'sitestat'),//站点设备管理 ...restBuilder('sitestat', 'sitestat'),//站点设备管理
builder('sitestat/maplist', 'sitestat/maplist'),//地图站点 builder('sitestat/maplist', 'sitestat/maplist'),//地图站点
builder('sitestat/mapDetail', 'sitestat/mapDetail'),//地图设备 builder('sitestat/mapDetail', 'sitestat/mapDetail'),//地图设备
...restBuilder('platform', 'platform'),//平台 ...restBuilder('platform', 'platform'),//平台
...restBuilder('product', 'product'),//产品 ...restBuilder('product', 'product'),//产品
...restBuilder('device', 'device'),//设备 ...restBuilder('device', 'device'),//设备
...restBuilder('device/alarm/info', 'device/alarm/info'),//设备告警信息 ...restBuilder('device/alarm/info', 'device/alarm/info'),//设备告警信息
...restBuilder('device/module', 'device/module'),//设备模块使用率 ...restBuilder('device/module', 'device/module'),//设备模块使用率
...restBuilder('device/module/use', 'device/module/use'),//设备模块使用率 ...restBuilder('device/module/use', 'device/module/use'),//设备模块使用率
...restBuilder('device/module/distribute', 'device/module/distribute'),//设备前端模块部署 ...restBuilder('device/module/distribute', 'device/module/distribute'),//设备前端模块部署
...restBuilder('device/log', 'device/log'),
...restBuilder('device/log', 'device/log'),//
...restBuilder('firm', 'firm'),// ...restBuilder('firm', 'firm'),//
...restBuilder('alarm/config', 'alarm/config'),//设备告警配置 ...restBuilder('alarm/config', 'alarm/config'),//设备告警配置
...restBuilder('alarm/sms/send', 'alarm/sms/send'),//设备告警短信 ...restBuilder('alarm/sms/send', 'alarm/sms/send'),//设备告警短信
......
device-manager-ui/admin/src/views/Home.vue
View file @ 8b1ae536
This diff is collapsed.
device-manager-ui/admin/src/views/alarm/config/dialogshow.vue
View file @ 8b1ae536
...@@ -3,29 +3,65 @@ ...@@ -3,29 +3,65 @@
<el-dialog :title="title" :visible.sync="open" width="90%" append-to-body> <el-dialog :title="title" :visible.sync="open" width="90%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<Field label="产品" prop="productId" v-model="form.productId" placeholder="请输入产品"/> <Field
<Field label="告警类型" prop="alarmType" v-model="form.alarmType" type="select" :enumData="dict.alarmType" placeholder="请选择告警类型"/> label="产品"
<Field label="告警级别," prop="alarmLevel" v-model="form.alarmLevel" type="select" :enumData="dict.alarmLevel" placeholder="请选择告警级别,"/> prop="productId"
<Field label="推送方式," prop="alarmPusW1ay" v-model="form.alarmPusW1ay" type="select" :enumData="dict.alarmPusW1ay" placeholder="请选择推送方式,"/> v-model="form.productId"
<Field label="是否启用" prop="isUse" v-model="form.isUse" type="select" :enumData="dict.isUse" placeholder="请选择是否启用"/> placeholder="请输入产品"
/>
<Field
label="告警类型"
prop="alarmType"
v-model="form.alarmType"
type="select"
:enumData="dict.alarmType"
placeholder="请选择告警类型"
/>
<Field
label="告警级别,"
prop="alarmLevel"
v-model="form.alarmLevel"
type="select"
:enumData="dict.alarmLevel"
placeholder="请选择告警级别,"
/>
<Field
label="推送方式,"
prop="alarmPusW1ay"
v-model="form.alarmPusW1ay"
type="select"
:enumData="dict.alarmPusW1ay"
placeholder="请选择推送方式,"
/>
<Field
label="是否启用"
prop="isUse"
v-model="form.isUse"
type="select"
:enumData="dict.isUse"
placeholder="请选择是否启用"
/>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" v-if="pageInfo.type !== 'view'" @click="submitForm">确 定</el-button> <el-button
type="primary"
v-if="pageInfo.type !== 'view'"
@click="submitForm"
>确 定</el-button
>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import form from "@/assets/mixins/formdialog"; import form from "@/assets/mixins/formdialog";
import dialogShow from "./dialogshow"; import dialogShow from "./dialogshow";
export default { export default {
mixins: [form], mixins: [form],
components: { components: {
dialogShow , dialogShow,
}, },
data() { data() {
return { return {
...@@ -35,59 +71,50 @@ ...@@ -35,59 +71,50 @@
title: "设备告警配置", title: "设备告警配置",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
toString:[ toString: ["alarmType", "alarmLevel", "alarmPusW1ay", "isUse"],
"alarmType",
"alarmLevel",
"alarmPusW1ay",
"isUse",
],
// 表单校验 // 表单校验
rules: { rules: {
alarmType: [ alarmType: [
{required: true,message: "请输入告警类型", trigger: "blur" }, { required: true, message: "请输入告警类型", trigger: "blur" },
], ],
alarmLevel: [ alarmLevel: [
{required: true,message: "请输入告警级别,", trigger: "blur" }, { required: true, message: "请输入告警级别,", trigger: "blur" },
], ],
alarmPusW1ay: [ alarmPusW1ay: [
{required: true,message: "请输入推送方式,", trigger: "blur" }, { required: true, message: "请输入推送方式,", trigger: "blur" },
],
isUse: [
{required: true,message: "请输入是否启用", trigger: "blur" },
], ],
createTime: [ isUse: [{ required: true, message: "请输入是否启用", trigger: "blur" }],
{required: true,message: "请选择创建时间" }, createTime: [{ required: true, message: "请选择创建时间" }],
], },
}
}; };
}, },
methods: { methods: {
/** 编辑 */ /** 编辑 */
edit(row) { edit(row) {
this.reset() this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl =this.pageInfo.editUrl;; this.urls.currUrl = this.pageInfo.editUrl;
this.getData(); this.getData();
this.pageInfo.type="edit" this.pageInfo.type = "edit";
this.title = "修改设备告警配置"; this.title = "修改设备告警配置";
}, },
/** 新增 */ /** 新增 */
add(row) { add(row) {
this.reset() this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl = this.pageInfo.addUrl; this.urls.currUrl = this.pageInfo.addUrl;
this.getData(); this.getData();
this.pageInfo.type="add" this.pageInfo.type = "add";
this.title = "新增设备告警配置"; this.title = "新增设备告警配置";
}, },
/** 查看*/ /** 查看*/
view(row) { view(row) {
this.reset() this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl =this.pageInfo.viewUrl;; this.urls.currUrl = this.pageInfo.viewUrl;
this.getData(); this.getData();
this.pageInfo.type="view" this.pageInfo.type = "view";
this.title = "设备告警配置详细"; this.title = "设备告警配置详细";
}, },
/**取消按钮 */ /**取消按钮 */
...@@ -107,11 +134,11 @@ ...@@ -107,11 +134,11 @@
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
productId : null, productId: null,
alarmType : 0, alarmType: 0,
alarmLevel : null, alarmLevel: null,
alarmPusW1ay : 0, alarmPusW1ay: 0,
isUse : null, isUse: null,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
...@@ -121,5 +148,5 @@ ...@@ -121,5 +148,5 @@
} }
}, },
}, },
}; };
</script> </script>
device-manager-ui/admin/src/views/alarm/config/drawershow.vue
View file @ 8b1ae536
...@@ -8,27 +8,72 @@ ...@@ -8,27 +8,72 @@
> >
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<Field :span="22" label="产品类型" prop="productId" type="select" v-model="form.productId" :enumData="dict.productId" placeholder="请输入产品"/> <Field
<Field :span="22" label="告警类型" prop="alarmType" v-model="form.alarmType" type="select" :enumData="dict.alarmType" placeholder="请选择告警类型"/> :span="22"
<Field :span="22" label="告警级别" prop="alarmLevel" v-model="form.alarmLevel" type="select" :enumData="dict.alarmLevel" placeholder="请选择告警级别,"/> label="产品类型"
<Field :span="22" label="推送方式" prop="alarmPusW1ay" v-model="form.alarmPusW1ay" type="select" :enumData="dict.alarmPusW1ay" placeholder="请选择推送方式,"/> prop="productId"
<Field :span="22" label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/> type="select"
<Field :span="22" label="是否启用" prop="enabled" v-model="form.enabled" type="radio" :enumData="dict.enabled" placeholder="请选择是否启用"/> v-model="form.productId"
:enumData="dict.productId"
placeholder="请输入产品"
/>
<Field
:span="22"
label="告警类型"
prop="alarmType"
v-model="form.alarmType"
type="select"
:enumData="dict.alarmType"
placeholder="请选择告警类型"
/>
<Field
:span="22"
label="告警级别"
prop="alarmLevel"
v-model="form.alarmLevel"
type="select"
:enumData="dict.alarmLevel"
placeholder="请选择告警级别,"
/>
<Field
:span="22"
label="推送方式"
prop="alarmPusW1ay"
v-model="form.alarmPusW1ay"
type="select"
:enumData="dict.alarmPusW1ay"
placeholder="请选择推送方式,"
/>
<Field
:span="22"
label="备注"
prop="remark"
v-model="form.remark"
type="textarea"
placeholder="请输入备注"
/>
<Field
:span="22"
label="是否启用"
prop="enabled"
v-model="form.enabled"
type="radio"
:enumData="dict.enabled"
placeholder="请选择是否启用"
/>
</el-row> </el-row>
<form-buttons @submit='submitForm' noCancelBtn /> <form-buttons @submit="submitForm" noCancelBtn />
</el-form> </el-form>
</el-drawer> </el-drawer>
</template> </template>
<script> <script>
import form from "@/assets/mixins/formdialog"; import form from "@/assets/mixins/formdialog";
import dialogShow from "./dialogshow"; import dialogShow from "./dialogshow";
export default { export default {
mixins: [form], mixins: [form],
components: { components: {
dialogShow , dialogShow,
}, },
data() { data() {
return { return {
...@@ -38,7 +83,7 @@ ...@@ -38,7 +83,7 @@
title: "设备告警配置", title: "设备告警配置",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
toString:[ toString: [
"productId", "productId",
"alarmType", "alarmType",
"alarmLevel", "alarmLevel",
...@@ -48,53 +93,49 @@ ...@@ -48,53 +93,49 @@
// 表单校验 // 表单校验
rules: { rules: {
productId: [ productId: [
{required: true,message: "请选择产品类型", trigger: "blur" }, { required: true, message: "请选择产品类型", trigger: "blur" },
], ],
alarmType: [ alarmType: [
{required: true,message: "请输入告警类型", trigger: "blur" }, { required: true, message: "请输入告警类型", trigger: "blur" },
], ],
alarmLevel: [ alarmLevel: [
{required: true,message: "请输入告警级别,", trigger: "blur" }, { required: true, message: "请输入告警级别,", trigger: "blur" },
], ],
alarmPusW1ay: [ alarmPusW1ay: [
{required: true,message: "请输入推送方式,", trigger: "blur" }, { required: true, message: "请输入推送方式,", trigger: "blur" },
],
isUse: [
{required: true,message: "请输入是否启用", trigger: "blur" },
],
createTime: [
{required: true,message: "请选择创建时间" },
], ],
} isUse: [{ required: true, message: "请输入是否启用", trigger: "blur" }],
createTime: [{ required: true, message: "请选择创建时间" }],
},
}; };
}, },
methods: { methods: {
/** 编辑 */ /** 编辑 */
edit(row) { edit(row) {
this.reset() this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl =this.pageInfo.editUrl;; this.urls.currUrl = this.pageInfo.editUrl;
this.getData(); this.getData();
this.pageInfo.type="edit" this.pageInfo.type = "edit";
this.title = "修改设备告警配置"; this.title = "修改设备告警配置";
}, },
/** 新增 */ /** 新增 */
add(row) { add(row) {
this.reset() this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl = this.pageInfo.addUrl; this.urls.currUrl = this.pageInfo.addUrl;
this.getData(); this.getData();
this.pageInfo.type="add" this.pageInfo.type = "add";
this.title = "新增设备告警配置"; this.title = "新增设备告警配置";
}, },
/** 查看*/ /** 查看*/
view(row) { view(row) {
this.reset() this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl =this.pageInfo.viewUrl;; this.urls.currUrl = this.pageInfo.viewUrl;
this.getData(); this.getData();
this.pageInfo.type="view" this.pageInfo.type = "view";
this.title = "设备告警配置详细"; this.title = "设备告警配置详细";
}, },
/**取消按钮 */ /**取消按钮 */
...@@ -114,11 +155,11 @@ ...@@ -114,11 +155,11 @@
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
productId : null, productId: null,
alarmType : 0, alarmType: 0,
alarmLevel : null, alarmLevel: null,
alarmPusW1ay : 0, alarmPusW1ay: 0,
isUse : null, isUse: null,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
...@@ -128,5 +169,5 @@ ...@@ -128,5 +169,5 @@
} }
}, },
}, },
}; };
</script> </script>
device-manager-ui/admin/src/views/alarm/config/list.vue
View file @ 8b1ae536
...@@ -2,25 +2,21 @@ ...@@ -2,25 +2,21 @@
<div class="page"> <div class="page">
<LayoutTable :data="tableData" notSearch :config="tableConfig"> <LayoutTable :data="tableData" notSearch :config="tableConfig">
</LayoutTable> </LayoutTable>
<!-- <dialog-show ref="dialogform" @ok="getData" /> --> <!-- <dialog-show ref="dialogform" @ok="getData" /> -->
<drawer-show ref="drawerform" @ok="getData" /> <drawer-show ref="drawerform" @ok="getData" />
</div> </div>
</template> </template>
<script> <script>
/** 表单弹出框模式需引入 */ /** 表单弹出框模式需引入 */
import drawerShow from "./drawershow"; import drawerShow from "./drawershow";
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
export default { export default {
name: "AlarmConfig", name: "AlarmConfig",
components: {drawerShow }, components: { drawerShow },
mixins: [table], mixins: [table],
created() { created() {},
},
methods: { methods: {
/** 重写新增方法 */ /** 重写新增方法 */
toAdd(row) { toAdd(row) {
//this.$refs.dialogform.add(row); //this.$refs.dialogform.add(row);
...@@ -30,7 +26,6 @@ ...@@ -30,7 +26,6 @@
/** 重写编辑方法 */ /** 重写编辑方法 */
toEdit(row) { toEdit(row) {
this.$refs.drawerform.edit(row); this.$refs.drawerform.edit(row);
}, },
/** 重写查看方法 */ /** 重写查看方法 */
// toView(row) { // toView(row) {
...@@ -51,47 +46,89 @@ ...@@ -51,47 +46,89 @@
/> />
); );
}, },
}, },
data() { data() {
return { return {
config: { config: {
search: [ search: [],
],
columns: [ columns: [
{type: "selection", width: 60}, { type: "selection", align: "center", width: 60 },
{label: "序号",type: "index", width: 60}, { label: "序号", align: "center", type: "index", width: 60 },
{label: "告警内容", prop: "alarmType",formatter: this.formatter}, {
{label: "设备类型", prop: "productId", formatter: this.formatterString}, label: "告警内容",
align: "center",
prop: "alarmType",
formatter: this.formatter,
},
{
label: "设备类型",
align: "center",
prop: "productId",
formatter: this.formatterString,
},
{label: "告警级别", prop: "alarmLevel",formatter: this.formatter}, {
{label: "推送方式", prop: "alarmPusW1ay",formatter: this.formatter}, label: "告警级别",
{label: "备注", prop: "remark"}, align: "center",
prop: "alarmLevel",
formatter: this.formatter,
},
{
label: "推送方式",
align: "center",
prop: "alarmPusW1ay",
formatter: this.formatter,
},
{ label: "备注", align: "center", prop: "remark" },
{label: "创建时间", prop: "createTime",formatter:this.formatterDate}, {
label: "创建时间",
align: "center",
prop: "createTime",
formatter: this.formatterDate,
},
{label: "更新时间", prop: "updateTime",formatter:this.formatterDate}, {
label: "更新时间",
align: "center",
prop: "updateTime",
formatter: this.formatterDate,
},
{ {
prop: "enabled", prop: "enabled",
align: "center",
label: "启用/停用", label: "启用/停用",
width: 100, width: 100,
formatter: this.changeStatus, formatter: this.changeStatus,
}, },
{ {
label: "操作", label: "操作",
align: "center",
width: 240, width: 240,
formatter: row => { formatter: (row) => {
return ( return (
<table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} /> <table-buttons
noAdd
row={row}
onEdit={this.toEdit}
onView={this.toView}
onDel={this.toDel}
/>
); );
} },
} },
] ],
} },
};
}
}; };
},
};
</script> </script>
<style lang="less" >
.page {
.table-head {
height: 72px;
}
}
</style>
device-manager-ui/admin/src/views/alarm/config/view.vue
View file @ 8b1ae536
<template> <template>
<layout-view> <layout-view>
<el-descriptions :title="title" :column="column" :size="size" :colon="false" border> <el-descriptions
:title="title"
:column="column"
:size="size"
:colon="false"
border
>
<template slot="title"> <template slot="title">
<i class="el-icon-tickets"></i> <i class="el-icon-tickets"></i>
基本详细信息 基本详细信息
</template> </template>
<template slot="extra"> <template slot="extra">
<el-button type="primary" @click="$router.go(-1)" size="small">返回</el-button> <el-button type="primary" @click="$router.go(-1)" size="small"
>返回</el-button
>
</template> </template>
<el-descriptions-item label="产品" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item
{{form.productId}} label="产品"
label-class-name="labelClass"
content-class-name="contentClass"
>
{{ form.productId }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="告警类型" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item
label="告警类型"
label-class-name="labelClass"
content-class-name="contentClass"
>
{{ util_formatters("alarmType", form.alarmType) }} {{ util_formatters("alarmType", form.alarmType) }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="告警级别," label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item
label="告警级别,"
label-class-name="labelClass"
content-class-name="contentClass"
>
{{ util_formatters("alarmLevel", form.alarmLevel) }} {{ util_formatters("alarmLevel", form.alarmLevel) }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="推送方式," label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item
label="推送方式,"
label-class-name="labelClass"
content-class-name="contentClass"
>
{{ util_formatters("alarmPusW1ay", form.alarmPusW1ay) }} {{ util_formatters("alarmPusW1ay", form.alarmPusW1ay) }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="是否启用" label-class-name="labelClass" content-class-name="contentClass"> <el-descriptions-item
label="是否启用"
label-class-name="labelClass"
content-class-name="contentClass"
>
{{ util_formatters("isUse", form.isUse) }} {{ util_formatters("isUse", form.isUse) }}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</layout-view> </layout-view>
</template> </template>
<script> <script>
import view from "@/assets/mixins/view"; import view from "@/assets/mixins/view";
export default { export default {
mixins: [view], mixins: [view],
components: { components: {},
}, methods: {},
methods: {
},
data() { data() {
return { return {
size:"small", size: "small",
column:2, column: 2,
toString:[ toString: ["alarmType", "alarmLevel", "alarmPusW1ay", "isUse"],
"alarmType", toArrays: [],
"alarmLevel", toDate: [],
"alarmPusW1ay", };
"isUse", },
], };
toArrays: [
],
toDate: [
]
}
}
}
</script> </script>
<style lang="less"> <style lang="less">
.labelClass{ .labelClass {
width: 200px; width: 200px;
} }
.el-descriptions__body{ .el-descriptions__body {
margin-left: 5px; margin-left: 5px;
margin-right: 5px; margin-right: 5px;
color: #606266; color: #606266;
background-color: #FFF; background-color: #fff;
} }
.contentClass{ .contentClass {
width: 600px; width: 600px;
} }
</style> </style>
\ No newline at end of file
device-manager-ui/admin/src/views/alarm/sms/send/list.vue
View file @ 8b1ae536
<template> <template>
<div class="page"> <div class="page">
<LayoutTable :data="tableData" notAdd notDel :config="tableConfig"> <LayoutTable :data="tableData" notAdd notDel :config="tableConfig">
<el-button <el-button
slot="table-head-left2" slot="table-head-left2"
style="margin-left: 10px" style="margin-left: 10px"
...@@ -9,7 +8,8 @@ ...@@ -9,7 +8,8 @@
size="mini" size="mini"
@click="doExport" @click="doExport"
:disabled="isExport" :disabled="isExport"
>导出</el-button> >导出</el-button
>
</LayoutTable> </LayoutTable>
<drawer-show ref="drawerform" @ok="getData" /> <drawer-show ref="drawerform" @ok="getData" />
...@@ -17,17 +17,15 @@ ...@@ -17,17 +17,15 @@
</template> </template>
<script> <script>
/** 表单弹出框模式需引入 */ /** 表单弹出框模式需引入 */
import drawerShow from "./drawershow"; import drawerShow from "./drawershow";
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
export default { export default {
name: "AlarmSmsSend", name: "AlarmSmsSend",
components: {drawerShow }, components: { drawerShow },
mixins: [table], mixins: [table],
created() { created() {},
},
methods: { methods: {
/** 重写新增方法 */ /** 重写新增方法 */
toAdd(row) { toAdd(row) {
this.$refs.dialogform.add(row); this.$refs.dialogform.add(row);
...@@ -35,7 +33,6 @@ ...@@ -35,7 +33,6 @@
/** 重写编辑方法 */ /** 重写编辑方法 */
toEdit(row) { toEdit(row) {
this.$refs.dialogform.edit(row); this.$refs.dialogform.edit(row);
}, },
/** 重写查看方法 */ /** 重写查看方法 */
toView(row) { toView(row) {
...@@ -44,16 +41,21 @@ ...@@ -44,16 +41,21 @@
/** 导出Excel */ /** 导出Excel */
doExport() { doExport() {
this.isExport = true; this.isExport = true;
this.$download("/alarm/sms/send/exportExcel", { this.$download(
"idList": this.selection, "/alarm/sms/send/exportExcel",
'sendStatus': this.$route.query['sendStatus'], {
'sendTime': this.$route.query['sendTime'], idList: this.selection,
}, { type: "excel" }).then(() => this.isExport = false).catch(error => { sendStatus: this.$route.query["sendStatus"],
sendTime: this.$route.query["sendTime"],
},
{ type: "excel" }
)
.then(() => (this.isExport = false))
.catch((error) => {
this.isExport = false; this.isExport = false;
this.$message.error(error.message); this.$message.error(error.message);
}); });
}, },
}, },
data() { data() {
return { return {
...@@ -63,7 +65,7 @@ ...@@ -63,7 +65,7 @@
name: "sendStatus", name: "sendStatus",
type: "select", type: "select",
label: "发送状态", label: "发送状态",
fuzzy: true fuzzy: true,
}, },
{ {
...@@ -76,33 +78,60 @@ ...@@ -76,33 +78,60 @@
name: "sendTimeEnd", name: "sendTimeEnd",
type: "datetime", type: "datetime",
label: "结束时间", label: "结束时间",
placeholder:"结束时间" placeholder: "结束时间",
}, },
], ],
columns: [ columns: [
{type: "selection", width: 60}, { type: "selection", align: "center", width: 60 },
{type: "index",label:"序号", width: 60}, { type: "index", align: "center", label: "序号", width: 60 },
{label: "发送内容", prop: "sendMess",width:500}, { label: "发送内容", align: "center", prop: "sendMess", width: 500 },
{label: "联系电话", prop: "mobile"}, { label: "联系电话", align: "center", prop: "mobile" },
{label: "接收人员", prop: "receiver"}, { label: "接收人员", align: "center", prop: "receiver" },
{label: "发送状态", prop: "sendStatus",formatter: this.formatter}, {
label: "发送状态",
align: "center",
prop: "sendStatus",
formatter: this.formatter,
},
{label: "发送时间", prop: "sendTime", formatter: this.formatterDate}, {
label: "发送时间",
align: "center",
prop: "sendTime",
formatter: this.formatterDate,
},
{ {
label: "操作", label: "操作",
align: "center",
width: 240, width: 240,
formatter: row => { formatter: (row) => {
return ( return (
<table-buttons noAdd noEdit noDel row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} /> <table-buttons
noAdd
noEdit
noDel
row={row}
onEdit={this.toEdit}
onView={this.toView}
onDel={this.toDel}
/>
); );
} },
} },
] ],
} },
};
}
}; };
},
};
</script> </script>
<style lang="less" >
.buttons {
display: flex;
.el-row {
margin-left: 20px;
}
}
</style>
\ No newline at end of file
device-manager-ui/admin/src/views/device/alarm/info/list.vue
View file @ 8b1ae536
<template> <template>
<div class="page"> <div class="page">
<LayoutTable :data="tableData" notAdd notDel :config="tableConfig"> <LayoutTable :data="tableData" notAdd notDel :config="tableConfig">
<el-button <el-button
slot="table-head-left2" slot="table-head-left2"
style="margin-left: 10px" style="margin-left: 10px"
...@@ -16,19 +15,29 @@ ...@@ -16,19 +15,29 @@
>告警次数：{{ tableData.totalCount }}次</el-tag >告警次数：{{ tableData.totalCount }}次</el-tag
> >
<el-tag slot="table-head-row2-left" size="mini" style="margin: 5px" type="danger" <el-tag
slot="table-head-row2-left"
size="mini"
style="margin: 5px"
type="danger"
>危险：{{ tableData.dangerCount }}次</el-tag >危险：{{ tableData.dangerCount }}次</el-tag
> >
<el-tag slot="table-head-row2-left" size="mini" style="margin: 5px" type="warning" <el-tag
slot="table-head-row2-left"
size="mini"
style="margin: 5px"
type="warning"
>次要：{{ tableData.subCount }}次</el-tag >次要：{{ tableData.subCount }}次</el-tag
> >
<el-tag slot="table-head-row2-left" size="mini" style="margin: 5px" type="info" <el-tag
slot="table-head-row2-left"
size="mini"
style="margin: 5px"
type="info"
>一般：{{ tableData.normalCount }}次</el-tag >一般：{{ tableData.normalCount }}次</el-tag
> >
</LayoutTable> </LayoutTable>
<dialog-show ref="dialogform" @ok="getData" /> <dialog-show ref="dialogform" @ok="getData" />
...@@ -52,11 +61,11 @@ export default { ...@@ -52,11 +61,11 @@ export default {
created() { created() {
console.log("queryIn:", this.queryIn); console.log("queryIn:", this.queryIn);
if (this.queryIn&&this.queryIn.alarmDevice) { if (this.queryIn && this.queryIn.alarmDevice) {
this.query={} this.query = {};
this.query["alarmDevice"] = this.queryIn.alarmDevice; this.query["alarmDevice"] = this.queryIn.alarmDevice;
} }
this.changePath("/device/alarm/info") this.changePath("/device/alarm/info");
}, },
methods: { methods: {
/** 重写新增方法 */ /** 重写新增方法 */
...@@ -74,12 +83,18 @@ export default { ...@@ -74,12 +83,18 @@ export default {
/** 导出Excel */ /** 导出Excel */
doExport() { doExport() {
this.isExport = true; this.isExport = true;
this.$download("/device/alarm/info/exportExcel", { this.$download(
"idList": this.selection, "/device/alarm/info/exportExcel",
'alarmDevice': this.$route.query['alarmDevice'], {
'alarmType': this.$route.query['alarmType'], idList: this.selection,
'alarmStatus': this.$route.query['alarmStatus'], alarmDevice: this.$route.query["alarmDevice"],
}, { type: "excel" }).then(() => this.isExport = false).catch(error => { alarmType: this.$route.query["alarmType"],
alarmStatus: this.$route.query["alarmStatus"],
},
{ type: "excel" }
)
.then(() => (this.isExport = false))
.catch((error) => {
this.isExport = false; this.isExport = false;
this.$message.error(error.message); this.$message.error(error.message);
}); });
...@@ -89,14 +104,12 @@ export default { ...@@ -89,14 +104,12 @@ export default {
return { return {
config: { config: {
search: [ search: [
{ {
name: "alarmStatus", name: "alarmStatus",
type: "select", type: "select",
label: "告警状态", label: "告警状态",
}, },
{ {
name: "alarmTimeStart", name: "alarmTimeStart",
type: "datetime", type: "datetime",
...@@ -107,48 +120,62 @@ export default { ...@@ -107,48 +120,62 @@ export default {
name: "alarmTimeEnd", name: "alarmTimeEnd",
type: "datetime", type: "datetime",
label: "结束时间", label: "结束时间",
placeholder:"结束时间" placeholder: "结束时间",
}, },
], ],
columns: [ columns: [
{type: "selection",reserveSelection:true, width: 60,label:"全选"}, {
type: "selection",
align: "center",
reserveSelection: true,
width: 60,
label: "全选",
},
{ {
type: "index", type: "index",
align: "center",
label: "序号", label: "序号",
width: 50 width: 50,
}, },
{ {
label: "告警时间", label: "告警时间",
align: "center",
prop: "alarmTime", prop: "alarmTime",
formatter: this.formatterDate, formatter: this.formatterDate,
}, },
{ {
label: "告警设备", label: "告警设备",
align: "center",
prop: "alarmDevice", prop: "alarmDevice",
formatter: this.formatter, formatter: this.formatter,
}, },
{ {
label: "告警内容", label: "告警内容",
align: "center",
prop: "alarmContent", prop: "alarmContent",
}, },
{ label: "告警级别", prop: "alarmLevel", formatter: this.formatter }, {
label: "告警级别",
align: "center",
prop: "alarmLevel",
{ label: "接收人员,", prop: "alarmReceivePersonnel" }, formatter: this.formatter,
},
{
label: "接收人员,",
align: "center",
prop: "alarmReceivePersonnel",
},
{ {
label: "告警状态", label: "告警状态",
align: "center",
prop: "alarmStatus", prop: "alarmStatus",
formatter: this.formatter, formatter: this.formatter,
}, },
], ],
}, },
}; };
......
device-manager-ui/admin/src/views/device/list.vue
View file @ 8b1ae536
<template> align: "center",<template>
<div class="page"> <div class="page">
<span style="font-size: 13px" <span style="font-size: 13px"
><b>设备列表</b> (<el-link ><b>设备列表</b> (<el-link
...@@ -9,7 +9,11 @@ ...@@ -9,7 +9,11 @@
> >
站点编码：{{ siteCode }} )</span 站点编码：{{ siteCode }} )</span
> >
<el-link style="margin-left: 10px" type="primary" @click="switchMap" :underline="false" <el-link
style="margin-left: 10px"
type="primary"
@click="switchMap"
:underline="false"
>地图模式</el-link >地图模式</el-link
> >
<el-button <el-button
...@@ -180,8 +184,8 @@ export default { ...@@ -180,8 +184,8 @@ export default {
created() { created() {
console.log(this.$route); console.log(this.$route);
this.siteId = this.$route.query.siteId; this.siteId = this.$route.query.siteId;
this.info=this.$route.query this.info = this.$route.query;
this.query={siteId:this.siteId} this.query = { siteId: this.siteId };
this.$get("/sitestat/siteInfo", { this.$get("/sitestat/siteInfo", {
siteId: this.siteId, siteId: this.siteId,
...@@ -200,7 +204,7 @@ export default { ...@@ -200,7 +204,7 @@ export default {
// this.$router.push({ query: {siteId:this.siteId } }); // this.$router.push({ query: {siteId:this.siteId } });
}, },
methods: { methods: {
switchMap(){ switchMap() {
this.$router.push({ this.$router.push({
path: "/sitestat/mapDetail", path: "/sitestat/mapDetail",
query: this.info, query: this.info,
...@@ -354,14 +358,13 @@ export default { ...@@ -354,14 +358,13 @@ export default {
.then((res) => { .then((res) => {
if (res.code == 1) { if (res.code == 1) {
this.$message.success("编辑站点成功！"); this.$message.success("编辑站点成功！");
this.tree.open=false; this.tree.open = false;
this.getData(); this.getData();
} }
}) })
.catch((error) => { .catch((error) => {
this.loading=false; this.loading = false;
this.$message.error(error.message); this.$message.error(error.message);
}); });
}, },
...@@ -380,7 +383,6 @@ export default { ...@@ -380,7 +383,6 @@ export default {
/> />
); );
}, },
}, },
data() { data() {
return { return {
...@@ -397,7 +399,7 @@ export default { ...@@ -397,7 +399,7 @@ export default {
// 上传的地址 // 上传的地址
url: "/m/device/importData", url: "/m/device/importData",
}, },
info:{}, info: {},
// 站点树 // 站点树
tree: { tree: {
// 是否显示弹出层（设备导入） // 是否显示弹出层（设备导入）
...@@ -421,45 +423,61 @@ export default { ...@@ -421,45 +423,61 @@ export default {
name: "deviceCode", name: "deviceCode",
type: "text", type: "text",
label: "设备编码", label: "设备编码",
fuzzy:true fuzzy: true,
}, },
{ {
name: "deviceStatus", name: "deviceStatus",
type: "select", type: "select",
label: "状态", label: "状态",
}, },
], ],
columns: [ columns: [
{ type: "selection",reserveSelection:true, width: 60 }, { type: "selection", reserveSelection: true, width: 60 },
{ type: "index", label: "序号",align:"center", width: 50 }, { type: "index", label: "序号", align: "center", width: 50 },
{ label: "设备名称", prop: "deviceName" }, { label: "设备名称", align: "center", prop: "deviceName" },
{ label: "设备类型", prop: "productId", formatter: this.formatter }, {
label: "设备类型",
align: "center",
prop: "productId",
formatter: this.formatter,
},
{ label: "设备编码", prop: "deviceCode" }, { label: "设备编码", align: "center", prop: "deviceCode" },
// { label: "mac地址", prop: "deviceMac" }, // { label: "mac地址", prop: "deviceMac" },
{ {
label: "设备生产商", label: "设备生产商",
align: "center",
prop: "deviceFirmId", prop: "deviceFirmId",
formatter: this.formatter, formatter: this.formatter,
width: 150, width: 150,
}, },
{ label: "负责人", prop: "leadingOfficial" }, { label: "负责人", align: "center", prop: "leadingOfficial" },
{ label: "联系电话", prop: "leadingOfficialTelephone" }, {
label: "联系电话",
align: "center",
prop: "leadingOfficialTelephone",
},
{ {
label: "状态 ", label: "状态 ",
align: "center",
prop: "deviceStatus", prop: "deviceStatus",
formatter: this.formatterStatus, formatter: this.formatterStatus,
}, },
{ label: "利旧设备", prop: "source", formatter: this.formatterYES }, {
label: "利旧设备",
align: "center",
prop: "source",
formatter: this.formatterYES,
},
{ {
prop: "enabled", prop: "enabled",
align: "center",
label: "启用/停用", label: "启用/停用",
width: 100, width: 100,
formatter: this.changeStatus, formatter: this.changeStatus,
...@@ -467,12 +485,14 @@ export default { ...@@ -467,12 +485,14 @@ export default {
{ {
label: "创建时间", label: "创建时间",
align: "center",
prop: "createTime", prop: "createTime",
formatter: this.formatterDate, formatter: this.formatterDate,
}, },
{ {
label: "操作", label: "操作",
align: "center",
width: 240, width: 240,
formatter: (row) => { formatter: (row) => {
return ( return (
...@@ -499,7 +519,6 @@ export default { ...@@ -499,7 +519,6 @@ export default {
) : ( ) : (
"" ""
)} )}
</div> </div>
); );
}, },
......
device-manager-ui/admin/src/views/device/log/list.vue
View file @ 8b1ae536
...@@ -38,8 +38,7 @@ export default { ...@@ -38,8 +38,7 @@ export default {
name: "deviceCode", name: "deviceCode",
type: "text", type: "text",
label: "设备编号", label: "设备编号",
fuzzy:true fuzzy: true,
}, },
{ {
name: "logType", name: "logType",
...@@ -48,22 +47,44 @@ export default { ...@@ -48,22 +47,44 @@ export default {
}, },
], ],
columns: [ columns: [
{ label: "traceID", prop: "traceID",width:120 }, { label: "traceID", align: "center", prop: "traceID", width: 320 },
{ label: "设备编号", prop: "deviceCode",width:160 }, {
label: "设备编号",
align: "center",
prop: "deviceCode",
width: 160,
},
{ label: "设备名称", prop: "deviceName",width:160 }, {
{ label: "内容", prop: "content" }, label: "设备名称",
align: "center",
prop: "deviceName",
width: 160,
},
{ label: "内容", align: "center", prop: "content" },
{ label: "业务标识", prop: "messageHead",width:80 }, {
label: "业务标识",
align: "center",
prop: "messageHead",
width: 80,
},
{ label: "日志类型", prop: "logType", formatter: this.formatter ,width:80}, {
label: "日志类型",
align: "center",
prop: "logType",
formatter: this.formatter,
width: 80,
},
{ {
label: "创建时间", label: "创建时间",
align: "center",
prop: "createTime", prop: "createTime",
formatter: this.formatterDate, formatter: this.formatterDate,
width:160 width: 160,
}, },
// { // {
// label: "操作", // label: "操作",
......
device-manager-ui/admin/src/views/device/module/distribute/list.vue
View file @ 8b1ae536
...@@ -29,21 +29,18 @@ export default { ...@@ -29,21 +29,18 @@ export default {
}, },
/** 重写查看方法 */ /** 重写查看方法 */
toView(row) { toView(row) {
this.$get("/device/module/distribute/view", { id: row.id })
this.$get("/device/module/distribute/view",{id:row.id})
.then((res) => { .then((res) => {
if (res.code == 1) { if (res.code == 1) {
window.open(res.data.entity.filePath,"_blank") window.open(res.data.entity.filePath, "_blank");
} }
}) })
.catch((error) => { .catch((error) => {
this.$message.error(error.message); this.$message.error(error.message);
}); });
}, },
distribute(row) { distribute(row) {
this.$post("/device/module/distribute/active", row) this.$post("/device/module/distribute/active", row)
.then((res) => { .then((res) => {
if (res.code == 1) { if (res.code == 1) {
...@@ -61,22 +58,34 @@ export default { ...@@ -61,22 +58,34 @@ export default {
config: { config: {
search: [], search: [],
columns: [ columns: [
{ type: "selection", width: 60 }, { type: "selection", align: "center", width: 60 },
{ type: "index", label: "序号", width: 50 }, { type: "index", align: "center", label: "序号", width: 50 },
{ label: "产品", prop: "productId", formatter: this.formatter }, {
label: "产品",
align: "center",
prop: "productId",
formatter: this.formatter,
},
{ {
label: "分辨率", label: "分辨率",
align: "center",
prop: "imageResolution", prop: "imageResolution",
formatter: this.formatter, formatter: this.formatter,
}, },
{ label: "版本号", prop: "version" }, { label: "版本号", align: "center", prop: "version" },
{ label: "是否部署", prop: "distribute", formatter: this.formatter }, {
label: "是否部署",
align: "center",
prop: "distribute",
formatter: this.formatter,
},
{ {
label: "操作", label: "操作",
align: "center",
width: 240, width: 240,
formatter: (row) => { formatter: (row) => {
return ( return (
......
device-manager-ui/admin/src/views/device/module/list.vue
View file @ 8b1ae536
<template> <template>
<div class="page"> <div class="page">
<LayoutTable :data="tableData" :config="tableConfig"> <LayoutTable :data="tableData" :config="tableConfig"> </LayoutTable>
</LayoutTable>
<dialog-show ref="dialogform" @ok="getData" /> <dialog-show ref="dialogform" @ok="getData" />
</div> </div>
</template> </template>
<script> <script>
/** 表单弹出框模式需引入 */ /** 表单弹出框模式需引入 */
import dialogShow from "./dialogshow"; import dialogShow from "./dialogshow";
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
export default { export default {
name: "DeviceModule", name: "DeviceModule",
components: {dialogShow }, components: { dialogShow },
mixins: [table], mixins: [table],
created() { created() {},
},
methods: { methods: {
/** 重写新增方法 */ /** 重写新增方法 */
toAdd(row) { toAdd(row) {
this.$refs.dialogform.add(row); this.$refs.dialogform.add(row);
...@@ -26,38 +23,42 @@ ...@@ -26,38 +23,42 @@
/** 重写编辑方法 */ /** 重写编辑方法 */
toEdit(row) { toEdit(row) {
this.$refs.dialogform.edit(row); this.$refs.dialogform.edit(row);
}, },
/** 重写查看方法 */ /** 重写查看方法 */
// toView(row) { // toView(row) {
// this.$refs.dialogform.view(row); // this.$refs.dialogform.view(row);
// }, // },
}, },
data() { data() {
return { return {
config: { config: {
search: [ search: [],
],
columns: [ columns: [
{type: "selection", width: 60}, { type: "selection", align: "center", width: 60 },
{type: "index",label: "序号",width: 50}, { type: "index", align: "center", label: "序号", width: 50 },
{label: "模块名称", prop: "moduleName"}, { label: "模块名称", align: "center", prop: "moduleName" },
{label: "模块消息编码", prop: "moduleMsgCode"}, { label: "模块消息编码", align: "center", prop: "moduleMsgCode" },
{ {
label: "操作", label: "操作",
align: "center",
width: 240, width: 240,
formatter: row => { formatter: (row) => {
return ( return (
<table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} /> <table-buttons
noAdd
row={row}
onEdit={this.toEdit}
onView={this.toView}
onDel={this.toDel}
/>
); );
} },
} },
] ],
} },
};
}
}; };
},
};
</script> </script>
\ No newline at end of file
device-manager-ui/admin/src/views/device/module/use/list.vue
View file @ 8b1ae536
...@@ -68,19 +68,24 @@ export default { ...@@ -68,19 +68,24 @@ export default {
config: { config: {
search: [], search: [],
columns: [ columns: [
{ label: "模块名称", prop: "moduleName" }, { label: "模块名称", align: "center", prop: "moduleName" },
// { label: "模块消息编码", prop: "moduleMsgCode" }, // { label: "模块消息编码", prop: "moduleMsgCode" },
{ {
label: "设备名称", label: "设备名称",
align: "center",
prop: "deviceId", prop: "deviceId",
formatter: this.formatterString, formatter: this.formatterString,
}, },
{ label: "产品名称", prop: "platformAndProductName" }, {
label: "产品名称",
align: "center",
prop: "platformAndProductName",
},
{ label: "调用次数", prop: "useNum" }, { label: "调用次数", align: "center", prop: "useNum" },
], ],
}, },
}; };
......
device-manager-ui/admin/src/views/firm/list.vue
View file @ 8b1ae536
<template> <template>
<div class="page"> <div class="page">
<LayoutTable :data="tableData" :config="tableConfig"> <LayoutTable :data="tableData" :config="tableConfig"> </LayoutTable>
</LayoutTable>
<drawer-show ref="drawerform" @ok="getData" /> <drawer-show ref="drawerform" @ok="getData" />
</div> </div>
</template> </template>
<script> <script>
/** 表单弹出框模式需引入 */ /** 表单弹出框模式需引入 */
import drawerShow from "./drawershow"; import drawerShow from "./drawershow";
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
export default { export default {
name: "FirmList", name: "FirmList",
components: { components: {
drawerShow drawerShow,
},
mixins: [table],
created() {
}, },
mixins: [table],
created() {},
methods: { methods: {
/** 重写新增方法 */ /** 重写新增方法 */
toAdd(row) { toAdd(row) {
...@@ -34,7 +31,6 @@ ...@@ -34,7 +31,6 @@
toView(row) { toView(row) {
this.$refs.drawerform.view(row); this.$refs.drawerform.view(row);
}, },
}, },
data() { data() {
return { return {
...@@ -44,32 +40,49 @@ ...@@ -44,32 +40,49 @@
name: "firmName", name: "firmName",
type: "text", type: "text",
label: "设备生产厂商名称", label: "设备生产厂商名称",
fuzzy: true fuzzy: true,
}, },
], ],
columns: [ columns: [
{ type: "selection",reserveSelection:true, width: 60 }, {
{ type: "index", label: "序号",align:"center", width: 50 }, type: "selection",
align: "center",
reserveSelection: true,
width: 60,
},
{ type: "index", label: "序号", align: "center", width: 50 },
{label: "设备生产厂商名称", prop: "firmName"}, { label: "设备生产厂商名称", align: "center", prop: "firmName" },
{label: "设备生产商编码", prop: "firmCode"}, { label: "设备生产商编码", align: "center", prop: "firmCode" },
{label: "备注", prop: "firmRemark"}, { label: "备注", align: "center", prop: "firmRemark" },
{label: "创建时间", prop: "createTime", formatter: this.formatterDate}, {
label: "创建时间",
align: "center",
prop: "createTime",
formatter: this.formatterDate,
},
{ {
label: "操作", label: "操作",
align: "center",
width: 240, width: 240,
formatter: row => { formatter: (row) => {
return ( return (
<table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} /> <table-buttons
noAdd
row={row}
onEdit={this.toEdit}
onView={this.toView}
onDel={this.toDel}
/>
); );
} },
} },
] ],
} },
};
}
}; };
},
};
</script> </script>
\ No newline at end of file
device-manager-ui/admin/src/views/login/authentication.vue
View file @ 8b1ae536
...@@ -6,25 +6,28 @@ ...@@ -6,25 +6,28 @@
<script> <script>
export default { export default {
name: 'authentication', name: "authentication",
created () { created() {
this.login(); this.login();
}, },
methods: { methods: {
login() { login() {
this.$post('/login/index').then(this.loginSuccess).catch(this.loginFail) this.$post("/login/index").then(this.loginSuccess).catch(this.loginFail);
}, },
loginSuccess({data}) { loginSuccess({ data }) {
this.$store.commit('setUserData', data); this.$store.commit("setUserData", data);
this.$router.replace({ this.$router.replace({
path: this.redirect, path: this.redirect,
}); });
}, },
loginFail(error) { loginFail(error) {
this.$message.error(error.message || '请登录'); this.$message.error(error.message || "请登录");
console.log("href:"+process.env.VUE_APP_PORTAL_URL) console.log("href:" + process.env.VUE_APP_PORTAL_URL);
window.location.href=process.env.VUE_APP_PORTAL_URL=='undefined'?'http://192.168.0.98:11072':process.env.VUE_APP_PORTAL_URL window.location.href =
process.env.VUE_APP_PORTAL_URL == "undefined"
? "http://192.168.0.98:11072"
: process.env.VUE_APP_PORTAL_URL;
// window.location.href=process.env.VUE_APP_PORTAL_URL // window.location.href=process.env.VUE_APP_PORTAL_URL
// this.$router.replace({ // this.$router.replace({
...@@ -33,18 +36,18 @@ export default { ...@@ -33,18 +36,18 @@ export default {
// redirect: this.redirect, // redirect: this.redirect,
// } // }
// }); // });
} },
}, },
computed: { computed: {
isLogin() { isLogin() {
return this.$store.state.isLogin return this.$store.state.isLogin;
} },
}, },
data() { data() {
return { return {
redirect: this.$route.query.redirect, redirect: this.$route.query.redirect,
loading: true, loading: true,
} };
} },
} };
</script> </script>
device-manager-ui/admin/src/views/platform/list.vue
View file @ 8b1ae536
<template> <template>
<div class="page"> <div class="page">
<LayoutTable :data="tableData" :config="tableConfig"> <LayoutTable :data="tableData" :config="tableConfig"> </LayoutTable>
</LayoutTable>
<drawer-show ref="drawerform" @ok="getData" /> <drawer-show ref="drawerform" @ok="getData" />
</div> </div>
</template> </template>
<script> <script>
/** 表单弹出框模式需引入 */ /** 表单弹出框模式需引入 */
import drawerShow from "./drawershow"; import drawerShow from "./drawershow";
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
export default { export default {
name: "Platform", name: "Platform",
components: {drawerShow }, components: { drawerShow },
mixins: [table], mixins: [table],
created() { created() {},
},
methods: { methods: {
/** 重写新增方法 */ /** 重写新增方法 */
toAdd(row) { toAdd(row) {
this.$refs.drawerform.add(row); this.$refs.drawerform.add(row);
...@@ -26,42 +23,65 @@ ...@@ -26,42 +23,65 @@
/** 重写编辑方法 */ /** 重写编辑方法 */
toEdit(row) { toEdit(row) {
this.$refs.drawerform.edit(row); this.$refs.drawerform.edit(row);
}, },
/** 重写查看方法 */ /** 重写查看方法 */
toView(row) { toView(row) {
this.$refs.drawerform.view(row); this.$refs.drawerform.view(row);
}, },
}, },
data() { data() {
return { return {
config: { config: {
search: [ search: [],
],
columns: [ columns: [
{ type: "selection",reserveSelection:true, width: 60 }, {
{ type: "index", label: "序号",align:"center", width: 50 }, type: "selection",
align: "center",
reserveSelection: true,
width: 60,
},
{ type: "index", label: "序号", align: "center", width: 50 },
{label: "平台名称，名称唯一", prop: "platformName"}, {
label: "平台名称，名称唯一",
align: "center",
prop: "platformName",
},
{label: "平台编码，编码唯一", prop: "platformSn"}, { label: "平台编码，编码唯一", align: "center", prop: "platformSn" },
{label: "发送第三方平台消息类型", prop: "sendMsgType",formatter: this.formatter}, {
label: "发送第三方平台消息类型",
align: "center",
prop: "sendMsgType",
formatter: this.formatter,
},
{label: "是否启用发送消息", prop: "sendSwitch",formatter: this.formatter}, {
label: "是否启用发送消息",
align: "center",
prop: "sendSwitch",
formatter: this.formatter,
},
{ {
label: "操作", label: "操作",
align: "center",
width: 240, width: 240,
formatter: row => { formatter: (row) => {
return ( return (
<table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} /> <table-buttons
noAdd
row={row}
onEdit={this.toEdit}
onView={this.toView}
onDel={this.toDel}
/>
); );
} },
} },
] ],
} },
};
}
}; };
},
};
</script> </script>
\ No newline at end of file
device-manager-ui/admin/src/views/product/list.vue
View file @ 8b1ae536
...@@ -31,27 +31,40 @@ export default { ...@@ -31,27 +31,40 @@ export default {
this.$refs.drawerform.view(row); this.$refs.drawerform.view(row);
}, },
}, },
// beforeRouteEnter(to, from, next) {next(vm => { // beforeRouteEnter(to, from, next) {next(vm => {
// // 通过 `vm` 访问组件实例 // // 通过 `vm` 访问组件实例
// console.log(vm) // console.log(vm)
// })}, // })},
data() { data() {
return { return {
config: { config: {
search: [], search: [],
columns: [ columns: [
// {type: "selection", width: 60}, // {type: "selection", width: 60},
{ type: "index", label: "序号",align:"center", width: 50 }, {
type: "index",
align: "center",
label: "序号",
align: "center",
width: 50,
},
{ label: "关联平台", prop: "platformId", formatter: this.formatter }, {
label: "关联平台",
align: "center",
align: "center",
prop: "platformId",
formatter: this.formatter,
},
{ label: "产品名称", prop: "productName" }, { label: "产品名称", align: "center", prop: "productName" },
{ label: "产品编码", prop: "productCode" }, { label: "产品编码", align: "center", prop: "productCode" },
{ label: "备注", prop: "productRemark" }, { label: "备注", align: "center", prop: "productRemark" },
{ {
label: "操作", label: "操作",
align: "center",
width: 240, width: 240,
formatter: (row) => { formatter: (row) => {
return ( return (
......
device-manager-ui/admin/src/views/sitestat/dialogshow.vue
View file @ 8b1ae536
...@@ -3,32 +3,77 @@ ...@@ -3,32 +3,77 @@
<el-dialog :title="title" :visible.sync="open" width="90%" append-to-body> <el-dialog :title="title" :visible.sync="open" width="90%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<Field label="站点Id，来源基础服务平台" prop="siteId" v-model="form.siteId" placeholder="请输入站点Id，来源基础服务平台"/> <Field
<Field label="站点编号，来源基础服务平台" prop="siteCode" v-model="form.siteCode" type="textarea" placeholder="请输入站点编号，来源基础服务平台"/> label="站点Id，来源基础服务平台"
<Field label="站点名称" prop="siteName" v-model="form.siteName" type="textarea" placeholder="请输入站点名称"/> prop="siteId"
<Field label="设备总数" prop="deviceTotal" v-model="form.deviceTotal" placeholder="请输入设备总数"/> v-model="form.siteId"
<Field label="在线数量" prop="onlineCount" v-model="form.onlineCount" placeholder="请输入在线数量"/> placeholder="请输入站点Id，来源基础服务平台"
<Field label="离线数量" prop="offlineCount" v-model="form.offlineCount" placeholder="请输入离线数量"/> />
<Field label="停用数量" prop="stopCount" v-model="form.stopCount" placeholder="请输入停用数量"/> <Field
<Field label="待激活数量" prop="unActiveCount" v-model="form.unActiveCount" placeholder="请输入待激活数量"/> label="站点编号，来源基础服务平台"
prop="siteCode"
v-model="form.siteCode"
type="textarea"
placeholder="请输入站点编号，来源基础服务平台"
/>
<Field
label="站点名称"
prop="siteName"
v-model="form.siteName"
type="textarea"
placeholder="请输入站点名称"
/>
<Field
label="设备总数"
prop="deviceTotal"
v-model="form.deviceTotal"
placeholder="请输入设备总数"
/>
<Field
label="在线数量"
prop="onlineCount"
v-model="form.onlineCount"
placeholder="请输入在线数量"
/>
<Field
label="离线数量"
prop="offlineCount"
v-model="form.offlineCount"
placeholder="请输入离线数量"
/>
<Field
label="停用数量"
prop="stopCount"
v-model="form.stopCount"
placeholder="请输入停用数量"
/>
<Field
label="待激活数量"
prop="unActiveCount"
v-model="form.unActiveCount"
placeholder="请输入待激活数量"
/>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" v-if="pageInfo.type !== 'view'" @click="submitForm">确 定</el-button> <el-button
type="primary"
v-if="pageInfo.type !== 'view'"
@click="submitForm"
>确 定</el-button
>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import form from "@/assets/mixins/formdialog"; import form from "@/assets/mixins/formdialog";
import dialogShow from "./dialogshow"; import dialogShow from "./dialogshow";
export default { export default {
mixins: [form], mixins: [form],
components: { components: {
dialogShow , dialogShow,
}, },
data() { data() {
return { return {
...@@ -38,46 +83,43 @@ ...@@ -38,46 +83,43 @@
title: "站点统计", title: "站点统计",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
toString:[ toString: [],
],
// 表单校验 // 表单校验
rules: { rules: {
unActiveCount: [ unActiveCount: [
{required: true,message: "请输入待激活数量", trigger: "blur" }, { required: true, message: "请输入待激活数量", trigger: "blur" },
],
createTime: [
{required: true,message: "请选择创建时间" },
], ],
} createTime: [{ required: true, message: "请选择创建时间" }],
},
}; };
}, },
methods: { methods: {
/** 编辑 */ /** 编辑 */
edit(row) { edit(row) {
this.reset() this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl =this.pageInfo.editUrl;; this.urls.currUrl = this.pageInfo.editUrl;
this.getData(); this.getData();
this.pageInfo.type="edit" this.pageInfo.type = "edit";
this.title = "修改站点统计"; this.title = "修改站点统计";
}, },
/** 新增 */ /** 新增 */
add(row) { add(row) {
this.reset() this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl = this.pageInfo.addUrl; this.urls.currUrl = this.pageInfo.addUrl;
this.getData(); this.getData();
this.pageInfo.type="add" this.pageInfo.type = "add";
this.title = "新增站点统计"; this.title = "新增站点统计";
}, },
/** 查看*/ /** 查看*/
view(row) { view(row) {
this.reset() this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl =this.pageInfo.viewUrl;; this.urls.currUrl = this.pageInfo.viewUrl;
this.getData(); this.getData();
this.pageInfo.type="view" this.pageInfo.type = "view";
this.title = "站点统计详细"; this.title = "站点统计详细";
}, },
/**取消按钮 */ /**取消按钮 */
...@@ -97,14 +139,14 @@ ...@@ -97,14 +139,14 @@
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
siteId : null, siteId: null,
siteCode : "", siteCode: "",
siteName : "", siteName: "",
deviceTotal : null, deviceTotal: null,
onlineCount : null, onlineCount: null,
offlineCount : null, offlineCount: null,
stopCount : null, stopCount: null,
unActiveCount : null, unActiveCount: null,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
...@@ -114,5 +156,5 @@ ...@@ -114,5 +156,5 @@
} }
}, },
}, },
}; };
</script> </script>
device-manager-ui/admin/src/views/sitestat/list.vue
View file @ 8b1ae536
...@@ -4,13 +4,8 @@ ...@@ -4,13 +4,8 @@
<el-col :span="6" :xs="12" class="mytree"> <el-col :span="6" :xs="12" class="mytree">
<el-card> <el-card>
<div slot="header"> <div slot="header">
<span <span><b class="cardTitle">站点分布</b></span>
><b class="cardTitle">站点分布</b></span <el-button style="float: right" @click="switchStat" type="text"
>
<el-button
style="float: right; "
@click="switchStat"
type="text"
>切换为地图模式</el-button >切换为地图模式</el-button
> >
</div> </div>
...@@ -122,7 +117,7 @@ export default { ...@@ -122,7 +117,7 @@ export default {
//进入设备列表页面 //进入设备列表页面
this.$router.push({ this.$router.push({
path: "/device/list", path: "/device/list",
query: {sitestatId:row.id,siteId:row.siteId}, query: { sitestatId: row.id, siteId: row.siteId },
}); });
}, },
...@@ -141,13 +136,15 @@ export default { ...@@ -141,13 +136,15 @@ export default {
// this.siteMatterTable.siteId = node.id; // this.siteMatterTable.siteId = node.id;
//this.getSiteMatterTableData(); //this.getSiteMatterTableData();
console.log(node.id.search(",")>-1) console.log(node.id.search(",") > -1);
if (node.id.search(",")>-1) { if (node.id.search(",") > -1) {
console.log(node.id) console.log(node.id);
//this.query = { siteId: node.id.split(",")[0] ,siteIdList:node.id.split(",")} //this.query = { siteId: node.id.split(",")[0] ,siteIdList:node.id.split(",")}
this.query = { siteIdList:node.id.split(",").map(i=>parseInt(i)) }; this.query = {
siteIdList: node.id.split(",").map((i) => parseInt(i)),
};
} else { } else {
this.query = { siteId: node.id }; this.query = { siteId: node.id };
} }
...@@ -168,32 +165,56 @@ export default { ...@@ -168,32 +165,56 @@ export default {
}, },
], ],
columns: [ columns: [
{ type: "selection",reserveSelection:true, width: 60 }, { type: "selection", reserveSelection: true, width: 60 },
{ type: "index", label: "序号",align:"center", width: 50 }, {
type: "index",
align: "center",
label: "序号",
align: "center",
width: 50,
},
{ label: "站点名称", prop: "siteName" }, { label: "站点名称", align: "center", prop: "siteName" },
{ label: "站点编号", prop: "siteCode" }, { label: "站点编号", align: "center", prop: "siteCode" },
{ label: "设备总数", prop: "deviceTotal", formatter: this.formatter }, {
label: "设备总数",
align: "center",
prop: "deviceTotal",
formatter: this.formatter,
},
{ label: "在线数量", prop: "onlineCount", formatter: this.formatter }, {
label: "在线数量",
align: "center",
prop: "onlineCount",
formatter: this.formatter,
},
{ {
label: "离线数量", label: "离线数量",
align: "center",
prop: "offlineCount", prop: "offlineCount",
formatter: this.formatter, formatter: this.formatter,
}, },
{ label: "停用数量", prop: "stopCount", formatter: this.formatter }, {
label: "停用数量",
align: "center",
prop: "stopCount",
formatter: this.formatter,
},
{ {
label: "待激活数量", label: "待激活数量",
align: "center",
prop: "unActiveCount", prop: "unActiveCount",
formatter: this.formatter, formatter: this.formatter,
}, },
{ {
label: "操作", label: "操作",
align: "center",
width: 240, width: 240,
formatter: (row) => { formatter: (row) => {
return ( return (
......
device-manager-ui/admin/src/views/sitestat/mapDetail.vue
View file @ 8b1ae536
...@@ -194,7 +194,7 @@ export default { ...@@ -194,7 +194,7 @@ export default {
}); });
//this.info = this.$route.query; //this.info = this.$route.query;
this.query = {sitestatId:sitestatId, siteId, siteId }; this.query = { sitestatId: sitestatId, siteId, siteId };
}, },
methods: { methods: {
formatterDate, formatterDate,
...@@ -227,7 +227,7 @@ export default { ...@@ -227,7 +227,7 @@ export default {
path: "/device/list", path: "/device/list",
query: { query: {
siteId: this.info.siteId, siteId: this.info.siteId,
sitestatId:this.info.id sitestatId: this.info.id,
}, },
}); });
}, },
...@@ -364,7 +364,7 @@ export default { ...@@ -364,7 +364,7 @@ export default {
}, },
}; };
</script> </script>
<style scoped> <style lang="less" scoped>
.el-divider--horizontal { .el-divider--horizontal {
margin: 5, 0, 5, 0; margin: 5, 0, 5, 0;
background: 0 0; background: 0 0;
......
device-manager-ui/admin/src/views/sitestat/maplist.vue
View file @ 8b1ae536
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<el-card> <el-card>
<div slot="header"> <div slot="header">
<span><b class="cardTitle">站点分布</b></span> <span><b class="cardTitle">站点分布</b></span>
<el-button style="float: right" @click="switchStat" type="text" <el-button style="float: right" @click="switchStat" type="text"
>切换为列表模式</el-button >切换为列表模式</el-button
> >
...@@ -30,7 +29,6 @@ ...@@ -30,7 +29,6 @@
</el-scrollbar> </el-scrollbar>
</el-card> </el-row </el-card> </el-row
></Map> ></Map>
<dialog-show ref="dialogform" @ok="getData" /> <dialog-show ref="dialogform" @ok="getData" />
</div> </div>
</template> </template>
...@@ -95,7 +93,7 @@ export default { ...@@ -95,7 +93,7 @@ export default {
this.$router.push({ this.$router.push({
path: "/sitestat/mapDetail", path: "/sitestat/mapDetail",
// query: info, // query: info,
query: {sitestatId:info.id,siteId:info.siteId}, query: { sitestatId: info.id, siteId: info.siteId },
}); });
}, },
......
device-manager-ui/admin/src/views/system/log/list.vue
View file @ 8b1ae536
...@@ -26,7 +26,13 @@ export default { ...@@ -26,7 +26,13 @@ export default {
}, },
], ],
columns: [ columns: [
{ type: "index", label: "序号",align:"center", width: 50 }, {
type: "index",
align: "center",
label: "序号",
align: "center",
width: 50,
},
{ {
prop: "userName", prop: "userName",
......
device-manager-ui/admin/src/views/system/menu/show.vue
View file @ 8b1ae536
...@@ -4,71 +4,97 @@ ...@@ -4,71 +4,97 @@
:model="form" :model="form"
:loading="loading" :loading="loading"
:rules="rules" :rules="rules"
size='small' size="small"
label-width='100px' label-width="100px"
ref="form" ref="form"
> >
<el-row> <el-row>
<Field label="ID" prop="id" v-model="form.id" v-if='pageInfo.type !== "add"' disabled /> <Field
<Field label="名称" prop="name" v-model="form.name"/> label="ID"
<Field label="权限类型" prop="authType" v-model="form.authType" :enumData='dict.authType' type='select' /> prop="id"
<Field label="父级菜单" prop="parentId" v-model="form.parentId" :enumData='menu' type='select' /> v-model="form.id"
v-if="pageInfo.type !== 'add'"
disabled
/>
<Field label="名称" prop="name" v-model="form.name" />
<Field
label="权限类型"
prop="authType"
v-model="form.authType"
:enumData="dict.authType"
type="select"
/>
<Field
label="父级菜单"
prop="parentId"
v-model="form.parentId"
:enumData="menu"
type="select"
/>
<Field label="访问地址" prop="url" v-model="form.url" /> <Field label="访问地址" prop="url" v-model="form.url" />
<Field label="状态" prop="status" v-model="form.status" :enumData='dict.status' type='radio' /> <Field
<Field label="图标" prop="imgPath" :span='24'> label="状态"
<el-radio-group v-model="form.imgPath" class='form-el-radio-group'> prop="status"
v-model="form.status"
:enumData="dict.status"
type="radio"
/>
<Field label="图标" prop="imgPath" :span="24">
<el-radio-group v-model="form.imgPath" class="form-el-radio-group">
<el-radio-button label="">不需要图标</el-radio-button> <el-radio-button label="">不需要图标</el-radio-button>
<el-radio-button v-for='(icon, index) in icons' :key='index' :label="icon"> <el-radio-button
<i :class="'el-icon-'+icon"></i> v-for="(icon, index) in icons"
{{icon}} :key="index"
:label="icon"
>
<i :class="`iconfont ${icon}`"></i>
{{ icon }}
</el-radio-button> </el-radio-button>
</el-radio-group> </el-radio-group>
</Field> </Field>
</el-row> </el-row>
<form-buttons @submit='submitForm'/> <form-buttons @submit="submitForm" />
</el-form> </el-form>
</layout-form> </layout-form>
</template> </template>
<script> <script>
import form from '@/assets/mixins/form'; import form from "@/assets/mixins/form";
export default { export default {
mixins: [form], mixins: [form],
methods: { methods: {
afterSubmit() { afterSubmit() {
this.$store.dispatch('login'); this.$store.dispatch("login");
this.$router.go(-1); this.$router.go(-1);
}, },
}, },
computed: { computed: {
menu() { menu() {
let menu = {'0': '无'}; let menu = { 0: "无" };
this.$store.state.userData.barList.forEach(item=>{ this.$store.state.userData.barList.forEach((item) => {
menu[item.id+''] = item.name menu[item.id + ""] = item.name;
}); });
return menu; return menu;
} },
}, },
data() { data() {
return { return {
toString: ['parentId', 'authType', 'status'], toString: ["parentId", "authType", "status"],
icons: [ icons: [
'info', 'error', 'success', 'warning', 'question', "icon-shouye",
'tickets', 'document', 'goods', 'sold-out', 'news', "icon-shezhi",
'message', 'date', 'printer', 'time', 'bell', "icon-xiaoxi",
'mobile-phone', 'service', 'view', 'menu', 'star-on', "icon-xitongguanli",
'location', 'phone', 'picture', 'delete', 'search', "icon-gaojing",
'edit', 'rank', 'refresh', 'share', 'setting', "icon-dalou",
'upload', 'upload2', 'download', 'loading', "icon-xitongguanli1",
], ],
rules: { rules: {
name: [ name: [{ required: true, message: "请输入名称", trigger: "blur" }],
{ required: true, message: '请输入名称', trigger: 'blur' }, },
], };
}, },
} };
}
}
</script> </script>
device-manager-ui/admin/src/views/system/resource/list.vue
View file @ 8b1ae536
<template> <template>
<div class="page"> <div class="page">
<LayoutTable :data='tableData' :config='tableConfig' /> <LayoutTable :data="tableData" :config="tableConfig" />
<dialog-show ref="dialogform" @ok="getData" /> <dialog-show ref="dialogform" @ok="getData" />
</div> </div>
</template> </template>
<script> <script>
import table from '@/assets/mixins/table'; import table from "@/assets/mixins/table";
import dialogShow from "./dialogshow"; import dialogShow from "./dialogshow";
export default { export default {
mixins: [table], mixins: [table],
...@@ -32,34 +32,42 @@ export default { ...@@ -32,34 +32,42 @@ export default {
config: { config: {
search: [ search: [
{ {
name: 'name', name: "name",
type: 'text', type: "text",
label: '资源名称', label: "资源名称",
}, },
{ {
name: 'authType', name: "authType",
type: 'select', type: "select",
label: '权限类型', label: "权限类型",
}, },
], ],
columns: [ columns: [
{ type: "selection",reserveSelection:true, width: 60 }, {
{ type: "index", label: "序号",align:"center", width: 50 }, type: "selection",
align: "center",
reserveSelection: true,
width: 60,
},
{ type: "index", label: "序号", align: "center", width: 50 },
// { // {
// prop: 'id', // prop: 'id',
// label: 'ID', // label: 'ID',
// }, // },
{ {
prop: 'name', prop: "name",
label: '名称', align: "center",
label: "名称",
}, },
{ {
prop: 'url', prop: "url",
label: '资源', align: "center",
label: "资源",
}, },
{ {
prop: 'authType', prop: "authType",
label: '认证类型', align: "center",
label: "认证类型",
formatter: this.formatter, formatter: this.formatter,
}, },
...@@ -70,18 +78,24 @@ export default { ...@@ -70,18 +78,24 @@ export default {
// formatter: this.formatter, // formatter: this.formatter,
// }, // },
{ {
label: '操作', label: "操作",
align: "center",
witdh: 120, witdh: 120,
formatter: (row)=> { formatter: (row) => {
return ( return (
<table-buttons noView row={row} onEdit={this.toEdit} onDel={this.toDel} /> <table-buttons
) noView
row={row}
onEdit={this.toEdit}
onDel={this.toDel}
/>
);
}, },
}, },
], ],
}, },
} };
} },
} };
</script> </script>
device-manager-ui/admin/vue.config.js
View file @ 8b1ae536
...@@ -17,7 +17,7 @@ module.exports = { ...@@ -17,7 +17,7 @@ module.exports = {
hot: true,//自动保存 hot: true,//自动保存
proxy: { proxy: {
'/m': { '/m': {
target: 'http://127.0.0.1:18222', target: 'http://192.168.0.98:11091',
changeOrigin: true, changeOrigin: true,
secure: false, secure: false,
cookieDomainRewrite: 'plm.testnew.com', cookieDomainRewrite: 'plm.testnew.com',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment