From 2210965709e2ee278d65aad03f3c83bdcfd89647 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Fri, 24 Apr 2020 14:17:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=B3=BB=E7=BB=9F=E5=85=B3?=
 =?UTF-8?q?=E4=BA=8Evue=E6=8A=A5=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/baseUrl.js                                 |  4 ++--
 src/views/iscs/iscsSystem/config/bas/controlBAS.vue  |  6 +++---
 .../iscs/iscsSystem/config/cctv/controlCCTV.vue      |  3 ++-
 src/views/iscs/iscsSystem/index.vue                  |  4 ++--
 src/views/orderauthor/order/detail.vue               | 12 ++++++------
 src/views/orderauthor/rules/index.vue                |  4 ++--
 src/views/publish/publishMap/index.vue               | 12 ++++++------
 src/views/publish/runPlanEveryDay/index.vue          | 10 +++++-----
 src/views/publish/runPlanTemplate/index.vue          | 10 +++++-----
 src/views/system/deviceManage/add.vue                |  8 ++++----
 src/views/system/deviceManage/editConfig.vue         |  8 ++++----
 11 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 7cedc6817..e9046878d 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,9 +2,9 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        // BASE_API = 'https://test.joylink.club/jlcloud';
+        BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
-        BASE_API = 'http://192.168.3.6:9000'; // 旭强
+        // BASE_API = 'http://192.168.3.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
         // BASE_API = 'http://192.168.3.82:9000'; // 杜康
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
diff --git a/src/views/iscs/iscsSystem/config/bas/controlBAS.vue b/src/views/iscs/iscsSystem/config/bas/controlBAS.vue
index 4612fcdf4..b336c4bab 100644
--- a/src/views/iscs/iscsSystem/config/bas/controlBAS.vue
+++ b/src/views/iscs/iscsSystem/config/bas/controlBAS.vue
@@ -76,7 +76,7 @@
         </el-table-column>
       </el-table>
     </div>
-    <el-dialog title="" :visible.sync="dialogVisible" width="600px" :before-close="handleClose" class="dialog-div">
+    <el-dialog title="" :visible.sync="dialogVisible" width="600px" class="dialog-div">
       <div>
         <div class="dialog-box">
           <div class="title">模式类别</div>
