c4bdc1e0d6
# Conflicts: # src/main/resources/static/assets/images/backgrounds/1.jpg # src/main/resources/static/assets/images/backgrounds/2.jpg # src/main/resources/static/assets/images/backgrounds/3.jpg # src/main/resources/static/assets/images/backgrounds/4.jpg # src/main/resources/static/assets/images/backgrounds/5.jpg # src/main/resources/static/assets/images/backgrounds/6.jpg # src/main/resources/static/assets/images/backgrounds/7.jpg # src/main/resources/static/assets/images/backgrounds/8.jpg # src/main/resources/static/assets/images/backgrounds/9.jpg # src/main/resources/static/assets/js/dialog.js # src/main/resources/static/assets/js/vendor/ckplayer/ckplayer/ckplayer.js # src/main/resources/static/assets/js/vendor/ueditor/lang/zh-cn/images/localimage.png # src/main/resources/static/assets/js/vendor/ueditor/themes/default/css/ueditor.css # src/main/resources/static/assets/js/vendor/ueditor/themes/default/css/ueditor.min.css # src/main/resources/static/assets/js/vendor/ueditor/themes/iframe.css # src/main/resources/static/assets/js/vendor/ueditor/ueditor.config.js # src/main/resources/static/assets/layuiadmin/config.js # src/main/resources/static/assets/layuiadmin/layui/lay/modules/form.js # src/main/resources/static/assets/layuiadmin/lib/admin.js # src/main/resources/static/assets/layuiadmin/modules/common.js # src/main/resources/static/assets/layuiadmin/modules/dialog.js # src/main/resources/static/assets/layuiadmin/modules/restajax.js # src/main/resources/static/assets/layuiadmin/style/admin.css # src/main/resources/static/assets/layuiadmin/style/login.css # src/main/resources/static/default.html
55 lines
1.6 KiB
HTML
55 lines
1.6 KiB
HTML
<!DOCTYPE html>
|
|
<html>
|
|
<head>
|
|
<<<<<<< HEAD
|
|
<base href="/twoduty/">
|
|
=======
|
|
<base href="/dataview/">
|
|
>>>>>>> origin/master
|
|
<meta charset="utf-8">
|
|
<meta name="renderer" content="webkit">
|
|
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
|
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
|
|
<link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
|
|
<link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
|
|
<link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
|
|
</head>
|
|
<body>
|
|
<<<<<<< HEAD
|
|
|
|
<div id="LAY-app" class="layui-fluid">
|
|
<div class="layui-row layui-col-space15"></div>
|
|
=======
|
|
<div id="LAY-app" class="layui-fluid">
|
|
<div class="layui-row layui-col-space3">
|
|
<div class="layui-col-sm12 layui-col-md12">
|
|
<iframe width="100%" :height="height+'px'" :src="src"></iframe>
|
|
</div>
|
|
</div>
|
|
>>>>>>> origin/master
|
|
</div>
|
|
</div>
|
|
<script type="text/javascript" src="assets/js/vue.min.js"></script>
|
|
<script src="assets/layuiadmin/layui/layui.js"></script>
|
|
<script>
|
|
<<<<<<< HEAD
|
|
layui.config({
|
|
base: 'assets/layuiadmin/' //静态资源所在路径
|
|
}).extend({
|
|
index: 'lib/index' //主入口模块
|
|
}).use(['index', 'animate-numbers'], function() {
|
|
var $ = layui.$;
|
|
new Vue({
|
|
el: '#LAY-app',
|
|
data: {},
|
|
methods: {},
|
|
mounted: function() {
|
|
var self = this;
|
|
}
|
|
})
|
|
});
|
|
=======
|
|
>>>>>>> origin/master
|
|
</script>
|
|
</body>
|
|
</html> |