Skip to content

platform / fanxing_new

Go to a project
Commit b8787dfc by 潘建波
Options

提交高亮显示当前任务

1 parent 60eb16b6
Inline Side-by-side
Showing 12 changed files with 102 additions and 46 deletions
dist.zip
No preview for this file type
public/dynamicParameters.html
...@@ -47,11 +47,11 @@ ...@@ -47,11 +47,11 @@
<body> <body>
<div class="easyui-layout" data-options="fit:true"> <div class="easyui-layout" data-options="fit:true">
<div data-options="region:'west',split:true" style="width:300px;" class='treE'> <div data-options="region:'west',split:true" style="width:240px;" >
<div id="ptree" class="easyui-tree" data-options="fit:true,lines:true,onClick:clickTreeNode,filter:searchTree"> <div id="ptree" class="easyui-tree" data-options="fit:true,lines:true,onClick:clickTreeNode,filter:searchTree">
</div> </div>
</div> </div>
<div data-options="region:'center'" style="padding:5px"> <div data-options="region:'center'" style="padding:5px;margin-left: 10px;">
<div id="pgrid" class="easyui-propertygrid" data-options="showGroup:false,fit:true,fitColumns:true, <div id="pgrid" class="easyui-propertygrid" data-options="showGroup:false,fit:true,fitColumns:true,
columns:myColumns,onAfterEdit:onEndEditParameter,onClickRow:onClickPropertyRow"> columns:myColumns,onAfterEdit:onEndEditParameter,onClickRow:onClickPropertyRow">
</div> </div>
......
public/index.html
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.png"> <link rel="icon" href="<%= BASE_URL %>favicon.png">
<title>fanxing</title> <title>视频分析平台</title>
<script src="<%= BASE_URL %>js/kinetic-v5.1.0.min.js"></script> <script src="<%= BASE_URL %>js/kinetic-v5.1.0.min.js"></script>
<script src="<%= BASE_URL %>js/ObjTree.js"></script> <script src="<%= BASE_URL %>js/ObjTree.js"></script>
<script src="<%= BASE_URL %>js/jquery.min.js"></script> <script src="<%= BASE_URL %>js/jquery.min.js"></script>
......
src/api/apiList.js
...@@ -6,11 +6,11 @@ import search from "./search"; ...@@ -6,11 +6,11 @@ import search from "./search";
import device from "./device"; import device from "./device";
import resource from "./resource"; import resource from "./resource";
import codes from "./codes"; import codes from "./codes";
import ops from "./ops" import ops from "./ops";
let wsIP = "vion-panda.51vip.biz:52510"; let wsIP = "";
switch (process.env.NODE_ENV) { switch (process.env.NODE_ENV) {
case "development": case "development":
wsIP = "192.168.9.233:20080"; // 测试环境url wsIP = "192.168.9.149:20080"; // 测试环境url
// baseUrl = "http://192.168.9.61:8086"; // baseUrl = "http://192.168.9.61:8086";
break; break;
case "pre": case "pre":
......
src/api/axios.js
...@@ -80,13 +80,18 @@ service.interceptors.request.use( ...@@ -80,13 +80,18 @@ service.interceptors.request.use(
); );
// 添加响应拦截器 // 添加响应拦截器
service.interceptors.response.use(response => {
service.interceptors.response.use(
response => {
// endLoading(); // endLoading();
if (response.data && response.data.ecode && response.data.ecode == 401) {
localStorage.removeItem("atoken");
router.replace({
path: "/"
});
// location.reload();
} else {
let { data } = response; let { data } = response;
return data; return data;
}, }
err => { err => {
// endLoading(); // endLoading();
if (err && err.response) { if (err && err.response) {
...@@ -95,8 +100,25 @@ service.interceptors.response.use( ...@@ -95,8 +100,25 @@ service.interceptors.response.use(
Message.error({ message: "连接服务器失败!" }); Message.error({ message: "连接服务器失败!" });
} }
return Promise.reject(err); return Promise.reject(err);
} };
); });
// service.interceptors.response.use(
// response => {
// // endLoading();
// let { data } = response;
// return data;
// },
// err => {
// // endLoading();
// if (err && err.response) {
// Message.error({ message: err.response.data.enote });
// } else {
// Message.error({ message: "连接服务器失败!" });
// }
// return Promise.reject(err);
// }
// );
/** /**
* 创建统一封装过的 axios 实例 * 创建统一封装过的 axios 实例
......
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.62:20080"; // 测试环境url baseUrl = "http://192.168.9.149: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/sceneManage/eventDetail.vue
...@@ -7,17 +7,23 @@ ...@@ -7,17 +7,23 @@
> >
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div @mousemove="picMove" class="pic-wrap"> <div class="pic-wrap">
<el-image
style="width: 100%;"
:src="curPicData.bigpic"
:preview-src-list="srcList"
>
<div slot="error" class="image-slot">
<img <img
v-if="curPicData.picsEmpty" :src="curPicData.bigpic"
:src="carImg" alt=""
alt="暂无图片" style="width: 30%;display: block;margin: 0 auto;"
title="暂无图片"
slot="reference"
class="pictures small"
/> />
</div>
</el-image>
<!-- <img v-if="curPicData.pics" :src="carImg" alt="暂无图片" slot="reference" class='pictures small' /> --> <!-- <img v-if="curPicData.pics" :src="carImg" alt="暂无图片" slot="reference" class='pictures small' /> -->
<el-popover <!-- <el-popover
placement="left-end" placement="left-end"
width="305" width="305"
trigger="hover" trigger="hover"
...@@ -38,7 +44,7 @@ ...@@ -38,7 +44,7 @@
slot="reference" slot="reference"
class="pictures small" class="pictures small"
/> />
</el-popover> </el-popover> -->
</div> </div>
</el-col> </el-col>
<!-- 交通 --> <!-- 交通 -->
...@@ -243,7 +249,10 @@ ...@@ -243,7 +249,10 @@
</el-col> </el-col>
</el-row> </el-row>
<span slot="footer"> <span slot="footer">
<button class="el-button el-button--default el-button--small" @click="beforeHideModal" > <button
class="el-button el-button--default el-button--small"
@click="beforeHideModal"
>
关闭 关闭
</button> </button>
</span> </span>
...@@ -257,14 +266,20 @@ export default { ...@@ -257,14 +266,20 @@ export default {
return { return {
carImg: "", carImg: "",
isShow: false, isShow: false,
curPicData: {} curPicData: {},
srcList: []
}; };
}, },
methods: { methods: {
detailInfo: function(data) { detailInfo: function(data) {
this.curPicData = {}; this.curPicData = {};
this.curPicData = data; this.curPicData = data;
console.log("detail",data) this.srcList = [];
setTimeout(() => {
if (data.bigpic) {
this.srcList.push(data.bigpic);
}
}, 0);
this.isShow = true; this.isShow = true;
this.$store.commit("setocxstate", 0); this.$store.commit("setocxstate", 0);
}, },
......
src/views/sceneManage/index.vue
...@@ -321,9 +321,10 @@ export default { ...@@ -321,9 +321,10 @@ export default {
margin-bottom 5px margin-bottom 5px
width 15vw width 15vw
height 30px height 30px
padding-left 30px margin-left 15px
line-height 30px line-height 30px
font-size 13px font-size 13px
padding-left 8px
color #666666 color #666666
// width calc(100% - 30px); // width calc(100% - 30px);
overflow hidden overflow hidden
...@@ -341,6 +342,18 @@ export default { ...@@ -341,6 +342,18 @@ export default {
cursor text cursor text
} }
.subtaskActive { .subtaskActive {
// background #0c3b87 position relative
color #333
}
.subtaskActive::before{
position absolute
content ""
top 11px
left 0px
display inline-block
height 8px
width 8px
background rgba(42, 225, 47, 0.74)
border-radius 10px
} }
</style> </style>
src/views/sceneManage/setting/parameter.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<el-dialog <el-dialog
title="参数设置" title="参数设置"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
width="50%" width="60%"
:before-close="handleClose" :before-close="handleClose"
> >
<span> <span>
......
src/views/taskManage/editVideo.vue
...@@ -245,7 +245,9 @@ export default { ...@@ -245,7 +245,9 @@ export default {
message: "添加成功", message: "添加成功",
type: "success" type: "success"
}); });
this.tableData.push(vchan); res.name = vchan.name;
res.subtask_id = res.id;
this.tableData.push(res);
} else { } else {
this.$message.error(res.enote); this.$message.error(res.enote);
} }
......
src/views/taskManage/index.vue
...@@ -94,6 +94,7 @@ ...@@ -94,6 +94,7 @@
:freeList="freeList" :freeList="freeList"
> >
</subTaskInfo> </subTaskInfo>
<div v-if="props.row.subTaskData.length <= 0" class="notaskinfo">暂无子任务</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -314,6 +315,7 @@ export default { ...@@ -314,6 +315,7 @@ export default {
? data[i].running_status ? data[i].running_status
: ""; : "";
data[i].vchan.enableStatus = data[i].enableStatus ? data[i].enableStatus : ""; data[i].vchan.enableStatus = data[i].enableStatus ? data[i].enableStatus : "";
data[i].vchan.info = data[i].info ? data[i].info : "";
} }
ary.push(data[i].vchan); ary.push(data[i].vchan);
} }
...@@ -630,4 +632,8 @@ export default { ...@@ -630,4 +632,8 @@ export default {
.statusbox { .statusbox {
background: red; background: red;
} }
.notaskinfo{
text-align: center;
color: #c4c4c4;
}
</style> </style>
src/views/taskManage/subtask.vue
...@@ -6,13 +6,13 @@ ...@@ -6,13 +6,13 @@
<span class="subtask-info">{{ subTaskData.vchan_name }}</span> <span class="subtask-info">{{ 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>
<span class="subtask-info">{{ subTaskData.device_ip }}</span> <span class="subtask-info">{{ subTaskData.device_ip }}</span> -->
<span class="label">已用资源</span> <!-- <span class="label">已用资源</span>
<span class="subtask-info">{{ subTaskData.video_busy }}</span> <span class="subtask-info">{{ subTaskData.video_busy }}</span>
<span class="label">设备容量</span> <span class="label">设备容量</span>
<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"> <span class="subtask-info">
<el-select v-model="assign_id"> <el-select v-model="assign_id">
<el-option <el-option
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</el-option> </el-option>
</el-select> </el-select>
</span> </span>
<span class="label sub-btn" @click="subMove">确定</span> <span class="label sub-btn" @click="subMove" hidden>确定</span>
</div> </div>
</template> </template>
...@@ -106,11 +106,7 @@ export default { ...@@ -106,11 +106,7 @@ export default {
console.log(this.subTaskData); console.log(this.subTaskData);
}, },
watch: {}, watch: {},
mounted() { mounted() {}
this.assign_id = this.subTaskData.assign_id
? this.subTaskData.assign_id
: "";
}
}; };
</script> </script>
...@@ -123,11 +119,13 @@ export default { ...@@ -123,11 +119,13 @@ export default {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
overflow: hidden; overflow: hidden;
} }
span:last-child{
border-bottom: 1px solid #333;
}
.label { .label {
width: 5vw; width: 5vw;
text-align: center; text-align: center;
border-left: 1px solid $border-color; // border-left: 1px solid $border-color;
background: #f0f0f0; background: #f0f0f0;
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
...@@ -136,7 +134,7 @@ export default { ...@@ -136,7 +134,7 @@ export default {
width: 3vw; width: 3vw;
} }
.taskstatus { .taskstatus {
width: 5vw; width: 6vw;
} }
.subtask-info { .subtask-info {
border-left: 1px solid #f0f0f0; border-left: 1px solid #f0f0f0;
...@@ -146,14 +144,14 @@ export default { ...@@ -146,14 +144,14 @@ export default {
line-height: 40px; line-height: 40px;
} }
.subtask-info:nth-child(4) { .subtask-info:nth-child(4) {
width: 7vw; width: 8vw;
overflow: hidden; overflow: hidden;
} }
.subtask-info:nth-child(6) { .subtask-info:nth-child(6) {
width: 8vw; width: 15vw;
} }
.subtask-info:nth-child(8) { .subtask-info:nth-child(8) {
width: 6vw; width: 12vw;
} }
.subtask-info:nth-child(10) { .subtask-info:nth-child(10) {
width: 3vw; width: 3vw;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!