Merge branch 'master' of https://git.lgzn.space/chengdandan/TransFlow
This commit is contained in:
commit
f39bff2153
|
|
@ -0,0 +1,13 @@
|
|||
import request from '@/utils/request.js';
|
||||
import axios from 'axios';
|
||||
export const getHostInfoApi = params => {
|
||||
return axios.get('api/GetHostInfo', {
|
||||
params
|
||||
});
|
||||
};
|
||||
//保存主机名称
|
||||
export const getSetHostName = params => {
|
||||
return axios.get('api/SetHostName', {
|
||||
params
|
||||
});
|
||||
};
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
import request from '@/utils/request.js';
|
||||
import axios from 'axios';
|
||||
export const getHostInfoApi = params => {
|
||||
return axios.get('api/GetHostInfo', {
|
||||
params
|
||||
});
|
||||
};
|
||||
//保存主机名称
|
||||
export const getSetHostName = params => {
|
||||
return axios.get('api/SetHostName', {
|
||||
params
|
||||
});
|
||||
};
|
||||
|
|
@ -1,9 +1,7 @@
|
|||
import request from '@/utils/request.js';
|
||||
|
||||
export function loginApi(data) { // 登录接口
|
||||
return request({
|
||||
url: '/hxh/api-test/login',
|
||||
method: 'post',
|
||||
data: data
|
||||
import axios from 'axios';
|
||||
export const loginApi = params => {
|
||||
return axios.get('api/GetZhanghLogin', {
|
||||
params
|
||||
});
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ if (process.env.NODE_ENV === 'development') {
|
|||
}
|
||||
//获取用户信息
|
||||
export const getUserApi = params => {
|
||||
return axios.get('api/GetZhanghDetails', {
|
||||
params
|
||||
});
|
||||
return axios.get(`api/GetZhanghDetails?UserId=${params}`, {});
|
||||
};
|
||||
//修改密码
|
||||
|
|
|
|||
|
|
@ -15,13 +15,14 @@ export default {
|
|||
postSetQuanjsz: 'http://172.16.1.168:5000/api/SetQuanjsz',
|
||||
saveRoleApi: 'http://172.16.1.168:5000/api/AddZhangh',
|
||||
editRoleApi: 'http://172.16.1.168:5000/api/EditZhangh',
|
||||
|
||||
//保存主机名称
|
||||
editRoleApi: 'http://172.16.1.168:5000/api/EditZhangh',
|
||||
//新增图形接口
|
||||
addFigure: 'http://172.16.1.168:5000/api/AddJianktx',
|
||||
//编辑图形名称
|
||||
editFigure: 'http://172.16.1.168:5000/api/EditTuxmc',
|
||||
//编辑保存组件弹窗传参
|
||||
editComponent: 'http://172.16.1.168:5000/api/SetMonqjkzjcs'
|
||||
setHostName: 'http://172.16.1.168:5000/api/SetHostName'
|
||||
|
||||
// `http://${ipUurl}:5000/api/AddShipjk`
|
||||
// dataUrl: `http://${ipUurl}:5000/api/AddShipjk`,
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@ export default {
|
|||
this.$router.push('/');
|
||||
} else {
|
||||
this.$message.error('请输入账号和密码');
|
||||
console.log('error submit!!');
|
||||
return false;
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -2,12 +2,6 @@
|
|||
<div class="content-box">
|
||||
<div class="container">
|
||||
<p class="title">FTP设置</p>
|
||||
<!-- <div class="test-div">
|
||||
<i class="el-icon-edit"></i>
|
||||
<i class="el-icon-share"></i>
|
||||
<i class="el-icon-delete"></i>
|
||||
</div> -->
|
||||
|
||||
<el-form :model="form" label-position="left" label-width="110px" style="width:50%">
|
||||
<el-form-item label="账号:">
|
||||
<el-input placeholder="请输入账号名" v-model="form.ComponentPropsname" clearable></el-input>
|
||||
|
|
@ -32,16 +26,16 @@ export default {
|
|||
form: {
|
||||
name: '',
|
||||
password: '',
|
||||
FTP: '',
|
||||
}
|
||||
FTP: ''
|
||||
}
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
Submit() {
|
||||
this.form;
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
|
|
|||
|
|
@ -4,17 +4,20 @@
|
|||
<el-form ref="form" :model="sizeForm" label-width="140px">
|
||||
<p>主机</p>
|
||||
<el-form-item label="名称:" :label-width="formLabelWidth">
|
||||
<!-- <el-col :span="6"> -->
|
||||
<el-input v-model="sizeForm.name" autocomplete="off" style="width:50%"></el-input>
|
||||
<!-- </el-col> -->
|
||||
<el-button type="primary" style="margin-left:10px" @click="saveHostName" size="small">保存</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item label="时间:" :label-width="formLabelWidth">
|
||||
<!-- <el-col :span="6"> -->
|
||||
<el-date-picker type="date" placeholder="选择日期" v-model="sizeForm.date1" style="width: 50%;" autocomplete="off" ></el-date-picker>
|
||||
<!-- </el-col> -->
|
||||
<!-- <el-col :span="2"> -->
|
||||
<el-date-picker
|
||||
type="datetime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
placeholder="选择日期"
|
||||
v-model="sizeForm.date1"
|
||||
style="width: 50%;"
|
||||
autocomplete="off"
|
||||
></el-date-picker>
|
||||
|
||||
<el-button type="primary" style="margin-left:10px" size="small">自动校验</el-button>
|
||||
<!-- </el-col> -->
|
||||
</el-form-item>
|
||||
<p>备份&恢复</p>
|
||||
<el-form-item label="备份服务器设置:">
|
||||
|
|
@ -36,7 +39,8 @@
|
|||
multiple
|
||||
:limit="3"
|
||||
:on-exceed="handleExceed"
|
||||
:file-list="fileList">
|
||||
:file-list="fileList"
|
||||
>
|
||||
<el-button size="small" type="primary">点击上传</el-button>
|
||||
</el-upload>
|
||||
</el-col>
|
||||
|
|
@ -55,22 +59,16 @@
|
|||
</el-form-item>
|
||||
<p>全局设置</p>
|
||||
<el-form-item label="视频接入上限:">
|
||||
<el-input-number v-model="videoNumber" :min="1" size="mini"
|
||||
:max="8"></el-input-number>
|
||||
<el-input-number v-model="videoNumber" :min="1" size="mini" :max="8"></el-input-number>
|
||||
<i class="el-icon-warning" style="color: #409EFF; margin: 0 3px 0 10px;"></i>范围1-8、默认6
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="跳帧设置:">
|
||||
<!-- <el-input-number v-model="FPS" @change="handleChange" size="mini"></el-input-number> -->
|
||||
<el-select v-model="FPS" size="mini" placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item in options"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value">
|
||||
</el-option>
|
||||
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
|
||||
</el-select>
|
||||
<i class="el-icon-warning" style="color: #409EFF; margin: 0 3px 0 10px;"></i>默认取值:单路视频流 0 ;2-3 路视频流 1;4-6 路视频流 4
|
||||
<i class="el-icon-warning" style="color: #409EFF; margin: 0 3px 0 10px;"></i>默认取值:单路视频流 0 ;2-3 路视频流
|
||||
1;4-6 路视频流 4
|
||||
</el-form-item>
|
||||
<el-button type="primary" size="small" @click="commit()">保存</el-button>
|
||||
</el-form>
|
||||
|
|
@ -79,10 +77,11 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import {getQuanjszData} from "../../api/index";
|
||||
import serverUrl from "../../config/apiurl.js"
|
||||
import {setQuanjsz} from "@/api/index"
|
||||
import axios from 'axios'
|
||||
import { getHostInfoApi } from '../../api/aboutMachine';
|
||||
import { getQuanjszData } from '../../api/index';
|
||||
import serverUrl from '../../config/apiurl.js';
|
||||
import { setQuanjsz } from '@/api/index';
|
||||
import axios from 'axios';
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
|
|
@ -113,25 +112,63 @@ export default {
|
|||
{
|
||||
value: '4',
|
||||
label: '4'
|
||||
},
|
||||
],
|
||||
}
|
||||
]
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
this.getShipjkDatalist()
|
||||
this.getShipjkDatalist();
|
||||
this.getInfo();
|
||||
},
|
||||
methods: {
|
||||
//保存主机名称
|
||||
saveHostName(value) {
|
||||
let formData = new FormData();
|
||||
formData.append('HostName', this.sizeForm.name);
|
||||
axios({
|
||||
method: 'post',
|
||||
url: serverUrl.setHostName,
|
||||
data: formData
|
||||
}).then(res => {
|
||||
console.log('res', res);
|
||||
if (res.data.code == 200) {
|
||||
this.$message({
|
||||
message: res.data.msg,
|
||||
type: 'success'
|
||||
});
|
||||
} else {
|
||||
this.$message({
|
||||
message: res.data.msg,
|
||||
type: 'warning'
|
||||
});
|
||||
}
|
||||
});
|
||||
},
|
||||
// 获取名称和时间
|
||||
getInfo() {
|
||||
getHostInfoApi()
|
||||
.then(res => {
|
||||
this.sizeForm.name = res.data.data.hostname;
|
||||
this.sizeForm.date1 = res.data.data.time;
|
||||
console.log(res.data.data, 11111);
|
||||
})
|
||||
.catch(err => {
|
||||
this.$message.error(res.data.msg);
|
||||
});
|
||||
},
|
||||
handleagain() {
|
||||
this.$confirm('此操作将重新启动系统, 是否继续?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
})
|
||||
.then(() => {
|
||||
// this.$message({
|
||||
// type: 'success',
|
||||
// message: '删除成功!'
|
||||
// });
|
||||
}).catch(() => {
|
||||
})
|
||||
.catch(() => {
|
||||
this.$message({
|
||||
type: 'info',
|
||||
message: '已取消'
|
||||
|
|
@ -143,12 +180,14 @@ export default {
|
|||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
})
|
||||
.then(() => {
|
||||
// this.$message({
|
||||
// type: 'success',
|
||||
// message: '删除成功!'
|
||||
// });
|
||||
}).catch(() => {
|
||||
})
|
||||
.catch(() => {
|
||||
this.$message({
|
||||
type: 'info',
|
||||
message: '已取消重置'
|
||||
|
|
@ -162,24 +201,25 @@ export default {
|
|||
console.log(file);
|
||||
},
|
||||
handleExceed(files, fileList) {
|
||||
this.$message.warning(`当前限制选择 3 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`);
|
||||
this.$message.warning(
|
||||
`当前限制选择 3 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`
|
||||
);
|
||||
},
|
||||
beforeRemove(file, fileList) {
|
||||
return this.$confirm(`确定移除 ${file.name}?`);
|
||||
},
|
||||
handleChangeVideoNumber(value) {
|
||||
console.log("videoNumber",value)
|
||||
this.videoNumber=value
|
||||
this.videoNumber = value;
|
||||
let formData = new FormData();
|
||||
formData.append("F_NB_SHIPJRSX",value);
|
||||
formData.append("F_NB_TIAOZSZ",this.FPS);
|
||||
formData.append("F_VC_ID",this.id);
|
||||
formData.append('F_NB_SHIPJRSX', value);
|
||||
formData.append('F_NB_TIAOZSZ', this.FPS);
|
||||
formData.append('F_VC_ID', this.id);
|
||||
axios({
|
||||
method: "post",
|
||||
method: 'post',
|
||||
url: serverUrl.postSetQuanjsz,
|
||||
data: formData
|
||||
}).then((res) => {
|
||||
console.log("res",res)
|
||||
}).then(res => {
|
||||
console.log('res', res);
|
||||
if (res.data.code == 200) {
|
||||
this.$message({
|
||||
message: res.data.msg,
|
||||
|
|
@ -191,50 +231,50 @@ export default {
|
|||
type: 'warning'
|
||||
});
|
||||
}
|
||||
})
|
||||
});
|
||||
},
|
||||
handleChange(value) {
|
||||
console.log("FPS",value)
|
||||
this.FPS=value
|
||||
console.log('FPS', value);
|
||||
this.FPS = value;
|
||||
const formData = new URLSearchParams();
|
||||
// let formData = new FormData();
|
||||
formData.append("VideoAccessLimit",this.videoNumber);
|
||||
formData.append("SkipFrame",value);
|
||||
formData.append("GlobalSettingId",this.id);
|
||||
formData.append('VideoAccessLimit', this.videoNumber);
|
||||
formData.append('SkipFrame', value);
|
||||
formData.append('GlobalSettingId', this.id);
|
||||
formData(formData).then(res => {
|
||||
this.$message({
|
||||
message: res.data.msg,
|
||||
type: 'success'
|
||||
});
|
||||
})
|
||||
});
|
||||
},
|
||||
//获取全局设置数据
|
||||
getShipjkDatalist() {
|
||||
getQuanjszData().then(res => {
|
||||
console.log("res11111",res)
|
||||
console.log('res11111', res);
|
||||
if (res.data.code == 200) {
|
||||
this.videoNumber=res.data.data.videoAccessLimit
|
||||
this.FPS=res.data.data.skipFrame
|
||||
this.id = res.data.data.globalSettingId
|
||||
this.videoNumber = res.data.data.videoAccessLimit;
|
||||
this.FPS = res.data.data.skipFrame;
|
||||
this.id = res.data.data.globalSettingId;
|
||||
}
|
||||
})
|
||||
});
|
||||
},
|
||||
//点击确认
|
||||
commit() {
|
||||
const formData = new URLSearchParams();
|
||||
// let formData = new FormData();
|
||||
formData.append("VideoAccessLimit",this.videoNumber);
|
||||
formData.append("SkipFrame",this.FPS);
|
||||
formData.append("GlobalSettingId",this.id);
|
||||
formData.append('VideoAccessLimit', this.videoNumber);
|
||||
formData.append('SkipFrame', this.FPS);
|
||||
formData.append('GlobalSettingId', this.id);
|
||||
setQuanjsz(formData).then(res => {
|
||||
this.$message({
|
||||
message: res.data.msg,
|
||||
type: 'success'
|
||||
});
|
||||
})
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<p class="title">我的账号</p>
|
||||
<el-form label-position="left" label-width="60px" :model="formLabelAlign">
|
||||
<el-form-item label="名称:">
|
||||
{{ formLabelAlign.name }}
|
||||
{{ formLabelAlign.userName }}
|
||||
</el-form-item>
|
||||
<el-form-item label="账号:">
|
||||
{{ formLabelAlign.account }}
|
||||
|
|
@ -13,26 +13,88 @@
|
|||
{{ formLabelAlign.password }}
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-button @click="editPassword" slot="prepend" size="small" type="primary">修改密码</el-button>
|
||||
</div>
|
||||
<el-dialog title="修改密码" :visible.sync="dialogVisible" width="30%" @close="dialogClosed">
|
||||
<el-input v-model="password"></el-input>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="savePassword">确定</el-button>
|
||||
<el-button @click="dialogVisible = false">取消</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { getUserApi } from '@/api/myld.js';
|
||||
|
||||
import serverUrl from '@/config/apiurl.js';
|
||||
import axios from 'axios';
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
password: '',
|
||||
dialogVisible: false,
|
||||
formLabelAlign: {
|
||||
name: 'admin',
|
||||
account: 'admin',
|
||||
password: '123456'
|
||||
userName: '',
|
||||
account: '',
|
||||
password: ''
|
||||
}
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
dialogClosed() {
|
||||
this.password = '';
|
||||
},
|
||||
//保存密码
|
||||
savePassword() {
|
||||
let formData = new FormData();
|
||||
formData.append('userName', this.formLabelAlign.userName);
|
||||
formData.append('account', this.formLabelAlign.account);
|
||||
formData.append('roleId', this.formLabelAlign.roleId);
|
||||
formData.append('IsEnable', 1);
|
||||
formData.append('passWord', this.password);
|
||||
formData.append('userId', this.formLabelAlign.userId);
|
||||
axios({
|
||||
method: 'post',
|
||||
url: serverUrl.editRoleApi,
|
||||
data: formData
|
||||
}).then(res => {
|
||||
if (res.data.code == 200) {
|
||||
this.$message({
|
||||
message: res.data.msg,
|
||||
type: 'success'
|
||||
});
|
||||
this.dialogVisible = false;
|
||||
this.$router.push('/Login');
|
||||
this.getUser();
|
||||
} else {
|
||||
this.$message({
|
||||
message: res.data.msg,
|
||||
type: 'warning'
|
||||
});
|
||||
}
|
||||
});
|
||||
},
|
||||
editPassword() {
|
||||
this.dialogVisible = true;
|
||||
},
|
||||
getUser() {
|
||||
console.log(window.localStorage.getItem(''));
|
||||
if (window.localStorage.getItem('user')) {
|
||||
let form = JSON.parse(window.localStorage.getItem('user'));
|
||||
getUserApi(form.userId)
|
||||
.then(res => {
|
||||
if (res.data.code == 200) {
|
||||
this.formLabelAlign = res.data.data;
|
||||
this.formLabelAlign.password = '******';
|
||||
console.log(this.formLabelAlign);
|
||||
} else {
|
||||
this.$message.error(res.data.msg);
|
||||
}
|
||||
})
|
||||
.catch(err => {
|
||||
this.$message.error(err.data.msg);
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue