接口对接

package-lock.json

@@ -5260,6 +5260,12 @@
         "is-buffer": "^1.1.5"
       }
     },
+    "klona": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
+      "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==",
+      "dev": true
+    },
     "last-call-webpack-plugin": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-2.1.2.tgz",
@@ -9571,6 +9577,16 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
       "dev": true
     },
+    "sass-loader": {
+      "version": "12.4.0",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.4.0.tgz",
+      "integrity": "sha512-7xN+8khDIzym1oL9XyS6zP6Ges+Bo2B2xbPrjdMHEYyV3AQYhd/wXeru++3ODHF0zMjYmVadblSKrPrjEkL8mg==",
+      "dev": true,
+      "requires": {
+        "klona": "^2.0.4",
+        "neo-async": "^2.6.2"
+      }
+    },
     "sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",

package.json

@@ -48,6 +48,7 @@
     "postcss-loader": "^2.0.8",
     "postcss-url": "^7.2.1",
     "rimraf": "^2.6.0",
+    "sass-loader": "^12.4.0",
     "semver": "^5.3.0",
     "shelljs": "^0.7.6",
     "uglifyjs-webpack-plugin": "^1.1.1",

src/api/request.js

@@ -1,5 +1,5 @@
 import {Service} from './Service.js'
-export function getVehicles() {//获取车辆信息
+export function getVehicles(data) {//获取车辆信息
   return Service({
     url: '/Framework/IDSInfo/VehiclesInfo?page='+data.page+"&perpage="+data.pagie,
     method: 'get',
@@ -33,7 +33,12 @@ export function getbuttonstat() {//获取按钮状态
     method: 'get'
   })
 }
-
+export function alarmInformation() {//告警信息
+  return Service({
+    url: '/Framework/AlarmPlc/GetAlarmList?value=false',
+    method: 'get'
+  })
+}
 export function getVehicleFace() {//小车光电
   return Service({
     url: '/dbvehiclebpc',
@@ -185,7 +190,7 @@ export function Dbbpc() {//解锁路径
 
 export function Changestat(data) {//开包任务
   return Service({
-    url: '/changestateunpacking',
+    url: '/Framework/Mission/MissionSwitch',
     method: 'post',
     data:data
   })
@@ -193,7 +198,7 @@ export function Changestat(data) {//开包任务
 
 export function Changestat2(data) {//备用任务
   return Service({
-    url: '/changestatereserve',
+    url: '/Framework/LimitCar/OnlineLimt',
     method: 'post',
     data:data
   })
@@ -216,13 +221,80 @@ export function Changestat3(data) {//同时任务
 }
 
 export function setDbcarry(data) {//设置输送机状态
-console.log(data)
   return Service({
     url: '/dbcarry',
     method: 'post',
     data:data
   })
 }
+
+export function networkConfiguration(data) {//网络配置
+    return Service({
+      url: '/Framework/AmrPlc/GetAllList?PageIndex='+data.page+"&PageSize="+data.PageSize,
+      method: 'get',
+      data:data
+    })
+  }
+  export function networkConfigurationele(data) {//网络配置删除
+    return Service({
+      url: '/Framework/AmrPlc/DeletAmrPlc',
+      method: 'post',
+      data:data
+    })
+  } 
+export function orderConfiguration(data) {//订单配置
+    return Service({
+      url: '/Framework/OrderConfig/GetAllList?PageIndex='+data.page+"&PageSize="+data.PageSize,
+      method: 'get',
+      data:data
+    })
+  }
+
+export function orderConfigurationele(data) {//订单配置删除
+  return Service({
+    url: '/Framework/OrderConfig/DeletOrderConfig',
+    method: 'post',
+    data:data
+  })
+}
+export function labelConfiguration(data) {//标签配置
+    return Service({
+      url: '/Framework/TagPlc/GetAllList?PageIndex='+data.page+"&PageSize="+data.PageSize,
+      method: 'get',
+      data:data
+    })
+  }
+
+  export function labelConfigele(data) {//标签配置删除
+    return Service({
+      url: '/Framework/TagPlc/DeleteTagPlc',
+      method: 'post',
+      data:data
+    })
+  } 
+export function alarmConfiguration(data) {//告警配置
+  return Service({
+    url: '/Framework/AlarmPlc/GetAllList?PageIndex='+data.page+"&PageSize="+data.PageSize,
+    method: 'get',
+    data:data
+  })
+}
+
+export function alarmConfigurationadd(data) {//新增告警配置
+  return Service({
+    url: '/Framework/AlarmPlc/AddAlarmPlc',
+    method: 'post',
+    data:data
+  })
+}
+
+export function alarmConfigurationele(data) {//告警配置删除
+  return Service({
+    url: '/Framework/AlarmPlc/DeletAmrPlc',
+    method: 'post',
+    data:data
+  })
+}
 // export function getAllAndroidPlugins() {
 //   return Service({
 //     url: '/manager/getAndroidPlugin ',

src/assets/css/common.less

@@ -228,7 +228,16 @@ body {
   border:none !important;
   font-weight: 600;
 }
-
+.Colorbutton_red {
+  background: #f56c6c!important;
+  // background-image: url('../../assets/img/btn_blue.png')!important;
+  background-size: 100% 100%!important;
+  border: 0px;
+  // width: 70px;
+  color: #FFF!important;
+  border:none !important;
+  font-weight: 600;
+}
 .BMap_cpyCtrl {
   display: none;
 }

src/components/alarmConfigpop/index.vue

@@ -0,0 +1,206 @@
+<template>
+    <div class="alarmConfigpop">
+        <el-dialog
+        title=""
+        :visible.sync="dialogVisibledarm"
+        :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="24">
+                    <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="source" >
+                            <el-input v-model="form.source" placeholder="请输入来源（必填）"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="24">
+                    <el-col :span="12">
+                        <el-form-item label="告警位置" prop="alarm_position" >
+                            <el-input v-model="form.alarm_position" placeholder="请输入告警位置（必填）"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="告警内容" prop="alarm_content" >
+                            <el-input v-model="form.alarm_content" placeholder="请输入告警内容（必填）"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="24">
+                        <el-form-item label="处理方法" prop="handle_methode" >
+                            <el-input v-model="form.handle_methode" 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 {
+    alarmConfigurationadd
+  } from '@/api/request.js'
+export default {
+    props: ['dialogVisibledarm', 'listdata'],
+    data () {
+        return {
+            isWidth: '43%',
+            butName: '保存',
+            butNames: '取消',
+            form: {
+                tagname: null,
+                source:null,
+                alarm_position:null,
+                alarm_content: null,
+                handle_methode: null
+            },
+            rules: {
+                tagname: [
+                    { required: true, message: '请输入标签', trigger: 'blur' }
+                ],
+                source: [
+                    { required: true, message: '请输入来源', trigger: 'blur' }
+                ],
+                alarm_position: [
+                    { required: true, message: '请输入告警位置', trigger: 'blur' }
+                ],
+                alarm_content: [
+                    { required: true, message: '请输入告警内容', trigger: 'blur' }
+                ],
+                handle_methode: [
+                    { required: true, message: '请输入处理方法', trigger: 'blur' }
+                ]
+            },
+        }
+    },
+    methods: {
+        handleClose () {
+            this.$emit('arlem')
+        },
+        elearm () {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    alarmConfigurationadd(this.form).then(res => {
+                        if (res.resultCode == 1) {
+                            this.$message({
+                                message: res.resultMsg,
+                                type: 'success'
+                            });
+                            this.$emit('arlem')
+                        } else {
+                            this.$message.error(res.resultMsg);
+                        }
+                    })
+                } else {
+                // console.log('error submit!!');
+                return false;
+                }
+            });
+        }
+    }
+}
+</script>
+<style lang="less">
+.alarmConfigpop{
+        .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/components/delepop/index.vue

@@ -0,0 +1,142 @@
+<template>
+    <div class="delepop">
+        <el-dialog
+        title=""
+        :visible.sync="dialogVisibledele"
+        :modal-append-to-body="false"
+        :before-close="handleClose"
+        :width="isWidth">
+            <div class="deletepopup_header">
+                <div class="left">
+                    <p>{{deleContent.name}}</p>
+                </div>
+            </div>
+            <div class="deletepopup_cont">
+                {{deleContent.cont}}
+            </div>
+            <div class="footer">
+                <el-button class="delebut" @click="elearm">
+                    {{butName}}
+                </el-button>
+                <el-button class="elebuts" @click="handleClose">
+                    {{butNames}}
+                </el-button>
+                <!-- <Bfbutton :butName='butName' class="delebut"  :type = '7'/>
+                <Bfbutton :butName='butNames' class="elebut" @click.native="handleClose"  :type = '17'/> -->
+            </div>
+        </el-dialog>
+    </div>
+</template>
+<script>
+  import {
+    alarmConfigurationele,
+    orderConfigurationele,
+    labelConfigele,
+    networkConfigurationele
+  } from '@/api/request.js'
+export default {
+    props: ['dialogVisibledele', 'deleContent', 'alarList'],
+    data () {
+        return {
+            isWidth: '31.3%',
+            butName: '删除',
+            butNames: '取消'
+        }
+    },
+    methods: {
+        handleClose () {
+            this.$emit('delepop')
+        },
+        elearm () {
+            if (this.deleContent.type === '告警') {
+                alarmConfigurationele(this.alarList).then(res => {
+                    console.log(res)
+                    this.$emit('delepop')
+                })
+            } else if (this.deleContent.type === '订单') {
+                orderConfigurationele(this.alarList).then(res => {
+                    console.log(res)
+                    this.$emit('delepop')
+                })
+            } else if (this.deleContent.type === '标签') {
+                labelConfigele(this.alarList).then(res => {
+                    console.log(res)
+                    this.$emit('delepop')
+                })
+            } else if (this.deleContent.type === '网络') {
+                networkConfigurationele(this.alarList).then(res => {
+                    console.log(res)
+                    this.$emit('delepop')
+                })
+            }
+        }
+    }
+}
+</script>
+<style lang="less">
+.delepop{
+    .el-dialog__header{
+        display: none;
+    }
+    .el-dialog{
+        border-radius: 16px;
+        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__body{
+        padding: 0;
+        background: #FFFFFF;
+        box-shadow: 0px 6px 10px 0px rgba(0, 0, 0, 0.3);
+        border-radius: 16px;
+        padding: 0 48px 0 48px;
+        .deletepopup_header{
+            width: 100%;
+            height: 120px;
+            display: flex;
+            .left{
+                width: 100%;
+                height: 100%;
+                display: flex;
+                align-items: center;
+                p{
+                    font-size: 24px;
+                    font-weight: bold;
+                    color: #303133;
+                }
+            }
+        }
+        .deletepopup_cont{
+            width: 100%;
+            // height: 111px;
+            display: flex;
+            align-items: center;
+            font-size: 16px;
+            font-weight: 400;
+            color: #303133;
+        }
+        .footer{
+            width: 100%;
+            height: 112px;
+            display: flex;
+            align-items: center;
+            justify-content: flex-end;
+            .delebut{
+                background: #f56c6c;
+                color: #FFFFFF;
+            }
+            .elebuts{
+                margin-left: 24px;
+            }
+        }
+    }
+}
+</style>

src/pages/Common/home.vue

@@ -130,16 +130,16 @@
                      
 					<div class="alarm_up" style="width: 100%;height:120px;position: relative;top: 0px;float:left">
 						<top-title title="告警信息"></top-title>
-						<div style="width: 100%;height: 80%; overflow: hidden;">
-							<vue-seamless-scroll :data="agreepersonlist"  :class-option="optionSetting">
+						<div style="width: 100%;height: 80%;overflow: hidden;">
+							<vue-seamless-scroll :data="agreepersonlist"  :class-option="optionSetting" ref="myScoll">
 								<div class="givealarm_child" v-for="(item, index) in agreepersonlist" :key="index">
 									<!-- <div class="top">
 										<div  :class="{'logcomplete':item.start2 == 1,'logwarning':item.start2 == 2,'logalarm':item.start2 == 3,}"></div>
 										<div class="content">{{item.name}}</div>
 										<div class="start" :class="item.start == 1 ? 'start': 'starter'">{{item.start == 1 ? '已处理': '未处理'}}</div>
 									</div> -->
-									<p>{{item.time}}</p>
-									<span>{{item.name}}</span>
+									<p>{{item.alarm_date}}</p>
+									<span>{{item.error_content}}</span>
 								</div>
 							</vue-seamless-scroll>
 							<!-- <p v-if="Offline" style="float: left;font-size: 28px;color: #606266b0;letter-spacing: 3px;line-height: 10px;padding-left: 40px;">车辆已下线</p> -->
@@ -163,9 +163,9 @@
 								<template slot-scope="scope">
 									<div v-if="item.label == '操作'">
 										<!-- <el-button class="Colorbutton_blue" @click="showDetial(scope.row.Id)">详情信息</el-button> -->
-										<el-button class="Colorbutton" v-if="scope.row.order_state == 'EXECUTING'" @click="thisOrderStop(scope.row.Id)">暂停</el-button>
-										<el-button class="Colorbutton" v-if="scope.row.order_state == 'HELD'" @click="thisOrderRun(scope.row.Id)">继续</el-button>
-										<el-button class="Colorbutton_blue" v-if="scope.row.order_state != 'CANCELLED'&&scope.row.order_state != 'FAILED'&&scope.row.order_state != 'DELETED'&&scope.row.order_state != 'SUCCESS'" @click="thisOrderClres(scope.row.Id)">取消</el-button>
+										<el-button class="Colorbutton"  @click="thisOrderStop(scope.row.Id)">暂停</el-button>
+										<el-button class="Colorbutton"  @click="thisOrderRun(scope.row.Id)">继续</el-button>
+										<el-button class="Colorbutton_blue"  @click="thisOrderClres(scope.row.Id)">取消</el-button>
 									</div>
 									<div v-else-if="item.label == '完成进度'">
 										<div class="progress_body">
@@ -291,12 +291,14 @@
 		keepCarOnline,
 		Changestat3,
 		Dbalarm,
-		getbuttonstat
+		getbuttonstat,
+		alarmInformation
 	} from '@/api/request.js'
 	import OrdersInfo from '../../components/OrdersInfo.vue'
 	export default {
 		data() {
 			return {
+				// heighter: '100%',
 				mapURL:"",
 				pageCount:0,
 				isopen1:false,
@@ -304,54 +306,7 @@
 				isopen3:false,
 				ifRe: false,
 				Offline: false,
-				agreepersonlist: [{
-					name: '报警信息：内容内容内容内容内容内容内容内容内容内容内容',
-					start: 1,
-					start2: 1,
-					time: '2021/09/09 15:26'
-				},
-				{
-					name: '报警信息：内容内容内容内容内容内容内容内容内容内容内容',
-					start: 2,
-					start2: 2,
-					time: '2021/09/09 15:26'
-				},
-				{
-					name: '报警信息：内容内容内容内容内容内容内容内容内容内容内容',
-					start: 2,
-					start2: 3,
-					time: '2021/09/09 15:26'
-				},
-				{
-					name: '报警信息：内容内容内容内容内容内容内容内容内容内容内容',
-					start: 2,
-					start2: 1,
-					time: '2021/09/09 15:26'
-				},
-				{
-					name: '报警信息：内容内容内容内容内容内容内容内容内容内容内容',
-					start: 2,
-					start2: 2,
-					time: '2021/09/09 15:26'
-				},
-				{
-					name: '报警信息：内容内容内容内容内容内容内容内容内容内容内容',
-					start: 2,
-					start2: 3,
-					time: '2021/09/09 15:26'
-				},
-				{
-					name: '报警信息：内容内容内容内容内容内容内容内容内容内容内容',
-					start: 2,
-					start2: 2,
-					time: '2021/09/09 15:26'
-				},
-				{
-					name: '报警信息：内容内容内容内容内容内容内容内容内容内容内容',
-					start: 2,
-					start2: 2,
-					time: '2021/09/09 15:26'
-				}],
+				agreepersonlist: [],
 				showCar: {
 					ifshow: true,
 					num: '#'
@@ -689,12 +644,12 @@
 			optionSetting () {
 				return{
 					step: 0.3,
-					limitMoveNum:8,
+					limitMoveNum:5,
 					hoverStop:true,//是否悬停
 					openWatch: true, // 开启数据实时监控刷新dom
 					singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
 					singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
-					waitTime: 1000 // 单步运动停止的时间(默认值1000ms)
+					waitTime: 10000 // 单步运动停止的时间(默认值1000ms)
 				}
 			}
 		},
@@ -705,11 +660,12 @@
 			clearInterval(this.sj)
 			let that = this;
 			this.js = setInterval(()=>{//实时更新数据
-			   that.getVehicle();
-			   that.GetTemplate();
-			   that.gettempalteMode()
-			   that.Getorder();
-			   that.getbuttonstats();
+				that.getVehicle();
+				that.GetTemplate();
+				that.gettempalteMode()
+				that.Getorder();
+				that.getbuttonstats();
+				that.alarmList()
 			 },3000)
 		},
 		beforeRouteLeave(to, from, next){
@@ -720,9 +676,17 @@
 			}
 		},
 		methods: {
+			//告警信息
+			alarmList() {
+				alarmInformation().then(res => {
+					this.agreepersonlist = res.resultData.result
+					this.agreepersonlist.push()
+					this.$refs.myScoll.reset();
+				})
+			},
 			getbuttonstats(){
 				getbuttonstat().then(res => {
-					console.log(res)
+					// console.log(res)
 					if (res.resultData) {
 						if(res.resultData[0].mission_boutton==1){
 							this.isopen1==true

src/pages/SystemSet/User/index.vue

@@ -19,47 +19,80 @@
     <!-- <el-button type="primary" class="addUser" v-if="isAdmin" @click="addUser">新增用户</el-button> -->
     <div class="downlodTables" >导入</div>
     <div class="downlodTable" @click="downlodTable">导出</div>
+    <div class="downlodTableer" @click="newAdd()">新增</div>
     <el-table :data="tableData" id="userTableData" style="width: 100%;color: #2DAFF5;" v-show="actives == 0">
-			<el-table-column prop="nickname" align="center" label="车辆">
+			<el-table-column prop="ipname" align="center" label="车辆">
 			</el-table-column>
-			<el-table-column prop="work_order_count" align="center" label="地址">
+			<el-table-column prop="adress" align="center" label="地址">
 			</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_red" @click="networkele(scope)">删除</el-button>
+        </template>
+      </el-table-column>
 		</el-table>
     <el-table :data="tableData" id="userTableData" style="width: 100%;color: #2DAFF5;" v-show="actives == 1">
-			<el-table-column prop="nickname" align="center" label="任务标签">
+			<el-table-column prop="tagname" align="center" label="任务标签">
+			</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>
-			<el-table-column prop="work_order_count" align="center" label="目的地">
+      <el-table-column prop="securite_result" align="center" label="安检结果(字符串)">
 			</el-table-column>
-      <el-table-column prop="work_order_count" align="center" label="安检结果(字符串)">
+      <el-table-column prop="securite_result" align="center" label="安检标签">
 			</el-table-column>
-      <el-table-column prop="work_order_count" align="center" label="车辆匹配">
+      <el-table-column prop="car_name" align="center" label="车辆匹配">
 			</el-table-column>
-      <el-table-column prop="work_order_count" align="center" label="站点匹配">
+      <el-table-column prop="station_name" align="center" label="站点匹配">
 			</el-table-column>
-      <el-table-column prop="work_order_count" align="center" label="匹配订单号">
+      <el-table-column prop="order_id" 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_red" @click="orderele(scope)">删除</el-button>
+        </template>
+      </el-table-column>
 		</el-table>
     <el-table :data="tableData" id="userTableData" style="width: 100%;color: #2DAFF5;" v-show="actives == 2">
-			<el-table-column prop="nickname" align="center" label="标签">
+			<el-table-column prop="tagname" align="center" label="标签">
 			</el-table-column>
-			<el-table-column prop="work_order_count" align="center" label="对应输送机">
+			<el-table-column prop="conv_name" align="center" label="对应输送机">
 			</el-table-column>
-      <el-table-column prop="work_order_count" align="center" label="来源">
+      <el-table-column prop="ip" align="center" label="来源">
 			</el-table-column>
-      <el-table-column prop="work_order_count" align="center" label="是否启用">
+      <el-table-column prop="state" 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_red" @click="labelConfigele(scope)">删除</el-button>
+        </template>
+      </el-table-column>
 		</el-table>
-    <el-table :data="tableData" id="userTableData" style="width: 100%;color: #2DAFF5;" v-show="actives == 3">
-			<el-table-column prop="nickname" align="center" label="标签" width="200px">
+    <el-table :data="tableData" id="userTableData" style="width: 100%;color: #2DAFF5;" v-show="actives == 3" :height="heighter">
+			<el-table-column prop="tagname" align="center" label="标签" width="200px">
 			</el-table-column>
-      <el-table-column prop="work_order_count" align="center" label="来源" width="200px">
+      <el-table-column prop="source" align="center" label="来源" width="200px">
 			</el-table-column>
-      <el-table-column prop="work_order_count" align="center" label="告警位置" width="200px">
+      <el-table-column prop="alarm_position" align="center" label="告警位置" width="200px">
 			</el-table-column>
-      <el-table-column prop="work_order_count" align="center" label="告警内容">
+      <el-table-column prop="alarm_content" align="center" label="告警内容">
 			</el-table-column>
-      <el-table-column prop="work_order_count" align="center" label="处理方法">
+      <el-table-column prop="handle_methode" 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_red" @click="alarmele(scope)">删除</el-button>
+        </template>
+      </el-table-column>
 		</el-table>
     <el-table :data="tableData" id="userTableData" style="width: 100%;color: #2DAFF5;" v-show="actives == 4">
 			<el-table-column prop="nickname" align="center" label="项目">
@@ -67,6 +100,12 @@
       <el-table-column prop="work_order_count" align="center" label="设置值">
 			</el-table-column>
 		</el-table>
+    <el-pagination
+      background
+      layout="prev, pager, next, jumper"
+      :current-page.sync="currentPage3"
+      :total="totalPages">
+    </el-pagination>
     <!-- <el-table :data="userTableData" ref='userTableData' id="userTableData" style="width: 100%;color: #2DAFF5;max-height: 100%;overflow-y: auto;background-color: none;">
       <el-table-column prop="username" align="center" label="用户名">
       </el-table-column>
@@ -130,6 +169,11 @@
         <el-button type="primary" @click="btnNO" id="sureBtn">取消</el-button>
       </span>
     </el-dialog> -->
+    <!-- 删除 -->
+    <Delepop :deleContent="deleContent" :dialogVisibledele='dialogVisibledele' :alarList='alarList' @delepop= 'delepop'/>
+    <!-- 新增/修改告警 -->
+    <AlarmConfigpop :dialogVisibledarm='dialogVisibledarm' :listdata= 'listdata' @arlem = "arlem" />
+    
   </div>
 </template>
 
@@ -137,10 +181,17 @@
   import {
     Homeadduser,
     GetUsers,
-	homedeleteuser
+    homedeleteuser,
+    networkConfiguration,
+    orderConfiguration,
+    labelConfiguration,
+    alarmConfiguration,
+    alarmConfigurationele
   } from '@/api/request.js'
   import FileSaver from "file-saver";
   import XLSX from "xlsx";
+  import Delepop from "@/components/delepop/index.vue";
+  import AlarmConfigpop from "@/components/alarmConfigpop/index.vue";
   export default {
     name: "User",
     data() {
@@ -166,6 +217,19 @@
         }
       };
       return {
+        currentPage3: 1,
+        totalPages: 0,
+        dialogVisibledarm:false,
+        listdata: {},
+        alarList: {},
+        deleContent:{
+          name: '删除告警信息',
+          cont: '是否确认删除该告警信息？',
+          type: '告警'
+        },
+        dialogVisibledele: false,
+        heighter: '100%',
+        pageCount: 0, 
         navName: '网络配置',
         tableData: [],
         actives: 0,
@@ -261,11 +325,149 @@
 		// 		this.isAdmin=true;
 		// 	}
     // },
+    mounted () {
+      this.network()
+    },
+    watch: {
+      actives () {
+        this.currentPage3 = 1
+        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()
+        }
+      },
+      currentPage3 () {
+        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()
+        }
+        console.log(this.currentPage3)
+      }
+    },
     methods: {
       navUp (index, item) {
         this.navName = item.name
         this.actives = index
       },
+      changePage(e){
+				this.pageSize = e;
+        if (this.actives == 0) {
+				  this.network();
+        } else if (this.actives == 1) {
+          this.orderConfig()
+        } else if (this.actives == 2) {
+          this.giveAn()
+        }
+			},
+      //网络配置
+      network () {
+        let params = {
+          page: this.currentPage3,
+          PageSize: 10
+        }
+        networkConfiguration(params).then(res => {
+          this.tableData = res.resultData
+          this.totalPages = res.pageNumber*10
+        })
+      },
+      //网络配置删除
+      networkele (data) {
+        this.dialogVisibledele = true
+        this.alarList = data.row
+        this.deleContent = {
+          name: '删除网络信息',
+          cont: '是否确认删除该网络信息？',
+          type: '网络'
+        }
+      },
+      //订单配置
+      orderConfig () {
+        let params = {
+          page: this.currentPage3,
+          PageSize: 10
+        }
+        orderConfiguration(params).then(res => {
+          this.tableData = res.resultData
+          this.totalPages = res.pageNumber*10
+        })
+      },
+      //订单删除
+      orderele (data) {
+        this.dialogVisibledele = true
+        this.alarList = data.row
+        this.deleContent = {
+          name: '删除订单信息',
+          cont: '是否确认删除该订单信息？',
+          type: '订单'
+        }
+      },
+      //标签配置
+      labelConfig () {
+        let params = {
+          page: this.currentPage3,
+          PageSize: 10
+        }
+        labelConfiguration(params).then(res => {
+          this.tableData = res.resultData
+          this.totalPages = res.pageNumber*10
+        })
+      },
+      //标签配置删除
+      labelConfigele (data) {
+        this.dialogVisibledele = true
+        this.alarList = data.row
+        this.deleContent = {
+          name: '删除标签信息',
+          cont: '是否确认删除该标签信息？',
+          type: '标签'
+        }
+      },
+      //告警信息
+      giveAn () {
+        let params = {
+          page: this.currentPage3,
+          PageSize: 10
+        }
+        alarmConfiguration(params).then(res => {
+					this.tableData = res.resultData
+          this.totalPages = res.pageNumber*10
+				})
+      },
+      //新增告警
+      newAdd () {
+        if (this.actives == 3) {
+          this.dialogVisibledarm = true
+          this.listdata = {
+            name: '新增告警配置'
+          }
+        }
+      },
+      //告警删除
+      alarmele (data) {
+        this.dialogVisibledele = true
+        this.alarList = data.row
+        this.deleContent = {
+          name: '删除告警配置',
+          cont: '是否确认删除该告警配置？',
+          type: '告警'
+        }
+      },
+      delepop () {
+        this.dialogVisibledele = false
+      },
+      arlem () {
+        this.dialogVisibledarm = false
+      },
       // GetUser() {
       //   GetUsers().then(res => {
       //     console.log(res.UsersManagement);
@@ -354,6 +556,10 @@
       addUser() {
         this.dialogVisible = true;
       }
+    },
+    components: {
+      Delepop,
+      AlarmConfigpop
     }
   }
 </script>
@@ -368,7 +574,7 @@
     float: right;
     position: absolute;
     top: 30px;
-    right: 125px;
+    right: 150px;
     color: #ddd;
     text-align: center;
     line-height: 30px;
@@ -383,13 +589,27 @@
     float: right;
     position: absolute;
     top: 30px;
-    right: 200px;
+    right: 220px;
+    color: #ddd;
+    text-align: center;
+    line-height: 30px;
+    cursor: pointer;
+  }
+  .downlodTableer {
+    width: 50px;
+    height: 30px;
+    box-shadow: inset 0px 1px 38px 0px rgba(0, 162, 253, 0.4) !important;
+    border: 1px solid rgba(1, 148, 228, 0.34) !important;
+    background: none !important;
+    float: right;
+    position: absolute;
+    top: 30px;
+    right: 90px;
     color: #ddd;
     text-align: center;
     line-height: 30px;
     cursor: pointer;
   }
-
   .logBox {
     width: 100%;
     height: 100%;
@@ -624,4 +844,9 @@
     border: none;
     border-radius: 0;
   }
+  .el-pagination{
+    margin-left: 40%;
+    position: absolute;
+    bottom: 0;
+  }
 </style>