update 系统名称、样式修改；在线编辑挪到登录页面

public/index.html

@@ -5,7 +5,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <title>JeroBoot平台</title>
+  <title>中国重汽标准法规管理模块系统</title>
   <!--<link rel="icon" href="<%= BASE_URL %>logo.png">-->
   <script src="<%= BASE_URL %>cdn/babel-polyfill/polyfill_7_2_5.js"></script>
   <script src="<%= BASE_URL %>api_address_config.js"></script>

src/common/onlyOffice/onlyOfficeEdit.js

@@ -1,19 +1,39 @@
-import store from '@/store'
+// import store from '@/store'
 import { getFileInfo } from '@api/api'
 
-export default (fileId, showFileName) => {
-  getFileInfo({ id: fileId }).then(res => {
-    if (res.success) {
-      const userId = store.getters.userInfo.id
-      const userName = store.getters.userInfo.username
-      const fileInfo = res.result || {}
-      const fullFilePathArr = fileInfo.url.split('/')
-      const fileName = fileInfo.fileName
-      const fileSuffix = fileName ? fileName.split('.')[fileName.split('.').length - 1] : ''
-      const filePath = `${fullFilePathArr[0]}/`
-      const fileDownloadUrl = `${window._CONFIG.onlyOfficeDownloadFileUrl}/${fileInfo.url}`
-      const url = `${window._CONFIG.onlyOfficeUrl}/editor?attId=${fileId}&userId=${userId}&userName=${userName}&filePath=${filePath}&fileName=${fileName}&oldFileName=${showFileName}&fileType=${fileSuffix}&key=${fileId}&fileUrl=${fileDownloadUrl}`
-      window.open(url, '_blank')
+export default async (fileId, showFileName) => {
+  let fileInfo = {}
+  // 如果有fileId就从接口获取文件信息，否则打开默认模板
+  if (fileId) {
+    fileInfo = await getFileInfoData(fileId) || {}
+  } else {
+    // 这个是福田现在的模板
+    fileInfo = {
+      fileName: 'task_9ad64b01_top_9ad64b01_node.docx',
+      url: 'model/task_9ad64b01/task_9ad64b01_top_9ad64b01_node.docx"'
     }
+  }
+  // const userId = store.getters.userInfo.id
+  // const userName = store.getters.userInfo.username
+  const fullFilePathArr = fileInfo.url.split('/')
+  const fileName = fileInfo.fileName
+  const fileSuffix = fileName ? fileName.split('.')[fileName.split('.').length - 1] : ''
+  const filePath = `${fullFilePathArr[0]}/${fullFilePathArr[1]}/`
+  // 这会儿不用登录，先把关于用户信息的东西去掉
+  // &userId=${userId}&userName=${userName}
+  const url = `${window._CONFIG.onlyOfficeUrl}/editor?attId=${fileInfo.id}&filePath=${filePath}&fileName=${fileName}&oldFileName=${showFileName}&fileType=${fileSuffix}&key=${fileId}&isEdit=123`
+  window.open(url, '_blank')
+}
+
+const getFileInfoData = (id) => {
+  return new Promise(resolve => {
+    let fileInfo
+    getFileInfo({ id }).then(res => {
+      if (res.success) {
+        fileInfo = res.result
+      }
+    }).finally(() => {
+      resolve(fileInfo)
+    })
   })
 }

src/components/layouts/TabLayout.vue

@@ -139,7 +139,7 @@ export default {
   methods: {
     // update-begin-author:sunjianlei date:20200120 for: 动态更改页面标题
     changeTitle (title) {
-      const projectTitle = 'Jero-Boot 企业级快速开发平台'
+      const projectTitle = '中国重汽标准法规管理模块系统'
       // 首页特殊处理
       if (this.$route.path === indexKey) {
         document.title = projectTitle

src/components/layouts/UserLayout.vue

@@ -2,13 +2,13 @@
   <div id="userLayout" :class="['user-layout-wrapper',device]">
     <div :class="!mobile ? 'container' : 'container-mobile'">
       <div class="top" id="top" v-if="!mobile">
-        <div class="logo">
-          <img id="logo" src="~@/assets/logo.png" alt="">
-        </div>
-        <div id="company">
-          <span id="c-company">合众未来</span>
-          <span id="p-company">HEZHONGWEILAI</span>
-        </div>
+<!--        <div class="logo">-->
+<!--          <img id="logo" src="~@/assets/logo.png" alt="">-->
+<!--        </div>-->
+<!--        <div id="company">-->
+<!--          <span id="c-company">合众未来</span>-->
+<!--          <span id="p-company">HEZHONGWEILAI</span>-->
+<!--        </div>-->
       </div>
       <div v-if="mobile">
         <span class="top-bg"><img src="~/@assets/mobileBg.png" alt=""></span>

src/components/page/GlobalHeader.vue

@@ -17,7 +17,7 @@
         :type="collapsed ? 'menu-unfold' : 'menu-fold'"
         @click="toggle"/>
 
-      <span v-if="device === 'desktop'">欢迎进入 Jero-Boot 平台</span>
+      <span v-if="device === 'desktop'">中国重汽标准法规管理模块系统</span>
       <span v-else>Jero-Boot</span>
 
       <user-menu :theme="theme"/>
@@ -192,9 +192,9 @@ export default {
 
     .header {
       z-index: 2;
-      color: white;
+      color: #1D2129;
       height: @height;
-      background-color: @primary-color;
+      background-color: white;
       transition: background 300ms;
 
       /* dark 样式 */

src/components/tools/Logo.vue

@@ -3,8 +3,8 @@
     <router-link :to="routerLinkTo">
 
       <!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
-      <img v-if="navTheme === 'dark'" src="~@/assets/logo.png" alt="logo">
-      <img v-else src="~@/assets/logo.png" alt="logo">
+      <!--      <img v-if="navTheme === 'dark'" src="~@/assets/logo.png" alt="logo">-->
+      <!--      <img v-else src="~@/assets/logo.png" alt="logo">-->
       <!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
 
       <h1 v-if="showTitle">{{ title }}</h1>
@@ -21,7 +21,7 @@ export default {
   props: {
     title: {
       type: String,
-      default: 'Jero-Boot Pro',
+      default: '研发云平台',
       required: false
     },
     showTitle: {
@@ -38,27 +38,34 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-  /*缩小首页布 局顶部的高度*/
-  @height: 59px;
+/*缩小首页布 局顶部的高度*/
+@height: 59px;
 
-  .sider {
-    box-shadow: none !important;
-    .logo {
-      height: @height !important;
-      line-height: @height !important;
-      box-shadow: none !important;
-      transition: background 300ms;
+.sider {
+  box-shadow: none !important;
 
-      a {
-        color: white;
-        &:hover {
-          color: rgba(255, 255, 255, 0.8);
-        }
+  .logo {
+    height: @height !important;
+    line-height: @height !important;
+    box-shadow: 1px 0px 0 0 #e8e8e8 !important;
+    transition: background 300ms;
+    background-color: transparent !important;
+
+    h1 {
+      color: #222222 !important;
+    }
+
+    a {
+      color: white;
+
+      &:hover {
+        color: rgba(255, 255, 255, 0.8);
       }
     }
-
-    &.light .logo {
-      background-color: @primary-color;
-    }
   }
+
+  &.light .logo {
+    background-color: @primary-color;
+  }
+}
 </style>

src/mixins/ConfigurableTableMixin.js

@@ -49,7 +49,6 @@ export const ConfigurableTableMixin = {
       loading: false,
       orderBy: '1',
       orderByField: '',
-      getTableHeaderData: null, // 获取表头数据的方法
       operateMaxNum: 1,
       // 操作列的column
       operateColumn: {

src/views/dashboard/Analysis.vue

@@ -1,22 +1,21 @@
 <template>
   <div>
-    <user-or-organ-selection></user-or-organ-selection>
+    <!--    <user-or-organ-selection></user-or-organ-selection>-->
   </div>
 </template>
 
 <script>
-import UserOrOrganSelection from '../../components/selection/UserOrOrganSelection'
+// import UserOrOrganSelection from '../../components/selection/UserOrOrganSelection'
 
 export default {
   name: 'Analysis',
-  components: { UserOrOrganSelection },
+  // components: { UserOrOrganSelection },
   data () {
     return {}
   },
   created () {
 
   },
-  methods: {
-  }
+  methods: {}
 }
 </script>

src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue

@@ -0,0 +1,13 @@
+<template>
+  <div></div>
+</template>
+
+<script>
+export default {
+  name: 'DomesticStandardList'
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/user/Login.vue

@@ -92,6 +92,17 @@
           </a-col>
           <a-col :span="3"></a-col>
         </a-row>
+        <a-row class="login-btn">
+          <a-col :span="3"></a-col>
+          <a-col :span="18">
+            <a-form-item>
+              <a-button block size="large" type="primary" htmlType="submit" @click="editFileByOnlyOffice('')">
+                在线编辑
+              </a-button>
+            </a-form-item>
+          </a-col>
+          <a-col :span="3"></a-col>
+        </a-row>
       </div>
     </a-form>
     <a-form v-if="mobile" :form="form" class="user-layout-login user-layout-login-mobile" ref="formLogin" id="formLogin">
@@ -186,6 +197,7 @@ import { postAction, getAction } from '@/api/manage'
 
 import { getRSAPublicKey } from '@/utils/encryption.js'
 import { JSEncrypt } from 'jsencrypt'
+import onlyOfficeEdit from '@/common/onlyOffice/onlyOfficeEdit'
 // const Base64 = require('js-base64').Base64
 
 export default {
@@ -388,6 +400,9 @@ export default {
           })
         }
       })
+    },
+    editFileByOnlyOffice (fileId) {
+      onlyOfficeEdit(fileId, '企业标准')
     }
   }
 }
@@ -429,7 +444,7 @@ function isMobile () {
     .user-layout-login{
       z-index: 99;
       width: 24%;
-      height: 56%;
+      height: 59%;
       padding: 3% 0 3% 0;
       min-width: 332px;
       min-height: 460px;