Skip to content

W
web-monitor
Commit 3b0d4317 authored by dupengyu's avatar dupengyu
Browse files
Options

弹窗宽度

parent fc87c5a6
Show whitespace changes
Inline Side-by-side
Showing with 53 additions and 40 deletions
src/utils/request.js
View file @ 3b0d4317
......@@ -80,7 +80,7 @@ service.interceptors.response.use(
endLoading(config.el)
let resFinal = res.rsp || res || {}
let code = resFinal.errorCode || resFinal.code
let message = resFinal.message || resFinal.errorMsg || resFinal.error || '接口错误'
let message = resFinal.message || resFinal.errorMsg || resFinal.error || resFinal.msg || '接口错误'
if (code) {
if (code === 201) {
location.href = location.href.replace(/#.+/, '') + '#/login'
......
src/views/jobgroup/jobinfo/index.vue
View file @ 3b0d4317
......@@ -247,9 +247,9 @@
v-model="cornInput[0].key"
@input="cornInput[0].data = []"
>
<el-radio label="*">每时</el-radio>
<el-radio label="*">每秒</el-radio>
<el-radio label="zq">周期</el-radio>
<el-radio label="jg">从x时开始，每y小时执行一次</el-radio>
<el-radio label="jg">从x秒开始，每y秒执行一次</el-radio>
<el-radio label="zd">指定</el-radio>
</el-radio-group>
<div
......@@ -315,9 +315,9 @@
v-model="cornInput[1].key"
@input="cornInput[1].data = []"
>
<el-radio label="*">每时</el-radio>
<el-radio label="*">每分钟</el-radio>
<el-radio label="zq">周期</el-radio>
<el-radio label="jg">从x时开始，每y小时执行一次</el-radio>
<el-radio label="jg">从x分钟开始，每分钟执行一次</el-radio>
<el-radio label="zd">指定</el-radio>
</el-radio-group>
<div
......@@ -327,7 +327,7 @@
从<el-input
v-model="cornInput[1].data[0]"
style="width: 100px"
placeholder="请输入时"
placeholder="请输入分钟"
@input="
cornInput[1].value =
cornInput[1].data[0] + '-' + cornInput[1].data[1]
......@@ -336,7 +336,7 @@
始到<el-input
v-model="cornInput[1].data[1]"
style="width: 100px"
placeholder="请输入时"
placeholder="请输入分钟"
@input="
cornInput[1].value =
cornInput[1].data[0] + '-' + cornInput[1].data[1]
......@@ -350,7 +350,7 @@
从<el-input
v-model="cornInput[1].data[0]"
style="width: 100px"
placeholder="请输入时"
placeholder="请输入分钟"
@input="
cornInput[1].value =
cornInput[1].data[0] + '/' + cornInput[1].data[1]
......@@ -359,7 +359,7 @@
开始，每<el-input
v-model="cornInput[1].data[1]"
style="width: 100px"
placeholder="请输入时"
placeholder="请输入分钟"
@input="
cornInput[1].value =
cornInput[1].data[0] + '/' + cornInput[1].data[1]
......@@ -452,7 +452,7 @@
@input="cornInput[3].data = []"
>
<el-radio label="?">不指定</el-radio>
<el-radio label="*">每月</el-radio>
<el-radio label="*">每日</el-radio>
<el-radio label="zq">周期</el-radio>
<el-radio label="1W">每月1号最近的那个工作日</el-radio>
<el-radio label="L">本月最后一天</el-radio>
......@@ -465,7 +465,7 @@
从<el-input
v-model="cornInput[3].data[0]"
style="width: 100px"
placeholder="请输入年份"
placeholder="请输入日"
@input="
cornInput[3].value =
cornInput[3].data[0] + '-' + cornInput[3].data[1]
......@@ -474,7 +474,7 @@
始到<el-input
v-model="cornInput[3].data[1]"
style="width: 100px"
placeholder="请输入年份"
placeholder="请输入日"
@input="
cornInput[3].value =
cornInput[3].data[0] + '-' + cornInput[3].data[1]
......@@ -569,7 +569,7 @@
从<el-input
v-model="cornInput[5].data[0]"
style="width: 100px"
placeholder="请输入年份"
placeholder="请输入星期"
@input="
cornInput[5].value =
cornInput[5].data[0] + '-' + cornInput[5].data[1]
......@@ -578,7 +578,7 @@
始到<el-input
v-model="cornInput[5].data[1]"
style="width: 100px"
placeholder="请输入年份"
placeholder="请输入星期"
@input="
cornInput[5].value =
cornInput[5].data[0] + '-' + cornInput[5].data[1]
......@@ -832,7 +832,7 @@ export default {
{ key: "*", value: "", data: [] },
{ key: "*", value: "", data: [] },
{ key: "*", value: "", data: [] },
{ key: "*", value: "", data: [] },
{ key: "?", value: "", data: [] },
{ key: "*", value: "", data: [] },
],
rules: {
......@@ -1023,7 +1023,7 @@ export default {
},
resGroupList: [],
total: 0,
activeName: "1",
activeName: "2",
options: [
{
id: -1,
......@@ -1085,7 +1085,6 @@ export default {
delete this.addFrom.addTime;
delete this.addFrom.updateTime;
delete this.addFrom.glueUpdatetime;
console.log("----------1***********--------------");
let params1 = JSON.parse(
JSON.stringify(this.addFrom.executorParam.params)
......@@ -1095,21 +1094,17 @@ export default {
if (!datas.childJobId) {
delete datas.childJobId;
}
datas.scheduleConf = this.scheduleConf
datas.scheduleConf = this.scheduleConf;
let data = {
...datas,
};
const params = new URLSearchParams(data).toString();
console.log("----------2***********--------------");
let res;
if (this.addFrom.id) {
res = await update(params);
} else {
res = await add(params);
}
console.log("----------3***********--------------");
if (res.code == 200) {
this.addDialogVisible = false;
this.addFrom = {
......@@ -1185,11 +1180,28 @@ export default {
handleClose() {
this.manageFrom = {};
this.addFrom = {
scheduleType: "CRON",
executorRouteStrategy: "FIRST",
executorBlockStrategy: "SERIAL_EXECUTION",
misfireStrategy: "DO_NOTHING",
glueType: "BEAN",
executorHandler: "pollingHandler",
executorTimeout: "0",
executorFailRetryCount: "0",
executorParam: {
equipId: "",
params: [],
params: ["轮询标识"],
},
};
this.cornInput = [
{ key: "*", value: "", data: [] },
{ key: "*", value: "", data: [] },
{ key: "*", value: "", data: [] },
{ key: "*", value: "", data: [] },
{ key: "*", value: "", data: [] },
{ key: "?", value: "", data: [] },
{ key: "*", value: "", data: [] },
];
this.aDialogVisible = false;
this.cDialogVisible = false;
this.addDialogVisible = false;
......@@ -1255,6 +1267,16 @@ export default {
this.addDialogVisible = true;
this.addFrom = datas;
let arr = datas.scheduleConf.split(" ");
this.cornInput = [
{ key: arr[0], value: arr[0], data: [] },
{ key: arr[1], value: arr[1], data: [] },
{ key: arr[2], value: arr[2], data: [] },
{ key: arr[3], value: arr[3], data: [] },
{ key: arr[4], value: arr[4], data: [] },
{ key: arr[5], value: arr[5], data: [] },
{ key: arr[6], value: arr[6], data: [] },
];
this.$set(this.addFrom.executorParam, "equipId", equipId);
this.$set(this.addFrom.executorParam, "params", params);
break;
......
src/views/jobgroup/joblog/index.vue
View file @ 3b0d4317
......@@ -73,14 +73,6 @@
</template>
</el-table-column>
<el-table-column prop="handleTime" label="执行时间" align="center" />
<el-table-column prop="handleCode" label="执行结果" align="center">
<template slot-scope="scope">
<el-tag :type="scope.row.handleCode === 0 ? 'success' : 'danger'">{{
scope.row.handleCode === 0 ? "成功" : "失败"
}}</el-tag>
</template>
</el-table-column>
<el-table-column prop="handleMsg" label="执行备注" align="center" />
<el-table-column prop="handleMsg" label="参数结果" align="center">
<template slot-scope="scope">
<el-button type="text" @click="handleOpenView(scope.row)"
......
src/views/setting/statistics/comp/fsuTable.vue
View file @ 3b0d4317
......@@ -135,7 +135,7 @@
<el-dialog
title="编辑-FSU"
:visible.sync="visible"
width="40%"
width="760px"
:close-on-click-modal="false"
>
<fsu :curInfo="curInfo" :isEdit="1" @update="update" />
......
src/views/setting/statistics/comp/leakyTable.vue
View file @ 3b0d4317
......@@ -181,7 +181,7 @@
<el-dialog
title="编辑-漏缆"
:visible.sync="visible"
width="40%"
width="760px"
:close-on-click-modal="false"
>
<leakyCable :curInfo="curInfo" :isEdit="1" @update="update" />
......
src/views/setting/statistics/comp/lineTable.vue
View file @ 3b0d4317
......@@ -179,7 +179,7 @@
<el-dialog
title="编辑-天馈线"
:visible.sync="visible"
width="40%"
width="760px"
:close-on-click-modal="false"
>
<lineVue :curInfo="curInfo" :isEdit="1" @update="update" />
......
src/views/setting/statistics/comp/monitorTable.vue
View file @ 3b0d4317
......@@ -163,7 +163,7 @@
<el-dialog
title="编辑-监测设备"
:visible.sync="visible"
width="40%"
width="760px"
:close-on-click-modal="false"
>
<monitor :curInfo="curInfo" :isEdit="1" @update="update" />
......@@ -171,7 +171,7 @@
<!-- <el-dialog
title="自动添加设备"
:visible.sync="open"
width="40%"
width="760px"
:close-on-click-modal="false"
>
<autoAdd />
......@@ -179,7 +179,7 @@
<el-dialog
title="监测设备参数设置"
:visible.sync="openSetting"
width="40%"
width="760px"
:close-on-click-modal="false"
>
<autoAdd
......
src/views/setting/statistics/comp/stationTable.vue
View file @ 3b0d4317
......@@ -9,7 +9,6 @@
<el-button type="primary" @click="refresh">刷新</el-button>
<el-button type="primary" @click="block = !block">查询</el-button>
<el-button type="primary" @click="exportData">导出</el-button>
</div>
</div>
<el-form
......@@ -114,7 +113,7 @@
<el-dialog
title="编辑-站点"
:visible.sync="visible"
width="40%"
width="760px"
:close-on-click-modal="false"
>
<station :curInfo="curInfo" :isEdit="1" @update="update" />
......
vue.config.js
View file @ 3b0d4317
......@@ -10,7 +10,7 @@ const name = defaultSettings.title || '漏缆故障定位监测系统' // page t
const port = process.env.port || process.env.npm_config_port || 8890 // dev port
// const href = 'http://101.126.159.207'
const href = 'http://127.0.0.1'
// const href = 'http://192.168.0.165'
// const href = 'http://192.168.0.167'
const rewriteDefaultConfig = {
changeOrigin: true,
......
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