Skip to content

platform / fanxing_new

Go to a project
Commit c790af3c by 潘建波
Options

fix🐛 修改事件导出bug

1 parent 57400486
Inline Side-by-side
Showing 15 changed files with 73 additions and 55 deletions
.env.development
NODE_ENV = 'development' NODE_ENV = 'development'
VUE_APP_URL = 'http://vion-panda.51vip.biz:52510'
\ No newline at end of file \ No newline at end of file
VUE_APP_URL = 'http://192.168.9.133:20080'
\ No newline at end of file \ No newline at end of file
dist.zip
No preview for this file type
public/js/version.json
{"commit":"84835baa8f06548d75add8b5fc4f93e6c10f8563","commitDate":"2020-7-14 16:35","buildDate":"2020-7-14 16:40","version":"2.0.5","info":"fix🐛 实事展示字段显示错误，新建任务，设备管理增加设备类型"}
\ No newline at end of file \ No newline at end of file
{"commit":"57400486932693cf04f4dc6ea790f673324fbf76","commitDate":"2020-7-14 18:27","buildDate":"2020-7-15 16:56","version":"2.0.5","info":"fix🐛 【BUG】效果展示”界面内抓拍结果的“抓拍时间”和“违法类型”项空白 【BUG】效果展示”界面无法点播视频 【BUG】选中的模型线类型与实际画线效果不一致 【BUG】新添加模型框移动标定线会消失 【NEW】新增云台控制拉近拉远 【NEW】设备管理,无法显示出设备类型"}
\ No newline at end of file \ No newline at end of file
src/api/baseUrl.js
...@@ -4,7 +4,7 @@ console.log(process.env.NODE_ENV); ...@@ -4,7 +4,7 @@ console.log(process.env.NODE_ENV);
switch (process.env.NODE_ENV) { switch (process.env.NODE_ENV) {
case "development": case "development":
// baseUrl = "http://192.168.9.234:20080"; // 测试环境url // baseUrl = "http://192.168.9.234:20080"; // 测试环境url
baseUrl = "http://192.168.9.149:20080"; // 测试环境url baseUrl = "http://192.168.9.133:20080"; // 测试环境url
// baseUrl = "http://192.168.9.82:8080"; // 测试环境url // baseUrl = "http://192.168.9.82:8080"; // 测试环境url
// baseUrl = "http://192.168.9.61:8086"; // baseUrl = "http://192.168.9.61:8086";
// baseUrl = 'http://vion-panda.51vip.biz:52510'; // baseUrl = 'http://vion-panda.51vip.biz:52510';
......
src/views/ops/equipment_manage.vue
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<div class="info-content"> <div class="info-content">
<div class="con-item"> <div class="con-item">
<span class="con-label">设备类型:</span> <span class="con-label">设备类型:</span>
<span class="con-text">{{curDevData.license_info.platType}}</span> <span class="con-text">{{curDevData.license_info?curDevData.license_info.platType:''}}</span>
</div> </div>
<!-- <div class="con-item"> <!-- <div class="con-item">
<span class="con-label">设备类型:</span> <span class="con-label">设备类型:</span>
......
src/views/search/event.vue
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
v-model="conditions.task_id" v-model="conditions.task_id"
@change="getSubTask" @change="getSubTask"
> >
<el-option value="" label="全部"></el-option>
<el-option <el-option
v-for="item in taskList" v-for="item in taskList"
:value="item.task_id" :value="item.task_id"
...@@ -341,10 +342,6 @@ export default { ...@@ -341,10 +342,6 @@ export default {
}) })
.then(res => { .then(res => {
this.taskList = res.list_data; this.taskList = res.list_data;
this.taskList.unshift({
task_id: "",
task_name: "全部"
});
}); });
}, },
getSubTask() { getSubTask() {
...@@ -396,30 +393,23 @@ export default { ...@@ -396,30 +393,23 @@ export default {
if (this.conditions.event_cate != "安防事件") { if (this.conditions.event_cate != "安防事件") {
cate = this.conditions.event_cate; cate = this.conditions.event_cate;
} }
let url = var url = `${
process.env.VUE_APP_URL + process.env.VUE_APP_URL
"/api/v1/behavior/events/export?s=" + }/api/v1/behavior/events/export?s=${Math.random()}&event_dt__gte=${this.$moment(
Math.random() + this.conditions.start_dt
"&event_dt__gte=" + )
this.$moment(this.conditions.start_dt)
.utc() .utc()
.format("YYYY-MM-DD HH:mm:ss") + .format("YYYY-MM-DD HH:mm:ss")}&event_dt__lt=${this.$moment(
"&event_dt__lt=" + this.conditions.end_dt
this.$moment(this.conditions.end_dt) )
.utc() .utc()
.format("YYYY-MM-DD HH:mm:ss") + .format("YYYY-MM-DD HH:mm:ss")}&task_id=${
"&task_id=" + this.conditions.task_id
this.conditions.task_id + }&subtask_id=${this.conditions.subtask_id}&location_code__like=${
"&subtask_id=" +
this.conditions.subtask_id +
"&location_code__like=" +
this.conditions.location_code this.conditions.location_code
? this.conditions.location_code.replace(/\s\s*/g, "") ? this.conditions.location_code.replace(/\s\s*/g, "")
: this.conditions.location_code + : this.conditions.location_code
"&event_type=" + }&event_cate=${cate}`;
this.conditions.type +
"&event_cate=" +
cate;
window.open(encodeURI(url)); window.open(encodeURI(url));
}, },
leftFun() { leftFun() {
...@@ -461,6 +451,7 @@ export default { ...@@ -461,6 +451,7 @@ export default {
this.getData(); this.getData();
}, },
query() { query() {
this.page = 1;
this.getData(); this.getData();
}, },
getData() { getData() {
......
src/views/search/illegal.vue
...@@ -547,6 +547,7 @@ export default { ...@@ -547,6 +547,7 @@ export default {
this.getData(); this.getData();
}, },
query() { query() {
this.page = 1;
this.getData(); this.getData();
}, },
getData() { getData() {
......
src/views/search/pedestrian.vue
...@@ -434,6 +434,7 @@ export default { ...@@ -434,6 +434,7 @@ export default {
this.getData(); this.getData();
}, },
query() { query() {
this.page = 1;
this.getData(); this.getData();
}, },
getData() { getData() {
......
src/views/search/publicFlow.vue
...@@ -437,6 +437,7 @@ export default { ...@@ -437,6 +437,7 @@ export default {
this.getData(); this.getData();
}, },
query() { query() {
this.page = 1;
this.getData(); this.getData();
}, },
getData() { getData() {
......
src/views/search/traficflow.vue
...@@ -319,6 +319,7 @@ export default { ...@@ -319,6 +319,7 @@ export default {
this.getData(); this.getData();
}, },
query() { query() {
this.page = 1;
this.getData(); this.getData();
}, },
getData() { getData() {
......
src/views/search/vehicleSearch.vue
...@@ -547,6 +547,7 @@ export default { ...@@ -547,6 +547,7 @@ export default {
this.getData(); this.getData();
}, },
query() { query() {
this.page = 1;
this.getData(); this.getData();
}, },
getData() { getData() {
......
src/views/search/xcycle.vue
...@@ -668,6 +668,7 @@ export default { ...@@ -668,6 +668,7 @@ export default {
this.getData(); this.getData();
}, },
query() { query() {
this.page = 1;
this.getData(); this.getData();
}, },
getData() { getData() {
......
src/views/taskManage/editSet.vue
...@@ -203,16 +203,20 @@ export default { ...@@ -203,16 +203,20 @@ export default {
let that = this; let that = this;
this.freeList.forEach(ele => { this.freeList.forEach(ele => {
if (ele.license_info && ele.license_info.platType) { if (ele.license_info && ele.license_info.platType) {
console.log(this.platT)
if (that.platT.length == 0) { if (that.platT.length == 0) {
that.platT.push(ele.license_info.platType); that.platT.push(ele.license_info.platType);
} } else {
let isactive = true;
for (let i = 0; i < that.platT.length; i++) { for (let i = 0; i < that.platT.length; i++) {
if (that.platT[i] != ele.license_info.platType) { if (that.platT[i] == ele.license_info.platType) {
that.platT.push(ele.license_info.platType); isactive = false;
break; break;
} }
} }
if (isactive) {
that.platT.push(ele.license_info.platType);
}
}
} }
}); });
} }
...@@ -354,17 +358,17 @@ export default { ...@@ -354,17 +358,17 @@ export default {
}, },
sendstatus(data) { sendstatus(data) {
let status = 0; let status = 0;
if ( // if (
data.task_algo_type != this.backpdata.task_algo_type || // data.task_algo_type != this.backpdata.task_algo_type ||
data.start_time != this.backpdata.start_time || // data.start_time != this.backpdata.start_time ||
data.end_time != this.backpdata.end_time || // data.end_time != this.backpdata.end_time ||
data.plate_type != this.backpdata.plate_type || // data.plate_type != this.backpdata.plate_type ||
data.resource_use != this.backpdata.resource_use || // data.resource_use != this.backpdata.resource_use ||
data.priority != this.backpdata.priority || // data.priority != this.backpdata.priority ||
data.store_conf_unid != this.backpdata.store_conf.unid // data.store_conf_unid != this.backpdata.store_conf.unid
) { // ) {
status = 1; // status = 1;
} // }
return status; return status;
}, },
getStore() { getStore() {
......
src/views/taskManage/index.vue
...@@ -285,7 +285,7 @@ export default { ...@@ -285,7 +285,7 @@ export default {
pedittype: "add", pedittype: "add",
currentRow: {}, currentRow: {},
assign_ip: "", assign_ip: "",
curscrollTop:0 curscrollTop: 0
}; };
}, },
components: { components: {
...@@ -463,9 +463,16 @@ export default { ...@@ -463,9 +463,16 @@ export default {
this.$refs.editvideo.showModal(row); this.$refs.editvideo.showModal(row);
}, },
editTask(type, index, row) { editTask(type, index, row) {
if(type === "add") { if (type === "add") {
this.curscrollTop = 0; this.curscrollTop = 0;
} else { } else {
if (row.status == "Running") {
this.$message({
type: "info",
message: "暂停任务再尝试操作！"
});
return;
}
this.setsSrollTop(); this.setsSrollTop();
} }
this.$refs.editset.initData(type, row); this.$refs.editset.initData(type, row);
......
src/views/taskManage/subtask.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<span class="label labelindex">{{ subindex + 1 }}</span> <span class="label labelindex">{{ subindex + 1 }}</span>
<span class="subtask-info taskstatus" v-html="formater(subTaskData)" @click="showinfo(subTaskData)"></span> <span class="subtask-info taskstatus" v-html="formater(subTaskData)" @click="showinfo(subTaskData)"></span>
<span class="label">视频源文件</span> <span class="label">视频源文件</span>
<span class="subtask-info">{{ subTaskData.vchan_name }}</span> <span class="subtask-info" :title="subTaskData.vchan_name">{{ subTaskData.vchan_name }}</span>
<span class="label">任务ID</span> <span class="label">任务ID</span>
<span class="subtask-info">{{ subTaskData.subtask_id }}</span> <span class="subtask-info">{{ subTaskData.subtask_id }}</span>
<!-- <span class="label">设备地址</span> <!-- <span class="label">设备地址</span>
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
<span class="subtask-info">{{ subTaskData.video_total }}</span> --> <span class="subtask-info">{{ subTaskData.video_total }}</span> -->
<span class="label">任务信息</span> <span class="label">任务信息</span>
<span class="subtask-info">{{ subTaskData.info }}</span> <span class="subtask-info">{{ subTaskData.info }}</span>
<span class="label" hidden>分析设备</span> <span class="label">分析设备</span>
<span class="subtask-info" hidden> <span class="subtask-info">
<el-select v-model="assign_id"> <el-select v-model="assign_id">
<!-- <el-option <!-- <el-option
v-for="(item, index) in freeList" v-for="(item, index) in freeList"
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
v-for="(item, index) in freeList" v-for="(item, index) in freeList"
:key="index" :key="index"
:value="item.device_id" :value="item.device_id"
:label="item.in_ip" :label="item.in_ip + item.license_info.platType"
> >
{{ item.in_ip }} {{ item.license_info.platType }} {{ item.in_ip }} {{ item.license_info.platType }}
</el-option> </el-option>
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</el-option> --> </el-option> -->
</el-select> </el-select>
</span> </span>
<span class="label sub-btn" @click="subMove" hidden>确定</span> <span class="label sub-btn" @click="subMove">确定</span>
</div> </div>
</template> </template>
...@@ -66,6 +66,13 @@ export default { ...@@ -66,6 +66,13 @@ export default {
props: ["subTaskData", "freeList", "taskData", "subindex"], props: ["subTaskData", "freeList", "taskData", "subindex"],
methods: { methods: {
subMove() { subMove() {
if (this.taskData.status == "Running") {
this.$message({
type: "info",
message: "暂停任务再尝试操作！"
});
return;
}
let taskID = this.taskData.task_id; let taskID = this.taskData.task_id;
let subTaksID = this.subTaskData.subtask_id; let subTaksID = this.subTaskData.subtask_id;
this.$api.task.getTaskParams(taskID, subTaksID).then(res => { this.$api.task.getTaskParams(taskID, subTaksID).then(res => {
...@@ -137,7 +144,8 @@ export default { ...@@ -137,7 +144,8 @@ export default {
overflow: hidden; overflow: hidden;
} }
span:last-child{ span:last-child{
border-bottom: 1px solid #333; border-bottom: 1px solid #ccc;
cursor: pointer;
} }
.label { .label {
width: 5vw; width: 5vw;
...@@ -161,18 +169,19 @@ export default { ...@@ -161,18 +169,19 @@ export default {
line-height: 40px; line-height: 40px;
} }
.subtask-info:nth-child(4) { .subtask-info:nth-child(4) {
width: 10vw; width: 9vw;
overflow: hidden; overflow: hidden;
} }
.subtask-info:nth-child(6) { .subtask-info:nth-child(6) {
width: 18vw; width: 12vw;
} }
.subtask-info:nth-child(8) { .subtask-info:nth-child(8) {
width: 16vw; width: 10vw;
border-right: 1px solid #f0f0f0; border-right: 1px solid #f0f0f0;
} }
.subtask-info:nth-child(10) { .subtask-info:nth-child(10) {
width: 3vw; width: 10vw;
} }
.subtask-info:nth-child(12) { .subtask-info:nth-child(12) {
width: 3vw; width: 3vw;
...@@ -182,6 +191,7 @@ export default { ...@@ -182,6 +191,7 @@ export default {
} }
.sub-btn { .sub-btn {
cursor: pointer; cursor: pointer;
border: 0;
} }
} }
</style> </style>
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!