Skip to content

U
UI-TW
Commit feffe6ec by 肖小磊
Options

init

parent 49f6e304
Showing with 65 additions and 53 deletions
dist - 副本/index.html 0 → 100644
<!DOCTYPE html><html><head><meta charset=utf-8><title>gomax</title><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link href=/static/css/app.e4786ca506f2f19503441732c33aa6fa.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.d39de9296815a28ff96e.js></script><script type=text/javascript src=/static/js/vendor.d3d5c12cad60d324d4c5.js></script><script type=text/javascript src=/static/js/app.73c37fe1cf4d414169cf.js></script></body></html>
<!DOCTYPE html><html><head><meta charset=utf-8><title>gomax</title><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link href=/static/css/app.e4786ca506f2f19503441732c33aa6fa.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.d39de9296815a28ff96e.js></script><script type=text/javascript src=/static/js/vendor.d3d5c12cad60d324d4c5.js></script><script type=text/javascript src=/static/js/app.73c37fe1cf4d414169cf.js></script></body></html>
\ No newline at end of file
dist - 副本/static/css/app.e4786ca506f2f19503441732c33aa6fa.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist - 副本/static/css/app.e4786ca506f2f19503441732c33aa6fa.css.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist - 副本/static/js/app.73c37fe1cf4d414169cf.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist - 副本/static/js/app.73c37fe1cf4d414169cf.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist - 副本/static/js/manifest.d39de9296815a28ff96e.js 0 → 100644
!function(e){function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}var r=window.webpackJsonp;window.webpackJsonp=function(t,c,i){for(var u,a,f,s=0,l=[];s<t.length;s++)a=t[s],o[a]&&l.push(o[a][0]),o[a]=0;for(u in c)Object.prototype.hasOwnProperty.call(c,u)&&(e[u]=c[u]);for(r&&r(t,c,i);l.length;)l.shift()();if(i)for(s=0;s<i.length;s++)f=n(n.s=i[s]);return f};var t={},o={2:0};n.e=function(e){function r(){u.onerror=u.onload=null,clearTimeout(a);var n=o[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),o[e]=void 0)}var t=o[e];if(0===t)return new Promise(function(e){e()});if(t)return t[2];var c=new Promise(function(n,r){t=o[e]=[n,r]});t[2]=c;var i=document.getElementsByTagName("head")[0],u=document.createElement("script");u.type="text/javascript",u.charset="utf-8",u.async=!0,u.timeout=12e4,n.nc&&u.setAttribute("nonce",n.nc),u.src=n.p+"static/js/"+e+"."+{0:"d3d5c12cad60d324d4c5",1:"73c37fe1cf4d414169cf"}[e]+".js";var a=setTimeout(r,12e4);return u.onerror=u.onload=r,i.appendChild(u),c},n.m=e,n.c=t,n.i=function(e){return e},n.d=function(e,r,t){n.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},n.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(r,"a",r),r},n.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},n.p="/",n.oe=function(e){throw console.error(e),e}}([]);
!function(e){function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}var r=window.webpackJsonp;window.webpackJsonp=function(t,c,i){for(var u,a,f,s=0,l=[];s<t.length;s++)a=t[s],o[a]&&l.push(o[a][0]),o[a]=0;for(u in c)Object.prototype.hasOwnProperty.call(c,u)&&(e[u]=c[u]);for(r&&r(t,c,i);l.length;)l.shift()();if(i)for(s=0;s<i.length;s++)f=n(n.s=i[s]);return f};var t={},o={2:0};n.e=function(e){function r(){u.onerror=u.onload=null,clearTimeout(a);var n=o[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),o[e]=void 0)}var t=o[e];if(0===t)return new Promise(function(e){e()});if(t)return t[2];var c=new Promise(function(n,r){t=o[e]=[n,r]});t[2]=c;var i=document.getElementsByTagName("head")[0],u=document.createElement("script");u.type="text/javascript",u.charset="utf-8",u.async=!0,u.timeout=12e4,n.nc&&u.setAttribute("nonce",n.nc),u.src=n.p+"static/js/"+e+"."+{0:"d3d5c12cad60d324d4c5",1:"73c37fe1cf4d414169cf"}[e]+".js";var a=setTimeout(r,12e4);return u.onerror=u.onload=r,i.appendChild(u),c},n.m=e,n.c=t,n.i=function(e){return e},n.d=function(e,r,t){n.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},n.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(r,"a",r),r},n.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},n.p="/",n.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.d39de9296815a28ff96e.js.map
\ No newline at end of file
dist - 副本/static/js/vendor.d3d5c12cad60d324d4c5.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist - 副本/static/js/vendor.d3d5c12cad60d324d4c5.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/api.js
......@@ -3,7 +3,7 @@
var ApiConfig = {
//baseLink: "http://115.159.142.32:8068/",
//baseLink: "http://115.159.142.32:8058/",
//baseLink: "http://localhost:58947/",
//baseLink: "http://localhost:58947/",
//baseLink: "http://10.126.226.37:8070/",
baseLink: "http://10.96.0.2:8070/",
Link: {
......
src/components/task/ShopDetail.vue
......@@ -18,19 +18,23 @@
</el-form-item>
</el-form>
</el-col>
<el-col :span="22">
<el-col :span="24">
<el-table :data="SDtableData" stripe style="width: 100%;">
<el-table-column prop="TerminalNum" label="终端编号" width="180" align="center">
<el-table-column prop="TerminalNum" label="终端编号" width="108" align="center">
</el-table-column>
<el-table-column prop="Terminaltype" label="终端类型" width="108" align="center">
</el-table-column>
<el-table-column prop="Terminaltype" label="终端类型" width="180" align="center">
<el-table-column prop="OnlineStatus" label="在线状态" width="108" align="center">
</el-table-column>
<el-table-column prop="OnlineStatus" label="在线状态" align="center">
<el-table-column prop="Address" label="IP" width="108" align="center">
</el-table-column>
<el-table-column prop="Address" label="IP" align="center">
<el-table-column prop="UpdateStatus" label="更新状态" width="108" align="center">
</el-table-column>
<el-table-column prop="UpdateStatus" label="更新状态" align="center">
<el-table-column prop="BegTime" label="开始时间" width="118" align="center">
</el-table-column>
<el-table-column prop="ErrorMessage" label="执行信息" align="center">
<el-table-column prop="EndTime" label="结束时间" width="118" align="center">
</el-table-column>
<el-table-column prop="ErrorMessage" label="执行信息" align="center">
</el-table-column>
</el-table>
</el-col>
......@@ -47,33 +51,37 @@
</template>
<script>
export default {
name: 'ShopDetail',
name: "ShopDetail",
data() {
return {
isshow3: false,
isshow2: false,
Taskid: '',
Taskid: "",
SDformInline: {
TerminalNum: '',
Terminaltype: ''
TerminalNum: "",
Terminaltype: ""
},
SDtableData: [{
TerminalNum: '2016-05-02',
Terminaltype: '王小虎',
OnlineStatus: '',
Address: '上海市普陀区金沙江路 1518 弄',
UpdateStatus: '',
ErrorMessage: ''
}],
TerminalNname: '',
TerminalNnum: '',
TerminalNadd: '',
SDtableData: [
{
TerminalNum: "2016-05-02",
Terminaltype: "王小虎",
OnlineStatus: "",
Address: "上海市普陀区金沙江路 1518 弄",
UpdateStatus: "",
ErrorMessage: "",
BegTime: "",
EndTime: ""
}
],
TerminalNname: "",
TerminalNnum: "",
TerminalNadd: "",
TaskPosCount: 1,
currentPage: 1,
PageSizes: [5, 10, 30],
PageSize: 10,
PageIndex: 1,
}
PageIndex: 1
};
},
methods: {
GetTerminalList() {
......@@ -107,33 +115,33 @@ export default {
obj.OnlineStatus = "异常";
} else if (NewTaskPosList[i].state == -2) {
obj.OnlineStatus = "停止";
}
else {
} else {
obj.OnlineStatus = NewTaskPosList[i].state;
}
obj.Address = NewTaskPosList[i].ip;
obj.BegTime = NewTaskPosList[i].beginTime;
obj.EndTime = NewTaskPosList[i].endTime;
obj.ErrorMessage = NewTaskPosList[i].errorMsg;
if (NewTaskPosList[i].taskStatus == 0) {
obj.UpdateStatus = "待执行";
}
else if (NewTaskPosList[i].taskStatus == -1) {
} else if (NewTaskPosList[i].taskStatus == -1) {
obj.UpdateStatus = "执行失败";
}
else if (NewTaskPosList[i].taskStatus == 1) {
} else if (NewTaskPosList[i].taskStatus == 1) {
obj.UpdateStatus = "执行中";
}
else if (NewTaskPosList[i].taskStatus == 2) {
} else if (NewTaskPosList[i].taskStatus == 2) {
obj.UpdateStatus = "执行完成";
}
else if (NewTaskPosList[i].taskStatus == 3 || NewTaskPosList[i].taskStatus == -3) {
} else if (
NewTaskPosList[i].taskStatus == 3 ||
NewTaskPosList[i].taskStatus == -3
) {
obj.UpdateStatus = "暂停";
}
else if (NewTaskPosList[i].taskStatus == -4 || NewTaskPosList[i].taskStatus == -4) {
} else if (
NewTaskPosList[i].taskStatus == -4 ||
NewTaskPosList[i].taskStatus == -4
) {
obj.UpdateStatus = "终止";
}
else {
} else {
obj.UpdateStatus = "未知";
}
List.push(obj);
......@@ -141,11 +149,11 @@ export default {
that.SDtableData = List;
console.log(that.SDtableData);
}
})
that.SDformInline.Terminaltype = '';
that.SDformInline.TerminalNum = '';
});
that.SDformInline.Terminaltype = "";
that.SDformInline.TerminalNum = "";
},
//分页动作
//分页动作
handleSizeChange(val) {
this.PageSize = Number(`${val}`);
this.PageIndex = 1;
......@@ -169,11 +177,8 @@ export default {
this.isshow3 = false;
}
},
created() {
}
}
created() {}
};
</script>
<style scoped>
.el-dialog__body {
......@@ -213,7 +218,7 @@ export default {
height: 40px;
line-height: 40px;
padding: 0;
border: 1px solid #EAEDF1;
border: 1px solid #eaedf1;
}
.Lookprocess-table {
......
src/components/task/createDownLoadTask.vue
......@@ -507,7 +507,7 @@ export default {
HttpFilePath: "",
HttpFileHash: 0,
Type: 0,
NeedRestart: true,
NeedRestart: false,
ToPath: "",
NotifyMessage: "",
TaskName: '',
......@@ -755,7 +755,7 @@ export default {
this.createUploadTaskForm.NeedRestart = res.needRestart;
this.NeedRestart = res.needRestart;
this.createUploadTaskForm.ToPath = res.toPath;
this.createUploadTaskForm.FilePath = res.filePath;
this.createUploadTaskForm.FileHash = res.fileHash;
......@@ -856,7 +856,7 @@ export default {
BatFilePath: "",
FilePath: "",
Type: 0,
NeedRestart: true,
NeedRestart: 0,
ToPath: "",
NotifyMessage: "",
TaskName: '',
......
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