系统配置

src/api/request.js

@@ -235,6 +235,20 @@ export function networkConfiguration(data) {//网络配置
       data:data
     })
   }
+  export function networkConfigurationadd(data) {//新增网络配置
+    return Service({
+      url: '/Framework/AmrPlc/AddAmrPlc',
+      method: 'post',
+      data:data
+    })
+  } 
+  export function networkConfigurationmod(data) {//修改网络配置
+    return Service({
+      url: '/Framework/AmrPlc/UpdateAmrPlc',
+      method: 'post',
+      data:data
+    })
+  } 
   export function networkConfigurationele(data) {//网络配置删除
     return Service({
       url: '/Framework/AmrPlc/DeletAmrPlc',
@@ -249,7 +263,20 @@ export function orderConfiguration(data) {//订单配置
       data:data
     })
   }
-
+  export function orderConfigurationadd(data) {//新增订单配置
+    return Service({
+      url: '/Framework/OrderConfig/AddOrderConfig',
+      method: 'post',
+      data:data
+    })
+  }
+  export function orderConfigurationmod(data) {//修改订单配置
+    return Service({
+      url: '/Framework/OrderConfig/UpdateOrderConfig',
+      method: 'post',
+      data:data
+    })
+  }
 export function orderConfigurationele(data) {//订单配置删除
   return Service({
     url: '/Framework/OrderConfig/DeletOrderConfig',
@@ -265,6 +292,21 @@ export function labelConfiguration(data) {//标签配置
     })
   }
 
+  export function labelConfigurationadd(data) {//新增标签配置
+    return Service({
+      url: '/Framework/TagPlc/AddTagPlc',
+      method: 'post',
+      data:data
+    })
+  }
+  
+  export function labelConfigurationmod(data) {//修改标签配置
+    return Service({
+      url: '/Framework/TagPlc/UpdateTagPlc',
+      method: 'post',
+      data:data
+    })
+  }
   export function labelConfigele(data) {//标签配置删除
     return Service({
       url: '/Framework/TagPlc/DeleteTagPlc',

src/components/alarmConfigpop/index.vue

@@ -102,6 +102,13 @@ export default {
     },
     methods: {
         handleClose () {
+            this.form = {
+                tagname: null,
+                source:null,
+                alarm_position:null,
+                alarm_content: null,
+                handle_methode: null
+            },
             this.$emit('arlem')
         },
         elearm () {
@@ -120,6 +127,13 @@ export default {
                                     message: res.resultMsg,
                                     type: 'success'
                                 });
+                                this.form = {
+                                    tagname: null,
+                                    source:null,
+                                    alarm_position:null,
+                                    alarm_content: null,
+                                    handle_methode: null
+                                },
                                 this.$emit('arlem')
                             } else {
                                 this.$message.error(res.resultMsg);
@@ -133,6 +147,13 @@ export default {
                                     message: res.resultMsg,
                                     type: 'success'
                                 });
+                                this.form = {
+                                    tagname: null,
+                                    source:null,
+                                    alarm_position:null,
+                                    alarm_content: null,
+                                    handle_methode: null
+                                },
                                 this.$emit('arlem')
                             } else {
                                 this.$message.error(res.resultMsg);

src/components/delepop/index.vue

@@ -50,23 +50,51 @@ export default {
         elearm () {
             if (this.deleContent.type === '告警') {
                 alarmConfigurationele(this.alarList).then(res => {
-                    console.log(res)
-                    this.$emit('delepop')
+                    if (res.resultCode == 1) {
+                        this.$message({
+                            message: res.resultMsg,
+                            type: 'success'
+                        });
+                        this.$emit('delepop')
+                    } else {
+                        this.$message.error(res.resultMsg);
+                    }
                 })
             } else if (this.deleContent.type === '订单') {
                 orderConfigurationele(this.alarList).then(res => {
-                    console.log(res)
-                    this.$emit('delepop')
+                    if (res.resultCode == 1) {
+                        this.$message({
+                            message: res.resultMsg,
+                            type: 'success'
+                        });
+                        this.$emit('delepop')
+                    } else {
+                        this.$message.error(res.resultMsg);
+                    }
                 })
             } else if (this.deleContent.type === '标签') {
                 labelConfigele(this.alarList).then(res => {
-                    console.log(res)
-                    this.$emit('delepop')
+                    if (res.resultCode == 1) {
+                        this.$message({
+                            message: res.resultMsg,
+                            type: 'success'
+                        });
+                        this.$emit('delepop')
+                    } else {
+                        this.$message.error(res.resultMsg);
+                    }
                 })
             } else if (this.deleContent.type === '网络') {
                 networkConfigurationele(this.alarList).then(res => {
-                    console.log(res)
-                    this.$emit('delepop')
+                    if (res.resultCode == 1) {
+                        this.$message({
+                            message: res.resultMsg,
+                            type: 'success'
+                        });
+                        this.$emit('delepop')
+                    } else {
+                        this.$message.error(res.resultMsg);
+                    }
                 })
             }
         }

src/components/labelConfigpop/index.vue

@@ -0,0 +1,251 @@
+<template>
+    <div class="labelConfigpop">
+        <el-dialog
+        title=""
+        :visible.sync="dialogVisibledlabe"
+        :modal-append-to-body="false"
+        :before-close="handleClose"
+        :width="isWidth">
+            <div class="strategyaddpop_header">
+                <div class="left">
+                    <p>{{listdata.name}}</p>
+                </div>
+            </div>
+            <el-form ref="form" :model="form" :rules="rules" label-width="110px" size="small ">
+                <el-row :gutter="12">
+                    <el-col :span="12">
+                        <el-form-item label="标签" prop="tagname">
+                            <el-input v-model="form.tagname" placeholder="请输入标签（必填）"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="对应输送机" prop="conv_name" >
+                            <el-input v-model="form.conv_name" placeholder="请输入对应输送机（必填）"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="12">
+                    <el-col :span="12">
+                        <el-form-item label="来源" prop="ip">
+                            <el-input v-model="form.ip" placeholder="请输入来源（必填）"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12"  style="padding-left: 35px;display:flex">
+                        <p style="margin-right:30px;color: #6cb1ec;line-height: 33px;margin-top:0;margin-bottom:0">是否启用</p>
+                        <el-radio v-model="radio" :label="item.id" v-for='(item,index) in option' :key="index" >{{item.label}}</el-radio>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div class="footer">
+                <el-button class="delebut" @click="elearm">
+                    {{butName}}
+                </el-button>
+                <el-button class="elebuts" @click="handleClose">
+                    {{butNames}}
+                </el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+<script>
+  import {
+      labelConfigurationadd,
+      labelConfigurationmod
+  } from '@/api/request.js'
+export default {
+    props: ['dialogVisibledlabe', 'listdata'],
+    data () {
+        return {
+            radio: 0,
+            isWidth: '43%',
+            butName: '保存',
+            butNames: '取消',
+            option: [{
+                label: '停用',
+                id:0
+            },
+            {
+                label: '启用',
+                id:1
+            }],
+            form: {
+                tagname: null,
+                conv_name:null,
+                ip: null,
+                state: null
+            },
+            rules: {
+                tagname: [
+                    { required: true, message: '请输入标签', trigger: 'blur' }
+                ],
+                conv_name: [
+                    { required: true, message: '请输入对应输送机', trigger: 'blur' }
+                ],
+                ip: [
+                    { required: true, message: '请输入来源', trigger: 'blur' }
+                ]
+            },
+        }
+    },
+    watch: {
+        listdata () {
+            if (this.listdata.list) {
+                this.form = this.listdata.list
+                this.radio = this.listdata.list.state
+            }
+        }
+    },
+    methods: {
+        handleClose () {
+            this.form = {
+                tagname: null,
+                conv_name:null,
+                ip:null,
+                state: null,
+            },
+            this.radio = 0
+            this.$emit('labeladd')
+        },
+        elearm () {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    this.form.tagname = this.form.tagname.replace(/\s*/g,"")
+                    this.form.conv_name = this.form.conv_name.replace(/\s*/g,"")
+                    this.form.ip = this.form.ip.replace(/\s*/g,"")
+                    this.form.state = this.radio
+                    //新增
+                    if (this.listdata.type == 0) {
+                        labelConfigurationadd(this.form).then(res => {
+                            if (res.resultCode == 1) {
+                                this.$message({
+                                    message: res.resultMsg,
+                                    type: 'success'
+                                });
+                                this.form = {
+                                    tagname: null,
+                                    conv_name:null,
+                                    ip:null,
+                                    state: null,
+                                },
+                                this.$emit('labeladd')
+                            } else {
+                                this.$message.error(res.resultMsg);
+                            }
+                        })
+                    } else {
+                        //修改
+                        labelConfigurationmod(this.form).then(res => {
+                            if (res.resultCode == 1) {
+                                this.$message({
+                                    message: res.resultMsg,
+                                    type: 'success'
+                                });
+                                this.form = {
+                                    tagname: null,
+                                    conv_name:null,
+                                    ip:null,
+                                    state: null,
+                                },
+                                this.$emit('labeladd')
+                            } else {
+                                this.$message.error(res.resultMsg);
+                            }
+                        })
+                    }
+                } else {
+                // console.log('error submit!!');
+                return false;
+                }
+            });
+        }
+    }
+}
+</script>
+<style lang="less">
+.labelConfigpop{
+    .el-dialog{
+        // border-radius: 20px;
+        display: flex;
+        display: -ms-flex; /* 兼容IE */
+        flex-direction: column;
+        -ms-flex-direction: column; /* 兼容IE */
+        margin:0 !important;
+        position:absolute;
+        top:50%;
+        left:50%;
+        transform:translate(-50%,-50%);
+        max-height:calc(100% - 30px);
+        max-width:calc(100% - 30px);
+    }
+    .el-dialog__header{
+        display: none;
+    }
+    .el-dialog__body{
+        padding: 0;
+        background-color: #04152f;
+	    border: solid 2px #6cb1ec;
+        box-shadow: 0px 6px 10px 0px rgba(0, 0, 0, 0.3);
+        // border-radius: 20px;
+        padding: 0 48px 0 48px;
+        .strategyaddpop_header{
+            width: 100%;
+            height: 120px;
+            display: flex;
+            .left{
+                width: 100%;
+                height: 100%;
+                display: flex;
+                align-items: center;
+                p{
+                    font-size: 24px;
+                    font-family: Microsoft YaHei;
+                    font-weight: bold;
+                    color: #ffffff;
+                }
+            }
+            .right{
+                width: 50%;
+                height: 100%;
+                display: flex;
+                align-items: center;
+                justify-content: flex-end;
+                .but{
+                    height: 32px;
+                }
+                .but:last-child{
+                    margin-left: 16px;
+                }
+            }
+        }
+        .el-form-item__label{
+            color: #6cb1ec;
+        }
+        .el-radio{
+            line-height: 33px;
+        }
+        .el-input__inner{
+            background-color: #111d30;
+	        border: solid 1px #6cb1ec;
+        }
+        .el-input__inner::placeholder{
+            color: #9cbfdd;
+        }
+        .footer{
+            width: 100%;
+            height: 112px;
+            display: flex;
+            align-items: center;
+            justify-content: flex-end;
+            .delebut{
+                background: rgba(0, 162, 253, 0.3);
+                color: #FFFFFF;
+            }
+            .elebuts{
+                background-color: #003e6b;
+                color: #FFFFFF;
+                margin-left: 24px;
+            }
+        }
+    }
+}
+</style>

src/components/networkConfigpop/index.vue

@@ -0,0 +1,223 @@
+<template>
+    <div class="networkConfigpop">
+        <el-dialog
+        title=""
+        :visible.sync="dialogVisiblenetwork"
+        :modal-append-to-body="false"
+        :before-close="handleClose"
+        :width="isWidth">
+            <div class="strategyaddpop_header">
+                <div class="left">
+                    <p>{{listdata.name}}</p>
+                </div>
+            </div>
+            <el-form ref="form" :model="form" :rules="rules" label-width="110px" size="small ">
+                <el-row>
+                    <el-col :span="24">
+                        <el-form-item label="车辆" prop="ipname">
+                            <el-input v-model="form.ipname" placeholder="请输入标签（必填）"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="24">
+                        <el-form-item label="地址" prop="adress" >
+                            <el-input v-model="form.adress" placeholder="请输入来源（必填）"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div class="footer">
+                <el-button class="delebut" @click="elearm">
+                    {{butName}}
+                </el-button>
+                <el-button class="elebuts" @click="handleClose">
+                    {{butNames}}
+                </el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+<script>
+  import {
+    networkConfigurationadd,
+    networkConfigurationmod
+  } from '@/api/request.js'
+export default {
+    props: ['dialogVisiblenetwork', 'listdata'],
+    data () {
+        return {
+            butName: '保存',
+            butNames: '取消',
+            isWidth: '22.6%',
+            form: {
+                ipname: null,
+                adress:null,
+            },
+            rules: {
+                ipname: [
+                    { required: true, message: '请输入标签', trigger: 'blur' }
+                ],
+                adress: [
+                    { required: true, message: '请输入来源', trigger: 'blur' }
+                ],
+            },
+        }
+    },
+    watch: {
+        listdata () {
+            if (this.listdata.list) {
+                this.form = this.listdata.list
+            }
+        }
+    },
+    methods: {
+        handleClose () {
+            this.form= {
+                ipname: null,
+                adress:null,
+            },
+            this.$emit('workConadd')
+        },
+        elearm () {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    this.form.ipname = this.form.ipname.replace(/\s*/g,"")
+                    this.form.adress = this.form.adress.replace(/\s*/g,"")
+                    //新增
+                    if (this.listdata.type == 0) {
+                        networkConfigurationadd(this.form).then(res => {
+                            if (res.resultCode == 1) {
+                                this.$message({
+                                    message: res.resultMsg,
+                                    type: 'success'
+                                });
+                                this.form= {
+                                    ipname: null,
+                                    adress:null,
+                                },
+                                this.$emit('workConadd')
+                            } else {
+                                this.$message.error(res.resultMsg);
+                            }
+                        })
+                    } else {
+                        // 修改
+                        networkConfigurationmod(this.form).then(res => {
+                            if (res.resultCode == 1) {
+                                this.$message({
+                                    message: res.resultMsg,
+                                    type: 'success'
+                                });
+                                this.form= {
+                                    ipname: null,
+                                    adress:null,
+                                },
+                                this.$emit('workConadd')
+                            } else {
+                                this.$message.error(res.resultMsg);
+                            }
+                        })
+                    }
+                } else {
+                // console.log('error submit!!');
+                return false;
+                }
+            });
+        }
+    }
+}
+</script>
+<style lang="less">
+.networkConfigpop{
+    .el-dialog{
+        // border-radius: 20px;
+        display: flex;
+        display: -ms-flex; /* 兼容IE */
+        flex-direction: column;
+        -ms-flex-direction: column; /* 兼容IE */
+        margin:0 !important;
+        position:absolute;
+        top:50%;
+        left:50%;
+        transform:translate(-50%,-50%);
+        max-height:calc(100% - 30px);
+        max-width:calc(100% - 30px);
+    }
+    .el-dialog__header{
+        display: none;
+    }
+    .el-dialog__body{
+        padding: 0;
+        background-color: #04152f;
+	    border: solid 2px #6cb1ec;
+        box-shadow: 0px 6px 10px 0px rgba(0, 0, 0, 0.3);
+        // border-radius: 20px;
+        padding: 0 48px 0 48px;
+        .strategyaddpop_header{
+            width: 100%;
+            height: 120px;
+            display: flex;
+            .left{
+                width: 100%;
+                height: 100%;
+                display: flex;
+                align-items: center;
+                p{
+                    font-size: 24px;
+                    font-family: Microsoft YaHei;
+                    font-weight: bold;
+                    color: #ffffff;
+                }
+            }
+            .right{
+                width: 50%;
+                height: 100%;
+                display: flex;
+                align-items: center;
+                justify-content: flex-end;
+                .but{
+                    height: 32px;
+                }
+                .but:last-child{
+                    margin-left: 16px;
+                }
+            }
+        }
+        .el-form-item__label{
+            width: 55px !important;
+            color: #6cb1ec;
+        }
+        .el-form-item {
+            display: flex;
+        }
+        .el-form-item__content{
+            width: 80%;
+            margin-left: 0 !important;
+        }
+        .el-input__inner{
+            background-color: #111d30;
+	        border: solid 1px #6cb1ec;
+        }
+        .el-input__inner::placeholder{
+            color: #9cbfdd;
+        }
+        .footer{
+            width: 100%;
+            height: 112px;
+            display: flex;
+            align-items: center;
+            justify-content: flex-end;
+            .delebut{
+                background: rgba(0, 162, 253, 0.3);
+                color: #FFFFFF;
+            }
+            .elebuts{
+                background-color: #003e6b;
+                color: #FFFFFF;
+                margin-left: 24px;
+            }
+        }
+    }
+}
+</style>

src/components/orderConfigpop/index.vue

@@ -0,0 +1,307 @@
+<template>
+    <div class="orderConfigpop">
+        <el-dialog
+        title=""
+        :visible.sync="dialogVisibledoder"
+        :modal-append-to-body="false"
+        :before-close="handleClose"
+        :width="isWidth">
+            <div class="strategyaddpop_header">
+                <div class="left">
+                    <p>{{listdata.name}}</p>
+                </div>
+            </div>
+            <el-form ref="form" :model="form" :rules="rules" label-width="110px" size="small ">
+                <el-row :gutter="12">
+                    <el-col :span="12">
+                        <el-form-item label="任务标签" prop="tagname">
+                            <el-input v-model="form.tagname" placeholder="请输入标签（必填）"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="目的地" prop="destination" >
+                            <el-input v-model="form.destination" placeholder="请输入来源（必填）"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="12">
+                    <el-col :span="12">
+                        <el-form-item label="行李标签" prop="bagtag">
+                            <el-input v-model="form.bagtag" placeholder="请输入标签（必填）"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="安检结果(字符串)" prop="securite_result" >
+                            <el-input v-model="form.securite_result" placeholder="请输入来源（必填）"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="12">
+                    <el-col :span="12">
+                        <el-form-item label="安检标签" prop="securite_tagname">
+                            <el-input v-model="form.securite_tagname" placeholder="请输入标签（必填）"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="车辆匹配" prop="car_name" >
+                            <el-input v-model="form.car_name" type="number" placeholder="请输入来源（必填）"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="12">
+                    <el-col :span="12">
+                        <el-form-item label="站点匹配" prop="station_name">
+                            <el-input v-model="form.station_name" type="number" placeholder="请输入标签（必填）"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="匹配订单号" prop="order_id" >
+                            <el-input v-model="form.order_id" type="number" placeholder="请输入来源（必填）"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div class="footer">
+                <el-button class="delebut" @click="elearm">
+                    {{butName}}
+                </el-button>
+                <el-button class="elebuts" @click="handleClose">
+                    {{butNames}}
+                </el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+<script>
+  import {
+      orderConfigurationadd,
+      orderConfigurationmod
+  } from '@/api/request.js'
+export default {
+    props: ['dialogVisibledoder', 'listdata'],
+    data () {
+        return {
+            isWidth: '43%',
+            butName: '保存',
+            butNames: '取消',
+            form: {
+                tagname: null,
+                destination:null,
+                bagtag: null,
+                securite_result:null,
+                securite_tagname: null,
+                car_name: null,
+                station_name: null,
+                order_id: null
+            },
+            rules: {
+                tagname: [
+                    { required: true, message: '请输入任务标签', trigger: 'blur' }
+                ],
+                destination: [
+                    { required: true, message: '请输入目的地', trigger: 'blur' }
+                ],
+                bagtag: [
+                    { required: true, message: '请输入行李标签', trigger: 'blur' }
+                ],
+                securite_result: [
+                    { required: true, message: '请输入安检结果', trigger: 'blur' }
+                ],
+                securite_tagname: [
+                    { required: true, message: '请输入安检标签', trigger: 'blur' }
+                ],
+                car_name: [
+                    { required: true, message: '请输入车辆匹配', trigger: 'blur' }
+                ],
+                station_name: [
+                    { required: true, message: '请输入站点匹配', trigger: 'blur' }
+                ],
+                order_id: [
+                    { required: true, message: '请输入匹配订单号', trigger: 'blur' }
+                ]
+            },
+        }
+    },
+    watch: {
+        listdata () {
+            if (this.listdata.list) {
+                this.form = this.listdata.list
+            }
+        }
+    },
+    methods: {
+        handleClose () {
+        this.form = {
+            tagname: null,
+            destination:null,
+            bagtag: null,
+            securite_result:null,
+            securite_tagname: null,
+            car_name: null,
+            station_name: null,
+            order_id: null
+        }
+            this.$emit('oderadd')
+        },
+        elearm () {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    this.form.tagname = this.form.tagname.replace(/\s*/g,"")
+                    this.form.destination = this.form.destination.replace(/\s*/g,"")
+                    this.form.bagtag = this.form.bagtag.replace(/\s*/g,"")
+                    this.form.securite_result = this.form.securite_result.replace(/\s*/g,"")
+                    this.form.securite_tagname = this.form.securite_tagname.replace(/\s*/g,"")
+                    // this.form.car_name = this.form.car_name.replace(/\s*/g,"")
+                    // this.form.station_name = this.form.station_name.replace(/\s*/g,"")
+                    // this.form.order_id = this.form.order_id.replace(/\s*/g,"")
+                    //新增
+                    if (this.listdata.type == 0) {
+                        orderConfigurationadd(this.form).then(res => {
+                            if (res.resultCode == 1) {
+                                this.$message({
+                                    message: res.resultMsg,
+                                    type: 'success'
+                                });
+                                this.form = {
+                                    tagname: null,
+                                    destination:null,
+                                    bagtag: null,
+                                    securite_result:null,
+                                    securite_tagname: null,
+                                    car_name: null,
+                                    station_name: null,
+                                    order_id: null
+                                },
+                                this.$emit('oderadd')
+                            } else {
+                                this.$message.error(res.resultMsg);
+                                this.form = {
+                                    tagname: null,
+                                    destination:null,
+                                    bagtag: null,
+                                    securite_result:null,
+                                    securite_tagname: null,
+                                    car_name: null,
+                                    station_name: null,
+                                    order_id: null
+                                }
+                            }
+                        })
+                    } else {
+                        //修改
+                        orderConfigurationmod(this.form).then(res => {
+                            if (res.resultCode == 1) {
+                                this.$message({
+                                    message: res.resultMsg,
+                                    type: 'success'
+                                });
+                                this.form = {
+                                    tagname: null,
+                                    destination:null,
+                                    bagtag: null,
+                                    securite_result:null,
+                                    securite_tagname: null,
+                                    car_name: null,
+                                    station_name: null,
+                                    order_id: null
+                                }
+                                this.$emit('oderadd')
+                            } else {
+                                this.$message.error(res.resultMsg);
+                            }
+                        })
+                    }
+                } else {
+                // console.log('error submit!!');
+                return false;
+                }
+            });
+        }
+    }
+}
+</script>
+<style lang="less">
+.orderConfigpop{
+    .el-dialog{
+        // border-radius: 20px;
+        display: flex;
+        display: -ms-flex; /* 兼容IE */
+        flex-direction: column;
+        -ms-flex-direction: column; /* 兼容IE */
+        margin:0 !important;
+        position:absolute;
+        top:50%;
+        left:50%;
+        transform:translate(-50%,-50%);
+        max-height:calc(100% - 30px);
+        max-width:calc(100% - 30px);
+    }
+    .el-dialog__header{
+        display: none;
+    }
+    .el-dialog__body{
+        padding: 0;
+        background-color: #04152f;
+	    border: solid 2px #6cb1ec;
+        box-shadow: 0px 6px 10px 0px rgba(0, 0, 0, 0.3);
+        // border-radius: 20px;
+        padding: 0 48px 0 48px;
+        .strategyaddpop_header{
+            width: 100%;
+            height: 120px;
+            display: flex;
+            .left{
+                width: 100%;
+                height: 100%;
+                display: flex;
+                align-items: center;
+                p{
+                    font-size: 24px;
+                    font-family: Microsoft YaHei;
+                    font-weight: bold;
+                    color: #ffffff;
+                }
+            }
+            .right{
+                width: 50%;
+                height: 100%;
+                display: flex;
+                align-items: center;
+                justify-content: flex-end;
+                .but{
+                    height: 32px;
+                }
+                .but:last-child{
+                    margin-left: 16px;
+                }
+            }
+        }
+        .el-form-item__label{
+            color: #6cb1ec;
+        }
+        .el-input__inner{
+            background-color: #111d30;
+	        border: solid 1px #6cb1ec;
+        }
+        .el-input__inner::placeholder{
+            color: #9cbfdd;
+        }
+        .footer{
+            width: 100%;
+            height: 112px;
+            display: flex;
+            align-items: center;
+            justify-content: flex-end;
+            .delebut{
+                background: rgba(0, 162, 253, 0.3);
+                color: #FFFFFF;
+            }
+            .elebuts{
+                background-color: #003e6b;
+                color: #FFFFFF;
+                margin-left: 24px;
+            }
+        }
+    }
+}
+</style>

