Commit 2f51c16e authored by winai buttasart's avatar winai buttasart

update edit graph

parent 6918e647
This diff is collapsed.
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
<img src="../asset/image/icon/files.png" alt="..." class="preview"> <img src="../asset/image/icon/files.png" alt="..." class="preview">
</button> </button>
<button type="button" class="btn btn-success btnCreate" data-toggle="tooltip" title="สร้างกราฟ" style="margin-left:10px;" <button type="button" class="btn btn-success btnCreate" data-toggle="tooltip" title="สร้างกราฟ" style="margin-left:10px;"
onclick="ChartEdit('./customChart/01/01.html')"> onclick="ChartEdit('./customChart/01/test.html')">
<img src="../asset/image/icon/create.png" alt="..." class="preview"> <img src="../asset/image/icon/create.png" alt="..." class="preview">
</button> </button>
<br> <br>
...@@ -465,9 +465,13 @@ ...@@ -465,9 +465,13 @@
<!-- Bootstrap core JavaScript --> <!-- Bootstrap core JavaScript -->
<script src="../asset/js/jquery/jquery.min.js"></script> <!-- <script src="../asset/js/jquery/jquery.min.js"></script> -->
<script src="../asset/bootstrap/js/bootstrap.bundle.min.js"></script> <script src="../asset/bootstrap/js/bootstrap.bundle.min.js"></script>
<script>
window.$ = window.jQuery = require("../asset/js/jquery/jquery.min.js")
</script>
<script> <script>
function ChartEdit(path) { function ChartEdit(path) {
var win = window.open(path, '_blank'); var win = window.open(path, '_blank');
......
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
<img src="../asset/image/icon/files.png" alt="..." class="preview"> <img src="../asset/image/icon/files.png" alt="..." class="preview">
</button> </button>
<button type="button" class="btn btn-success btnCreate" data-toggle="tooltip" title="สร้างกราฟ" style="margin-left:10px;" <button type="button" class="btn btn-success btnCreate" data-toggle="tooltip" title="สร้างกราฟ" style="margin-left:10px;"
onclick="ChartEdit('./customChart/01/01.html')"> onclick="ChartEdit('./customChart/01/test.html')">
<img src="../asset/image/icon/create.png" alt="..." class="preview"> <img src="../asset/image/icon/create.png" alt="..." class="preview">
</button> </button>
<br> <br>
......
...@@ -14,6 +14,12 @@ ...@@ -14,6 +14,12 @@
<link href="./asset/bootstrap/css/bootstrap.min.css" rel="stylesheet"> <link href="./asset/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<link rel="stylesheet" href="./asset/css/round-about.css"> <link rel="stylesheet" href="./asset/css/round-about.css">
<style> <style>
img.preview { img.preview {
display: block; display: block;
...@@ -160,7 +166,7 @@ ...@@ -160,7 +166,7 @@
<img src="./asset/image/icon/files.png" alt="..." class="preview"> <img src="./asset/image/icon/files.png" alt="..." class="preview">
</button> </button>
<button type="button" class="btn btn-success btnCreate" data-toggle="tooltip" title="สร้างกราฟ" style="margin-left:10px;" <button type="button" class="btn btn-success btnCreate" data-toggle="tooltip" title="สร้างกราฟ" style="margin-left:10px;"
onclick="ChartEdit('./chartMenu/customChart/01/01.html')"> onclick="ChartEdit('./chartMenu/customChart/01/test.html')">
<img src="./asset/image/icon/create.png" alt="..." class="preview"> <img src="./asset/image/icon/create.png" alt="..." class="preview">
</button> </button>
<br> <br>
...@@ -475,7 +481,27 @@ ...@@ -475,7 +481,27 @@
<!-- Bootstrap core JavaScript --> <!-- Bootstrap core JavaScript -->
<script src="./asset/js/jquery/jquery.min.js"></script> <script src="./asset/js/jquery/jquery.min.js"></script>
<script src="./asset/bootstrap/js/bootstrap.bundle.min.js"></script> <script src="./asset/bootstrap/js/bootstrap.bundle.min.js"></script>
<!-- <script src="./asset/js/canvasjs/canvasjs.min.js"></script> -->
<script>
// <script src="./asset/js/jquery/jquery.min.js"> try {
// window.$ = window.jQuery = require("./asset/js/jquery/jquery.min.js");
// window.$ = window.jQuery = require("./asset/bootstrap/js/bootstrap.bundle.min.js");
// // window.$ = window.jQuery = require("./asset/js/jquery/jquery.min.js");
// window.$ = window.jQuery = require("./asset/bootstrap/js/bootstrap.bundle.min.js");
// $ = jQuery = module.exports;
// } catch (e) {}
// mainWindow.webContents.on('did-start-loading', function () {
// mainWindow.webContents.executeJavaScript(
// "var $ = jQuery = require('./asset/js/jquery/jquery.min.js'), mainWindow = require('remote').getCurrentWindow();"
// );
// });
</script>
<script> <script>
function ChartEdit(path) { function ChartEdit(path) {
var win = window.open(path, '_blank'); var win = window.open(path, '_blank');
......
...@@ -947,6 +947,11 @@ ...@@ -947,6 +947,11 @@
"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
"dev": true "dev": true
}, },
"jquery": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
"integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg=="
},
"jsbn": { "jsbn": {
"version": "0.1.1", "version": "0.1.1",
"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
......
...@@ -20,5 +20,8 @@ ...@@ -20,5 +20,8 @@
"devDependencies": { "devDependencies": {
"electron": "^1.8.2", "electron": "^1.8.2",
"electron-packager": "^11.0.1" "electron-packager": "^11.0.1"
},
"dependencies": {
"jquery": "^3.3.1"
} }
} }
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