修改附件显示

study-manager-ui/admin/src/components/FileUpload.vue

@@ -4,7 +4,7 @@
       :action="uploadFileUrl + '?prePath=' + prePath"
       :before-upload="handleBeforeUpload"
       :file-list="fileList"
-      :limit="3"
+      :limit="fileNumber"
       :on-error="handleUploadError"
       :on-exceed="handleExceed"
       :on-success="handleUploadSuccess"
@@ -71,6 +71,10 @@ export default {
       type: Number,
       default: 20,
     },
+    fileNumber: {
+      type: Number,
+      default: 1,
+    },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     // default: () => ["doc", "xls", "pdf", "xml"],
     fileType: {

study-manager-ui/admin/src/components/Header.vue

@@ -30,6 +30,8 @@
              <i class="el-icon-arrow-down el-icon--right"></i>
           </span> -->
 
+        <i  class="el-icon-s-home" style="font-size: 15px;margin-right: 10px" > 返回门户</i>
+
          <el-dropdown @command="handleCommand">
           <span class="el-dropdown-link" style="color:white">
             {{userData.currUserName}}
@@ -40,6 +42,7 @@
             <el-dropdown-item command="logout">退出登录</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
+
       </div>
     </div>
 

study-manager-ui/admin/src/router.js

@@ -50,6 +50,7 @@ const router = new Router({
                 ...restBuilder('project/study', 'project/study'),
 
                 //以下为基础路由配置
+                builder('blank', 'blank'),
                 builder('', 'Home'),
                 builder('index', 'Home'),
                 builder('login/updatePwd', 'login/updatePwd'),

study-manager-ui/admin/src/views/Layout.vue

@@ -2,9 +2,6 @@
     <div :style="menuPageCss" class="pages page-layout">
         <LayoutHeader v-if="menuPage!=='left'"></LayoutHeader>
         <LayoutHeaderLeft @toggle="toggle" :isOpen="isOpen" v-if="menuPage==='left'" />
-
-
-        
         <router-view :class="{'active': !isOpen}" />
     </div>
 </template>

study-manager-ui/admin/src/views/study/stat/list.vue

@@ -39,24 +39,12 @@
             return {
                 config: {
                     search: [
-                        {
-                            name: "siteId",
-                            type: "text",
-                            label: "站点Id，来源基础服务平台",
-                            fuzzy: true
-                        },
                         {
                             name: "projectTotalCount",
                             type: "text",
                             label: "题目总数",
                             fuzzy: true
                         },
-                        {
-                            name: "projectAddCount",
-                            type: "text",
-                            label: "昨日新增项目数量",
-                            fuzzy: true
-                        },
                         {
                             name: "unStudyPersonCount",
                             type: "text",
@@ -69,18 +57,7 @@
                             label: "未学习率",
                             fuzzy: true
                         },
-                        {
-                            name: "pushTotalCount",
-                            type: "text",
-                            label: "今日消息推送数量",
-                            fuzzy: true
-                        },
-                        {
-                            name: "pushAddCount",
-                            type: "text",
-                            label: "昨日新增减少数量",
-                            fuzzy: true
-                        },
+
                     ],
                     columns: [
                         {type: "selection", width: 60},
@@ -113,4 +90,4 @@
             };
         }
     };
-</script>
\ No newline at end of file
+</script>

study-manager/.gitignore

+*.iml
+node_modules/
+.idea/
+*.class
+target/
\ No newline at end of file

study-manager/target/classes/application.yml

-spring:
-  main:
-    allow-bean-definition-overriding: true
-application:
-  log:
-    level: info
-    path: /mortals/app/logs
-
-

study-manager/target/classes/banner.txt

->>>>>>>>>>>>>>>>>>>
-      >> study-manager <<
-<<<<<<<<<<<<<<<<<<<
\ No newline at end of file

study-manager/target/classes/bootstrap.yml

-server:
-  tomcat:
-    uri-encoding: utf-8
-  port: 17300
-  servlet:
-    context-path: /study
-spring:
-  application:
-    name: study-manager
-  profiles:
-    active: develop
-  servlet:
-    multipart:
-      max-file-size: 100MB
-      max-request-size: 1000MB
-  jackson:
-    serialization:
-      WRITE_DATES_AS_TIMESTAMPS: true
-    default-property-inclusion: NON_NULL
-  #    time-zone: GMT+8
-  #    date-format: yyyy-MM-dd HH:mm:ss
-  cloud:
-    nacos:
-      # Nacos 作为注册中心的配置项，对应 NacosDiscoveryProperties 配置类
-      discovery:
-        server-addr: 192.168.0.54:8848 # Nacos 服务器地址
-        group: DEFAULT_GROUP
-        namespace: smart-gov-cs
-      config:
-        server-addr: ${spring.cloud.nacos.discovery.server-addr} # Nacos 服务器地址
-        group: ${spring.cloud.nacos.discovery.group}
-        namespace: ${spring.cloud.nacos.discovery.namespace} # Nacos 命名空间 dev 的编号
-        file-extension: yaml
-mybatis:
-  root-path: com.mortals
-  type-aliases-package: com.mortals.framework.model,com.mortals.xhx.common.**.model,com.mortals.xhx.**.model
-  mapper-locations: classpath*:sqlmap/**/*.xml
-  config-location: classpath*:config/mybatis-sqlmap-config.xml
-
-application:
-  auth:
-    unloginUrl: /refresh,/error,/login/login,/login/index,/login/logout,/customer/login/login,/customer/login/logout,/securitycode/createCode,/customer/trial/save,/file/common/*,/file/preview/*,/test*,/api/asset/*,/api/*,/zwfw/*,/ws/*,/swagger-ui*,/topic/*,/uploads/*
-    uncheckUrl: /refresh,/error,/login/login,/login/index,/login/logout,/customer/login/login,/customer/login/logout,/securitycode/createCode,/customer/trial/save,/file/common/*,/file/preview/*,/test*,/api/asset/*,/api/*,/zwfw/*,/ws/*,/swagger-ui*,/topic/*,/uploads/*
-token:
-  head: mortal
-hystrix:
-  command:
-    default:
-      execution:
-        isolation:
-          thread:
-            timeoutInMilliseconds: 60000