修改bug

src/components/orderConfigpop/index.vue

@@ -1,307 +1,344 @@
 <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>
+  <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="目的地">
+              <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="行李标签">
+              <el-input
+                v-model="form.bagtag"
+                placeholder="请输入标签"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安检结果(字符串)">
+              <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="安检标签">
+              <el-input
+                v-model="form.securite_tagname"
+                placeholder="请输入标签"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="车辆匹配">
+              <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="站点匹配">
+              <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'
+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' }
-                ]
-            },
-        }
+  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;
+      }
     },
-    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");
     },
-    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;
-                }
+    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;
+.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;
-        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;
+        align-items: center;
+        p {
+          font-size: 24px;
+          font-family: Microsoft YaHei;
+          font-weight: bold;
+          color: #ffffff;
         }
-        .el-input__inner{
-            background-color: #111d30;
-	        border: solid 1px #6cb1ec;
-        }
-        .el-input__inner::placeholder{
-            color: #9cbfdd;
+      }
+      .right {
+        width: 50%;
+        height: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+        .but {
+          height: 32px;
         }
-        .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;
-            }
+        .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/Baggage/index/index.vue

@@ -45,12 +45,20 @@
       </el-table-column>
     </el-table>
     <el-pagination
+      @current-change="changePage"
+      @prev-click="changePage"
+      @next-click="changePage"
+      layout="prev, pager, next"
+      :total="totalPages"
+    >
+    </el-pagination>
+    <!-- <el-pagination
       background
-      layout="prev, pager, next, jumper"
+      layout="prev, pager, next"
       :current-page.sync="currentPage3"
       :total="totalPages"
     >
-    </el-pagination>
+    </el-pagination> -->
   </div>
 </template>
 <script>
