From 0d70f430c0609a327f0eaf75236d07d0c971bc2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E8=B4=A4=E9=87=91?= <1960116313@qq.com>
Date: Mon, 27 Jun 2022 17:53:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=8D=A1=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E5=AF=BC=E5=87=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js                                   |  2 -
 .../communicationmanage/outbound/outbound.vue | 45 ++++++++++++-------
 src/views/informationmanage/sim/index.vue     | 37 ++++++++-------
 .../original/targetpackagemanage/index.vue    |  2 +-
 4 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/src/main.js b/src/main.js
index 499b887..f75a90f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,8 +23,6 @@ import avueUeditor from 'avue-plugin-ueditor';
 import website from '@/config/website';
 import crudCommon from '@/mixins/crud';
 import {baseUrl,apis} from '@/config/env';
-// import dataV from '@jiaminghi/data-view'
-// Vue.use(dataV)
 // 注册全局crud驱动
 window.$crudCommon = crudCommon;
 // 加载Vue拓展
diff --git a/src/views/communicationmanage/outbound/outbound.vue b/src/views/communicationmanage/outbound/outbound.vue
index 53e1916..4165be4 100644
--- a/src/views/communicationmanage/outbound/outbound.vue
+++ b/src/views/communicationmanage/outbound/outbound.vue
@@ -47,9 +47,7 @@
             title="您确认要同步实名吗？"
             placement="top"
           >
-            <div class="el-icon-refresh" slot="reference">
-              &nbsp;同步实名
-            </div>
+            <div class="el-icon-refresh" slot="reference">&nbsp;同步实名</div>
           </el-popconfirm>
         </el-dropdown-item>
         <el-dropdown-item>
@@ -58,7 +56,11 @@
             cancel-button-text="取消"
             @confirm="handleSimStatus(scope.row.id, scope.row.lifecycleStatus)"
             icon-color="red"
-            :title="scope.row.lifecycleStatus != 4?'您确认要停机吗？':'您确认要复机吗？'"
+            :title="
+              scope.row.lifecycleStatus != 4
+                ? '您确认要停机吗？'
+                : '您确认要复机吗？'
+            "
             placement="top"
           >
             <div
@@ -105,7 +107,7 @@
               v-for="(item, index) in tenantlist"
               :label="item.tenantName"
               :value="item.tenantId"
-              :key="item.tenantId"
+              :key="index"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -120,7 +122,7 @@
               v-for="(item, index) in exportTypelist"
               :label="item.dictValue"
               :value="item.dictKey"
-              :key="item.dictKey"
+              :key="index"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -291,7 +293,7 @@ export default {
             prop: "userId",
             type: "select",
             dicUrl: "/api/iot-system/user/fillData",
-             formatter: (val, value, label) => {
+            formatter: (val, value, label) => {
               if (value == -1) {
                 return "-";
               } else {
@@ -433,6 +435,13 @@ export default {
               label: "dictValue",
               value: "dictKey",
             },
+            formatter: (val, value, label) => {
+              if (value == -1) {
+                return "-";
+              } else {
+                return `${label}`;
+              }
+            },
             dataType: "number",
             span: 12,
             labelWidth: 130,
@@ -802,7 +811,9 @@ export default {
               this.website.tokenHeader
             }=${getToken()}&tenantId=${this.distribution.tenantId}&numStart=${
               this.distribution.numStart
-            }&numEnd=${this.distribution.numEnd}`
+            }&numEnd=${this.distribution.numEnd}&exportType=${
+              this.distribution.exportType
+            }`
           );
           this.dialogVisible = false;
           this.$refs.distribution.resetFields();
@@ -857,23 +868,23 @@ export default {
       });
     },
     //停机复机
-    handleSimStatus(id,type) {
+    handleSimStatus(id, type) {
       if (type == 4) {
-        updateSimStatus({id:id,operType:1}).then((res) => {
+        updateSimStatus({ id: id, operType: 1 }).then((res) => {
           if (res.data.code == 200) {
             this.$message.success("复机成功");
             this.onLoad(this.page, this.query);
-          }else{
-             this.$message.error("复机失败");
+          } else {
+            this.$message.error("复机失败");
           }
-        })
-      }else{
-        updateSimStatus({id:id,operType:0}).then((res) => {
+        });
+      } else {
+        updateSimStatus({ id: id, operType: 0 }).then((res) => {
           if (res.data.code == 200) {
             this.$message.success("停机成功");
             this.onLoad(this.page, this.query);
-          }else{
-             this.$message.error("停机失败");
+          } else {
+            this.$message.error("停机失败");
           }
         });
       }
diff --git a/src/views/informationmanage/sim/index.vue b/src/views/informationmanage/sim/index.vue
index 4070270..23189e8 100644
--- a/src/views/informationmanage/sim/index.vue
+++ b/src/views/informationmanage/sim/index.vue
@@ -37,7 +37,7 @@
           >删 除
         </el-button> -->
       </template>
-        <template slot-scope="scope" slot="menuBtn">
+      <template slot-scope="scope" slot="menuBtn">
         <el-dropdown-item>
           <el-popconfirm
             confirm-button-text="确定"
@@ -47,9 +47,7 @@
             title="您确认要同步实名吗？"
             placement="top-start"
           >
-            <div class="el-icon-refresh" slot="reference">
-              &nbsp;同步实名
-            </div>
+            <div class="el-icon-refresh" slot="reference">&nbsp;同步实名</div>
           </el-popconfirm>
         </el-dropdown-item>
         <el-dropdown-item>
@@ -58,7 +56,11 @@
             cancel-button-text="取消"
             @confirm="handleSimStatus(scope.row.id, scope.row.lifecycleStatus)"
             icon-color="red"
-            :title="scope.row.lifecycleStatus != 4?'您确认要停机吗？':'您确认要复机吗？'"
+            :title="
+              scope.row.lifecycleStatus != 4
+                ? '您确认要停机吗？'
+                : '您确认要复机吗？'
+            "
             placement="top-start"
           >
             <div
@@ -148,7 +150,10 @@
 
 <script>
 import { getList, getDetail, exporttype } from "@/api/informationmanage/sim.js";
-import { syncRealNameStatus, updateSimStatus} from "@/api/communication/outbound";
+import {
+  syncRealNameStatus,
+  updateSimStatus,
+} from "@/api/communication/outbound";
 import { mapGetters } from "vuex";
 import { getToken } from "@/util/auth";
 export default {
@@ -222,7 +227,7 @@ export default {
         selection: false,
         dialogClickModal: false,
         dialogWidth: "60%",
-         menuType: "menu",
+        menuType: "menu",
         menuWidth: "120",
         column: [
           {
@@ -699,23 +704,23 @@ export default {
       });
     },
     //停机复机
-    handleSimStatus(id,type) {
+    handleSimStatus(id, type) {
       if (type == 4) {
-        updateSimStatus({id:id,operType:1}).then((res) => {
+        updateSimStatus({ id: id, operType: 1 }).then((res) => {
           if (res.data.code == 200) {
             this.$message.success("复机成功");
             this.onLoad(this.page, this.query);
-          }else{
-             this.$message.error("复机失败");
+          } else {
+            this.$message.error("复机失败");
           }
-        })
-      }else{
-        updateSimStatus({id:id,operType:0}).then((res) => {
+        });
+      } else {
+        updateSimStatus({ id: id, operType: 0 }).then((res) => {
           if (res.data.code == 200) {
             this.$message.success("停机成功");
             this.onLoad(this.page, this.query);
-          }else{
-             this.$message.error("停机失败");
+          } else {
+            this.$message.error("停机失败");
           }
         });
       }
diff --git a/src/views/original/targetpackagemanage/index.vue b/src/views/original/targetpackagemanage/index.vue
index 4eee998..feea025 100644
--- a/src/views/original/targetpackagemanage/index.vue
+++ b/src/views/original/targetpackagemanage/index.vue
@@ -420,7 +420,7 @@ export default {
         }=${getToken()}`
       );
 
-    },
+   },
     onLoad(page, params = {}) {
       this.loading = true;
       getList(