Merge branch 'test' into 'master'

.env

-VUE_APP_SYSTEM_VERSION=1.0.1
+VUE_APP_SYSTEM_VERSION=1.0.3
 VUE_APP_BASE_URL=/
 VUE_APP_DEV_LIB_URL=
 VUE_APP_CUSTOMER_MENU_CODE=0001

package.json

@@ -34,7 +34,7 @@
     "nprogress": "^0.2.0",
     "popmotion": "^8.1.22",
     "qiniu-js": "^2.2.0",
-    "rym-element-ui": "^0.1.62",
+    "rym-element-ui": "^0.1.63",
     "vue-qr": "^1.2.8",
     "vuedraggable": "^2.16.0",
     "wangeditor": "^3.1.1"

public/index.html

@@ -5,7 +5,7 @@
   <meta charset="utf-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <meta name="viewport" content="width=device-width,initial-scale=1.0" />
-  <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
+  <link rel="icon" href="<%= BASE_URL %>ic_logo.ico" />
   <script src="https://unpkg.com/vue@2.6.10/dist/vue.js"></script>
   <script src="https://unpkg.com/vuex@3.1.0/dist/vuex.js"></script>
   <script src="https://unpkg.com/vue-router@3.0.1/dist/vue-router.js"></script>

src/api/dashboard/dashboard.js

@@ -40,5 +40,6 @@ export const getFeedbackList = req =>
 export const getWarnningCount = req =>
   fetch({
     url: devicePath + '/device/warning/count',
+    noErrorAlert: true,
     ...req,
   });

src/api/validate.js

@@ -33,7 +33,7 @@ export const validateCode = res => {
 };
 
 export const errorHandle = error => {
-  console.error('err' + error); // for debug
+  console.table(['fetchError: ', error]); // for debug
   store.dispatch('fetchDone');
   if (error.message && /timeout/.test(error.message)) {
     Message({
@@ -45,7 +45,7 @@ export const errorHandle = error => {
   }
   if (isCancel(error)) {
     console.log('取消请求');
-  } else {
+  } else if (!error.config.noErrorAlert) {
     Message({
       message: error.message,
       type: 'error',

src/assets/styles/element-ui.scss

@@ -101,6 +101,9 @@ $--color-danger: #ff3333;
     line-height: 1;
     font-size: 14px;
   }
+  .el-cascader__label {
+    line-height: 40px;
+  }
   .el-button {
     font-size: 14px;
     padding: 12px 20px;

src/components/input/AreaDashboard/AreaSelect.vue

@@ -69,6 +69,9 @@ export default {
     this.debouncedQueryChange = debounce(this.debounce, value => {
       this.handleQueryChange(value);
     });
+    if (this.value && this.value.find(item => item === -1)) {
+      this.selectedAll = true;
+    }
   },
   computed: {
     filterList() {

src/dev-local/develop.html

@@ -5,7 +5,7 @@
   <meta charset="utf-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <meta name="viewport" content="width=device-width,initial-scale=1.0" />
-  <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
+  <link rel="icon" href="<%= BASE_URL %>ic_logo.ico" />
   <script src="https://unpkg.com/vue@2.6.10/dist/vue.js"></script>
   <script src="https://unpkg.com/vuex@3.1.0/dist/vuex.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/vue-router@3.0.1/dist/vue-router.js"></script>