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

美化界面，动态加载html增加version参数清除浏览器自身缓存

Browse Source 
Former-commit-id: 841cad84ae5a65e3d41c67d926a2aca5fab75232
TangShanKaiPing
zhengpengju 5 years ago
parent f2eb456dd0
commit 9d14f1391d
7 changed files with 79 additions and 44 deletions
Show Stats Download Patch File Download Diff File

14
projects/WebSPA/wwwroot/images/avatar.svg
Unescape View File

@ -1 +1,13 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1578371831778" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5702" xmlns:xlink="http://www.w3.org/1999/xlink" width="256" height="256"><defs><style type="text/css"></style></defs><path d="M969.386667 962.56c0 22.755556-18.204444 40.96-40.96 40.96H111.502222c-22.755556 0-40.96-18.204444-40.96-40.96 0 0 6.826667-141.084444 118.328889-195.697778 70.542222-34.133333 43.235556-18.204444 129.706667-52.337778 86.471111-34.133333 106.951111-59.164444 106.951111-59.164444l-4.551111-45.511111s-95.573333-27.306667-111.502222-131.982222c-29.582222 6.826667-38.684444-31.857778-40.96-56.888889-2.275556-25.031111-18.204444-102.4 18.204444-95.573334-6.826667-52.337778-13.653333-97.848889-9.102222-122.88 4.551111-40.96-6.826667-47.786667 31.857778-79.644444 9.102222-9.102222-9.102222-47.786667-2.275556-59.164444 11.377778-22.755556 88.746667-13.653333 100.124444-18.204445 31.857778-13.653333 68.266667-22.755556 106.951112-25.031111 163.84 6.826667 227.555556 95.573333 236.657777 182.044444 2.275556 25.031111-2.275556 70.542222-11.377777 122.88 36.408889-6.826667 20.48 70.542222 18.204444 95.573334-2.275556 25.031111-11.377778 65.991111-40.96 56.888889-15.928889 104.675556-93.297778 131.982222-93.297778 131.982222l-4.551111 43.235555s20.48 22.755556 106.951111 59.164445c86.471111 34.133333 59.164444 20.48 129.706667 54.613333 106.951111 52.337778 113.777778 195.697778 113.777778 195.697778z m0 0" fill="#8a8a8a" p-id="5703"></path></svg>
<svg width="1024" height="1024" xmlns="http://www.w3.org/2000/svg" p-id="5702" version="1.1" class="icon" t="1578371831778">
<defs>
<style type="text/css"/>
</defs>
<g>
<title>background</title>
<rect fill="none" id="canvas_background" height="514" width="1073" y="-1" x="-1"/>
</g>
<g>
<title>Layer 1</title>
<path stroke="null" id="svg_1" p-id="5703" fill="#8a8a8a" d="m900.922221,989.073926c0,19.692269 -15.753817,35.446077 -35.446077,35.446077l-706.952312,0c-19.69226,0 -35.446077,-15.753808 -35.446077,-35.446077c0,0 5.907682,-122.092038 102.399778,-169.353479c61.046019,-29.538394 37.415307,-15.753808 112.245912,-45.292211c74.830605,-29.538394 92.553644,-51.199885 92.553644,-51.199885l-3.938452,-39.384529s-82.707518,-23.630721 -96.492096,-114.215134c-25.599951,5.907674 -33.476855,-27.569173 -35.446077,-49.230663c-1.96923,-21.66149 -15.753817,-88.615192 15.753808,-82.707518c-5.907682,-45.292202 -11.815356,-84.676731 -7.876904,-106.33823c3.938452,-35.446077 -5.907682,-41.35375 27.569173,-68.922923c7.876904,-7.876904 -7.876913,-41.353759 -1.96923,-51.199885c9.846134,-19.692269 76.799836,-11.815365 86.645961,-15.753817c27.569173,-11.815356 59.076797,-19.69226 92.553652,-21.66149c141.784307,5.907682 196.922643,82.707509 204.799547,157.538115c1.96923,21.661499 -1.969222,61.046028 -9.846126,106.33823c31.507616,-5.907674 17.723038,61.046028 15.753808,82.707518c-1.96923,21.66149 -9.846134,57.107567 -35.446077,49.230663c-13.784586,90.584413 -80.738288,114.215134 -80.738288,114.215134l-3.938452,37.415298s17.723038,19.692269 92.553644,51.199893c74.830605,29.538394 51.199893,17.723038 112.245912,47.261433c92.553644,45.292211 98.461326,169.353479 98.461326,169.353479zm0,0"/>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