src/pages/SystemSet/User/index.vue

@@ -27,8 +27,7 @@
 			</el-table-column>
       <el-table-column prop="name" label="操作" width="300px" align="center">
         <template slot-scope="scope">
-          <!-- <el-button class="Colorbutton" @click="networkadd(scope.row.Id)">新增</el-button> -->
-          <el-button class="Colorbutton" >修改</el-button>
+          <el-button class="Colorbutton" @click="networkmod(scope)">修改</el-button>
           <el-button class="Colorbutton_red" @click="networkele(scope)">删除</el-button>
         </template>
       </el-table-column>
@@ -38,11 +37,11 @@
 			</el-table-column>
 			<el-table-column prop="destination" align="center" label="目的地">
 			</el-table-column>
-      <el-table-column prop="securite_result" align="center" label="行李标签">
+      <el-table-column prop="bagtag" align="center" label="行李标签">
 			</el-table-column>
       <el-table-column prop="securite_result" align="center" label="安检结果(字符串)">
 			</el-table-column>
-      <el-table-column prop="securite_result" align="center" label="安检标签">
+      <el-table-column prop="securite_tagname" align="center" label="安检标签">
 			</el-table-column>
       <el-table-column prop="car_name" align="center" label="车辆匹配">
 			</el-table-column>