@@ -68,6 +76,10 @@ export default {
     this.BaggageInquiryList();
   },
   methods: {
+    changePage(e) {
+      this.pageSize = e;
+      this.getData();
+    },
     //搜索
     queryList() {
       this.BaggageInquiryList();
@@ -76,13 +88,13 @@ export default {
     BaggageInquiryList() {
       let params = {
         bagid: this.input,
-        page: 1,
+        page: this.pageSize,
         PageSize: 12,
       };
       BaggageInquiry(params).then((res) => {
         if (res.resultCode == 1) {
           this.tableData = res.resultData;
-          this.totalPages = res.pageNumber * 12;
+          this.totalPages = res.pageNumber;
         }
       });
     },
@@ -101,9 +113,13 @@ export default {
     position: absolute;
   }
   .el-pagination {
-    margin-left: 40%;
     position: absolute;
     bottom: 0;
+    left: 0;
+    right: 0;
+    z-index: 9999;
+    display: flex;
+    justify-content: center;
   }
   .border_left_top {
     width: 11.625rem;

src/pages/SystemSet/User/index.vue

@@ -9,101 +9,160 @@
     <div class="border_bottom border"></div>
     <div class="border_right_bottom border"></div>
     <el-button-group id="topButton2">
-      <el-button type="primary" class="active">{{navName}}</el-button>
+      <el-button type="primary" class="active">{{ navName }}</el-button>
     </el-button-group>
     <div class="nav_modify">
-          <ul>
-            <li v-for="(item,index) in navList" :key="index" :class="actives === index ? 'nav_childup': 'nav_child'" @click="navUp(index,item)">{{item.name}}</li>
-          </ul>
+      <ul>
+        <li
+          v-for="(item, index) in navList"
+          :key="index"
+          :class="actives === index ? 'nav_childup' : 'nav_child'"
+          @click="navUp(index, item)"
+        >
+          {{ item.name }}
+        </li>
+      </ul>
     </div>
     <!-- <el-button type="primary" class="addUser" v-if="isAdmin" @click="addUser">新增用户</el-button> -->
-    <div class="downlodTables" >导入</div>
+    <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="ipname" align="center" label="车辆">
-			</el-table-column>
-			<el-table-column prop="adress" align="center" label="地址">
-			</el-table-column>
+    <el-table
+      :data="tableData"
+      id="userTableData"
+      style="width: 100%; color: #2daff5"
+      v-show="actives == 0"
+    >
+      <el-table-column prop="ipname" align="center" label="车辆">
+      </el-table-column>
+      <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="networkmod(scope)">修改</el-button>
-          <el-button class="Colorbutton_red" @click="networkele(scope)">删除</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>
-		</el-table>
-    <el-table :data="tableData" id="userTableData" style="width: 100%;color: #2DAFF5;" v-show="actives == 1">
-			<el-table-column prop="tagname" align="center" label="任务标签">
-			</el-table-column>
-			<el-table-column prop="destination" align="center" label="目的地">
-			</el-table-column>
+    </el-table>
+    <el-table
+      :data="tableData"
+      id="userTableData"
+      style="width: 100%; color: #2daff5"
+      v-show="actives == 1"
+    >
+      <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="bagtag" align="center" label="行李标签">
-			</el-table-column>
-      <el-table-column prop="securite_result" align="center" label="安检结果(字符串)">
-			</el-table-column>
+      </el-table-column>
+      <el-table-column
+        prop="securite_result"
+        align="center"
+        label="安检结果(字符串)"
+      >
+      </el-table-column>
       <el-table-column prop="securite_tagname" align="center" label="安检标签">
-			</el-table-column>
+      </el-table-column>
       <el-table-column prop="car_name" align="center" label="车辆匹配">
-			</el-table-column>
+      </el-table-column>
       <el-table-column prop="station_name" align="center" label="站点匹配">
-			</el-table-column>
+      </el-table-column>
       <el-table-column prop="order_id" align="center" label="匹配订单号">
-			</el-table-column>
+      </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" @click="ordermod(scope)">修改</el-button>
-          <el-button class="Colorbutton_red" @click="orderele(scope)">删除</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>
-		</el-table>
-    <el-table :data="tableData" id="userTableData" style="width: 100%;color: #2DAFF5;" v-show="actives == 2">
-			<el-table-column prop="tagname" align="center" label="标签">
-			</el-table-column>
-			<el-table-column prop="conv_name" align="center" label="对应输送机">
-			</el-table-column>
-      <el-table-column prop="ip" align="center" label="来源">
-			</el-table-column>
+    </el-table>
+    <el-table
+      :data="tableData"
+      id="userTableData"
+      style="width: 100%; color: #2daff5"
+      v-show="actives == 2"
+    >
+      <el-table-column prop="tagname" align="center" label="标签">
+      </el-table-column>
+      <el-table-column prop="conv_name" align="center" label="对应输送机">
+      </el-table-column>
+      <el-table-column prop="ip" align="center" label="来源"> </el-table-column>
       <el-table-column prop="states" align="center" label="是否启用">
-			</el-table-column>
+      </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" @click="labelConfigmod(scope)">修改</el-button>
-          <el-button class="Colorbutton_red" @click="labelConfigele(scope)">删除</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>
-		</el-table>
-    <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>
+    <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="source" align="center" label="来源" width="200px">
-			</el-table-column>
-      <el-table-column prop="alarm_position" align="center" label="告警位置" width="200px">
-			</el-table-column>
+      </el-table-column>
+      <el-table-column
+        prop="alarm_position"
+        align="center"
+        label="告警位置"
+        width="200px"
+      >
+      </el-table-column>
       <el-table-column prop="alarm_content" align="center" label="告警内容">
-			</el-table-column>
+      </el-table-column>
       <el-table-column prop="handle_methode" align="center" label="处理方法">
-			</el-table-column>
+      </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" @click="newalarmmod(scope)">修改</el-button>
-          <el-button class="Colorbutton_red" @click="alarmele(scope)">删除</el-button>
+          <el-button class="Colorbutton" @click="newalarmmod(scope)"
+            >修改</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="项目">
-			</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="项目">
+      </el-table-column>
       <el-table-column prop="work_order_count" align="center" label="设置值">
-			</el-table-column>
-		</el-table>
+      </el-table-column>
+    </el-table>
     <el-pagination
-      background
-      layout="prev, pager, next, jumper"
-      :current-page.sync="currentPage3"
-      :total="totalPages">
+      @current-change="changePage"
+      @prev-click="changePage"
+      @next-click="changePage"
+      layout="prev, pager, next"
+      :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="用户名">
@@ -169,784 +228,832 @@
       </span>
     </el-dialog> -->
     <!-- 删除 -->
-    <Delepop :deleContent="deleContent" :dialogVisibledele='dialogVisibledele' :alarList='alarList' @delepop= 'delepop'/>
+    <Delepop
+      :deleContent="deleContent"
+      :dialogVisibledele="dialogVisibledele"
+      :alarList="alarList"
+      @delepop="delepop"
+    />
     <!-- 新增/修改告警 -->
-    <AlarmConfigpop :dialogVisibledarm='dialogVisibledarm' :listdata= 'listdata' @arlem = "arlem" />
+    <AlarmConfigpop
+      :dialogVisibledarm="dialogVisibledarm"
+      :listdata="listdata"
+      @arlem="arlem"
+    />
     <!-- 新增/修改网络配置 -->
-    <NetworkConfigpop :dialogVisiblenetwork = 'dialogVisiblenetwork' :listdata= 'listdata' @workConadd = 'workConadd'/>
+    <NetworkConfigpop
+      :dialogVisiblenetwork="dialogVisiblenetwork"
+      :listdata="listdata"
+      @workConadd="workConadd"
+    />
     <!-- 新增/修改订单 -->
-    <OrderConfigpop :dialogVisibledoder='dialogVisibledoder' :listdata= 'listdata' @oderadd = 'oderadd'/>
+    <OrderConfigpop
+      :dialogVisibledoder="dialogVisibledoder"
+      :listdata="listdata"
+      @oderadd="oderadd"
+    />
     <!-- 新增/修改标签 -->
-    <LabelConfigpop :dialogVisibledlabe='dialogVisibledlabe' :listdata= 'listdata' @labeladd = 'labeladd'/>
+    <LabelConfigpop
+      :dialogVisibledlabe="dialogVisibledlabe"
+      :listdata="listdata"
+      @labeladd="labeladd"
+    />
   </div>
 </template>
 
 <script>
-  import {
-    Homeadduser,
-    GetUsers,
-    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";
-  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() {
-      var userNameRule = (rule, value, callback) => {
-        if (this.form.addUserName === '') {
-          callback(new Error('用户名不能为空'));
-        } else {
-          this.userTableData.forEach((item, index, arr) => {
-            if (this.form.addUserName == item.username) {
-              callback(new Error('用户名已存在'));
-            }
-          })
-          callback()
-        }
-      };
-      var userPwdRule = (rule, value, callback) => {
-        if (this.form.addUserPwd === '') {
-          callback(new Error('密码不能为空'));
-        } else if (this.form.addUserPwd.length < 6) {
-          callback(new Error('密码不能小于6位'));
-        } else {
-          callback()
-        }
-      };
-      return {
-        currentPage3: 1,
-        totalPages: 0,
-        dialogVisiblenetwork: false,//新增网络配置
-        dialogVisibledarm:false,//新增告警配置
-        dialogVisibledoder: false,//新增修改订单
-        dialogVisibledlabe: false,//新增标签
-        listdata: {},
-        alarList: {},
-        deleContent:{
-          name: '删除告警信息',
-          cont: '是否确认删除该告警信息？',
-          type: '告警'
-        },
-        dialogVisibledele: false,
-        heighter: '100%',
-        pageCount: 0, 
-        navName: '网络配置',
-        tableData: [],
-        actives: 0,
-        navList:[{
-          name: '网络配置'
+import {
+  Homeadduser,
+  GetUsers,
+  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";
+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() {
+    var userNameRule = (rule, value, callback) => {
+      if (this.form.addUserName === "") {
+        callback(new Error("用户名不能为空"));
+      } else {
+        this.userTableData.forEach((item, index, arr) => {
+          if (this.form.addUserName == item.username) {
+            callback(new Error("用户名已存在"));
+          }
+        });
+        callback();
+      }
+    };
+    var userPwdRule = (rule, value, callback) => {
+      if (this.form.addUserPwd === "") {
+        callback(new Error("密码不能为空"));
+      } else if (this.form.addUserPwd.length < 6) {
+        callback(new Error("密码不能小于6位"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      currentPage3: 1,
+      totalPages: 0,
+      dialogVisiblenetwork: false, //新增网络配置
+      dialogVisibledarm: false, //新增告警配置
+      dialogVisibledoder: false, //新增修改订单
+      dialogVisibledlabe: false, //新增标签
+      listdata: {},
+      alarList: {},
+      pageSize: 1,
+      deleContent: {
+        name: "删除告警信息",
+        cont: "是否确认删除该告警信息？",
+        type: "告警",
+      },
+      dialogVisibledele: false,
+      heighter: "100%",
+      pageCount: 0,
+      navName: "网络配置",
+      tableData: [],
+      actives: 0,
+      navList: [
+        {
+          name: "网络配置",
         },
         {
-          name: '订单配置'
+          name: "订单配置",
         },
         {
-          name: '标签配置'
+          name: "标签配置",
         },
         {
-          name: '告警配置'
+          name: "告警配置",
         },
         {
-          name: '其他配置'
-        },],
-        form: {
-          addUserName: '',
-          addUserPwd: '',
-          addUserRoleValue: '',
-          addUserStateValue: ''
+          name: "其他配置",
         },
-        radio: 1,
-        dialogVisible: false,
-        rules: {
-          userName: [{
+      ],
+      form: {
+        addUserName: "",
+        addUserPwd: "",
+        addUserRoleValue: "",
+        addUserStateValue: "",
+      },
+      radio: 1,
+      dialogVisible: false,
+      rules: {
+        userName: [
+          {
             required: true,
             validator: userNameRule,
-            trigger: ['blur', 'change']
-          }],
-          userPwd: [{
-            required: true,
-            validator: userPwdRule,
-            trigger: ['blur', 'change']
-          }],
-          userRole: [{
-            required: true,
-            message: '请选择类型',
-            trigger: 'blur'
-          }],
-          userState: [{
-            required: true,
-            message: '请选择状态',
-            trigger: 'blur'
-          }]
-        },
-				isAdmin:false,
-        userTableData: [{
-            "username": "165asas",
-            "password": "123456",
-            "role": "user",
-            "state": "unlock"
+            trigger: ["blur", "change"],
           },
+        ],
+        userPwd: [
           {
-            "username": "sa223sas",
-            "password": "123456",
-            "role": "user",
-            "state": "unlock"
+            required: true,
+            validator: userPwdRule,
+            trigger: ["blur", "change"],
           },
-          {
-            "username": "admin4",
-            "password": "123456",
-            "role": "admin",
-            "state": "unlock"
-          }
         ],
-        addUserRole: [{
-            value: 'admin',
-            label: 'admin',
-          },
+        userRole: [
           {
-            value: 'user',
-            label: 'user',
-          }
-        ],
-        addUserState: [{
-            value: 'lock',
-            label: 'lock',
+            required: true,
+            message: "请选择类型",
+            trigger: "blur",
           },
+        ],
+        userState: [
           {
-            value: 'unlock',
-            label: 'unlock',
+            required: true,
+            message: "请选择状态",
+            trigger: "blur",
           },
-        ]
+        ],
+      },
+      isAdmin: false,
+      userTableData: [
+        {
+          username: "165asas",
+          password: "123456",
+          role: "user",
+          state: "unlock",
+        },
+        {
+          username: "sa223sas",
+          password: "123456",
+          role: "user",
+          state: "unlock",
+        },
+        {
+          username: "admin4",
+          password: "123456",
+          role: "admin",
+          state: "unlock",
+        },
+      ],
+      addUserRole: [
+        {
+          value: "admin",
+          label: "admin",
+        },
+        {
+          value: "user",
+          label: "user",
+        },
+      ],
+      addUserState: [
+        {
+          value: "lock",
+          label: "lock",
+        },
+        {
+          value: "unlock",
+          label: "unlock",
+        },
+      ],
+    };
+  },
+  // created() {
+  //   this.GetUser()
+  // 	let user = JSON.parse(sessionStorage.getItem("userData")).userName;
+  // 	if(user=="admin"){
+  // 		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();
       }
     },
-    // created() {
-    //   this.GetUser()
-		// 	let user = JSON.parse(sessionStorage.getItem("userData")).userName;
-		// 	if(user=="admin"){
-		// 		this.isAdmin=true;
-		// 	}
-    // },
-    mounted () {
-      this.network()
+    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);
     },
-    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;
+      this.pageSize = 1;
+    },
+    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();
       }
     },
-    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
-        })
-      },
-      //修改网络配置
-      networkmod (data) {
-          this.dialogVisiblenetwork = true
-          this.listdata = {
-            name: '修改网络配置',
-            type: 1,
-            list: data.row
-          }
-      },
-      //网络配置删除
-      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
-        })
-      },
-      //订单修改
-      ordermod (data) {
-          this.dialogVisibledoder = true
-          this.listdata = {
-            name: '修改订单配置',
-            type: 1,
-            list: data.row
-          }
-      },
-      //订单删除
-      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 => {
-          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
-        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: '新增告警配置',
-            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,
-          }
-        }
-      },
-      //修改告警
-      newalarmmod (data) {
-        if (this.actives == 3) {
-          this.dialogVisibledarm = true
-          this.listdata = {
-            name: '修改告警配置',
-            type: 1,
-            list: data.row
-          }
-        }
-      },
-      //告警删除
-      alarmele (data) {
-        this.dialogVisibledele = true
-        this.alarList = data.row
-        this.deleContent = {
-          name: '删除告警配置',
-          cont: '是否确认删除该告警配置？',
-          type: '告警'
-        }
-      },
-      //删除关闭
-      delepop () {
-        this.dialogVisibledele = 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()
-        }
-      },
-      //告警关闭
-      arlem () {
-        this.dialogVisibledarm = false
-        this.giveAn()
-      },
-      //关闭新增网络配置
-      workConadd () {
-        this.dialogVisiblenetwork = false
+    //网络配置
+    network() {
+      let params = {
+        page: this.pageSize,
+        PageSize: 10,
+      };
+      networkConfiguration(params).then((res) => {
+        this.tableData = res.resultData;
+        this.totalPages = res.pageNumber;
+      });
+    },
+    //修改网络配置
+    networkmod(data) {
+      this.dialogVisiblenetwork = true;
+      this.listdata = {
+        name: "修改网络配置",
+        type: 1,
+        list: data.row,
+      };
+    },
+    //网络配置删除
+    networkele(data) {
+      this.dialogVisibledele = true;
+      this.alarList = data.row;
+      this.deleContent = {
+        name: "删除网络信息",
+        cont: "是否确认删除该网络信息？",
+        type: "网络",
+      };
+    },
+    //订单配置
+    orderConfig() {
+      let params = {
+        page: this.pageSize,
+        PageSize: 10,
+      };
+      orderConfiguration(params).then((res) => {
+        this.tableData = res.resultData;
+        this.totalPages = res.pageNumber;
+      });
+    },
+    //订单修改
+    ordermod(data) {
+      this.dialogVisibledoder = true;
+      this.listdata = {
+        name: "修改订单配置",
+        type: 1,
+        list: data.row,
+      };
+    },
+    //订单删除
+    orderele(data) {
+      this.dialogVisibledele = true;
+      this.alarList = data.row;
+      this.deleContent = {
+        name: "删除订单信息",
+        cont: "是否确认删除该订单信息？",
+        type: "订单",
+      };
+    },
+    //标签配置
+    labelConfig() {
+      let params = {
+        page: this.pageSize,
+        PageSize: 10,
+      };
+      labelConfiguration(params).then((res) => {
+        res.resultData.forEach((res) => {
+          res.states = res.state == 1 ? "启用" : "停用";
+        });
+        this.tableData = res.resultData;
+        this.totalPages = res.pageNumber;
+      });
+    },
+    //标签配置修改
+    labelConfigmod(data) {
+      this.dialogVisibledlabe = true;
+      this.listdata = {
+        name: "修改标签配置",
+        type: 1,
+        list: data.row,
+      };
+    },
+    //标签配置删除
+    labelConfigele(data) {
+      this.dialogVisibledele = true;
+      this.alarList = data.row;
+      this.deleContent = {
+        name: "删除标签信息",
+        cont: "是否确认删除该标签信息？",
+        type: "标签",
+      };
+    },
+    //告警信息
+    giveAn() {
+      let params = {
+        page: this.pageSize,
+        PageSize: 10,
+      };
+      alarmConfiguration(params).then((res) => {
+        this.tableData = res.resultData;
+        this.totalPages = res.pageNumber;
+      });
+    },
+    //新增告警/网络/订单
+    newAdd() {
+      if (this.actives == 3) {
+        this.dialogVisibledarm = true;
+        this.listdata = {
+          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,
+        };
+      }
+    },
+    //修改告警
+    newalarmmod(data) {
+      if (this.actives == 3) {
+        this.dialogVisibledarm = true;
+        this.listdata = {
+          name: "修改告警配置",
+          type: 1,
+          list: data.row,
+        };
+      }
+    },
+    //告警删除
+    alarmele(data) {
+      this.dialogVisibledele = true;
+      this.alarList = data.row;
+      this.deleContent = {
+        name: "删除告警配置",
+        cont: "是否确认删除该告警配置？",
+        type: "告警",
+      };
+    },
+    //删除关闭
+    delepop() {
+      this.dialogVisibledele = false;
+      if (this.actives == 0) {
         this.network();
-      },
-      //关闭订单
-      oderadd () {
-        this.dialogVisibledoder = false
-        this.orderConfig()
-      },
-      //关闭标签
-      labeladd () {
-        this.dialogVisibledlabe =false
-        this.labelConfig()
-      },
-      // GetUser() {
-      //   GetUsers().then(res => {
-      //     console.log(res.UsersManagement);
-      //     this.userTableData = res.UsersManagement
-      //   })
-      // },
-	  // handleClick(row){
-		//   let data = {
-		// 	  "username":row.username
-		//   }
-		//   this.$confirm('是否删除当前用户?', '提示', {
-		//     confirmButtonText: '确定',
-		//     cancelButtonText: '取消',
-		//     type: 'warning'
-		//   }).then(() => {
-		//     homedeleteuser(data).then(res => {
-		//       this.$message({
-		//         type: 'success',
-		//         message: '导出成功!'
-		//       });
-		// 	  this.GetUser();
-		//     })
-		//   }).catch(() => {
-		//   });
-	  // },
-      // btnOK() {
-      //   let userForm = {
-      //     username: this.form.addUserName,
-      //     password: this.form.addUserPwd,
-      //     role: this.form.addUserRoleValue,
-      //     state: this.form.addUserStateValue
-      //   }
-      //   Homeadduser(userForm).then(res => {
-			// console.log(res);
-			// this.dialogVisible = false;
-			// this.$message({
-			//   type: 'success',
-			//   message: '创建成功'
-			// });
-			// this.GetUser()
-      //   })
-      // },
-      // btnNO() {
-      //   this.dialogVisible = !this.dialogVisible
-      // },
-      // goTo() {
-      //   this.$router.push("/Alarm/RealTime");
-      // },
-      downlodTable() {
-        this.$confirm('是否需要导出xlsx文档, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
+      } else if (this.actives == 1) {
+        this.orderConfig();
+      } else if (this.actives == 2) {
+        this.labelConfig();
+      } else if (this.actives == 3) {
+        this.giveAn();
+      }
+    },
+    //告警关闭
+    arlem() {
+      this.dialogVisibledarm = false;
+      this.giveAn();
+    },
+    //关闭新增网络配置
+    workConadd() {
+      this.dialogVisiblenetwork = false;
+      this.network();
+    },
+    //关闭订单
+    oderadd() {
+      this.dialogVisibledoder = false;
+      this.orderConfig();
+    },
+    //关闭标签
+    labeladd() {
+      this.dialogVisibledlabe = false;
+      this.labelConfig();
+    },
+    // GetUser() {
+    //   GetUsers().then(res => {
+    //     console.log(res.UsersManagement);
+    //     this.userTableData = res.UsersManagement
+    //   })
+    // },
+    // handleClick(row){
+    //   let data = {
+    // 	  "username":row.username
+    //   }
+    //   this.$confirm('是否删除当前用户?', '提示', {
+    //     confirmButtonText: '确定',
+    //     cancelButtonText: '取消',
+    //     type: 'warning'
+    //   }).then(() => {
+    //     homedeleteuser(data).then(res => {
+    //       this.$message({
+    //         type: 'success',
+    //         message: '导出成功!'
+    //       });
+    // 	  this.GetUser();
+    //     })
+    //   }).catch(() => {
+    //   });
+    // },
+    // btnOK() {
+    //   let userForm = {
+    //     username: this.form.addUserName,
+    //     password: this.form.addUserPwd,
+    //     role: this.form.addUserRoleValue,
+    //     state: this.form.addUserStateValue
+    //   }
+    //   Homeadduser(userForm).then(res => {
+    // console.log(res);
+    // this.dialogVisible = false;
+    // this.$message({
+    //   type: 'success',
+    //   message: '创建成功'
+    // });
+    // this.GetUser()
+    //   })
+    // },
+    // btnNO() {
+    //   this.dialogVisible = !this.dialogVisible
+    // },
+    // goTo() {
+    //   this.$router.push("/Alarm/RealTime");
+    // },
+    downlodTable() {
+      this.$confirm("是否需要导出xlsx文档, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
           this.downFile();
           this.$message({
-            type: 'success',
-            message: '导出成功!'
+            type: "success",
+            message: "导出成功!",
           });
-        }).catch(() => {
+        })
+        .catch(() => {
           this.$message({
-            type: 'info',
-            message: '已取消导出'
+            type: "info",
+            message: "已取消导出",
           });
         });
-      },
-      downFile() {
-        var wb = XLSX.utils.table_to_book(document.querySelector("#userTableData"));
-        var wbout = XLSX.write(wb, {
-          bookType: "xlsx",
-          bookSST: true,
-          type: "array"
-        });
-        try {
-          FileSaver.saveAs(
-            new Blob([wbout], {
-              type: "application/octet-stream"
-            }),
-            "user.xlsx"
-          );
-        } catch (e) {
-          if (typeof console !== "undefined") console.log(e, wbout);
-        }
-        return wbout;
-      },
-      addUser() {
-        this.dialogVisible = true;
+    },
+    downFile() {
+      var wb = XLSX.utils.table_to_book(
+        document.querySelector("#userTableData")
+      );
+      var wbout = XLSX.write(wb, {
+        bookType: "xlsx",
+        bookSST: true,
+        type: "array",
+      });
+      try {
+        FileSaver.saveAs(
+          new Blob([wbout], {
+            type: "application/octet-stream",
+          }),
+          "user.xlsx"
+        );
+      } catch (e) {
+        if (typeof console !== "undefined") console.log(e, wbout);
       }
+      return wbout;
     },
-    components: {
-      Delepop,
-      AlarmConfigpop,
-      NetworkConfigpop,
-      OrderConfigpop,
-      LabelConfigpop
-    }
-  }
+    addUser() {
+      this.dialogVisible = true;
+    },
+  },
+  components: {
+    Delepop,
+    AlarmConfigpop,
+    NetworkConfigpop,
+    OrderConfigpop,
+    LabelConfigpop,
+  },
+};
 </script>
 
 <style lang="less" scoped>