1
projects/WebSPA/wwwroot/images/device.svg
Unescape View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1588039572630" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9110" xmlns:xlink="http://www.w3.org/1999/xlink" width="1024" height="1024"><defs><style type="text/css"></style></defs><path d="M408.520306 659.194804l-176.006995-97.213166c-16.884392-9.465492-38.629442-3.581538-48.094935 12.791206-9.721317 16.372744-3.837362 37.350322 13.302855 46.815814l176.006995 97.213166c16.884392 9.465492 38.629442 3.581538 48.094935-12.791206 9.465492-16.628568 3.581538-37.350322-13.302855-46.815814z m0 0" fill="#07c160" p-id="9111"></path><path d="M818.862196 374.718381c16.884392-9.465492 23.024171-30.187246 13.302854-46.815814-9.721317-16.372744-31.210543-22.256699-48.094934-12.791206l-275.778403 152.471176-275.778402-152.471176c-16.884392-9.465492-38.629442-3.581538-48.094935 12.791206-9.721317 16.372744-3.837362 37.350322 13.302855 46.815814l279.615764 154.517769v330.013116c0 12.279558 6.651427 23.535819 17.651864 29.675598 11.000437 6.139779 24.303291 6.139779 35.303729 0 11.000437-6.139779 17.651864-17.39604 17.651864-29.675598V527.701205c0-1.023296-0.511648-2.046593-0.511648-3.069889l271.429392-149.912935z m0 0" fill="#07c160" p-id="9112"></path><path d="M964.681945 213.805009L570.968623 14.006371c-36.582849-18.675161-82.119543-18.675161-118.958216 0L58.808733 213.805009C22.481708 232.224346-0.030815 266.248954 0.225009 302.575979v423.900568c0 37.094498 23.024171 71.37493 59.862845 89.538443l393.457498 193.914683c36.071201 17.651864 80.07295 17.651864 116.14415 0l393.457498-193.914683c37.094498-18.419337 60.118668-52.443945 59.862845-89.538443V302.575979c0.511648-36.582849-22.000874-70.351633-58.3279-88.77097z m-5.116482 514.973955c0 12.535382-7.930548 24.047467-20.721754 30.187247L531.827533 954.927487c-12.535382 5.883955-27.629005 5.883955-40.164387 0L84.646969 758.966211c-12.791206-6.139779-20.721754-17.651864-20.721754-30.187247V300.529386c0-12.279558 7.674724-23.791643 20.210106-29.931422l406.760352-201.845232c12.535382-6.395603 28.396477-6.395603 40.93186 0L939.355357 270.597964c12.535382 6.139779 20.210106 17.651864 20.210106 29.931422v428.249578z m-14.837799-2.302417" fill="#07c160" p-id="9113"></path><path d="M803.512749 454.023859l-165.006558 94.3991c-22.768347 13.04703-41.187683 41.699332-41.187684 64.211855v189.054025c0 22.256699 18.419337 29.931422 41.187684 16.884392l165.006558-94.399101c22.768347-13.04703 41.187683-41.699332 41.187683-64.211854v-189.054025c0-22.256699-18.419337-29.931422-41.187683-16.884392z m0 0" fill="#07c160" p-id="9114"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