@@ -104,8 +104,8 @@ export default {
     data() {
         return {
             dialogVisible: false,
-            tableTitleStyle: 'text-align: center; height: 28px; padding: 0;background: #45607B;',
-            rowStyle: 'text-align: center;height: 28px; padding: 0; background: #45607B;',
+            tableTitleStyle: {'text-align': 'center', 'height': '28px', 'padding': '0', 'background': '#45607B'},
+            rowStyle: {'text-align': 'center', 'height': '28px', 'padding': '0', 'background': '#45607B' },
             tableData: [{
                 code: '101',
                 faf1: '打开',
diff --git a/src/views/iscs/iscsSystem/config/cctv/controlCCTV.vue b/src/views/iscs/iscsSystem/config/cctv/controlCCTV.vue
index 6ff73ef03..0834261dc 100644
--- a/src/views/iscs/iscsSystem/config/cctv/controlCCTV.vue
+++ b/src/views/iscs/iscsSystem/config/cctv/controlCCTV.vue
@@ -129,7 +129,8 @@ export default {
         return {
             selectedCCTV: '41',
             descriptionList: [],
-            textarea: ''
+            textarea: '',
+            value: ''
         };
     },
     mounted() {
diff --git a/src/views/iscs/iscsSystem/index.vue b/src/views/iscs/iscsSystem/index.vue
index 95e2a93ec..81f627124 100644
--- a/src/views/iscs/iscsSystem/index.vue
+++ b/src/views/iscs/iscsSystem/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="iscs-system-box">
-    <top-nav v-if="!$route.query.group" @selectMode="selectMode" />
-    <group-nav v-if="$route.query.group" @selectMode="selectMode" />
+    <top-nav v-if="!$route.query.group" />
+    <group-nav v-if="$route.query.group" />
     <div class="content-box iscs_content_box" :class="{'displayIscs': $route.query.group}">
       <router-view />
     </div>
diff --git a/src/views/orderauthor/order/detail.vue b/src/views/orderauthor/order/detail.vue
index 0da07a4be..b5c600618 100644
--- a/src/views/orderauthor/order/detail.vue
+++ b/src/views/orderauthor/order/detail.vue
@@ -8,17 +8,17 @@
       :data="orderList"
       size="medium"
     >
-      <el-table-column :key="goodsName" :label="this.$t('orderAuthor.commodityName')" prop="goodsName" />
-      <el-table-column :key="forever" :label="this.$t('orderAuthor.permanenceOrNot')" prop="forever">
+      <el-table-column :label="this.$t('orderAuthor.commodityName')" prop="goodsName" />
+      <el-table-column :label="this.$t('orderAuthor.permanenceOrNot')" prop="forever">
         <template slot-scope="scope">
           {{ $ConstSelect.translate(scope.row.forever, 'Whether') }}
         </template>
       </el-table-column>
 
-      <el-table-column :key="goodsName" :label="this.$t('orderAuthor.goodsAmount')" prop="goodsAmount" />
-      <el-table-column :key="goodsName" :label="this.$t('orderAuthor.itemPricing')" prop="price" />
-      <el-table-column :key="goodsName" :label="this.$t('orderAuthor.startDate')" prop="startTime" />
-      <el-table-column :key="goodsName" :label="this.$t('orderAuthor.purchaseMonths')" prop="monthAmount">
+      <el-table-column :label="this.$t('orderAuthor.goodsAmount')" prop="goodsAmount" />
+      <el-table-column :label="this.$t('orderAuthor.itemPricing')" prop="price" />
+      <el-table-column :label="this.$t('orderAuthor.startDate')" prop="startTime" />
+      <el-table-column :label="this.$t('orderAuthor.purchaseMonths')" prop="monthAmount">
         <template slot-scope="scope">
           {{ scope.row.forever?'/':scope.row.monthAmount }}
         </template>
diff --git a/src/views/orderauthor/rules/index.vue b/src/views/orderauthor/rules/index.vue
index aa634c300..a7fd67f22 100644
--- a/src/views/orderauthor/rules/index.vue
+++ b/src/views/orderauthor/rules/index.vue
@@ -227,11 +227,11 @@ export default {
         handleOriginalForm() {
             if (this.$route.query.distributeId) {
                 const form = localStore.get(this.$route.path);
-                form.distributeId = this.$route.query.distributeId;
+                form['distributeId'] = this.$route.query.distributeId;
                 localStore.set(this.$route.path, form);
             } else {
                 const form = localStore.get(this.$route.path);
-                form.distributeId = '';
+                form['distributeId'] = '';
                 localStore.set(this.$route.path, form);
             }
         },
diff --git a/src/views/publish/publishMap/index.vue b/src/views/publish/publishMap/index.vue
index 34507cb93..ef9a5c5d4 100644
--- a/src/views/publish/publishMap/index.vue
+++ b/src/views/publish/publishMap/index.vue
@@ -110,12 +110,6 @@ export default {
                                 type: 'warning',
                                 showControl: (row) => { return row.status == 1; }
                             },
-                            {
-                                name: this.$t('global.delete'),
-                                handleClick: this.handleDelete,
-                                type: 'danger',
-                                showControl: () => { return this.isShow != -1; }
-                            },
                             {
                                 name: this.$t('global.exportMap'),
                                 handleClick: this.handleExportMap,
@@ -138,6 +132,12 @@ export default {
                                 name: this.$t('publish.simulationDataCheck'),
                                 handleClick: this.handleSimulationCheck,
                                 showControl: (row) => { return row.drawWay; }
+                            },
+                            {
+                                name: this.$t('global.delete'),
+                                handleClick: this.handleDelete,
+                                type: 'danger',
+                                showControl: () => { return this.isShow != -1; }
                             }
                         ]
                     }
diff --git a/src/views/publish/runPlanEveryDay/index.vue b/src/views/publish/runPlanEveryDay/index.vue
index 2d698af3b..6021c0fe9 100644
--- a/src/views/publish/runPlanEveryDay/index.vue
+++ b/src/views/publish/runPlanEveryDay/index.vue
@@ -68,15 +68,15 @@ export default {
                         width: '250',
                         hide: (row) => { return this.$store.state.user.roles.indexOf(superAdmin) < 0; },
                         buttons: [
+                            {
+                                name: this.$t('global.preview'),
+                                handleClick: this.handleView,
+                                type: ''
+                            },
                             {
                                 name: this.$t('global.delete'),
                                 handleClick: this.handleDelete,
                                 type: 'danger'
-                            },
-                            {
-                            	name: this.$t('global.preview'),
-                            	handleClick: this.handleView,
-                            	type: ''
                             }
                         ]
                     }
diff --git a/src/views/publish/runPlanTemplate/index.vue b/src/views/publish/runPlanTemplate/index.vue
index 2771ad952..72c95637d 100644
--- a/src/views/publish/runPlanTemplate/index.vue
+++ b/src/views/publish/runPlanTemplate/index.vue
@@ -68,11 +68,6 @@ export default {
                         width: '450',
                         hide: () => { return this.$store.state.user.roles.indexOf(superAdmin) < 0; },
                         buttons: [
-                            {
-                                name: this.$t('global.delete'),
-                                handleClick: this.handleDelete,
-                                type: 'danger'
-                            },
                             {
                                 name: this.$t('publish.generateRunPlan'),
                                 handleClick: this.handleMapSelect,
@@ -87,6 +82,11 @@ export default {
                                 name: this.$t('global.preview'),
                                 handleClick: this.handleView,
                                 type: ''
+                            },
+                            {
+                                name: this.$t('global.delete'),
+                                handleClick: this.handleDelete,
+                                type: 'danger'
                             }
                         ]
                     }
diff --git a/src/views/system/deviceManage/add.vue b/src/views/system/deviceManage/add.vue
index 8f99cae37..e2612372a 100644
--- a/src/views/system/deviceManage/add.vue
+++ b/src/views/system/deviceManage/add.vue
@@ -13,10 +13,10 @@ import { createDevice, deviceIsExist} from '@/api/project';
 export default {
     name: 'DeviceAdd',
     props: {
-        type: {
-            type: String,
-            required: true
-        }
+        // type: {
+        //     type: String,
+        //     required: true
+        // }
     },
     data() {
         return {
diff --git a/src/views/system/deviceManage/editConfig.vue b/src/views/system/deviceManage/editConfig.vue
index 7933dd232..afdd0f5b2 100644
--- a/src/views/system/deviceManage/editConfig.vue
+++ b/src/views/system/deviceManage/editConfig.vue
@@ -36,10 +36,10 @@ import { getDeviceDetail, setPsdConfig, setSignalConfig, setSwitchConfig } from
 export default {
     name: 'EditConfig',
     props: {
-        type: {
-            type: String,
-            required: true
-        }
+        // type: {
+        //     type: String,
+        //     required: true
+        // }
     },
     data() {
         return {