mengff
/
jihe-hs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

更新设备管控

wangqin
hui 2 years ago
parent
26d1463e8b
commit
515fc8a134
5 changed files with 108 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 41
      ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/AddNEditDialog.vue
  2. 51
      ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/TaskItem.vue
  3. 31
      ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/taskEditDialog.vue
  4. 3
      ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/index.vue
  5. 22
      ruoyi-ui/src/views/JiHeExpressway/utils/api/batch.js

41
ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/AddNEditDialog.vue
View File

@ -189,24 +189,35 @@ export default {
this.isShowTimeEdit = true;
},
onDeleteTaskGroup(taskG){
request({
url: `/business/dcBatchFunctionsJob/time/${this.propData.id}/${taskG.time}`,
method: "DELETE"
}).then(res => {
this.$confirm("确定要删除该任务组么？", "操作确认", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
request({
url: `/business/dcBatchFunctionsJobGroup/${this.propData.id}`,
method: "GET"
url: `/business/dcBatchFunctionsJob/time/${this.propData.id}/${taskG.time}`,
method: "DELETE"
}).then(res => {
this.editData = {
id: res.data.id,
groupName: res.data.groupName,
status: res.data.status,
remark: res.data.remark,
detailedConfiguration: res.data.detailedConfiguration
}
this.getTaskList(); //新增task后自动刷新任务列表
request({
url: `/business/dcBatchFunctionsJobGroup/${this.propData.id}`,
method: "GET"
}).then(res => {
this.editData = {
id: res.data.id,
groupName: res.data.groupName,
status: res.data.status,
remark: res.data.remark,
detailedConfiguration: res.data.detailedConfiguration
}
this.getTaskList(); //新增task后自动刷新任务列表
});
});
})
.catch(() => {
this.$message.warn("取消删除。");
});
});
},
onSubmitTime(time){
this.isShowTimeEdit = false;

51
ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/TaskItem.vue
View File

@ -26,11 +26,18 @@
<p>时长：{{ editData.params.SETTM }}</p>
</div>
</template>
<template v-if="editData.deviceType == '12'">
<template v-if="editData.deviceType == '12'">
<div class="center">
<p>{{ gzmsDic[editData.params.SETMD] }}</p>
<p>时长：{{ editData.params.SETTM }}</p>
</div>
</template>
<template v-if="editData.deviceType == '13'">
<div class="center">
<p>{{ gzmsDic[editData.params.SETMD] }}</p>
<p>时长：{{ editData.params.SETTM }}</p>
</div>
</template>
</div>
@ -101,6 +108,16 @@ export default {
SETMD: temp.functions[0].params.SET,
SETTM: temp.functions[1].params.SET,
}
} else if (temp.deviceType == '12') {
params = {
SETMD: temp.functions[0].params.SET,
SETTM: temp.functions[1].params.SET,
}
} else if (temp.deviceType == '13') {
params = {
SETMD: temp.functions[0].params.SET,
SETTM: temp.functions[1].params.SET,
}
}
this.editData = {
id: this.propData.jobId,
@ -130,18 +147,26 @@ export default {
// this.$emit("onModify", {devices});
},
onDelete(){
request({
url: `/business/dcBatchFunctionsJob/` + this.propData.jobId,
method: "DELETE",
// params: {
// jobGroup: this.propData.id
// },
})
.then((result) => {
if (result.code != 200) return;
this.$message.success("删除成功");
this.$emit("onSubmit");
this.$confirm("确定要删除该任务么？", "操作确认", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
request({
url: `/business/dcBatchFunctionsJob/` + this.propData.jobId,
method: "DELETE",
// params: {
// jobGroup: this.propData.id
// },
})
.then((result) => {
if (result.code != 200) return;
this.$message.success("删除成功");
this.$emit("onSubmit");
})
});
},
initBasicData(){

31
ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/taskEditDialog.vue
View File

@ -83,14 +83,14 @@
<template v-else-if="searchData.deviceType == '12'">
<!-- 行车诱导 -->
<el-form-item label="工作状态">
<el-select v-model="editData.type12.mode" placeholder="请选择">
<el-option v-for="value, key in gzztMap" :key="key" :label="value" :value="key" />
<el-form-item label="工作模式">
<el-select v-model="editData.type12.SETMD" placeholder="请选择">
<el-option v-for="value, key in gzmsMap" :key="key" :label="value" :value="key" />
</el-select>
</el-form-item>
<el-form-item label="工作时长">
<el-col :span="8">
<el-input-number v-model="editData.type12.timeLength" :min="1" :max="600" label="描述文字" />
<el-input-number v-model="editData.type12.SETTM" :min="0" :max="100000" />
</el-col>
<!-- <el-col :span="4" style="margin-left: 10px;">分钟</el-col> -->
</el-form-item>
@ -98,13 +98,20 @@
<template v-else-if="searchData.deviceType == '13'">
<!-- 智能设备箱 -->
<el-form-item label="开启">
<el-switch v-model="editData.type13.switch">
<!-- active-color="#13ce66" inactive-color="#ff4949" -->
</el-switch>
<el-form-item label="工作模式">
<el-select v-model="editData.type13.SETMD" placeholder="请选择">
<el-option v-for="value, key in gzmsMap" :key="key" :label="value" :value="key" />
</el-select>
</el-form-item>
<el-form-item label="工作时长">
<el-col :span="8">
<el-input-number v-model="editData.type13.SETTM" :min="0" :max="100000" />
</el-col>
<!-- <el-col :span="4" style="margin-left: 10px;">分钟</el-col> -->
</el-form-item>
</template>
<el-form-item>
<el-button size="mini" type="primary" @click="onSubmit">保存</el-button>
</el-form-item>
@ -206,7 +213,7 @@ export default {
// { "STAY": 90, "ACTION": "1", "SPEED": "0", "COLOR": "ffff00", "FONT": "3", "FONT_SIZE": "24", "CONTENT": "长清收费站\\\\n出入口封闭", "width": "160", "height": "80", "formatStyle": "2" }
if (this.propData.deviceType == "2"){
this.editData.type2 = BoardUtils.contentToDeviceItem(this.propData.params);
} else if (this.propData.deviceType == "5" || this.propData.deviceType == "10"){
} else if (["5","10","12","13"].includes(this.propData.deviceType)){
this.editData["type" + this.propData.deviceType] = { ...this.propData.params};
}
}else{
@ -309,11 +316,13 @@ export default {
}
} else if (this.searchData.deviceType == "12") {
return {
SETMD: this.editData.type12.SETMD,
SETTM: this.editData.type12.SETTM
}
} else if (this.searchData.deviceType == "13") {
return {
SETMD: this.editData.type13.SETMD,
SETTM: this.editData.type13.SETTM
}
}
},

3
ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/index.vue
View File

@ -96,6 +96,7 @@ export default {
},
data() {
return {
searchData:{},
activeOption: {
active: {
text: "开"
@ -194,7 +195,7 @@ export default {
this.getData();
},
onReset(){
this.searchData.word = undefined;
this.searchData && (this.searchData.word = undefined);
// console.log(this.$refs["form"] , "__-=========");
this.$refs["form"].handleResetForm();
this.getData();

22
ruoyi-ui/src/views/JiHeExpressway/utils/api/batch.js
View File

@ -57,6 +57,28 @@ export function submitTaskRequest(id, jobGroup, time, devices, params, others) {
"params": { SET: params.SETTM }
}
]
} else if (deviceType == '12') { //行车诱导
functions = [
{
"functionId": "SETMD",
"params": { SET: params.SETMD }
},
{
"functionId": "SETTM",
"params": { SET: params.SETTM }
}
]
} else if (deviceType == '13') { //智能设备箱
functions = [
{
"functionId": "SETMD",
"params": { SET: params.SETMD }
},
{
"functionId": "SETTM",
"params": { SET: params.SETTM }
}
]
}
let temp = [{

Write Preview
Loading…
Cancel
Save