Merge remote-tracking branch 'origin/master'

exam-06173-uni - reg/.gitignore

@@ -0,0 +1 @@
+unpackage

exam-06173-uni - reg/manifest.json

@@ -11,6 +11,9 @@
     },
     /* 5+App特有相关 */
     "app-plus" : {
+        "compatible" : {
+            "ignoreVersion" : true
+        },
         "usingComponents" : true,
         "nvueCompiler" : "uni-app",
         "compilerVersion" : 3,
@@ -50,7 +53,9 @@
                 "autoSdkPermissions" : false
             },
             /* ios打包配置 */
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false
+            },
             /* SDK配置 */
             "sdkConfigs" : {
                 "ad" : {}

exam-06173-vue/src/layout/components/Navbar.vue

@@ -13,6 +13,21 @@
         <el-tooltip content="字体大小" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip>
+        <div class="right-menu-item" style="cursor:pointer;position: relative;padding-top:2px;" @mouseenter="funMouseIn" @mouseleave="funMouseOut">
+          <i class="el-icon-mobile" style="font-size: 20px;font-weight: bold;"></i>
+          <transition name="el-fade-in">
+            <div class="download-mn" v-show="downloadShow">
+              <div class="download-mn-it">
+                <img src="./../../assets/web/inner.png" alt="">
+                <div>公司人员考培系统app(Android)</div>
+              </div>
+              <div class="download-mn-it">
+                <img src="./../../assets/web/outer.png" alt="">
+                <div>外委人员考培系统app(Android)</div>
+              </div>
+            </div>
+          </transition>
+        </div>
 
       </template>
 
@@ -53,6 +68,11 @@ export default {
     SizeSelect,
     Search
   },
+  data() {
+    return {
+      downloadShow: false
+    }
+  },
   computed: {
     ...mapGetters([
       'sidebar',
@@ -78,7 +98,13 @@ export default {
       }).catch(() => {
 
       })
-    }
+    },
+    funMouseIn(){
+      this.downloadShow = true
+    },
+    funMouseOut(){
+      this.downloadShow = false
+    },
   }
 }
 </script>
@@ -88,7 +114,36 @@ export default {
   a {
     color: #054595 !important;
   }
-
+.download-mn{
+  position: fixed;
+  top: 50px;
+  right: 20px;
+  width: 270px;
+  height: 150px;
+  z-index: 9999;
+  border-radius: 6px;
+  background-color: rgb(233, 227, 227);
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  text-align: center;
+  .download-mn-it{
+    height: 150px;
+    padding: 10px 0 0;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    img{
+      width: 100px;
+      height: 100px;
+    }
+    div{
+      height: 20px;
+      font-size: 12px;
+      line-height: 1.5;
+    }
+  }
+}
 .navbar {
   height: 50px;
   overflow: hidden;

exam-06173-vue/src/views/admin/course/form.vue

@@ -269,7 +269,7 @@ import DepartRefs from "@/components/DepartRefs";
 import LiveList from "@/views/admin/course/live";
 import DirList from "@/views/admin/course/file/dir";
 import TimeRangePicker from "@/components/TimeRangePicker";
-
+const timeStart = new Date()
 export default {
   components: {
     TimeRangePicker,
@@ -285,7 +285,7 @@ export default {
     return {
       dialogVisible: false,
       excludes: [],
-      dateValues: [],
+      dateValues: [timeStart.formatDate("yyyy-MM-dd hh:mm:ss"), timeStart.formatDate("yyyy-MM-dd hh:mm:ss")],
       curIndex: 0,
       postForm: {
         content: "",
@@ -293,6 +293,8 @@ export default {
         videoDrag: false,
         stepLock: false,
         lecturerId: "",
+        startTime: timeStart.formatDate("yyyy-MM-dd hh:mm:ss"),
+        endTime: timeStart.formatDate("yyyy-MM-dd hh:mm:ss"),
         periods: 0,
         isMust: false,
         openType: 1,

exam-06173-vue/src/views/dashboard/index.vue

@@ -266,7 +266,7 @@ export default {
           title: {
             showTitle: true,
             text: `${
-              tabActive === "bm" ? "部门培训课时排行" : "职工培训课时排行top20"
+              tabActive === "bm" ? "部门培训课程排行" : "职工培训时长排行top20"
             }`,
             subtext: "可滚轮缩放、左右拖动查看",
             x: "center",
@@ -281,6 +281,7 @@ export default {
           },
           yAxis: {
             type: "value",
+            minInterval: 1,
           },
           tooltip: {
             show: true,
@@ -289,7 +290,7 @@ export default {
               let str = "";
               data.forEach((ele) => {
                 let circle = `<span style="display:inline-block;margin-right:5px;border-radius:50%;width:10px;height:10px;left:5px;background-color:${ele.color}"></span>`;
-                str += circle + `${ele.name}: ${ele.value}分钟 <br />`;
+                str += circle + `${ele.name} : ${ele.value}${tabActive === 'bm' ? '' : '分钟'} <br />`;
               });
               return str;
             },
@@ -332,7 +333,7 @@ export default {
 
         res.data.forEach((ele) => {
           xAxisData.push(tabActive === "bm" ? ele.deptName : ele.realName);
-          pxSeriesData.push(ele.total);
+          pxSeriesData.push(ele.total > 0 ? (ele.passed / ele.total) * 100 : 0);
         });
 
         option = {
@@ -361,7 +362,7 @@ export default {
               let str = "";
               data.forEach((ele) => {
                 let circle = `<span style="display:inline-block;margin-right:5px;border-radius:50%;width:10px;height:10px;left:5px;background-color:${ele.color}"></span>`;
-                str += circle + `${ele.name}: ${ele.value}% <br />`;
+                str += circle + `${ele.name} : ${ele.value}% <br />`;
               });
               return str;
             },