Skip to content

platform / fanxing_new

Go to a project
Commit 396f8de8 by 潘建波
Options

临时提交文件

1 parent bacfed30
Inline Side-by-side
Showing 11 changed files with 59 additions and 39 deletions
dist.zip
No preview for this file type
public/js/version.json
{"commit":"09e2faff9150d34bdd047ee5b5ed31865ef4aa7f","commitDate":"2020-12-23 18:27","buildDate":"2020-12-24 10:33","version":"2.0.9","info":"增加列表展示图片"}
\ No newline at end of file \ No newline at end of file
{"commit":"bacfed303de17d1adb667265fe3aa2967acf6950","commitDate":"2020-12-24 10:40","buildDate":"2020-12-29 15:46","version":"2.0.9","info":"提交合并后版本"}
\ No newline at end of file \ No newline at end of file
src/api/apiList.js
...@@ -12,7 +12,7 @@ import baseurl from './baseUrl' ...@@ -12,7 +12,7 @@ import baseurl from './baseUrl'
let wsIP = ""; let wsIP = "";
switch (process.env.NODE_ENV) { switch (process.env.NODE_ENV) {
case "development": case "development":
wsIP = config.https?"192.168.9.233:20070":"192.168.9.233:20080"; // 测试环境url wsIP = config.https?"192.168.9.227:20070":"192.168.9.227:20080"; // 测试环境url
// baseUrl = "http://192.168.9.61:8086"; // baseUrl = "http://192.168.9.61:8086";
break; break;
case "pre": case "pre":
......
src/assets/resetElementCss/index.scss
...@@ -142,6 +142,9 @@ ...@@ -142,6 +142,9 @@
.el-table { .el-table {
@include font-colr(tablecolor) @include font-colr(tablecolor)
} }
.el-table thead {
@include font-colr(tablecolor)
}
.el-table__body tr{ .el-table__body tr{
@include background_color(table_tr_bg) @include background_color(table_tr_bg)
} }
...@@ -229,7 +232,7 @@ display: table-cell!important; ...@@ -229,7 +232,7 @@ display: table-cell!important;
color: #FFFFFF; color: #FFFFFF;
} }
.el-dialog__footer{ .el-dialog__footer{
background:#F6F6F6 ; @include background_color(dialog_footer_bg);
} }
.dialog-footer .el-button--small { .dialog-footer .el-button--small {
padding: 9px 17px; padding: 9px 17px;
......
src/assets/scss/them.scss
...@@ -25,6 +25,7 @@ $themes: ( ...@@ -25,6 +25,7 @@ $themes: (
input_color:#606266, input_color:#606266,
label_color:#606266, label_color:#606266,
tablecolor:#606266, tablecolor:#606266,
options_color:#555,
//背景 //背景
background_color: #fff, background_color: #fff,
header_background_color: #0069FF, header_background_color: #0069FF,
...@@ -41,6 +42,7 @@ $themes: ( ...@@ -41,6 +42,7 @@ $themes: (
dialog_header_bg: #3BB7FF, dialog_header_bg: #3BB7FF,
pages_bg:#fff, pages_bg:#fff,
active_pages_bg:#0069ff, active_pages_bg:#0069ff,
dialog_footer_bg:#F6F6F6,
//选中导航背景颜色 //选中导航背景颜色
active_nave_bg:rgba(0,105,255,.1), active_nave_bg:rgba(0,105,255,.1),
table_tr_bg:#f4f4f4, table_tr_bg:#f4f4f4,
...@@ -74,16 +76,17 @@ $themes: ( ...@@ -74,16 +76,17 @@ $themes: (
input_color:#fff, input_color:#fff,
label_color:#9b9b9b, label_color:#9b9b9b,
tablecolor:#fff, tablecolor:#fff,
options_color:#939FCC,
//背景 //背景
setheader_bg:#0B1745, setheader_bg:#0B1745,
background_color: #1b2531, background_color: #1b2531,
//头部背景 //头部背景
header_background_color: #1040a6, header_background_color: #0D2052,
nav_bg:#0D2052, nav_bg:#08173E,
menu_bg:#08173E, menu_bg:#0B1643,
mian_bg:#0B122B, mian_bg:#0B122B,
editbtncolor: #0069ff, editbtncolor: #0069ff,
treeboxbg: #182760, treeboxbg: #172760,
table_th_bg:#0B1745, table_th_bg:#0B1745,
taskshipintitlebg:#0D1744, taskshipintitlebg:#0D1744,
picbox_bg:#0B1745, picbox_bg:#0B1745,
...@@ -92,16 +95,17 @@ $themes: ( ...@@ -92,16 +95,17 @@ $themes: (
pages_bg:#0e2869, pages_bg:#0e2869,
table_bg:#666, table_bg:#666,
active_pages_bg:#095dd0, active_pages_bg:#095dd0,
dialog_footer_bg:#1B3285,
//选中导航背景颜色 //选中导航背景颜色
active_nave_bg:rgba(11, 43, 106, .6), active_nave_bg:rgba(11, 43, 106, .6),
table_tr_bg:#182760, table_tr_bg:#172760,
dialog_header_bg: #0B1745 , dialog_header_bg: #0B1745 ,
dialog_body_bg:#182760, dialog_body_bg:#172760,
input_bg:#0D2152, input_bg:#0D2152,
table_hover_bg:rgba(0,0,0,.4), table_hover_bg:rgba(0,0,0,.4),
//边框 //边框
border_color1: #3d414a, border_color1: #3d414a,
table_border:rgba(0,0,0,.6), table_border:#1E2D66,
input_border: #24326B, input_border: #24326B,
pages_border:#095dd0, pages_border:#095dd0,
) )
......
src/views/Layout/index.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<el-container class="home-box"> <el-container class="home-box">
<el-header class="headers"> <el-header class="headers">
<!-- <img class="logoImg" src="../../assets/img/home/logo.png" alt="" /> --> <!-- <img class="logoImg" src="../../assets/img/home/logo.png" alt="" /> -->
<span class="logotitle">AI智能运算能力平台</span> <span class="logotitle">AI视频分析平台</span>
<span <span
:class="{ :class="{
'el-icon-s-fold': isopen, 'el-icon-s-fold': isopen,
......
src/views/Login.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
> >
</vue-particles> --> </vue-particles> -->
<div class="box"> <div class="box">
<h1>AI智能运算能力平台</h1> <h1>AI视频分析平台</h1>
<div style="width: 60%;margin: 0 auto;"> <div style="width: 60%;margin: 0 auto;">
<el-form <el-form
:model="ruleForm" :model="ruleForm"
......
src/views/sceneManage/index.vue
...@@ -145,8 +145,7 @@ export default { ...@@ -145,8 +145,7 @@ export default {
return; return;
} }
this.pushSteam(vdata); this.pushSteam(vdata);
debugger this.$refs.event.dataInit(this.currentSubtaskId, vdata.task_type);
this.$refs.event.dataInit(this.currentSubtaskId, vdata.task_type);
}, },
getTask(data) { getTask(data) {
let that = this; let that = this;
...@@ -217,6 +216,9 @@ export default { ...@@ -217,6 +216,9 @@ export default {
}, },
created() { created() {
this.getTask(); this.getTask();
},
mounted() {
} }
}; };
</script> </script>
......
src/views/sceneManage/setting/demarcate.vue
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</el-row> </el-row>
<el-row class="bdbody-box"> <el-row class="bdbody-box">
<div class="bdbody-left"> <div class="bdbody-left">
<div class="pic2"><img :src="src" /></div> <div class="pic2" id="demarcatpic" ><img :src="src" /></div>
<div id="CaliContainer"></div> <div id="CaliContainer"></div>
</div> </div>
<div class="bdbody-right"> <div class="bdbody-right">
...@@ -93,6 +93,18 @@ ...@@ -93,6 +93,18 @@
</div> </div>
</el-row> </el-row>
</span> </span>
<div class="ullodaimg">
<el-upload
class="upload-demo"
action=""
:auto-upload="false"
:show-file-list="false"
:on-change="handleChange"
:file-list="fileList">
<el-button type="primary">上传<i class="el-icon-upload el-icon--right"></i></el-button>
<span slot="tip" class="el-upload__tip upinfo"> 手动上传场景图片</span>
</el-upload>
</div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="handleClose">取 消</el-button> <el-button @click="handleClose">取 消</el-button>
<el-button type="primary" @click="save">确 定</el-button> <el-button type="primary" @click="save">确 定</el-button>
...@@ -119,6 +131,7 @@ export default { ...@@ -119,6 +131,7 @@ export default {
canvasState: 0, canvasState: 0,
showClose: false, showClose: false,
needLine: false, needLine: false,
fileList:[],
stage: {}, stage: {},
traffic: { traffic: {
cameraH: "6.5", cameraH: "6.5",
...@@ -823,6 +836,21 @@ export default { ...@@ -823,6 +836,21 @@ export default {
this.dialogVisible = false; this.dialogVisible = false;
this.handleClose(); this.handleClose();
}, },
handleChange(file, fileLis){
this.src = URL.createObjectURL(file.raw);
setTimeout(() => {
let img = document.getElementById("demarcatpic").childNodes[0];
let canvas = document.createElement("canvas");
canvas.width = 800;
canvas.height = 500;
try {
canvas.getContext("2d").drawImage(img, 0, 0, 800, 500);
_this.src = canvas.toDataURL("image/webp");
} catch (error) {
console.log(error);
}
}, 500);
},
clear: function() { clear: function() {
(this.traffic = { (this.traffic = {
cameraH: "6.5", cameraH: "6.5",
...@@ -907,4 +935,7 @@ export default { ...@@ -907,4 +935,7 @@ export default {
.edit-box{ .edit-box{
margin-top 200px margin-top 200px
} }
.ullodaimg{
margin-top 5px
}
</style> </style>
src/views/sceneManage/setting/index.vue
...@@ -514,6 +514,7 @@ export default { ...@@ -514,6 +514,7 @@ export default {
min-height: 30px; min-height: 30px;
padding: 0 10px; padding: 0 10px;
color: #555555; color: #555555;
@include font-colr(options_color);
margin-top: 1vh; margin-top: 1vh;
cursor: pointer; cursor: pointer;
......
src/views/taskManage/editSet.vue
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
<el-dialog <el-dialog
:title="headertitle" :title="headertitle"
:visible.sync="setvisible" :visible.sync="setvisible"
width="450px" width="500px"
:before-close="handleClose" :before-close="handleClose"
> >
<div> <div>
<el-form <el-form
label-position="left" label-position="left"
label-width="80px" label-width="120px"
:model="formData" :model="formData"
:rules="rules" :rules="rules"
ref="taskForm" ref="taskForm"
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="算法类型" label="算法类型"
hidden
prop="task_algo_type" prop="task_algo_type"
class="form-item" class="form-item"
> >
...@@ -47,21 +46,6 @@ ...@@ -47,21 +46,6 @@
<el-option value="5" label="交通行人"></el-option> <el-option value="5" label="交通行人"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item
label="服务类型"
prop="task_algo_type"
class="form-item"
>
<el-select
v-model="formData.tem"
placeholder="请选择"
:popper-append-to-body="false"
:disabled="pedittype == 'edit'"
>
<el-option v-for="(item, index) in serveTableData" :key="index" :value="item.servename" :label="item.servename"></el-option>
</el-select>
</el-form-item>
<el-form-item label="场景占用" class="form-item" prop="resource_use"> <el-form-item label="场景占用" class="form-item" prop="resource_use">
<el-select <el-select
v-model="formData.resource_use" v-model="formData.resource_use"
...@@ -169,7 +153,6 @@ export default { ...@@ -169,7 +153,6 @@ export default {
}; };
return { return {
setvisible: false, setvisible: false,
serveTableData:[],
timer: ["00:00:00", "23:59:59"], timer: ["00:00:00", "23:59:59"],
backpdata: "", backpdata: "",
headertitle:"添加任务", headertitle:"添加任务",
...@@ -403,14 +386,10 @@ export default { ...@@ -403,14 +386,10 @@ export default {
this.store_confs = res.list_data; this.store_confs = res.list_data;
}); });
}, },
getServeData(){
var tData = localStorage.getItem("serveData")?localStorage.getItem("serveData"):"[]";
this.serveTableData = JSON.parse(tData)
},
}, },
created() { created() {
this.getStore(); this.getStore();
this.getServeData();
} }
}; };
</script> </script>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!