Merge branch 'xy-ly' into fly

master
fanluyan 2 years ago
commit 93a8b2adcd

90
package-lock.json generated

@ -13844,49 +13844,6 @@
"webpack-merge": "^5.7.3", "webpack-merge": "^5.7.3",
"webpack-virtual-modules": "^0.4.2", "webpack-virtual-modules": "^0.4.2",
"whatwg-fetch": "^3.6.2" "whatwg-fetch": "^3.6.2"
},
"dependencies": {
"@vue/vue-loader-v15": {
"version": "npm:vue-loader@15.10.1",
"resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.1.tgz",
"integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==",
"dev": true,
"requires": {
"@vue/component-compiler-utils": "^3.1.0",
"hash-sum": "^1.0.2",
"loader-utils": "^1.1.0",
"vue-hot-reload-api": "^2.3.0",
"vue-style-loader": "^4.1.0"
},
"dependencies": {
"hash-sum": {
"version": "1.0.2",
"resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
"integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
"dev": true
}
}
},
"json5": {
"version": "1.0.2",
"resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
"dev": true,
"requires": {
"minimist": "^1.2.0"
}
},
"loader-utils": {
"version": "1.4.2",
"resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.2.tgz",
"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^1.0.1"
}
}
} }
}, },
"@vue/cli-shared-utils": { "@vue/cli-shared-utils": {
@ -14051,6 +14008,47 @@
} }
} }
}, },
"@vue/vue-loader-v15": {
"version": "npm:vue-loader@15.10.1",
"resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.1.tgz",
"integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==",
"dev": true,
"requires": {
"@vue/component-compiler-utils": "^3.1.0",
"hash-sum": "^1.0.2",
"loader-utils": "^1.1.0",
"vue-hot-reload-api": "^2.3.0",
"vue-style-loader": "^4.1.0"
},
"dependencies": {
"hash-sum": {
"version": "1.0.2",
"resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
"integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
"dev": true
},
"json5": {
"version": "1.0.2",
"resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
"dev": true,
"requires": {
"minimist": "^1.2.0"
}
},
"loader-utils": {
"version": "1.4.2",
"resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.2.tgz",
"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^1.0.1"
}
}
}
},
"@vue/web-component-wrapper": { "@vue/web-component-wrapper": {
"version": "1.3.0", "version": "1.3.0",
"resolved": "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz", "resolved": "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",
@ -15569,7 +15567,7 @@
}, },
"dom7": { "dom7": {
"version": "2.1.5", "version": "2.1.5",
"resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.5.tgz", "resolved": "https://registry.npmmirror.com/dom7/-/dom7-2.1.5.tgz",
"integrity": "sha512-xnhwVgyOh3eD++/XGtH+5qBwYTgCm0aW91GFgPJ3XG+jlsRLyJivnbP0QmUBFhI+Oaz9FV0s7cxgXHezwOEBYA==", "integrity": "sha512-xnhwVgyOh3eD++/XGtH+5qBwYTgCm0aW91GFgPJ3XG+jlsRLyJivnbP0QmUBFhI+Oaz9FV0s7cxgXHezwOEBYA==",
"dev": true, "dev": true,
"requires": { "requires": {
@ -15578,7 +15576,7 @@
"dependencies": { "dependencies": {
"ssr-window": { "ssr-window": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-2.0.0.tgz", "resolved": "https://registry.npmmirror.com/ssr-window/-/ssr-window-2.0.0.tgz",
"integrity": "sha512-NXzN+/HPObKAx191H3zKlYomE5WrVIkoCB5IaSdvKokxTpjBdWfr0RaP+1Z5KOfDT0ZVz+2tdtiBkhsEQ9p+0A==", "integrity": "sha512-NXzN+/HPObKAx191H3zKlYomE5WrVIkoCB5IaSdvKokxTpjBdWfr0RaP+1Z5KOfDT0ZVz+2tdtiBkhsEQ9p+0A==",
"dev": true "dev": true
} }
@ -19408,7 +19406,7 @@
}, },
"ssr-window": { "ssr-window": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-1.0.1.tgz", "resolved": "https://registry.npmmirror.com/ssr-window/-/ssr-window-1.0.1.tgz",
"integrity": "sha512-dgFqB+f00LJTEgb6UXhx0h+SrG50LJvti2yMKMqAgzfUmUXZrLSv2fjULF7AWGwK25EXu8+smLR3jYsJQChPsg==", "integrity": "sha512-dgFqB+f00LJTEgb6UXhx0h+SrG50LJvti2yMKMqAgzfUmUXZrLSv2fjULF7AWGwK25EXu8+smLR3jYsJQChPsg==",
"dev": true "dev": true
}, },

@ -134,7 +134,7 @@ export function getTerminalPhotoListJoggle(data) {
export function getChannelListJoggle(data) { export function getChannelListJoggle(data) {
return request({ return request({
url: "/test/getChannelList", url: "/test/getChannelByTermid",
method: "post", method: "post",
data, data,
}); });
@ -207,6 +207,40 @@ export function getSchedulenr(data) {
}); });
} }
//通道管理
//1.获取通道列表
export function getChannelListapi(data) {
return request({
url: "/test/getChannelList",
method: "post",
data,
});
}
//2.新增通道
export function addChannelapi(data) {
return request({
url: "/test/addChannelList",
method: "post",
data,
});
}
//3.删除通道
export function deleteChannelapi(data) {
return request({
url: "/test/deleteChannelList",
method: "post",
data,
});
}
//4.修改通道
export function updateChannelapi(data) {
return request({
url: "/test/updateChannelList",
method: "post",
data,
});
}
//线路信息管理接口数据 //线路信息管理接口数据
//获取电压等级列表 //获取电压等级列表
export function getdyListJoggle(data) { export function getdyListJoggle(data) {

@ -5,34 +5,29 @@
:visible.sync="isShow" :visible.sync="isShow"
:close-on-click-modal="false" :close-on-click-modal="false"
width="470px" width="470px"
:before-close="beforeclose"
> >
<el-form <el-form
label-position="left" label-position="left"
ref="formInfo" ref="formInfo"
label-width="80px" label-width="100px"
:rules="rules" :rules="rules"
:model="formdata" :model="formdata"
> >
<el-form-item label="名称:" prop="name"> <el-form-item label="通道名称:" prop="channelname">
<el-input v-model="formdata.name" autocomplete="off"></el-input> <el-input v-model="formdata.channelname" autocomplete="off" style="width:200px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="时间:" prop="time"> <el-form-item label="装置ID" prop="id">
<el-time-picker <el-input-number v-model="formdata.id" ></el-input-number>
is-range
v-model="formdata.time"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
value-format="HH:mm:ss"
>
</el-time-picker>
</el-form-item> </el-form-item>
<el-form-item label="间隔:" prop="span"> <el-form-item label="分辨率高:" prop="maxResolutionHeight">
<!-- <el-input v-model="formdata.span" autocomplete="off" type="number"></el-input> --> <el-input-number v-model="formdata.maxResolutionHeight" ></el-input-number>
<el-input-number v-model="formdata.span" :min="1"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="备注:" prop="remark"> <el-form-item label="分辨率宽:" prop="maxResolutionWidth">
<el-input v-model="formdata.remark" autocomplete="off"></el-input> <el-input-number v-model="formdata.maxResolutionWidth" ></el-input-number>
</el-form-item>
<el-form-item label="状态:" prop="status" v-if="title=='修改'">
<el-switch v-model="formdata.status" :active-value="1" :inactive-value="0"></el-switch>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -42,7 +37,7 @@
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import { addScheduleRulel, updateScheduleRulel } from "@/utils/api/index"; import { addChannelapi, updateChannelapi } from "@/utils/api/index";
export default { export default {
props: { props: {
title: String, title: String,
@ -52,10 +47,10 @@ export default {
isShow: false, isShow: false,
formdata: {}, formdata: {},
rules: { rules: {
name: [{ required: true, message: "请输入名称", trigger: "blur" }], channelname: [{ required: true, message: "请输入名称", trigger: "blur" }],
time: [{ required: true, message: "请选择时间", trigger: "blur" }], id: [{ required: true, message: "请输入id", trigger: "blur" }],
span: [{ required: true, message: "请输入间隔", trigger: "blur" }], maxResolutionHeight: [{ required: true, message: "请输入分辨率高", trigger: "blur" }],
remark: [{ required: true, message: "请输入备注", trigger: "blur" }], maxResolutionWidth: [{ required: true, message: "请输入分辨率宽", trigger: "blur" }],
}, },
}; };
}, },
@ -67,19 +62,15 @@ export default {
return (this.formdata = {}); return (this.formdata = {});
} }
this.formdata = val; this.formdata = val;
this.$set(this.formdata, "time", [val.startTime, val.endTime]);
}, },
// //
submitForm() { submitForm() {
this.$refs.formInfo.validate((valid) => { this.$refs.formInfo.validate((valid) => {
if (valid) { if (valid) {
this.formdata.startTime = this.formdata.time[0];
this.formdata.endTime = this.formdata.time[1];
delete this.formdata.time;
if (this.title == "新增") { if (this.title == "新增") {
let formArr = []; let formArr = [];
formArr.push(this.formdata); formArr.push(this.formdata);
addScheduleRulel({ list: formArr }) addChannelapi({ list: formArr })
.then((res) => { .then((res) => {
this.isShow = false; this.isShow = false;
this.$message.success("添加成功"); this.$message.success("添加成功");
@ -89,7 +80,7 @@ export default {
this.$message.error("添加失败"); this.$message.error("添加失败");
}); });
} else { } else {
updateScheduleRulel(this.formdata) updateChannelapi(this.formdata)
.then((res) => { .then((res) => {
this.isShow = false; this.isShow = false;
this.$message.success("修改成功"); this.$message.success("修改成功");
@ -111,6 +102,9 @@ export default {
hide() { hide() {
this.isShow = false; this.isShow = false;
}, },
beforeclose(){
this.$parent.deviceList();
}
}, },
mounted() {}, mounted() {},
}; };

@ -21,32 +21,14 @@
> >
<!-- <el-table-column type="index" width="55"> </el-table-column> <!-- <el-table-column type="index" width="55"> </el-table-column>
<el-table-column type="selection" width="55"> </el-table-column> --> <el-table-column type="selection" width="55"> </el-table-column> -->
<el-table-column label="单位" show-overflow-tooltip> <el-table-column label="通道名称" show-overflow-tooltip prop="channelname"></el-table-column>
<template slot-scope="scope">{{ scope.row.name }}</template> <el-table-column label="分辨率高" show-overflow-tooltip prop="maxResolutionHeight"></el-table-column>
</el-table-column> <el-table-column label="分辨率宽" show-overflow-tooltip prop="maxResolutionWidth"></el-table-column>
<el-table-column label="时间表类型" show-overflow-tooltip> <el-table-column label="状态" show-overflow-tooltip>
<template>时间表类型</template> <template slot-scope="scope">
<el-switch v-model="scope.row.status" :active-value="1" :inactive-value="0" disabled></el-switch>
</template>
</el-table-column> </el-table-column>
<el-table-column
prop="startTime"
label="开始时间"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="endTime"
label="结束时间"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="span"
label="间隔(分)"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="remark"
label="备注"
show-overflow-tooltip
></el-table-column>
<el-table-column fixed="right" label="操作" width="200"> <el-table-column fixed="right" label="操作" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -60,9 +42,7 @@
@click.native.stop="handleDelete(scope.row)" @click.native.stop="handleDelete(scope.row)"
>删除</el-button >删除</el-button
> >
<el-button type="text" @click.native.stop="handleSet(scope.row)" <!-- <el-button type="text" @click.native.stop="handleSet(scope.row)" >设置</el-button> -->
>设置</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -85,6 +65,7 @@
</template> </template>
<script> <script>
import adddeviceDialog from "./components/adddeviceDialog.vue"; import adddeviceDialog from "./components/adddeviceDialog.vue";
import { getChannelListapi, deleteChannelapi } from "@/utils/api/index";
export default { export default {
components: { components: {
@ -106,7 +87,7 @@ export default {
methods: { methods: {
//线 //线
deviceList() { deviceList() {
getScheduleRulelListJoggle({ getChannelListapi({
pageindex: this.page, pageindex: this.page,
pagesize: this.pageSize, pagesize: this.pageSize,
}) })
@ -157,7 +138,7 @@ export default {
type: "warning", type: "warning",
}) })
.then(() => { .then(() => {
deleteScheduleRulel({ list: deleteArr }).then((res) => { deleteChannelapi({ list: deleteArr }).then((res) => {
this.deviceList(); // this.deviceList(); //
}); });
this.$message({ type: "success", message: "删除成功!" }); this.$message({ type: "success", message: "删除成功!" });

@ -7,15 +7,15 @@
width="60%" width="60%"
> >
<el-tabs v-model="activeName" @tab-click="handleClick"> <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="查询实际时间表" name="1" class="searchTimeBox"> <el-tab-pane label="查询实际时间表" name="1" >
<div class="flexnr"> <div class="flexnr">
<div class="w8">通道:</div> <div class="w8">通道:</div>
<el-select v-model="selaccess" placeholder="请选择" class="mr20"> <el-select v-model="selaccess" placeholder="请选择" class="mr20">
<el-option <el-option
v-for="item in accesslist" v-for="item in accesslist"
:key="item.id" :key="item.channelid"
:label="item.channelName" :label="item.channelname"
:value="item.id" :value="item.channelid"
></el-option> ></el-option>
</el-select> </el-select>
<el-button type="primary" @click="inquirebtn()"></el-button> <el-button type="primary" @click="inquirebtn()"></el-button>
@ -160,7 +160,7 @@ export default {
getChannelListJoggle({ termid: id }) getChannelListJoggle({ termid: id })
.then((res) => { .then((res) => {
this.accesslist = res.data.list; this.accesslist = res.data.list;
this.selaccess = res.data.list[0].id; this.selaccess = res.data.list[0].channelid;
}) })
.catch((err) => {}); .catch((err) => {});
}, },
@ -273,8 +273,6 @@ export default {
</script> </script>
<style lang="less"> <style lang="less">
.setTimeDialog { .setTimeDialog {
.searchTimeBox {
}
.flexonly { .flexonly {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;

Loading…
Cancel
Save