Skip to content

platform / fanxing_new

Go to a project
Commit cf3ae4a5 by 潘建波
Options

临时提交

1 parent a03847f8
Inline Side-by-side
Showing 4 changed files with 32 additions and 17 deletions
public/js/version.json
{"commit":"fea992631da194b9776cba2116a9162aa351378e","commitDate":"2021-7-5 15:22","buildDate":"2021-7-15 11:45","version":"2.1.0","info":"提交导入少token问题"}
\ No newline at end of file \ No newline at end of file
{"commit":"a03847f885ec625778c76c07f9d062f6220bb759","commitDate":"2021-7-15 14:41","buildDate":"2021-7-15 19:3","version":"2.1.0","info":"【NEW】20181手动拉取"}
\ No newline at end of file \ No newline at end of file
src/api/resource/index.js
...@@ -69,12 +69,19 @@ export default { ...@@ -69,12 +69,19 @@ export default {
addCamera(params, id) { addCamera(params, id) {
return api.post(`${baseUrl}/api/v1/devconf_fx/devs/${id}/vchans`, params); return api.post(`${baseUrl}/api/v1/devconf_fx/devs/${id}/vchans`, params);
}, },
editCamera(params, id, id2) { editCamera(params, id, id2) {
return api.post( return api.post(
`${baseUrl}/api/v1/devconf_fx/devs/${id}/vchans/${id2}`, `${baseUrl}/api/v1/devconf_fx/devs/${id}/vchans/${id2}`,
params params
); );
}, },
editCodeCamera(params, id, id2) {
return api.post(
`{baseUrl}/api/v1/codes/custom/cates/${id}/codes/${id2}`,
params
);
},
uploadFile(params, id) { uploadFile(params, id) {
return api.post( return api.post(
`${baseUrl}/api/v1/devconf_fx/devs/${id}/vfile_vchans`, `${baseUrl}/api/v1/devconf_fx/devs/${id}/vfile_vchans`,
......
src/views/resource/treeComponents/cameraTree.vue
...@@ -271,13 +271,13 @@ export default { ...@@ -271,13 +271,13 @@ export default {
item => item.code == this.editForm.code item => item.code == this.editForm.code
); );
this.$api.resource this.$api.resource
.editCamera( .editCodeCamera(
{ {
name: this.editForm.name, name: this.editForm.name,
code: this.editForm.code code: this.editForm.code
}, },
cate_unid, cate_unid,
editObj[0].unid this.editForm.code
) )
.then(data => { .then(data => {
let type = this.editForm.targetType; let type = this.editForm.targetType;
......
src/views/sceneManage/setting/index.vue
...@@ -69,14 +69,16 @@ ...@@ -69,14 +69,16 @@
effect="dark" effect="dark"
content="删除场景" content="删除场景"
placement="top" placement="top"
v-if="taskInfo.mtasks[0].scenes.length !=1"
> >
<span v-if="scope.$index!=taskInfo.mtasks[0].scenes.length - 1" @click="delsounces(scope.row, scope.$index)" class="el-icon-remove"></span> <span @click="delsounces(scope.row, scope.$index)" class="el-icon-remove"></span>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
class="item" class="item"
effect="dark" effect="dark"
content="增加场景" content="增加场景"
placement="top" placement="top"
> >
<span @click="addsounces()" class="el-icon-circle-plus"></span> <span @click="addsounces()" class="el-icon-circle-plus"></span>
</el-tooltip> </el-tooltip>
...@@ -208,16 +210,18 @@ export default { ...@@ -208,16 +210,18 @@ export default {
addsounces(){ addsounces(){
let scensinit = JSON.parse(JSON.stringify(this.taskInfo.mtasks[0].scenes[0])); let scensinit = JSON.parse(JSON.stringify(this.taskInfo.mtasks[0].scenes[0]));
scensinit.config = {} scensinit.config = {}
scensinit.rois = ""; scensinit.rois = null;
scensinit.runtime = -1 scensinit.runtime = -1
scensinit.scene_unid = this.uuid() scensinit.scene_unid = this.uuid()
scensinit.position_name = 1 scensinit.position_name = "-1"
scensinit.position_num = -1 scensinit.position_num = "-1"
this.taskInfo.mtasks[0].scenes.push(scensinit) this.taskInfo.mtasks[0].scenes.push(scensinit)
this.subRoi(this.taskInfo.mtasks,`增加场景${this.uuid()}`);
}, },
//删除场景 //删除场景
delsounces(row,index){ delsounces(row,index){
this.taskInfo.mtasks[0].scenes.splice(index,1) this.taskInfo.mtasks[0].scenes.splice(index,1)
this.subRoi(this.taskInfo.mtasks,`删除场景${index}`);
}, },
getSipSetting: function() { getSipSetting: function() {
if (this.dev_unid) { if (this.dev_unid) {
...@@ -335,6 +339,18 @@ export default { ...@@ -335,6 +339,18 @@ export default {
return state; return state;
}, },
submitPosion(positionnum) { submitPosion(positionnum) {
let postions = []
this.taskInfo.mtasks[0].scenes.map(ele => {
postions.push(ele.position_num)
});
debugger
if(postions.indexOf(positionnum) > 0) {
this.$message({
message: "预置位已经存在请重新设置！",
type: "error"
});
return
}
this.taskInfo.mtasks[0].scenes.map(ele => { this.taskInfo.mtasks[0].scenes.map(ele => {
if (ele.scene_unid == this.currentRow.scene_unid) { if (ele.scene_unid == this.currentRow.scene_unid) {
ele.position_num = positionnum; ele.position_num = positionnum;
...@@ -346,7 +362,7 @@ export default { ...@@ -346,7 +362,7 @@ export default {
deleteytconfig(positionnum) { deleteytconfig(positionnum) {
this.taskInfo.mtasks[0].scenes.map(ele => { this.taskInfo.mtasks[0].scenes.map(ele => {
if (ele.scene_unid == this.currentRow.scene_unid) { if (ele.scene_unid == this.currentRow.scene_unid) {
ele.position_num = -1; ele.position_num = "0";
} }
}); });
let sunbtaskname = this.subtaskdata.subtask_name; let sunbtaskname = this.subtaskdata.subtask_name;
...@@ -477,15 +493,7 @@ export default { ...@@ -477,15 +493,7 @@ export default {
this.user_unid = window.sessionStorage.getItem("user_unid"); this.user_unid = window.sessionStorage.getItem("user_unid");
}, },
watch: { watch: {
// subtaskid(val) {
// this.loading = true;
// this.$api.task.getTaskParams(this.taskid, val).then(res => {
// this.taskInfo = res;
// this.switchstate = res.alternate_status == 1 ? true : false;
// this.loading = false;
// this.$forceUpdate();
// });
// }
} }
}; };
</script> </script>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!