Skip to content

N
national_museum_vod
Commit 5da060ba authored by 乐宝呗666's avatar 乐宝呗666
Browse files
Options

联调机顶盒接口

parent 3f0ad157
Show whitespace changes
Inline Side-by-side
Showing with 155 additions and 472 deletions
src/page/STB/base/components/dialog.vue
View file @ 5da060ba
......@@ -15,24 +15,24 @@
label-position="right"
:rules="rules"
>
<el-form-item label="所属单位：" prop="unit">
<el-form-item label="所属单位：" prop="orgId">
<el-select
size="small"
v-model="formItem.unit"
v-model="formItem.orgId"
clearable
placeholder="请选择所属单位"
@change="selectItem"
>
<el-option
v-for="item in unitOptions"
:key="item.value"
:label="item.label"
:value="item.value"
v-for="item in orgOptions"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="机构地理位置：" prop="address">
<el-input size="small" v-model="formItem.address" disabled></el-input>
<el-form-item label="机构地理位置：" prop="areaName">
<el-input size="small" v-model="formItem.areaName" disabled></el-input>
</el-form-item>
</el-form>
</div>
......@@ -44,54 +44,31 @@
</template>
<script>
export default {
data() {
return {
title:'',
formVisible: false,
formItem: {},
unitOptions: [
{
value: "1",
label: "黄金糕"
},
{
value: "2",
label: "双皮奶"
},
{
value: "3",
label: "蚵仔煎"
},
{
value: "4",
label: "龙须面"
},
{
value: "5",
label: "北京烤鸭"
}
],
orgOptions: [],
rules: {
unit: [{ required: true, message: "请选择所属单位", trigger: "change" }]
orgId: [{ required: true, message: "请选择所属单位", trigger: "change" }]
}
};
},
mounted(){
},
methods: {
backFn(item) {
this.formVisible = true;
this.$nextTick(()=>{
this.$refs.formItem.clearValidate();
})
if (item) {
// 编辑
this.formItem = item;
this.title="编辑"
} else {
// 新增
this.orgOptions = item
this.title="新增"
this.formItem = {};
}
},
// 关闭
......@@ -104,11 +81,22 @@ export default {
},
// 联动出地址
selectItem(val) {
this.formItem.address = val;
this.orgOptions.forEach(item=>{
if(val===item.id){
this.formItem.areaName = item.areaName;
this.formItem.areaId = item.areaId;
}
if(item.id===this.formItem.orgId){
this.formItem.userName = item.name
}
})
},
// 保存编辑信息
submitForm() {
let _this = this;
console.log(this.formItem)
_this.$refs.formItem.validate(valid => {
if (valid) {
let searchObj = {};
......@@ -117,37 +105,34 @@ export default {
searchObj[key] = _this.formItem[key];
}
}
_this.$emit("refreshFn");
_this.$https({
url: "tUser/boxAdd",
method: "post",
authType: this.backToken
},
_this.$qs.stringify(searchObj)
).then(res => {
if (res.data.resultCode == '200') {
_this.$message({
type: "success",
message: res.data.message
});
_this.formVisible = false;
// _this.$https(
// {
// url: "menu/edit",
// method: "put",
// authType: this.backToken
// },
// _this.$qs.stringify(searchObj)
// ).then(res => {
// if (res.data.status == 200 || res.data.status == 201) {
// _this.$message({
// type: "success",
// message: res.data.message
// });
// _this.formVisible = false;
// _this.$refs["formItem"].resetFields();
// } else {
// _this.$message({
// type: "error",
// message: res.data.message
// });
// }
// },
// error => {
// _this.$message({
// type: "error",
// message: error
// });
// }
// );
_this.$emit("refreshFn");
} else {
_this.$message({
type: "error",
message: res.data.message
});
}
},
error => {
_this.$message({
type: "error",
message: error
});
}
);
}
});
}
......
src/page/STB/base/index.vue
View file @ 5da060ba
......@@ -3,18 +3,18 @@
<div class="search-container">
<el-form :inline="true" :model="form">
<el-form-item>
<el-select v-model="form.unit" placeholder="请选择所属单位">
<el-select v-model="form.orgId" placeholder="请选择所属单位">
<el-option
v-for="item in unitOptions"
:key="item.value"
:label="item.label"
:value="item.value"
v-for="item in orgOptions"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-cascader
v-model="form.area"
v-model="form.areaId"
:options="areaOptions"
:props="defaultProps"
:show-all-levels="false"
......@@ -39,11 +39,20 @@
<div class="party-table">
<el-table border style="width: 100%;height:100%" height="100%" :data="tableData">
<el-table-column type="index" width="120" label="序号"></el-table-column>
<el-table-column label="MAC地址" prop="macUrl"></el-table-column>
<el-table-column label="所属单位" prop="unit"></el-table-column>
<el-table-column label="MAC地址" prop="mac"></el-table-column>
<el-table-column label="所属单位" prop="organName"></el-table-column>
</el-table>
</div>
<party-pagination />
<div class="partyt-pagination" style="margin:0 20px;">
<el-pagination
background
@current-change="handleCurrentChange"
:current-page="page.currentPage"
:page-size="page.pageSize"
layout="prev, pager, next, jumper"
:total="page.total"
></el-pagination>
</div>
</div>
<custom-dialog ref="formItem" @refreshFn="onSearch" />
</div>
......@@ -52,6 +61,7 @@
import { partyPagination } from "@/components/index";
import customDialog from "./components/dialog.vue";
import { getAreas } from "@/config/area.js";
import { getOrgListWithOutPage } from "@/config/organ.js";
export default {
components: { partyPagination, customDialog },
data() {
......@@ -63,207 +73,30 @@ export default {
value: "id",
checkStrictly: true
},
unitOptions: [
{
value: "选项1",
label: "黄金糕"
},
{
value: "选项2",
label: "双皮奶"
},
{
value: "选项3",
label: "蚵仔煎"
},
{
value: "选项4",
label: "龙须面"
},
{
value: "选项5",
label: "北京烤鸭"
}
],
orgOptions: [],
form: {
unit: "",
area: []
},
tableData: [
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
orgId: "",
areaId: []
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
}
]
tableData: []
};
},
mounted() {
this.getAreas();
// this.onSearch();
this.onSearch();
this.getOrgList();
},
methods: {
getOrgList(){
getOrgListWithOutPage().then(res => {
console.log(res)
this.orgOptions = res;
});
},
getAreas() {
getAreas().then(res => {
this.areaOptions = res;
// 处理children为[] 的问题
this.areaOptions.forEach(item=>{
if(!item.children.length){
item.children = null
}else{
item.children.forEach(j=>{
if(!j.children.length){
j.children = null
}else{
j.children.forEach(k=>{
if(!k.children.length){
k.children = null
}
})
}
})
}
})
});
},
// 查询
......@@ -277,21 +110,22 @@ export default {
let param = {
_index: this.page.currentPage,
_size: this.page.pageSize,
orgId: this.selectAreaId
areaId: this.form.areaId[this.form.areaId.length-1],
organId: this.form.orgId,
};
vm.$https(
{
url: "interaction/getList",
url: "boxOperation/selectPageList",
method: "post",
authType: this.backToken
},
vm.$qs.stringify(param)
)
.then(res => {
console.log(res.data.body);
let data = res.data.body;
console.log(res.data.data);
let data = res.data.data;
vm.page.total = data.total;
// vm.tableData = data.records;
vm.tableData = data.records;
})
.catch(function(err) {
console.log(err);
......@@ -300,10 +134,14 @@ export default {
// 新增弹框打开
addBox() {
console.log(this.$refs.formItem);
this.$refs.formItem.backFn();
this.$refs.formItem.backFn(this.orgOptions);
},
handleReset() {
this.form = {};
this.form = {
orgId: "",
areaId: []
};
this.onSearch()
},
// 分页
handleCurrentChange(val) {
......
src/page/STB/operation/index.vue
View file @ 5da060ba
......@@ -3,19 +3,19 @@
<div class="search-container">
<el-form :inline="true" :model="form">
<el-form-item>
<el-select v-model="form.unit" placeholder="请选择所属单位">
<el-select v-model="form.orgId" placeholder="请选择所属单位">
<el-option
v-for="item in unitOptions"
:key="item.value"
:label="item.label"
:value="item.value"
v-for="item in orgOptions"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-select v-model="form.state" placeholder="请选择机顶盒状态">
<el-select v-model="form.status" placeholder="请选择机顶盒状态">
<el-option
v-for="item in stateOptions"
v-for="item in statusOptions"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -24,7 +24,7 @@
</el-form-item>
<el-form-item>
<el-cascader
v-model="form.area"
v-model="form.areaId"
:options="areaOptions"
:props="defaultProps"
:show-all-levels="false"
......@@ -46,18 +46,33 @@
<div class="party-table">
<el-table border style="width: 100%;height:100%" height="100%" :data="tableData">
<el-table-column type="index" width="120" label="序号"></el-table-column>
<el-table-column label="mac地址" prop="macUrl"></el-table-column>
<el-table-column label="所属单位" prop="unit"></el-table-column>
<el-table-column label="机顶盒状态" prop="state"></el-table-column>
<el-table-column label="mac地址" prop="mac"></el-table-column>
<el-table-column label="所属单位" prop="organName"></el-table-column>
<el-table-column label="机顶盒状态" prop="status">
<template slot-scope="scope">
<span v-if="scope.row.status===1">待激活</span>
<span v-if="scope.row.status===2">已激活</span>
<span v-if="scope.row.status===3">故障</span>
</template>
</el-table-column>
</el-table>
</div>
<party-pagination />
<div class="partyt-pagination" style="margin:0 20px;">
<el-pagination
background
@current-change="handleCurrentChange"
:current-page="page.currentPage"
:page-size="page.pageSize"
layout="prev, pager, next, jumper"
:total="page.total"
></el-pagination>
</div>
</div>
</div>
</template>
<script>
import { partyPagination } from "@/components/index";
import { getAreas } from "@/config/area.js";
import { getOrgListWithOutPage } from "@/config/organ.js";
export default {
data() {
return {
......@@ -68,199 +83,33 @@ export default {
value: "id",
checkStrictly: true,
},
unitOptions: [
{
value: "选项1",
label: "黄金糕"
},
{
value: "选项2",
label: "双皮奶"
},
{
value: "选项3",
label: "蚵仔煎"
},
{
value: "选项4",
label: "龙须面"
},
{
value: "选项5",
label: "北京烤鸭"
}
],
stateOptions: [
orgOptions: [],
statusOptions: [
{
value: "1",
label: "待激活"
},
{
value: "2",
label: "禁用"
label: "已激活"
},
{
value: "3",
label: "启用"
label: "故障"
}
],
form: {
unit: "",
state: "",
area: []
},
tableData: [
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
orgId: "",
status: "",
areaId: []
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
},
{
unit: "中国博物馆",
state: "禁用",
name: "王小虎",
macUrl: "00:71:cc:d3:11"
}
]
tableData:[]
};
},
components: { partyPagination },
mounted() {
this.getAreas();
// this.onSearch();
this.onSearch();
this.getOrgList()
},
methods: {
getAreas() {
......@@ -268,6 +117,11 @@ export default {
this.areaOptions = res;
});
},
getOrgList(){
getOrgListWithOutPage().then(res => {
this.orgOptions = res;
});
},
// 查询
onSearch() {
this.page.currentPage = 1;
......@@ -279,28 +133,34 @@ export default {
let param = {
_index: this.page.currentPage,
_size: this.page.pageSize,
orgId: this.selectAreaId
areaId: this.form.areaId[this.form.areaId.length-1],
organId: this.form.orgId,
status: this.form.status,
};
vm.$https(
{
url: "interaction/getList",
url: "boxOperation/getPageList",
method: "post",
authType: this.backToken
},
vm.$qs.stringify(param)
)
.then(res => {
console.log(res.data.body);
let data = res.data.body;
let data = res.data.data;
vm.page.total = data.total;
// vm.tableData = data.records;
vm.tableData = data.records;
})
.catch(function(err) {
console.log(err);
});
},
handleReset() {
this.form = {};
this.form = {
orgId: "",
status: "",
areaId: []
};
this.onSearch()
},
// 分页
handleCurrentChange(val) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment