导出

src/api/request.js

@@ -417,13 +417,13 @@ export function AlarmSon(data) {//告警声音
   })
 }
 
-export function AlarmD(data) {
-  return Service({
-    url: '/Framework/ExportExcel/ExportAlarmPlc?filename=' + data.filename,
-    method: 'get',
-    data: data
-  })
-}
+// export function AlarmD(data) {
+//   return Service({
+//     url: '/Framework/ExportExcel/ExportAlarmPlc?filename=' + data.filename,
+//     method: 'get',
+//     data: data
+//   })
+// }
 // export function addNewAndroidPlugin(data) {
 //   return Service({
 //     url: '/manager/addAndroidPlguin',

src/pages/Alarm/History/index.vue

@@ -12,7 +12,7 @@
       <el-button type="primary" @click="goTo">当前</el-button>
       <el-button type="primary" class="active">历史</el-button>
     </el-button-group>
-    <div class="downlodTable" @click="downlodTable">导出</div>
+    <!-- <div class="downlodTable" @click="downlodTable">导出</div> -->
     <el-table
       :data="tableData"
       style="width: 100%; color: #2daff5; height: 678px; overflow-y: auto"
@@ -148,7 +148,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          this.downFile();
+          this.AlarmD();
           this.$message({
             type: "success",
             message: "导出成功!",
@@ -161,6 +161,31 @@ export default {
           });
         });
     },
+    //导出
+    AlarmD() {
+      // let xhr = new XMLHttpRequest();
+      // xhr.open(
+      //   "get",
+      //   window.g.url + "/Framework/ExportExcel/ExportAlarmPlc?filename=告警信息"
+      // );
+      // xhr.responseType = "blob";
+      // // xhr.setRequestHeader("token", res.resultMsg);
+      // xhr.onload = function () {
+      //   var blob = this.response;
+      //   let a = document.createElement("a");
+      //   let url = window.URL.createObjectURL(blob);
+      //   a.href = url;
+      //   a.download = "告警.xlsx";
+      //   a.click();
+      //   window.URL.revokeObjectURL(url);
+      // };
+      // xhr.send();
+      let a = document.createElement("a");
+      a.href =
+        window.g.url +
+        "/Framework/ExportExcel/ExportAlarmPlc?filename=告警信息";
+      a.click();
+    },
     downFile() {
       var wb = XLSX.utils.table_to_book(
         document.querySelector("#userTableData")

src/pages/Alarm/RealTime/index.vue

@@ -12,7 +12,7 @@
       <el-button type="primary" class="active">当前</el-button>
       <el-button type="primary" @click="goTo">历史</el-button>
     </el-button-group>
-    <div class="downlodTable" @click="downlodTable">导出</div>
+    <!-- <div class="downlodTable" @click="downlodTable">导出</div> -->
     <el-table
       :data="tableData"
       id="userTableData"
@@ -123,28 +123,28 @@ export default {
         });
     },
     AlarmD() {
-      let xhr = new XMLHttpRequest();
-      xhr.open(
-        "get",
-        window.g.url + "/Framework/ExportExcel/ExportAlarmPlc?filename=告警信息"
-      );
-      xhr.responseType = "blob";
-      // xhr.setRequestHeader("token", res.resultMsg);
-      xhr.onload = function () {
-        var blob = this.response;
-        let a = document.createElement("a");
-        let url = window.URL.createObjectURL(blob);
-        a.href = url;
-        a.download = "告警.xlsx";
-        a.click();
-        window.URL.revokeObjectURL(url);
-      };
-      xhr.send();
-      // let a = document.createElement("a");
-      // a.href =
-      //   window.g.url +
-      //   "/Framework/ExportExcel/ExportAlarmPlc?filename=告警信息";
-      // a.click();
+      // let xhr = new XMLHttpRequest();
+      // xhr.open(
+      //   "get",
+      //   window.g.url + "/Framework/ExportExcel/ExportAlarmPlc?filename=告警信息"
+      // );
+      // xhr.responseType = "blob";
+      // // xhr.setRequestHeader("token", res.resultMsg);
+      // xhr.onload = function () {
+      //   var blob = this.response;
+      //   let a = document.createElement("a");
+      //   let url = window.URL.createObjectURL(blob);
+      //   a.href = url;
+      //   a.download = "告警.xlsx";
+      //   a.click();
+      //   window.URL.revokeObjectURL(url);
+      // };
+      // xhr.send();
+      let a = document.createElement("a");
+      a.href =
+        window.g.url +
+        "/Framework/ExportExcel/ExportAlarmPlc?filename=告警信息";
+      a.click();
     },
     downFile() {
       var wb = XLSX.utils.table_to_book(

src/pages/Baggage/index/index.vue

@@ -86,7 +86,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          this.downFile();
+          this.AlarmD();
           this.$message({
             type: "success",
             message: "导出成功!",
@@ -99,6 +99,30 @@ export default {
           });
         });
     },
+    AlarmD() {
+      // let xhr = new XMLHttpRequest();
+      // xhr.open(
+      //   "get",
+      //   window.g.url + "/Framework/ExportExcel/ExportAlarmPlc?filename=告警信息"
+      // );
+      // xhr.responseType = "blob";
+      // // xhr.setRequestHeader("token", res.resultMsg);
+      // xhr.onload = function () {
+      //   var blob = this.response;
+      //   let a = document.createElement("a");
+      //   let url = window.URL.createObjectURL(blob);
+      //   a.href = url;
+      //   a.download = "告警.xlsx";
+      //   a.click();
+      //   window.URL.revokeObjectURL(url);
+      // };
+      // xhr.send();
+      let a = document.createElement("a");
+      a.href =
+        window.g.url +
+        "/Framework/ExportExcel/ExportBagTrack?filename=行李追踪";
+      a.click();
+    },
     downFile() {
       var wb = XLSX.utils.table_to_book(
         document.querySelector("#userTableData")

src/pages/Common/home.vue

@@ -14,33 +14,34 @@
 			</div>
 		</div> -->
     <div class="right_body">
-      <div class="right_upper">
-        <div class="right_upper_left">
-          <top-title title="地图信息"></top-title>
-          <div class="right_upper_title">
-            <!-- <div class="right_uppertitle_left">
+      <el-scrollbar>
+        <div class="right_upper">
+          <div class="right_upper_left">
+            <top-title title="地图信息"></top-title>
+            <div class="right_upper_title">
+              <!-- <div class="right_uppertitle_left">
 							<el-select class="Report order_select" v-model="value" placeholder="请选择订单模版">
 								<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
 								</el-option>
 							</el-select>
 						</div> -->
-            <div class="right_uppertitle_right">
-              <!-- <el-button class="custom_btn Colorbutton_blue" @click="pathOnlock">路径解锁</el-button> -->
-              <el-select
-                class="maskright_select"
-                v-model="addOrdersB"
-                @change="addOrders(addOrdersB)"
-                placeholder=""
-              >
-                <el-option
-                  v-for="item in tempalteoeder"
-                  :key="item.id"
-                  :label="item.template_name"
-                  :value="item.id"
+              <div class="right_uppertitle_right">
+                <!-- <el-button class="custom_btn Colorbutton_blue" @click="pathOnlock">路径解锁</el-button> -->
+                <el-select
+                  class="maskright_select"
+                  v-model="addOrdersB"
+                  @change="addOrders(addOrdersB)"
+                  placeholder=""
                 >
-                </el-option>
-              </el-select>
-              <!-- <el-select
+                  <el-option
+                    v-for="item in tempalteoeder"
+                    :key="item.id"
+                    :label="item.template_name"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+                <!-- <el-select
                 style="margin-left: 24px"
                 class="maskright_select"
                 v-model="addOrdersC"
@@ -55,38 +56,38 @@
                 >
                 </el-option>
               </el-select> -->
-              <!-- <el-button class="custom_btn Colorbutton_blue" @click="showModels">模板总览</el-button> -->
-              <!-- <el-button class="custom_btn Colorbutton_blue" @click="goMap">全屏显示</el-button> -->
-              <div class="all_pul" @click="goMap"></div>
+                <!-- <el-button class="custom_btn Colorbutton_blue" @click="showModels">模板总览</el-button> -->
+                <!-- <el-button class="custom_btn Colorbutton_blue" @click="goMap">全屏显示</el-button> -->
+                <div class="all_pul" @click="goMap"></div>
+              </div>
             </div>
-          </div>
-          <div class="right_map">
-            <iframe
-              width="100%"
-              frameborder="0"
-              scrolling="yes"
-              height="95%"
-              id="map_iframe"
-              :src="mapurl"
-            ></iframe>
-          </div>
-          <div class="right_mapMax" v-show="ifRe">
-            <div class="right_mapMax_Top">
-              <el-select
-                class="maskright_select"
-                v-model="addOrdersB"
-                @change="addOrders(addOrdersB)"
-                placeholder=""
-              >
-                <el-option
-                  v-for="item in tempalteMode"
-                  :key="item.template_name"
-                  :label="item.template_name"
-                  :value="item.template_name"
+            <div class="right_map">
+              <iframe
+                width="100%"
+                frameborder="0"
+                scrolling="yes"
+                height="95%"
+                id="map_iframe"
+                :src="mapurl"
+              ></iframe>
+            </div>
+            <div class="right_mapMax" v-show="ifRe">
+              <div class="right_mapMax_Top">
+                <el-select
+                  class="maskright_select"
+                  v-model="addOrdersB"
+                  @change="addOrders(addOrdersB)"
+                  placeholder=""
                 >
-                </el-option>
-              </el-select>
-              <!-- <el-select
+                  <el-option
+                    v-for="item in tempalteMode"
+                    :key="item.template_name"
+                    :label="item.template_name"
+                    :value="item.template_name"
+                  >
+                  </el-option>
+                </el-select>
+                <!-- <el-select
                 class="maskright_select"
                 v-model="addOrdersC"
                 @change="addOrders(addOrdersC)"
@@ -100,54 +101,54 @@
                 >
                 </el-option>
               </el-select> -->
-              <!-- <el-button class="custom_btn Colorbutton_blue" @click="showModels">模板总览</el-button> -->
-              <el-button
-                class="custom_btn exitRe Colorbutton_blue"
-                @click="goMap"
-                >退出全屏</el-button
-              >
-            </div>
-            <div class="right_mapMax_Bottom">
-              <iframe
-                frameborder="0"
-                scrolling="no"
-                width="100%"
-                height="100%"
-                id="map_iframe"
-                :src="mapurl"
-              ></iframe>
+                <!-- <el-button class="custom_btn Colorbutton_blue" @click="showModels">模板总览</el-button> -->
+                <el-button
+                  class="custom_btn exitRe Colorbutton_blue"
+                  @click="goMap"
+                  >退出全屏</el-button
+                >
+              </div>
+              <div class="right_mapMax_Bottom">
+                <iframe
+                  frameborder="0"
+                  scrolling="no"
+                  width="100%"
+                  height="100%"
+                  id="map_iframe"
+                  :src="mapurl"
+                ></iframe>
+              </div>
             </div>
-          </div>
-          <!-- <top-title title="报警统计" style="margin-top:20px"></top-title>
+            <!-- <top-title title="报警统计" style="margin-top:20px"></top-title>
 					<div class="alarm_statistics"></div> -->
-        </div>
-        <div class="right_upper_right">
-          <div class="right_upper_top">
-            <div class="right_upper_top_left">
-              <top-title title="车辆信息"> </top-title>
-              <div class="cars_infor_body">
-                <el-scrollbar style="width: 100%; height: 100%">
-                  <ul v-for="(item, index) in carsinfordata" :key="index">
-                    <li>
-                      {{ item.title }}
-                    </li>
-                    <li>
-                      {{ item.statues }}
-                    </li>
-                    <li>电量：{{ item.elect }}</li>
-                    <li>
-                      调度上线：<i
-                        @click="changestatus(item, index)"
-                        :class="
-                          item.dispatchstatues == '1'
-                            ? 'IconStart'
-                            : 'IconClose'
-                        "
-                      ></i>
-                    </li>
-                  </ul>
-                </el-scrollbar>
-                <!-- <div class="cars_item" :class="carsindex == index ? 'cars_item_active' : ''" @click="activeCar(index),carsindex=index"
+          </div>
+          <div class="right_upper_right">
+            <div class="right_upper_top">
+              <div class="right_upper_top_left">
+                <top-title title="车辆信息"> </top-title>
+                <div class="cars_infor_body">
+                  <el-scrollbar style="width: 100%; height: 100%">
+                    <ul v-for="(item, index) in carsinfordata" :key="index">
+                      <li>
+                        {{ item.title }}
+                      </li>
+                      <li>
+                        {{ item.statues }}
+                      </li>
+                      <li>电量：{{ item.elect }}</li>
+                      <li>
+                        调度上线：<i
+                          @click="changestatus(item, index)"
+                          :class="
+                            item.dispatchstatues == '1'
+                              ? 'IconStart'
+                              : 'IconClose'
+                          "
+                        ></i>
+                      </li>
+                    </ul>
+                  </el-scrollbar>
+                  <!-- <div class="cars_item" :class="carsindex == index ? 'cars_item_active' : ''" @click="activeCar(index),carsindex=index"
 								v-for="(item, index) in carsinfordata" :key="index">
 									<div class="cars_item_body">
 										<div class="cars_item_title">
@@ -166,205 +167,208 @@
 										</div>
 									</div>
 								</div> -->
-              </div>
-            </div>
-            <div class="right_upper_top_right">
-              <div
-                style="
-                  width: 100%;
-                  height: 110px;
-                  position: relative;
-                  top: 0px;
-                  float: left;
-                "
-              >
-                <top-title title="任务控制"></top-title>
-                <div class="carbtn_box" style="width: 100%; height: 70%">
-                  <div
-                    v-if="showCar.ifshow"
-                    class="carbtn_item"
-                    style="
-                      width: 100%;
-                      height: 120px;
-                      margin-bottom: 13px;
-                      background-color: #092754;
-                      display: flex;
-                      align-items: center;
-                      justify-content: space-around;
-                    "
-                    v-for="(item, index) in carbtn"
-                  >
-                    <label style="color: #ffffff; font-size: 20px">{{
-                      item.btn_title
-                    }}</label>
-                    <el-input
-                      v-if="item.type == 'byrw'"
-                      v-model="number"
-                      :min="0"
-                      onkeyup="this.value = this.value.replace(/[^\d.]/g,'');"
-                      placeholder=""
-                    ></el-input>
-                    <i
-                      class="IconFont"
-                      style="font-size: 20px"
-                      @click="changeCarbtn(item, index)"
-                      :class="item.btn_icon == '1' ? 'IconStart' : 'IconClose'"
-                    ></i>
-                  </div>
-                  <!-- <p v-if="Offline" style="float: left;font-size: 28px;color: #606266b0;letter-spacing: 3px;line-height: 10px;padding-left: 40px;">车辆已下线</p> -->
                 </div>
+              </div>
+              <div class="right_upper_top_right">
                 <div
-                  class="moreOrder"
                   style="
-                    float: right;
+                    width: 100%;
+                    height: 110px;
                     position: relative;
-                    top: -5px;
-                    width: 100px;
-                    height: 50px;
-                    right: 30px;
+                    top: 0px;
+                    float: left;
                   "
-                  @click=""
                 >
-                  <!-- <el-button class="Colorbutton_blue">更多订单</el-button> -->
+                  <top-title title="任务控制"></top-title>
+                  <div class="carbtn_box" style="width: 100%; height: 70%">
+                    <div
+                      v-if="showCar.ifshow"
+                      class="carbtn_item"
+                      style="
+                        width: 100%;
+                        height: 120px;
+                        margin-bottom: 13px;
+                        background-color: #092754;
+                        display: flex;
+                        align-items: center;
+                        justify-content: space-around;
+                      "
+                      v-for="(item, index) in carbtn"
+                    >
+                      <label style="color: #ffffff; font-size: 20px">{{
+                        item.btn_title
+                      }}</label>
+                      <el-input
+                        v-if="item.type == 'byrw'"
+                        v-model="number"
+                        :min="0"
+                        onkeyup="this.value = this.value.replace(/[^\d.]/g,'');"
+                        placeholder=""
+                      ></el-input>
+                      <i
+                        class="IconFont"
+                        style="font-size: 20px"
+                        @click="changeCarbtn(item, index)"
+                        :class="
+                          item.btn_icon == '1' ? 'IconStart' : 'IconClose'
+                        "
+                      ></i>
+                    </div>
+                    <!-- <p v-if="Offline" style="float: left;font-size: 28px;color: #606266b0;letter-spacing: 3px;line-height: 10px;padding-left: 40px;">车辆已下线</p> -->
+                  </div>
+                  <div
+                    class="moreOrder"
+                    style="
+                      float: right;
+                      position: relative;
+                      top: -5px;
+                      width: 100px;
+                      height: 50px;
+                      right: 30px;
+                    "
+                    @click=""
+                  >
+                    <!-- <el-button class="Colorbutton_blue">更多订单</el-button> -->
+                  </div>
                 </div>
               </div>
             </div>
-          </div>
 
-          <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"
-                ref="myScoll"
-              >
-                <div
-                  class="givealarm_child"
-                  v-for="(item, index) in agreepersonlist"
-                  :key="index"
+            <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"
+                  ref="myScoll"
                 >
-                  <!-- <div class="top">
+                  <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.alarm_date }}</p>
-                  <span>{{ item.error_position }}</span>
-                  <span>{{ item.error_content }}</span>
-                  <span>{{ item.handle_method }}</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> -->
+                    <p>{{ item.alarm_date }}</p>
+                    <span>{{ item.error_position }}</span>
+                    <span>{{ item.error_content }}</span>
+                    <span>{{ item.handle_method }}</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> -->
+              </div>
             </div>
