Browse Source

完善

wangqin
hui 7 months ago
parent
commit
627377f602
  1. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
  2. 39
      ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/AddNEditDialog.vue
  3. 16
      ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/index.vue
  4. 4
      ruoyi-ui/src/views/JiHeExpressway/pages/control/qrCode/index.vue
  5. 4
      ruoyi-ui/vue.config.js

2
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js

@ -28,7 +28,7 @@ export async function getCameraStream(camId, media = 1) {
if (data.code == 200) {
data.data.liveUrl =
"https://10.0.81.202/camera?target=" + data.data.liveUrl.substring(7);
"https://10.0.111.11/camera?target=" + data.data.liveUrl.substring(7);
}
return data;

39
ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/AddNEditDialog.vue

@ -1,27 +1,25 @@
<template>
<Dialog v-model="modelVisible" :title="propData ? '修改' : '新增'" width="1400px">
{{ propData }}
{{ editData }}
<div class="AddNEditDialog">
<!-- <Form :value="propData" class="form" ref="basicInfoForm" :formList="formList" column="1" labelWidth="80px" /> -->
<el-form ref="basicInfoForm" :model="editData" label-width="80px" :rules="groupBasicRules">
<el-form-item label="名称" prop="groupName">
<el-input v-model="editData.groupName"></el-input>
<el-input v-model="editData.groupName" placeholder="任务组名称"></el-input>
</el-form-item>
<el-form-item label="描述" prop="remark">
<el-input v-model="editData.remark"></el-input>
<el-input v-model="editData.remark" placeholder="任务组描述"></el-input>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-switch v-model="editData.status" active-value="1" inactive-value="0"></el-switch>
</el-form-item>
<div style="display: flex; justify-content: flex-end;">
<Button style="background-color: rgba(0, 179, 204, 0.3)"
@click.native="(modelVisible = false), (submitting = false)">
<el-button @click="(modelVisible = false), (submitting = false)">
取消
</Button>
<Button @click.native="onSaveTaskGroup" :loading="submitting"> 提交 </Button>
</el-button>
<el-button type="primary" @click="onSaveTaskGroup('basicInfoForm')" :loading="submitting"> 提交 </el-button>
</div>
</el-form>
{{ editData.id }}
<template v-if="editData.id">
<!-- 如果是新增的还没有保存的任务组不能添加任务 -->
@ -89,9 +87,10 @@ export default {
},
data() {
let gNameValidator = (rule, value, callback)=>{
if (value.trim().length<=0){
return callback(new Error('请输入任务组名称'));
}
// if (value.trim().length<=0){
// return callback(new Error(''));
// }
};
return {
editData:{},
@ -104,7 +103,8 @@ export default {
selectedTaskGroup:{},
groupBasicRules:{
groupName: [
{ validator: gNameValidator, trigger: 'blur' }
// { validator: gNameValidator, trigger: 'blur' }
{ required: true, message: '请输入活动名称', trigger: 'blur' },
],
}
};
@ -175,7 +175,7 @@ export default {
} else {
this.mode = "add"
this.editData = {
groupName: "任务组AAA",
groupName: "",
status: "1",
remark: "",
detailedConfiguration: ""
@ -224,9 +224,9 @@ export default {
});
})
},
onSaveTaskGroup() {
this.$refs.basicInfoForm.validate().then((result) => {
if (!result){
onSaveTaskGroup(formName) {
this.$refs[formName].validate(valid => {
if (!valid){
return ;
}
this.editData.groupName = this.editData.groupName.trim();
@ -235,9 +235,9 @@ export default {
this.submitting = true;
//
this.$set(this.editData, "id", 11);
this.submitting = false;
return
// this.$set(this.editData, "id", 11);
// this.submitting = false;
// return
//
request({
@ -251,6 +251,9 @@ export default {
Message.success(`提交成功!`);
this.$emit("onSuccess");
this.editData = result.data;
// this.mode = "edit"
})
.catch((err) => {
console.log(

16
ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/index.vue

@ -190,14 +190,14 @@ export default {
await delay(100);
//
this.data = [{
id:1,
groupName : "任务组一",
remark : "每天早7点关闭激光唤醒设备,晚7点打开激光唤醒设备。每天早7点关闭激光唤醒设备,晚7点打开激光唤醒设备。",
detailedConfiguration:"[{time:'08:00:00',tasks:[1]}]"
}]
this.isLoading = false;
return;
// this.data = [{
// id:1,
// groupName : "",
// remark : "7777",
// detailedConfiguration:"[{time:'08:00:00',tasks:[1]}]"
// }]
// this.isLoading = false;
// return;
//
request({

4
ruoyi-ui/src/views/JiHeExpressway/pages/control/qrCode/index.vue

@ -1,6 +1,8 @@
<template>
<div class='comp_box'>
<iframe class="iframe" src="https://10.0.81.202:83/alarm-ui/single?u=pDo/guSkRP8=&p=u4johJJOFTyugiay04vYxQ==&t=za4NgrFfeTdF76uSUrhJuA==&route=/warning/QRCode" frameborder="0"></iframe>
<iframe class="iframe"
src="https://10.0.111.11:83/alarm-ui/single?u=pDo/guSkRP8=&p=u4johJJOFTyugiay04vYxQ==&t=za4NgrFfeTdF76uSUrhJuA==&route=/warning/QRCode"
frameborder="0"></iframe>
</div>
</template>

4
ruoyi-ui/vue.config.js

@ -53,8 +53,8 @@ module.exports = {
// target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁
// target: `http://10.168.78.135:8087`, //王钦
// target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
target: `http://10.168.68.42:8087`, //王思祥
// target: `http://10.168.65.194:8087`, //赵祥龙
// target: `http://10.168.68.42:8087`, //王思祥
target: `http://10.168.72.174:8087`, //赵祥龙
// target: `http://10.168.65.156:8097`, //孟
// target: `http://10.168.56.165:8087`, //王家宝
// target: `http://10.168.77.128:8087`, //王兴琳

Loading…
Cancel
Save