@@ -53,7 +52,7 @@
       <el-table-column prop="name" label="操作" width="300px" align="center">
         <template slot-scope="scope">
           <!-- <el-button class="Colorbutton" >新增</el-button> -->
-          <el-button class="Colorbutton">修改</el-button>
+          <el-button class="Colorbutton" @click="ordermod(scope)">修改</el-button>
           <el-button class="Colorbutton_red" @click="orderele(scope)">删除</el-button>
         </template>
       </el-table-column>
@@ -65,12 +64,12 @@
 			</el-table-column>
       <el-table-column prop="ip" align="center" label="来源">
 			</el-table-column>
-      <el-table-column prop="state" align="center" label="是否启用">
+      <el-table-column prop="states" align="center" label="是否启用">
 			</el-table-column>
       <el-table-column prop="name" label="操作" width="300px" align="center">
         <template slot-scope="scope">
           <!-- <el-button class="Colorbutton" >新增</el-button> -->
-          <el-button class="Colorbutton" >修改</el-button>
+          <el-button class="Colorbutton" @click="labelConfigmod(scope)">修改</el-button>
           <el-button class="Colorbutton_red" @click="labelConfigele(scope)">删除</el-button>
         </template>
       </el-table-column>
@@ -173,7 +172,12 @@
     <Delepop :deleContent="deleContent" :dialogVisibledele='dialogVisibledele' :alarList='alarList' @delepop= 'delepop'/>
     <!-- 新增/修改告警 -->
     <AlarmConfigpop :dialogVisibledarm='dialogVisibledarm' :listdata= 'listdata' @arlem = "arlem" />
-    
+    <!-- 新增/修改网络配置 -->
+    <NetworkConfigpop :dialogVisiblenetwork = 'dialogVisiblenetwork' :listdata= 'listdata' @workConadd = 'workConadd'/>
+    <!-- 新增/修改订单 -->
+    <OrderConfigpop :dialogVisibledoder='dialogVisibledoder' :listdata= 'listdata' @oderadd = 'oderadd'/>
+    <!-- 新增/修改标签 -->
+    <LabelConfigpop :dialogVisibledlabe='dialogVisibledlabe' :listdata= 'listdata' @labeladd = 'labeladd'/>
   </div>
 </template>
 
@@ -192,6 +196,9 @@
   import XLSX from "xlsx";
   import Delepop from "@/components/delepop/index.vue";
   import AlarmConfigpop from "@/components/alarmConfigpop/index.vue";
+  import NetworkConfigpop from "@/components/networkConfigpop/index.vue";
+  import OrderConfigpop from "@/components/orderConfigpop/index.vue";
+  import LabelConfigpop from "@/components/labelConfigpop/index.vue";
   export default {
     name: "User",
     data() {
@@ -219,7 +226,10 @@
       return {
         currentPage3: 1,
         totalPages: 0,
-        dialogVisibledarm:false,
+        dialogVisiblenetwork: false,//新增网络配置
+        dialogVisibledarm:false,//新增告警配置
+        dialogVisibledoder: false,//新增修改订单
+        dialogVisibledlabe: false,//新增标签
         listdata: {},
         alarList: {},
         deleContent:{
@@ -380,6 +390,15 @@
           this.totalPages = res.pageNumber*10
         })
       },
+      //修改网络配置
+      networkmod (data) {
+          this.dialogVisiblenetwork = true
+          this.listdata = {
+            name: '修改网络配置',
+            type: 1,
+            list: data.row
+          }
+      },
       //网络配置删除
       networkele (data) {
         this.dialogVisibledele = true
@@ -401,6 +420,15 @@
           this.totalPages = res.pageNumber*10
         })
       },
+      //订单修改
+      ordermod (data) {
+          this.dialogVisibledoder = true
+          this.listdata = {
+            name: '修改订单配置',
+            type: 1,
+            list: data.row
+          }
+      },
       //订单删除
       orderele (data) {
         this.dialogVisibledele = true
@@ -418,10 +446,22 @@
           PageSize: 10
         }
         labelConfiguration(params).then(res => {
+          res.resultData.forEach(res => {
+            res.states = res.state == 1 ? '启用' : '停用'
+          });
           this.tableData = res.resultData
           this.totalPages = res.pageNumber*10
         })
       },
+      //标签配置修改
+      labelConfigmod (data) {
+        this.dialogVisibledlabe = true
+          this.listdata = {
+            name: '修改标签配置',
+            type: 1,
+            list: data.row
+          }
+      },
       //标签配置删除
       labelConfigele (data) {
         this.dialogVisibledele = true
@@ -443,7 +483,7 @@
           this.totalPages = res.pageNumber*10
 				})
       },
-      //新增告警
+      //新增告警/网络/订单
       newAdd () {
         if (this.actives == 3) {
           this.dialogVisibledarm = true
@@ -451,6 +491,24 @@
             name: '新增告警配置',
             type: 0,
           }
+        } else if (this.actives == 0) {
+          this.dialogVisiblenetwork = true
+          this.listdata = {
+            name: '新增网络配置',
+            type: 0,
+          }
+        } else if (this.actives == 1) {
+          this.dialogVisibledoder = true
+          this.listdata = {
+            name: '新增订单配置',
+            type: 0,
+          }
+        } else if (this.actives == 2) {
+          this.dialogVisibledlabe = true
+          this.listdata = {
+            name: '新增标签配置',
+            type: 0,
+          }
         }
       },
       //修改告警
@@ -474,6 +532,7 @@
           type: '告警'
         }
       },
+      //删除关闭
       delepop () {
         this.dialogVisibledele = false
         if (this.actives == 0) {
@@ -486,17 +545,25 @@
           this.giveAn()
         }
       },
+      //告警关闭
       arlem () {
         this.dialogVisibledarm = false
-        if (this.actives == 0) {
-				  this.network();
-        } else if (this.actives == 1) {
-          this.orderConfig()
-        }else if (this.actives == 2) {
-          this.labelConfig()
-        }else if (this.actives == 3) {
-          this.giveAn()
-        }
+        this.giveAn()
+      },
+      //关闭新增网络配置
+      workConadd () {
+        this.dialogVisiblenetwork = false
+        this.network();
+      },
+      //关闭订单
+      oderadd () {
+        this.dialogVisibledoder = false
+        this.orderConfig()
+      },
+      //关闭标签
+      labeladd () {
+        this.dialogVisibledlabe =false
+        this.labelConfig()
       },
       // GetUser() {
       //   GetUsers().then(res => {
@@ -589,7 +656,10 @@
     },
     components: {
       Delepop,
-      AlarmConfigpop
+      AlarmConfigpop,
+      NetworkConfigpop,
+      OrderConfigpop,
+      LabelConfigpop
     }
   }
 </script>