-          </div>
-          <top-title title="订单信息" style="margin-top: 30px"></top-title>
-          <div class="right_lower">
-            <div class="filter_by_state">
-              <el-select
-                v-model="filter_by_state"
-                placeholder="全部"
-                clearable
-                class="filter_by_state_select"
-                @change="filterChange"
-              >
-                <el-option
-                  v-for="item in typeOptions"
-                  :key="item.value"
+            <top-title title="订单信息" style="margin-top: 30px"></top-title>
+            <div class="right_lower">
+              <div class="filter_by_state">
+                <el-select
+                  v-model="filter_by_state"
+                  placeholder="全部"
+                  clearable
+                  class="filter_by_state_select"
+                  @change="filterChange"
+                >
+                  <el-option
+                    v-for="item in typeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </div>
+              <el-table :data="tableData" height="267px" width="100%">
+                <el-table-column
                   :label="item.label"
-                  :value="item.value"
+                  :align="item.label == '完成进度' ? 'left' : 'center'"
+                  :width="item.label == '操作' ? '280' : ''"
+                  v-for="(item, index) in tableprop"
+                  :key="index"
                 >
-                </el-option>
-              </el-select>
-            </div>
-            <el-table :data="tableData" height="267px" width="100%">
-              <el-table-column
-                :label="item.label"
-                :align="item.label == '完成进度' ? 'left' : 'center'"
-                :width="item.label == '操作' ? '280' : ''"
-                v-for="(item, index) in tableprop"
-                :key="index"
-              >
-                <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
-                    >
-                  </div>
-                  <div v-else-if="item.label == '完成进度'">
-                    <div class="progress_body">
-                      <span class="progress_span">{{
-                        scope.row[item.prop]
-                      }}</span>
-                      <div
-                        :style="{
-                          width: scope.row[item.prop],
-                          background: '#20CEA0',
-                          height: '100%',
-                        }"
-                        class="progress_item"
-                      ></div>
+                  <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
+                      >
                     </div>
-                  </div>
-                  <div v-else>
-                    <div
-                      v-if="item.render"
-                      :style="{
-                        color: item.rendercolor
-                          ? item.rendercolor(scope.row)
-                          : '',
-                      }"
-                    >
-                      {{ item.render(scope.row) }}
+                    <div v-else-if="item.label == '完成进度'">
+                      <div class="progress_body">
+                        <span class="progress_span">{{
+                          scope.row[item.prop]
+                        }}</span>
+                        <div
+                          :style="{
+                            width: scope.row[item.prop],
+                            background: '#20CEA0',
+                            height: '100%',
+                          }"
+                          class="progress_item"
+                        ></div>
+                      </div>
                     </div>
                     <div v-else>
-                      {{ scope.row[item.prop] }}
+                      <div
+                        v-if="item.render"
+                        :style="{
+                          color: item.rendercolor
+                            ? item.rendercolor(scope.row)
+                            : '',
+                        }"
+                      >
+                        {{ item.render(scope.row) }}
+                      </div>
+                      <div v-else>
+                        {{ scope.row[item.prop] }}
+                      </div>
                     </div>
-                  </div>
-                </template>
-              </el-table-column>
-            </el-table>
-            <el-pagination
-              @current-change="changePage"
-              @prev-click="changePage"
-              @next-click="changePage"
-              layout="prev, pager, next"
-              :total="pageCount"
-            >
-            </el-pagination>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <el-pagination
+                @current-change="changePage"
+                @prev-click="changePage"
+                @next-click="changePage"
+                layout="prev, pager, next"
+                :total="pageCount"
+              >
+              </el-pagination>
+            </div>
           </div>
         </div>
-      </div>
+      </el-scrollbar>
       <!-- <top-title title="具体订单状态" style="margin-top: 10px;"></top-title>
 			<div class="right_lower">
 				<div class="filter_by_state">
@@ -1800,7 +1804,7 @@ export default {
     display: flex;
     flex-direction: column;
     width: 80%;
-
+    height: 87vh;
     .right_upper {
       flex: 2;
       display: flex;

src/pages/SystemSet/User/index.vue

@@ -24,8 +24,12 @@
       </ul>
     </div>
     <!-- <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="downlodTables" @click="downlodTable" v-if="actives != 2">
+      导入
+    </div>
+    <div class="downlodTable" @click="downlodTable" v-if="actives != 2">
+      导出
+    </div>
     <div class="downlodTableer" @click="newAdd()">新增</div>
     <el-table
       :data="tableData"
@@ -464,6 +468,43 @@ export default {
     },
   },
   methods: {
+    downlodTable() {
+      this.$confirm("是否需要导出xlsx文档, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.AlarmD();
+          this.$message({
+            type: "success",
+            message: "导出成功!",
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消导出",
+          });
+        });
+    },
+    AlarmD() {
+      let a = document.createElement("a");
+      if (this.actives == 0) {
+        a.href =
+          window.g.url +
+          "/Framework/ExportExcel/ExportAmrPlc?filename=网络配置";
+      } else if (this.actives == 1) {
+        a.href =
+          window.g.url +
+          "/Framework/ExportExcel/ExportConfigOrder?filename=订单配置";
+      } else if (this.actives == 3) {
+        a.href =
+          window.g.url +
+          "/Framework/ExportExcel/ExportAlarmPlc?filename=告警配置";
+      }
+      a.click();
+    },
     navUp(index, item) {
       this.navName = item.name;
       this.actives = index;