1
projects/WebSPA/wwwroot/images/node.svg
Unescape View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1588040084926" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9437" xmlns:xlink="http://www.w3.org/1999/xlink" width="1024" height="1024"><defs><style type="text/css"></style></defs><path d="M987.776 441.696a22.304 22.304 0 0 0-1.856-2l-90.864-86.656 0.032-0.528L532.688 7.424a23.088 23.088 0 0 0-32.144-0.208L36.48 439.504c-0.736 0.672-1.44 1.408-2.096 2.208C22.528 455.696 16 474.256 16 493.792c0 41.312 29.312 74.912 65.36 74.912h22.336v428.8c0 14.64 10.976 26.496 24.48 26.496h771.648c13.552 0 24.496-11.856 24.496-26.496v-428.8h16.496c36.032 0 65.376-33.616 65.376-74.912 0-19.568-6.528-38.096-18.416-52.096z m-80.272 75.952h-30.08c-1.856 0 18.336-1.712 16.512-1.248-1.744-0.464-20.544 1.776-22.432 1.776-13.536 0-27.504-0.64-27.504 14l2 426.832h-656l-1.328-416.832c0-14.64-10.976-26.528-24.48-26.528H117.36c-8.88 0-16.4-10-16.4-21.84 0-5.84 1.696-11.216 4.8-15.344L514 94.176l405.024 386.16c3.104 4.16 4.88 9.6 4.88 15.44-0.032 11.872-7.536 21.872-16.4 21.872z" p-id="9438" fill="#07c160"></path><path d="M436.912 493.504c12.208 0 22.384-10.176 22.384-22.384v-42.736c0-12.208-10.176-22.384-22.384-22.384a22.56 22.56 0 0 0-22.384 22.384v44.768c0 12.208 10.16 20.352 22.384 20.352z m132.272 0a22.56 22.56 0 0 0 22.368-22.384v-42.736a22.56 22.56 0 0 0-22.368-22.384c-12.208 0-22.384 10.176-22.384 22.384v44.768c0 12.208 10.192 20.352 22.384 20.352zM369.76 515.888v199.424c0 36.624 30.528 67.152 67.152 67.152h132.272c36.64 0 67.152-30.528 67.152-67.152V515.888H369.76z m109.888 221.808v-87.504h-42.72l87.504-87.52v87.52h44.768l-89.552 87.504z m-42.736 87.504h22.384v89.552h87.504v-87.52h22.384v-22.368h-132.272v20.336z" p-id="9439" fill="#07c160"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

1
projects/WebSPA/wwwroot/images/scene.svg
Unescape View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1588040144621" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9755" xmlns:xlink="http://www.w3.org/1999/xlink" width="1024" height="1024"><defs><style type="text/css"></style></defs><path d="M609.8 138.3l1.8 2.4 311.6 455.9c13.3 19.5 0.3 45.6-22.5 47.5l-2.6 0.1h-88l140.9 204c13.4 19.5 0.5 45.7-22.4 47.6l-2.6 0.1H210.9v-60.8h656.9l-280-405.7-85.2 128.8c-12.2 18.4-39 17.9-50.8-0.1l-1.5-2.6-117.5-223.3-212 424L66.3 729l238.5-477c10.6-21.3 40.1-22.4 52.6-3.1l1.5 2.5 121.2 230.3 81.7-123.4c11.3-17.1 35.7-18.2 48.5-2.9l1.8 2.4L768 583.3h72.4L585.6 210.4 500.1 327 451 291l110.8-151.1c11.9-16.2 35.5-16.5 48-1.6z" p-id="9756" fill="#07c160"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 841 B

14
projects/WebSPA/wwwroot/index.html
Unescape View File

@ -22,9 +22,9 @@
</div>
</div>
<script>
ver = '0.1.0.202004270919'; // 版本信息全局变量
var version = '0.1.0.202004281125'; // 版本信息全局变量
</script>
<script src="js/config.js?v1"></script>
<script src="js/config.js?v=0.1.0.202004281125"></script>
<script src="lib/linq/linq.min.js"></script>
<script src="lib/jquery/jquery.min.js"></script>
<script src="lib/jquery-serializejson/jquery.serializejson.min.js"></script>
@ -37,10 +37,10 @@
<script src="lib/Chart.js/Chart.bundle.min.js"></script>
<script src="lib/flv.js/flv.min.js"></script>
<script src="lib/WXInlinePlayer/index.js"></script>
<script src="js/util.js"></script>
<script src="js/store.js"></script>
<script src="js/message.js"></script>
<script src="js/iot.js"></script>
<script src="js/app.js"></script>
<script src="js/util.js?v=0.1.0.202004281125"></script>
<script src="js/store.js?v=0.1.0.202004281125"></script>
<script src="js/message.js?v=0.1.0.202004281125"></script>
<script src="js/iot.js?v=0.1.0.202004281125"></script>
<script src="js/app.js?v=0.1.0.202004281125"></script>
</body>
</html>

