Unverified Commit 923e4a84 authored by 乔占卫's avatar 乔占卫 Committed by GitHub
Browse files

Merge pull request #585 from Baoqi/revert_combined_server_ui 

fix wrong routes problem
parents 4fdea1d9 c809825d

escheduler-ui/src/view/common/meta.inc

+5 −5
Original line number Diff line number Diff line
@@ -11,12 +11,12 @@ 
<meta name="theme-color" content="#4a8dee">

<meta name="msapplication-navbutton-color" content="#4a8dee">

<meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1">

<link rel="shortcut icon" href="images/favicon.ico"/>

<link href="combo/1.0.0/base.css?v1.0.0.1" rel="stylesheet">

<link href="combo/1.0.0/3rd.css?v1.0.0.1" rel="stylesheet">

<link rel="shortcut icon" href="/images/favicon.ico"/>

<link href="/combo/1.0.0/base.css?v1.0.0.1" rel="stylesheet">

<link href="/combo/1.0.0/3rd.css?v1.0.0.1" rel="stylesheet">



<!--[if lt IE 9]>

<script src="combo/1.0.0/es5.js"></script>

<script src="/combo/1.0.0/es5.js"></script>

<![endif]-->



<script>

escheduler-ui/src/view/common/outro.inc

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
<!--<script src="https://s1.analysys.cn/libs/??jqueryui/1.12.1/jquery-ui.min.js,twitter-bootstrap/3.3.7/js/bootstrap.min.js,jsPlumb/2.8.5/js/jsplumb.min.js"></script> -->

<!--<script src="https://s1.analysys.cn/libs/??highlight.js/9.13.1/highlight.min.js,element-ui/2.4.9/index.js,clipboard.js/2.0.1/clipboard.min.js,d3/3.3.6/d3.min.js,dayjs/1.7.8/dayjs.min.js"></script> -->



<script src="combo/1.0.0/3rd.js?v1.0.0.1" type="text/javascript"></script>

<script src="/combo/1.0.0/3rd.js?v1.0.0.1" type="text/javascript"></script>