优化

ruoyi-ui/src/layout/components/Navbar.vue

@@ -10,7 +10,7 @@
     <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
 
     <div class="right-menu">
-      <template v-if="device!=='mobile'">
+      <template v-if="device !== 'mobile'">
         <search id="header-search" class="right-menu-item" />
 
         <el-tooltip content="系统使用文档" effect="dark" placement="bottom">
@@ -24,7 +24,10 @@
         </el-tooltip>
       </template>
 
-      <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
+      <el-dropdown
+        class="avatar-container right-menu-item hover-effect"
+        trigger="click"
+      >
         <div class="avatar-wrapper">
           <img :src="avatar" class="user-avatar" />
           <i class="el-icon-caret-bottom" />
@@ -55,7 +58,7 @@ import Hamburger from "@/components/Hamburger";
 import Screenfull from "@/components/Screenfull";
 import SizeSelect from "@/components/SizeSelect";
 import Search from "@/components/HeaderSearch";
-import RuoYiDoc from '@/components/BenYi/Doc'
+import RuoYiDoc from "@/components/BenYi/Doc";
 import { getDeptsInfo } from "@/api/system/dept";
 
 export default {
@@ -65,7 +68,7 @@ export default {
     Screenfull,
     SizeSelect,
     Search,
-    RuoYiDoc 
+    RuoYiDoc,
   },
   computed: {
     ...mapGetters(["sidebar", "avatar", "device"]),
@@ -76,14 +79,14 @@ export default {
       set(val) {
         this.$store.dispatch("settings/changeSetting", {
           key: "showSettings",
-          value: val
+          value: val,
         });
-      }
-    }
+      },
+    },
   },
   data() {
     return {
-      isMoreSchool: undefined
+      isMoreSchool: undefined,
     };
   },
   created() {
@@ -91,7 +94,7 @@ export default {
   },
   methods: {
     getDepts() {
-      getDeptsInfo().then(response => {
+      getDeptsInfo().then((response) => {
         // console.log("school=" + response.total);
         // console.log( response);
         if (response.total <= 1) {
@@ -106,19 +109,27 @@ export default {
     },
     async logout() {
       this.$confirm("确定注销并退出系统吗？", "提示", {
+        cancelButtonClass: "btn-custom-cancel",
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       }).then(() => {
         this.$store.dispatch("LogOut").then(() => {
           location.reload();
         });
       });
-    }
-  }
+    },
+  },
 };
 </script>
 
+<style lang="scss">
+.btn-custom-cancel {
+  float: right;
+  margin-left: 20px;
+}
+</style>
+
 <style lang="scss" scoped>
 .navbar {
   height: 50px;

ruoyi-ui/src/views/benyi/themestudy/index.vue

@@ -27,26 +27,34 @@
       <el-col :span="20" :xs="24">
         <el-card class="box-card">
           <div slot="header" class="clearfix">
-            <span class="box-card-title">{{title}}</span>
+            <span class="box-card-title">{{ title }}</span>
           </div>
           <div class="text item" v-show="title1">
-            <h3 class="box-card-title">{{title1}}</h3>
+            <h3 class="box-card-title">{{ title1 }}</h3>
             <div class="pad-left" v-html="note"></div>
           </div>
           <div class="text item" v-show="title2">
-            <h3 class="box-card-title">{{title2}}</h3>
-            <div class="pad-left">
+            <h3 class="box-card-title">
+              {{ title2 }}
+            </h3>
+            <div ref="printMe">
               <Editor v-model="communicate" />
             </div>
           </div>
           <div class="text item" v-show="title3">
-            <h3 class="box-card-title">{{title3}}</h3>
+            <h3 class="box-card-title">{{ title3 }}</h3>
 
             <div class="pad-left">
-              <div v-for="(item, index) in activityList" :key="index" class="text item">
-                <h3 class="box-card-case mr">活动{{item.sort}} - {{item.name}}</h3>
-                <h3 class="box-card-info">活动形式：{{fieldFormat(item)}}</h3>
-                <h3 class="box-card-info">重点领域：{{typeFormat(item)}}</h3>
+              <div
+                v-for="(item, index) in activityList"
+                :key="index"
+                class="text item"
+              >
+                <h3 class="box-card-case mr">
+                  活动{{ item.sort }} - {{ item.name }}
+                </h3>
+                <h3 class="box-card-info">活动形式：{{ fieldFormat(item) }}</h3>
+                <h3 class="box-card-info">重点领域：{{ typeFormat(item) }}</h3>
                 <h3 class="box-card-info">活动目标</h3>
                 <div class="text item pad-left" v-html="item.target"></div>
                 <h3 class="box-card-info">活动材料</h3>
@@ -76,7 +84,7 @@ import Editor from "@/components/Editor";
 export default {
   name: "Detail",
   components: {
-    Editor
+    Editor,
   },
   data() {
     return {
@@ -107,26 +115,26 @@ export default {
       // 树结构
       defaultProps: {
         children: "children",
-        label: "label"
+        label: "label",
       },
       // 查询参数
       queryParams: {
-        themeid: undefined
-      }
+        themeid: undefined,
+      },
     };
   },
   watch: {
     // 根据名称筛选部门树
     name(val) {
       this.$refs.tree.filter(val);
-    }
+    },
   },
   created() {
     this.getTreeselect();
-    this.getDicts("sys_theme_type").then(response => {
+    this.getDicts("sys_theme_type").then((response) => {
       this.typeOptions = response.data;
     });
-    this.getDicts("sys_theme_field").then(response => {
+    this.getDicts("sys_theme_field").then((response) => {
       this.fieldOptions = response.data;
     });
   },
@@ -161,7 +169,7 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
-      treeselect().then(response => {
+      treeselect().then((response) => {
         this.treeOptions = response.data;
       });
     },
@@ -183,7 +191,7 @@ export default {
       // this.getStandardList();
     },
     getThemeDetails() {
-      getTheme(this.id).then(response => {
+      getTheme(this.id).then((response) => {
         console.log(response);
         if (response.code == "200") {
           this.title1 = "主题网络";
@@ -193,7 +201,7 @@ export default {
           this.communicate = response.data.communicate;
           this.queryParams.themeid = response.data.id;
 
-          listActivity(this.queryParams).then(req => {
+          listActivity(this.queryParams).then((req) => {
             console.log(req);
             if (req.code == "200") {
               this.activityList = req.rows;
@@ -201,8 +209,8 @@ export default {
           });
         }
       });
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

ruoyi-ui/src/views/benyi_train/video/index.vue

@@ -417,7 +417,7 @@ export default {
       this.imageUrl = "";
     },
     handleSuccessVideo(response) {
-      console.log("上传完成", response);
+      // console.log("上传完成", response);
       this.imgFlag = false;
       this.percent = 0;
       if (response.hash) {
@@ -429,14 +429,14 @@ export default {
     handleError(err, file, fileList) {
       // 上传失败异常处理
       const error = JSON.parse(JSON.stringify(err));
-      console.log(err);
-      console.log(error);
+      // console.log(err);
+      // console.log(error);
       this.msgError(error.status.toString());
       this.imgFlag = false;
       this.percent = 0;
     },
     videoBeforeUpload(file) {
-      console.log(file);
+      // console.log(file);
       const _self = this;
       const isVideo =
         file.type === "video/mp4" ||
@@ -460,7 +460,7 @@ export default {
     //上传进度
     uploadProcess(event, file, fileList) {
       this.imgFlag = true;
-      console.log(event.percent);
+      // console.log(event.percent);
       this.percent = Math.floor(event.percent);
     },
     /** 查询培训列表 */

ruoyi-ui/src/views/system/user/change/dept/index.vue

@@ -66,7 +66,7 @@ export default {
         // console.log( response);
         if (response.total <= 1) {
         } else {
-          console.log(response);
+          // console.log(response);
           this.deptsOptions = response.rows;
         }
       });