-  .downlodTable {
-    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: 150px;
-    color: #ddd;
-    text-align: center;
-    line-height: 30px;
-    cursor: pointer;
-  }
-  .downlodTables {
-    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;
+.downlodTable {
+  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: 150px;
+  color: #ddd;
+  text-align: center;
+  line-height: 30px;
+  cursor: pointer;
+}
+.downlodTables {
+  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: 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%;
+  overflow: hidden;
+  position: relative;
+  padding: 4.0625rem 1.5rem 4.0625rem 2.5rem;
+  box-sizing: border-box;
+  // background: url(../../assets/img/border.png) no-repeat center center;
+  // background-size: 100% 100%;
+  .nav_modify {
     position: absolute;
-    top: 30px;
-    right: 220px;
-    color: #ddd;
-    text-align: center;
-    line-height: 30px;
-    cursor: pointer;
-  }
-  .downlodTableer {
-    width: 50px;
+    width: 25%;
     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%;
-    overflow: hidden;
-    position: relative;
-    padding: 4.0625rem 1.5rem 4.0625rem 2.5rem;
-    box-sizing: border-box;
-    // background: url(../../assets/img/border.png) no-repeat center center;
-    // background-size: 100% 100%;
-    .nav_modify{
-      position: absolute;
-      width: 25%;
-      height: 30px;
-      top: 29px;
-      left: 11%;
-      ul{
-        width: 100%;
+    top: 29px;
+    left: 11%;
+    ul {
+      width: 100%;
+      height: 100%;
+      display: flex;
+      margin-top: 0;
+      margin-bottom: 0;
+      padding-left: 0;
+      justify-content: space-between;
+      .nav_child {
+        width: 15%;
         height: 100%;
         display: flex;
-        margin-top: 0;
-        margin-bottom: 0;
-        padding-left: 0;
-        justify-content: space-between;
-        .nav_child{
-          width: 15%;
-          height: 100%;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          background: rgba(4,120,192,0.4);
-          border-radius: 1px;
-          color: #ffffff;
-          cursor: pointer;
-        }
-        .nav_childup{
-          width: 15%;
-          height: 100%;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          background: #0478C0;
-          border-radius: 1px;
-          color: #ffffff;
-          cursor: pointer;
-        }
+        align-items: center;
+        justify-content: center;
+        background: rgba(4, 120, 192, 0.4);
+        border-radius: 1px;
+        color: #ffffff;
+        cursor: pointer;
       }
-    }
-    .border {
-      position: absolute;
-    }
-
-    .border_left_top {
-      width: 11.625rem;
-      height: 5.875rem;
-      background: url(../../../assets/img/border_left_top.png);
-      left: 0;
-      top: 0;
-    }
-
-    .border_top {
-      width: calc(100% - 11.625rem - 4.9375rem);
-      height: 1.5rem;
-      background: url(../../../assets/img/border_top.png) no-repeat center center;
-      background-size: 100% 100%;
-      left: 11.625rem;
-      top: 0;
-    }
-
-    .border_right_top {
-      width: 4.9375rem;
-      height: 5.875rem;
-      background: url(../../../assets/img/border_right_top.png) no-repeat center center;
-      background-size: 100% 100%;
-      right: 0.0625rem;
-      top: 0;
-    }
-
-    .border_left {
-      width: 1.375rem;
-      height: calc(100% - 5.875rem - 7.625rem);
-      background: url(../../../assets/img/border_left.png) no-repeat center center;
-      background-size: 100% 100%;
-      left: 0;
-      top: 5.875rem;
-    }
-
-    .border_right {
-      width: 0.1875rem;
-      height: calc(100% - 5.875rem - 7.6875rem);
-      background: url(../../../assets/img/border_right.png) no-repeat center center;
-      background-size: 100% 100%;
-      right: 0;
-      top: 5.875rem;
-    }
-
-    .border_left_bottom {
-      width: 11.625rem;
-      height: 7.625rem;
-      background: url(../../../assets/img/border_left_bottom.png) no-repeat center center;
-      background-size: 100% 100%;
-      left: 0;
-      bottom: 0;
-    }
-
-    .border_bottom {
-      width: calc(100% - 11.625rem - 4.9375rem);
-      height: 0.1875rem;
-      background: url(../../../assets/img/border_bottom.png) no-repeat center center;
-      background-size: 100% 100%;
-      left: 11.625rem;
-      bottom: 0;
-    }
-
-    .border_right_bottom {
-      width: 4.9375rem;
-      height: 7.6875rem;
-      background: url(../../../assets/img/border_right_bottom.png) no-repeat center center;
-      background-size: 100% 100%;
-      right: 0;
-      bottom: 0;
-    }
-
-    #topButton2 {
-      position: absolute;
-      top: 8px;
-      left: 8px;
-      z-index: 1;
-
-      button:first-child {
-        border: none;
-        background: url(../../../assets/img/check1.png) no-repeat center center;
-        background-size: 100% 100%;
-        padding: 12px 80px 12px 40px;
-        position: absolute;
-        font-weight: bold;
-        font-style: italic;
-        color: #76899D;
-      }
-
-      .active {
-        color: #fff !important;
+      .nav_childup {
+        width: 15%;
+        height: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background: #0478c0;
+        border-radius: 1px;
+        color: #ffffff;
+        cursor: pointer;
       }
     }
-
-    .el-table::before {
-      height: 0;
-    }
-
-    .addUser {
-      position: absolute;
-      z-index: 10;
-      right: 25px;
-      top: 30px;
-      background: url(../../../assets/img/btn_add.png) no-repeat center center;
-      background-size: 100%;
-      border: none;
-      border-radius: 0;
-      width: 5rem;
-      padding: 0;
-      height: 2rem;
-      line-height: 2rem;
-      font-size: 0.775rem;
-      color: #2DAFF5;
-    }
-
+  }
+  .border {
+    position: absolute;
   }
 
-  #addUserDialog .el-dialog {
-    background: none;
+  .border_left_top {
+    width: 11.625rem;
+    height: 5.875rem;
+    background: url(../../../assets/img/border_left_top.png);
+    left: 0;
+    top: 0;
   }
 
-  #addUserDialog .el-dialog .el-dialog__header {
-    padding: 55px 60px 10px;
-    color: #2DAFF5;
-    position: absolute;
-    width: 100%;
+  .border_top {
+    width: calc(100% - 11.625rem - 4.9375rem);
+    height: 1.5rem;
+    background: url(../../../assets/img/border_top.png) no-repeat center center;
+    background-size: 100% 100%;
+    left: 11.625rem;
+    top: 0;
   }
 
-  #addUserDialog .el-dialog .el-dialog__header .el-dialog__title {
-    color: #2DAFF5;
+  .border_right_top {
+    width: 4.9375rem;
+    height: 5.875rem;
+    background: url(../../../assets/img/border_right_top.png) no-repeat center
+      center;
+    background-size: 100% 100%;
+    right: 0.0625rem;
+    top: 0;
   }
 
-  #addUserDialog .el-dialog .el-dialog__header .el-dialog__headerbtn {
-    position: absolute;
-    top: 5rem;
-    right: 11rem;
+  .border_left {
+    width: 1.375rem;
+    height: calc(100% - 5.875rem - 7.625rem);
+    background: url(../../../assets/img/border_left.png) no-repeat center center;
+    background-size: 100% 100%;
+    left: 0;
+    top: 5.875rem;
   }
 
-  #addUserDialog .el-dialog .el-dialog__body {
-    background: url(../../../assets/img/dialogBack.png) no-repeat center center;
+  .border_right {
+    width: 0.1875rem;
+    height: calc(100% - 5.875rem - 7.6875rem);
+    background: url(../../../assets/img/border_right.png) no-repeat center
+      center;
     background-size: 100% 100%;
-    padding: 110px 70px 110px 50px;
-    color: #2DAFF5;
-    height: 37rem;
-    box-sizing: border-box;
-    width: 600px;
-    margin: 0 auto;
+    right: 0;
+    top: 5.875rem;
   }
 
-  #addUserDialog .el-dialog .el-dialog__body .el-form-item__label {
-    color: #2DAFF5;
+  .border_left_bottom {
+    width: 11.625rem;
+    height: 7.625rem;
+    background: url(../../../assets/img/border_left_bottom.png) no-repeat center
+      center;
+    background-size: 100% 100%;
+    left: 0;
+    bottom: 0;
   }
 
-  #addUserDialog .el-dialog .el-dialog__body input {
-    color: #ddd;
-    height: 32px !important;
-    line-height: 32px !important;
-    -webkit-box-shadow: inset 0px 1px 38px 0px rgba(0, 162, 253, 0.4) !important;
-    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;
-    border-radius: 0 !important;
+  .border_bottom {
+    width: calc(100% - 11.625rem - 4.9375rem);
+    height: 0.1875rem;
+    background: url(../../../assets/img/border_bottom.png) no-repeat center
+      center;
+    background-size: 100% 100%;
+    left: 11.625rem;
+    bottom: 0;
   }
 
-  #addUserDialog .el-dialog .el-dialog__footer {
-    padding: 10px 50px;
-    position: absolute;
+  .border_right_bottom {
+    width: 4.9375rem;
+    height: 7.6875rem;
+    background: url(../../../assets/img/border_right_bottom.png) no-repeat
+      center center;
+    background-size: 100% 100%;
     right: 0;
-    bottom: 50px;
+    bottom: 0;
   }
 
-  .logBox .el-table th {
-    background: #103366 !important;
+  #topButton2 {
+    position: absolute;
+    top: 8px;
+    left: 8px;
+    z-index: 1;
+
+    button:first-child {
+      border: none;
+      background: url(../../../assets/img/check1.png) no-repeat center center;
+      background-size: 100% 100%;
+      padding: 12px 80px 12px 40px;
+      position: absolute;
+      font-weight: bold;
+      font-style: italic;
+      color: #76899d;
+    }
+
+    .active {
+      color: #fff !important;
+    }
   }
 
-  .logBox .el-table th>.cell {
-    color: #0194E4 !important;
+  .el-table::before {
+    height: 0;
   }
 
-  #sureBtn {
+  .addUser {
+    position: absolute;
+    z-index: 10;
+    right: 25px;
+    top: 30px;
     background: url(../../../assets/img/btn_add.png) no-repeat center center;
+    background-size: 100%;
     border: none;
     border-radius: 0;
+    width: 5rem;
+    padding: 0;
+    height: 2rem;
+    line-height: 2rem;
+    font-size: 0.775rem;
+    color: #2daff5;
   }
-  .el-pagination{
-    margin-left: 40%;
-    position: absolute;
-    bottom: 0;
-  }
+}
+
+#addUserDialog .el-dialog {
+  background: none;
+}
+
+#addUserDialog .el-dialog .el-dialog__header {
+  padding: 55px 60px 10px;
+  color: #2daff5;
+  position: absolute;
+  width: 100%;
+}
+
+#addUserDialog .el-dialog .el-dialog__header .el-dialog__title {
+  color: #2daff5;
+}
+
+#addUserDialog .el-dialog .el-dialog__header .el-dialog__headerbtn {
+  position: absolute;
+  top: 5rem;
+  right: 11rem;
+}
+
+#addUserDialog .el-dialog .el-dialog__body {
+  background: url(../../../assets/img/dialogBack.png) no-repeat center center;
+  background-size: 100% 100%;
+  padding: 110px 70px 110px 50px;
+  color: #2daff5;
+  height: 37rem;
+  box-sizing: border-box;
+  width: 600px;
+  margin: 0 auto;
+}
+
+#addUserDialog .el-dialog .el-dialog__body .el-form-item__label {
+  color: #2daff5;
+}
+
+#addUserDialog .el-dialog .el-dialog__body input {
+  color: #ddd;
+  height: 32px !important;
+  line-height: 32px !important;
+  -webkit-box-shadow: inset 0px 1px 38px 0px rgba(0, 162, 253, 0.4) !important;
+  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;
+  border-radius: 0 !important;
+}
+
+#addUserDialog .el-dialog .el-dialog__footer {
+  padding: 10px 50px;
+  position: absolute;
+  right: 0;
+  bottom: 50px;
+}
+
+.logBox .el-table th {
+  background: #103366 !important;
+}
+
+.logBox .el-table th > .cell {
+  color: #0194e4 !important;
+}
+
+#sureBtn {
+  background: url(../../../assets/img/btn_add.png) no-repeat center center;
+  border: none;
+  border-radius: 0;
+}
+.el-pagination {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 9999;
+  display: flex;
+  justify-content: center;
+}
 </style>