Procházet zdrojové kódy

Merge branch 'master' of http://git_xt.git.topm.win:8080/wenhongquan/VisualInspection

温红权 před 9 roky
rodič
revize
efdcbb3c02

+ 5 - 0
VisualInspection/js/main.js

@@ -33,6 +33,11 @@ function setletftime() {
 function getPageInfo(id) {
     var html = "";
     switch (id) {
+        case "1_1":
+            {
+                html = __inline('/view/mytask/unchecked.html');
+                break;
+            }
         case "7_5":
             {
                 html = __inline('/view/constant/constant.html');

+ 1 - 0
VisualInspection/view/common/commoncsslink.html

@@ -1,3 +1,4 @@
 <link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/css/zui.min.css">
+<link href="/node_modules/zui/dist/lib/datatable/zui.datatable.min.css" rel="stylesheet">
 <link rel="stylesheet" type="text/css" href="/css/common/header.css">
 <link rel="stylesheet" type="text/css" href="/css/common/foot.css">

+ 2 - 0
VisualInspection/view/common/commonscriptlink.html

@@ -2,6 +2,8 @@
 <script src="/js/util/const.js"></script>
 <script src="/node_modules/zui/dist/lib/jquery/jquery.js"></script>
 <script src="/node_modules/zui/dist/js/zui.min.js"></script>
+<script src="/node_modules/zui/dist/lib/datetimepicker/datetimepicker.min.js"></script>
+<script src="/node_modules/zui/dist/lib/datatable/zui.datatable.min.js"></script>
 <script src="/node_modules/moment/min/moment.min.js"></script>
 <script src="/node_modules/moment/locale/zh-cn.js"></script>
 <script src="/node_modules/axios/dist/axios.min.js"></script>

+ 2 - 2
VisualInspection/view/main.html

@@ -5,7 +5,8 @@
     <meta charset="utf-8">
     <title>稽查</title>
     <link rel="import" href="/view/common/commoncsslink.html?__inline">
-    <link rel="stylesheet" type="text/css" href="/css/main.css">
+    <link rel="stylesheet" type="text/css" href="/css/main.css">    
+    <link rel="import" href="/view/common/commonscriptlink.html?__inline">
 </head>
 
 <body>
@@ -45,7 +46,6 @@
     </div>
 
     <link rel="import" href="/view/common/foot.html?__inline">
-    <link rel="import" href="/view/common/commonscriptlink.html?__inline">
     <script src="/js/main.js"></script>
 </body>