15
projects/WebSPA/wwwroot/js/app.js
Unescape View File

@ -24,6 +24,8 @@ axios.interceptors.request.use(
}
// 绝对路径替换为网关+路径 (防止多次请求重复拼接URL)
config.url = config.url.indexOf('/') == 0 ? apigateway + config.url : config.url;
}else{
config.url += `?v=${version}`
}
$('#loading').show();
return config;
@ -149,8 +151,17 @@ router.afterEach((route, redirect) => {
})
})
///
// 人人通原生返回键回调
var onReturnBack = function (){
if(window.api){
window.api.execScript(
{
name: window.api.winName,
script: "api.closeWin()"
}
)
}
}
// indexedDB兼容
var indexedDB = window.indexedDB || window.webkitindexedDB || window.msIndexedDB || mozIndexedDB || null;

77
projects/WebSPA/wwwroot/pages/home.html
Unescape View File

@ -2,8 +2,8 @@
<div class="weui-tab__panel bg-white">
<div class="weui-tab__content">
<div class="weui-header">
<div class="weui-header-left"> <a class="icon icon-109">消息({{store.state.messages.length}})</a> </div>
<h1 class="weui-header-title"></h1>
<div class="weui-header-left"> <a class="icon icon-109">关闭</a> </div>
<h1 class="weui-header-title">消息({{store.state.messages.length}})</h1>
<div class="weui-header-right"><a class="icon"><img src="/images/more.svg" style="width:20px"></a></div>
</div>
<div class="center page-bd main">
@ -30,39 +30,48 @@
</li>
</ul>
</div>
</div>
</div>
<div class="weui-tab__content">
<div class="row p-3">物联网</div>
<div class="row">
<router-link to="/pages/iot/products" class="col-md-2 col-sm-3 col-4 p-3">
<div class="weui-grid__icon">
<img :src="config.apigateway+'/IoTCenter/images/device.png'" />
</div>
<p class="weui-grid__label">设备</p>
</router-link>
<router-link to="/pages/iot/nodes" class="col-md-2 col-sm-3 col-4 p-3">
<div class="weui-grid__icon">
<img :src="config.apigateway+'/IoTCenter/images/node.png'" />
</div>
<p class="weui-grid__label">智慧教室</p>
</router-link>
<router-link to="/pages/iot/scenes" class="col-md-2 col-sm-3 col-4 p-3">
<div class="weui-grid__icon">
<img :src="config.apigateway+'/IoTCenter/images/scene.png'" />
</div>
<p class="weui-grid__label">平台场景</p>
</router-link>
<div class="weui-header">
<div class="weui-header-left"> <a class="icon icon-109">关闭</a> </div>
<h1 class="weui-header-title">应用</h1>
<div class="weui-header-right"></div>
</div>
<div class="page__bd main">
<div class="row">
<router-link to="/pages/iot/products" class="col-md-2 col-sm-3 col-4 p-3">
<div class="weui-grid__icon" style="width:32px">
<img src="/images/device.svg" />
</div>
<p class="weui-grid__label">设备管理</p>
</router-link>
<router-link to="/pages/iot/nodes" class="col-md-2 col-sm-3 col-4 p-3">
<div class="weui-grid__icon" style="width:32px">
<img src="/images/node.svg" />
</div>
<p class="weui-grid__label">智慧教室</p>
</router-link>
<router-link to="/pages/iot/scenes" class="col-md-2 col-sm-3 col-4 p-3">
<div class="weui-grid__icon" style="width:32px">
<img src="/images/scene.svg" />
</div>
<p class="weui-grid__label">平台场景</p>
</router-link>
</div>
</div>
</div>
<div class="weui-tab__content">
<mt-header title="我的"></mt-header>
<div class="weui-header">
<div class="weui-header-left"> <a class="icon icon-109">关闭</a> </div>
<h1 class="weui-header-title">我的</h1>
<div class="weui-header-right"></div>
</div>
<div class="page panel js_show">
<div class="page__bd">
<div class="page__bd main">
<div class="weui-panel weui-panel_access">
<div class="weui-panel__bd">
<a href="javascript:void(0);" class="weui-media-box weui-media-box_appmsg weui-cell_access weui-cell_link">
<a href="javascript:void(0);" class="weui-media-box weui-media-box_appmsg weui-cell_link">
<div class="weui-media-box__hd"> <img class="weui-media-box__thumb" :src="user && user.avatar ? user.avatar : config.apigateway+'/images/avatar.svg'" /></div>
<div class="weui-media-box__bd">
<div class="weui-cell__bd">
@ -75,33 +84,33 @@
</div>
</div>
<div class="weui-panel weui-panel_access">
<div class="weui-panel__ft"> <a href="javascript:void(0);" class="weui-cell weui-cell_access weui-cell_link">
<div class="weui-panel__ft"> <a href="javascript:void(0);" class="weui-cell weui-cell_link">
<div class="weui-cell__bd">姓名</div>
<span class="weui-cell__ft">{{user ? user.realName : ''}}</span> </a>
</div>
<div class="weui-panel__ft"> <a href="javascript:void(0);" class="weui-cell weui-cell_access weui-cell_link">
<div class="weui-panel__ft"> <a href="javascript:void(0);" class="weui-cell weui-cell_link">
<div class="weui-cell__bd">身份证</div>
<span class="weui-cell__ft">{{user ? user.idCardNumber : '' }}</span> </a>
</div>
<div class="weui-panel__ft"> <a href="javascript:void(0);" class="weui-cell weui-cell_access weui-cell_link">
<div class="weui-panel__ft"> <a href="javascript:void(0);" class="weui-cell weui-cell_link">
<div class="weui-cell__bd">性别</div>
<span class="weui-cell__ft">{{ (user && user.sex === 1) ? '男' : '女' }}</span> </a>
<span class="weui-cell__ft">{{ (user && user.sex === 0) ? '男' : '女' }}</span> </a>
</div>
<div class="weui-panel__ft"> <a href="javascript:void(0);" class="weui-cell weui-cell_access weui-cell_link">
<div class="weui-panel__ft"> <a href="javascript:void(0);" class="weui-cell weui-cell_link">
<div class="weui-cell__bd">Email</div>
<span class="weui-cell__ft">{{user ? user.email : '' }}</span> </a>
</div>
<div class="weui-panel__ft"> <a href="javascript:void(0);" class="weui-cell weui-cell_access weui-cell_link">
<div class="weui-panel__ft"> <a href="javascript:void(0);" class="weui-cell weui-cell_link">
<div class="weui-cell__bd">生日</div>
<span class="weui-cell__ft">{{user ? user.birthday : '' }}</span> </a>
</div>
<div class="weui-panel__ft"> <a href="javascript:void(0);" class="weui-cell weui-cell_access weui-cell_link">
<div class="weui-panel__ft"> <a href="javascript:void(0);" class="weui-cell weui-cell_link">
<div class="weui-cell__bd">地区</div>
<span class="weui-cell__ft">{{user ? user.address : '' }}</span> </a>
</div>
</div>
<div class="weui-panel weui-panel_access">
<div class="weui-panel__ft"> <a href="javascript:void(0);" class="weui-cell weui-cell_access weui-cell_link" v-on:click="logout">
<div class="weui-panel__ft"> <a href="javascript:void(0);" class="weui-cell weui-cell_link" v-on:click="logout">
<div class="weui-cell__bd tcenter">退出</div></a>
</div>
</div>

Write Preview
Loading…
Cancel
Save