Merge remote-tracking branch 'origin/v0.1.1_alarm' into v0.1.1_alarm

src/App.vue

@@ -2,16 +2,16 @@
   <div id="app">
     <watercom></watercom>
     <router-view />
-    <theme-picker />
+    <!-- <theme-picker /> -->
   </div>
 </template>
 
 <script>
-import ThemePicker from "@/components/ThemePicker";
+// import ThemePicker from "@/components/ThemePicker";
 
 export default {
   name: "App",
-  components: { ThemePicker },
+  components: { },
     metaInfo() {
         return {
             title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,

src/components/ThemePicker/index.vue

@@ -62,10 +62,10 @@ export default {
         }
       }
 
-      if (!this.chalk) {
-        const url = `https://unpkg.com/element-ui@${version}/lib/theme-chalk/index.css`
-        await this.getCSSString(url, 'chalk')
-      }
+      // if (!this.chalk) {
+      //   const url = `https://unpkg.com/element-ui@${version}/lib/theme-chalk/index.css`
+      //   await this.getCSSString(url, 'chalk')
+      // }
 
       const chalkHandler = getHandler('chalk', 'chalk-style')
 

src/views/core/message/index.vue

@@ -511,7 +511,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
-      this.$refs.orgTreeSelect.clear();
+      // this.$refs.orgTreeSelect.clear();
       //this.roleList=[];
       this.reset();
       this.isSubmit = true;