Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/components/FormGenerator/FormDrawer.vue

@@ -354,7 +354,7 @@
     }
   }
   @include action-bar;
-  ::v-deep .el-drawer__header {
+  :deep(.el-drawer__header) {
     display: none;
   }
 </style>

src/components/FormGenerator/IconsDialog.vue

@@ -101,7 +101,7 @@
     }
   }
   .icon-dialog {
-    ::v-deep .el-dialog {
+    :deep(.el-dialog) {
       border-radius: 8px;
       margin-bottom: 0;
       margin-top: 4vh !important;

src/components/FormGenerator/JsonDrawer.vue

@@ -143,7 +143,7 @@
 <style lang="scss" scoped>
   @import '@/components/FormGenerator/styles/mixin.scss';
 
-  ::v-deep .el-drawer__header {
+  :deep(.el-drawer__header) {
     display: none;
   }
   @include action-bar;

src/views/system/dictionary/components/dict-edit.vue

@@ -422,6 +422,8 @@
         } else {
           this.$refs.form.clearValidate();
           this.form = { ...this.defaultForm };
+          this.form.dictStaticSubmitPOList = []; // clear the list of the dictionary static push button. 描述变化的字段不会在push后
+          this.tableData = []; // clear the list of the dictionary static push button. 描述变化的字段不会在push后。
         }
       }
     }

vue.config.js

@@ -17,7 +17,8 @@ module.exports = {
       '/api': {
         // target: 'http://192.168.3.51:18086', // 跨域请求的地址
         // target: 'http://192.168.3.35:8080', // kang杨威
-        target: 'http://192.168.3.25:8080', // 黄峥嵘
+        // target: 'http://192.168.3.25:8080', // 黄峥嵘
+        target: 'http://192.168.3.41:8080', // 何江鹏
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {