|
|
@@ -200,6 +200,10 @@
|
|
|
|
|
|
$(function(){
|
|
|
console.log("OK")
|
|
|
+ var aa = 'AA';
|
|
|
+ // 0429 Rita eval 測試
|
|
|
+ // eval('var ' + aa + 'name = $("input[name=user_loginname]").val();')
|
|
|
+ // console.log(AAname);
|
|
|
|
|
|
var namespace = '/test_conn';
|
|
|
var url = 'http://127.0.0.1';
|
|
|
@@ -689,7 +693,8 @@
|
|
|
|
|
|
if (current_width == 94) {
|
|
|
console.log(obj + ' INSTALLATION AddBar Pause');
|
|
|
- eval('clearInterval(timer)');
|
|
|
+ // eval('clearInterval(timer)');
|
|
|
+ clearInterval(timer);
|
|
|
}
|
|
|
};
|
|
|
|
|
|
@@ -714,8 +719,43 @@
|
|
|
$("input[name=user_password]").val('');
|
|
|
};
|
|
|
clearInterval(abs_update_interval);
|
|
|
- alert(resText);
|
|
|
+ setTimeout(alert(resText), 1000);
|
|
|
}, 'text');
|
|
|
+ // 再次確認所以的狀態寫入狀態條中
|
|
|
+ // for (const key of Object.entries(response)) {
|
|
|
+ // if (response[key[0]] == 'Install') {
|
|
|
+ // if (Automatic_Build_System_installation[key[0] + '-installation'] == 'Wait') {
|
|
|
+ // Automatic_Build_System_installation[key[0] + '-installation'] = 'Install';
|
|
|
+ // timer = window.setInterval("AddBarIndex('" + key[0] + "-status')", 2000);
|
|
|
+ // }
|
|
|
+ // } else if (response[key[0]] == '0') {
|
|
|
+ // // pass
|
|
|
+ // } else if (response[key[0]] == 'Error') {
|
|
|
+ // if (Automatic_Build_System_installation[key[0] + '-installation'] == 'Install') {
|
|
|
+ // Automatic_Build_System_installation[key[0] + '-installation'] = 'Error';
|
|
|
+ // ItemInstallFail(timer, key[0]);
|
|
|
+ // }
|
|
|
+ // // } else if (response[key[0]] == 'Success') {
|
|
|
+ // // if (Automatic_Build_System_installation[key[0] + '-installation'] == 'Install') {
|
|
|
+ // // Automatic_Build_System_installation[key[0] + '-installation'] = 'Success';
|
|
|
+ // // ItemInstallSuccess(timer, key[0]);
|
|
|
+ // // }
|
|
|
+ // // // ========== Rita 0428 測試保留 ==========
|
|
|
+ // // } else if (Number(response[key[0]]) !== NaN) {
|
|
|
+ // // if (Automatic_Build_System_installation[key[0] + '-installation'] == 'Install') {
|
|
|
+ // // Automatic_Build_System_installation[key[0] + '-installation'] = 'Success';
|
|
|
+ // // ItemInstallSuccess(timer, key[0], response[key[0]]);
|
|
|
+ // // }
|
|
|
+ // // // ========== Rita 0428 測試保留 ==========
|
|
|
+ // } else if (Number(response[key[0]]) !== NaN) {
|
|
|
+ // if (Automatic_Build_System_installation[key[0] + '-installation'] == 'Install') {
|
|
|
+ // Automatic_Build_System_installation[key[0] + '-installation'] = response[key[0]];
|
|
|
+ // ItemInstallSuccess(timer, key[0], response[key[0]]);
|
|
|
+ // }
|
|
|
+ // } else {
|
|
|
+ // console.log("response[key[0]]: " + response[key[0]]);
|
|
|
+ // }
|
|
|
+ // }
|
|
|
};
|
|
|
|
|
|
Automatic_Build_System_installation = {
|
|
|
@@ -729,6 +769,8 @@
|
|
|
'python3-tk-installation': 'Wait',
|
|
|
'wget-installation': 'Wait',
|
|
|
'python3-dev-installation': 'Wait',
|
|
|
+ 'default-libmysqlclient-dev-installation': 'Wait',
|
|
|
+ 'build-essential-installation': 'Wait',
|
|
|
'tasksel-installation': 'Wait',
|
|
|
'lamp-server-installation': 'Wait',
|
|
|
'phpMyAdmin-5.1.0-all-languages.tar.gz-installation': 'Wait',
|
|
|
@@ -748,7 +790,6 @@
|
|
|
'php7.2-json-installation': 'Wait',
|
|
|
'php7.2-zip-installation': 'Wait',
|
|
|
'apache2-installation': 'Wait',
|
|
|
- 'mysql -u root -e-installation': 'Wait',
|
|
|
'paho-mqtt-installation': 'Wait',
|
|
|
'mosquitto-installation': 'Wait',
|
|
|
'mqtt_server_setting-installation': 'Wait',
|
|
|
@@ -756,7 +797,11 @@
|
|
|
'golang-installation': 'Wait',
|
|
|
'gogsfile.git-installation': 'Wait',
|
|
|
'requirements-installation': 'Wait',
|
|
|
+ 'CoffeeProject.git-installation': 'Wait',
|
|
|
+ 'BBend-Test-JWT.git-installation': 'Wait',
|
|
|
+ 'Coffee_MySQL.sql-installation': 'Wait',
|
|
|
'chrony-installation': 'Wait',
|
|
|
+ 'ntpdate-installation': 'Wait',
|
|
|
'--keyserver-installation': 'Wait',
|
|
|
'update-installation': 'Wait',
|
|
|
'ros-melodic-desktop-full-installation': 'Wait',
|
|
|
@@ -769,6 +814,7 @@
|
|
|
}
|
|
|
|
|
|
var abs_update_process = 0;
|
|
|
+ var timer;
|
|
|
function abs_update() {
|
|
|
if (abs_update_process === 1) {
|
|
|
return;
|
|
|
@@ -785,7 +831,9 @@
|
|
|
if (response[key[0]] == 'Install') {
|
|
|
if (Automatic_Build_System_installation[key[0] + '-installation'] == 'Wait') {
|
|
|
Automatic_Build_System_installation[key[0] + '-installation'] = 'Install';
|
|
|
- timer = window.setInterval("AddBarIndex('" + key[0] + "-status')", 2000);
|
|
|
+ timer = window.setInterval("AddBarIndex(\"" + key[0] + "-status\")", 2000);
|
|
|
+ // eval('var ' + key[0] + '_timer = window.setInterval("AddBarIndex(\"' + key[0] + '-status\")", 2000);')
|
|
|
+ // alert('!!!')
|
|
|
}
|
|
|
} else if (response[key[0]] == '0') {
|
|
|
// pass
|
|
|
@@ -799,12 +847,24 @@
|
|
|
// Automatic_Build_System_installation[key[0] + '-installation'] = 'Success';
|
|
|
// ItemInstallSuccess(timer, key[0]);
|
|
|
// }
|
|
|
+ // // ========== Rita 0428 測試保留 ==========
|
|
|
+ // } else if (Number(response[key[0]]) !== NaN) {
|
|
|
+ // if (Automatic_Build_System_installation[key[0] + '-installation'] == 'Install') {
|
|
|
+ // Automatic_Build_System_installation[key[0] + '-installation'] = 'Success';
|
|
|
+ // ItemInstallSuccess(timer, key[0], response[key[0]]);
|
|
|
+ // }
|
|
|
+ // // ========== Rita 0428 測試保留 ==========
|
|
|
} else if (Number(response[key[0]]) !== NaN) {
|
|
|
+ // Automatic_Build_System_installation[key[0] + '-installation'] = response[key[0]];
|
|
|
+ // ItemInstallSuccess(timer, key[0], response[key[0]]);
|
|
|
if (Automatic_Build_System_installation[key[0] + '-installation'] == 'Install') {
|
|
|
- Automatic_Build_System_installation[key[0] + '-installation'] = 'Success';
|
|
|
+ Automatic_Build_System_installation[key[0] + '-installation'] = response[key[0]];
|
|
|
+ ItemInstallSuccess(timer, key[0], response[key[0]]);
|
|
|
+ } else if (Automatic_Build_System_installation[key[0] + '-installation'] == 'Wait') {
|
|
|
+ Automatic_Build_System_installation[key[0] + '-installation'] = response[key[0]];
|
|
|
+ console.log(key[0] + " : " + response[key[0]]);
|
|
|
ItemInstallSuccess(timer, key[0], response[key[0]]);
|
|
|
}
|
|
|
-
|
|
|
} else {
|
|
|
console.log("response[key[0]]: " + response[key[0]]);
|
|
|
}
|
