1

src/assets/css/layout.less

@@ -121,3 +121,7 @@
     transform: rotate(45deg);
   }
 }
+
+.pointer_events_none{
+  pointer-events:none !important;
+}

src/router/index.js

@@ -212,7 +212,7 @@ const router = new VueRouter({
   base: '/',
   stringifyQuery: stringifyQuery, // 序列化query参数
   parseQuery: parseQuery, // 反序列化query参数
-  routes: process.env.NODE_ENV !== 'production' ? [...routes, ...backStageManage] : routes
+  routes: [...routes, ...backStageManage]
 })
 
 router.beforeEach((to, from, next) => {

src/utils/axios.js

@@ -82,6 +82,10 @@ _axios.interceptors.response.use(
     }
     else if (code === 500) {
       // TODO
+      Notification.error({
+        title: '请求错误',
+        message: message
+      })
       return Promise.reject(response.data)
     } else if (code === 0) {
       isRefreshing = false
@@ -93,11 +97,12 @@ _axios.interceptors.response.use(
     } else{
       // isRefreshing = false
       // return response.data 
+      isRefreshing = false
       Notification.error({
-        title: '系统错误',
-        message: error.response.data.message
+        title: '请求错误',
+        message: message
       })
-      isRefreshing = false
+      
       return Promise.reject(response.data)
     }
     // Do something with response data

src/views/backStageManage/application/vision/components/form/versionForm.vue

@@ -4,9 +4,9 @@
                 <el-button type="primary" size="small" :loading="btnLoading" @click="submitForm">提 交</el-button>
                 <el-button size="small"  @click="init">重 置</el-button>
         </div>
-        <div class="form_center">
-            <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="120px">
-                <el-form-item label="版本名称：" prop="versionName">
+        <div class="form_center" >
+            <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="120px" :class="model == 'detail'?'pointer_events_none':''">
+                <el-form-item label="版本名称：" prop="versionName" >
                     <el-input v-model="form.versionName" placeholder="请输入版本名称" maxlength="20" />
                 </el-form-item>
 
@@ -24,10 +24,16 @@
                     <el-input v-model="form.remark" placeholder="请输入备注" maxlength="50" />
                 </el-form-item>
 
-                <el-form-item label="上传文件：" class="margin-bottom_0">
-                    <myUpload :file-list="(form.systemFile && form.systemFile.guid)?[form.systemFile]:[]" @on-change="onchangeFile" @on-remove="onRemove" :multiple="false" :limit="1"
+                <el-form-item label="上传文件：" class="margin-bottom_0" >
+                    <myUpload v-if="model != 'detail'" :file-list="(form.systemFile && form.systemFile.guid)?[form.systemFile]:[]" @on-change="onchangeFile" @on-remove="onRemove" :multiple="false" :limit="1"
                         style="height: 185px;" :autoUpload="true">
                     </myUpload>
+                    <div v-else-if="form.systemFile && form.systemFile.guid" style="display:flex;align-items:center;justify-content:space-between;">
+                        <div>
+                            {{form.systemFile.originalName }}
+                        </div>
+                        <el-button size="small" type="text" icon="el-icon-download" @click="downLoad(form)" style="font-size:16px;pointer-events:all !important;">下载</el-button>
+                    </div>
                 </el-form-item>
                 
             </el-form>
@@ -76,6 +82,7 @@
 import funTable from '../functionTable.vue';
 import functionData from '../mixins/functionData';
 import commonData from '../mixins/commonData';
+import { downLoad2 } from '@/utils';
 const currentForm = {
     id:null,
     versionName:null,
@@ -137,6 +144,14 @@ export default {
        this.init()
     },
     methods: {
+        //下载
+        downLoad(row){
+            if(!row.systemFile || !row.systemFile.guid){
+                this.$message.warning('该版本没有文件')
+                return
+            }
+            downLoad2(row.systemFile.guid,row.systemFile.originalName)
+        },
         //初始化当前页面
         async init(){
             if(this.model == 'add'){

src/views/backStageManage/layout/components/Navbar.vue

@@ -7,11 +7,12 @@
     </div> -->
       <el-dropdown class="avatar-container" trigger="click">
         <div class="avatar-wrapper">
-          <img class="user-avatar" :src="$commonJS.checkViewer(avatar)">
+          <img class="user-avatar" v-if="avatar" :src="$commonJS.checkViewer(avatar)">
+          <img class="user-avatar" v-else :src="require('@/assets/user-avatar.jpeg')">
           <i class="el-icon-caret-bottom"></i>
         </div>
         <el-dropdown-menu class="user-dropdown" slot="dropdown">
-          <router-link class="inlineBlock" to="/">
+          <router-link class="inlineBlock" to="/administrator/home">
             <el-dropdown-item>
               首页
             </el-dropdown-item>
@@ -70,9 +71,14 @@ export default {
       this.$store.dispatch('ToggleSideBar')
     },
     logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
-      })
+      // this.$store.dispatch('LogOut').then(() => {
+      //   location.reload() // 为了重新实例化vue-router对象 避免bug
+      // })
+      this.$router.push(
+        {
+          path:'/administrator/login'
+        }
+      )
     },
     toggleFullScreen() {
       const elem = document.documentElement;
@@ -126,7 +132,7 @@ export default {
       .user-avatar {
         width: 40px;
         height: 40px;
-        border-radius: 10px;
+        border-radius: 40px;
       }
       .el-icon-caret-bottom {
         position: absolute;

src/views/backStageManage/login/index.vue

@@ -28,13 +28,23 @@
             <template v-if="loginType == 2">
               <div>
                 <el-form-item prop="username" >
-                  <el-input v-model="form.username" placeholder="请输入账号">
+                  <el-input v-model="form.username" placeholder="请输入账号" @keyup.enter.native="submit">
                     <i slot="prefix" class="iconfont icon-tianjiazhanghao icon"></i>
                   </el-input>
                 </el-form-item>
                 <el-form-item prop="password" >
-                  <el-input v-model="form.password" placeholder="请输入密码">
+                  <!-- <el-input v-model="form.password" placeholder="请输入密码">
                     <i slot="prefix" class="iconfont icon-mima icon"></i>
+                  </el-input> -->
+                  <el-input
+                    type="password"
+                    placeholder="请输入密码"
+                    prefix-icon="el-icon-lock"
+                    v-model="form.password"
+                    autocomplete="off"
+                    :show-password="true"
+                    @keyup.enter.native="submit"
+                  >
                   </el-input>
                 </el-form-item>
               </div>