Browse Source

近期修改

master
bianyaqi 1 year ago
parent
commit
8082dd623a
  1. 7
      .env.staging
  2. 4
      src/components/360View/opticalFile/index.vue
  3. 1
      src/page-subspecialty/router/index.js
  4. 2
      src/page-subspecialty/views/modules/formList/screenReport.vue
  5. 2
      vue.config.js

7
.env.staging

@ -1,7 +1,12 @@
NODE_ENV=staging NODE_ENV=staging
VUE_APP_NODE_ENV=staging VUE_APP_NODE_ENV=staging
VUE_APP_LOGIN_URL='http://47.110.224.240:8036/xiangan-crf'
# VUE_APP_LOGIN_URL='http://47.110.224.240:8036/xiangan-crf'
# VUE_APP_LOGIN_URL='http://192.168.0.35:8001/xiangan-crf/'
VUE_APP_LOGIN_URL='http://192.168.0.36:8036/xiangan-crf/'
# 后缀
VUE_APP_BASE_SUF='/xa'
# pacs浏览器 # pacs浏览器
VUE_APP_PACS_URL='http://192.168.0.85:8001' VUE_APP_PACS_URL='http://192.168.0.85:8001'

4
src/components/360View/opticalFile/index.vue

@ -528,8 +528,8 @@ export default {
} }
.bottomList{ .bottomList{
height: calc(100% - 36px); height: calc(100% - 36px);
overflow: hidden;
overflow-y: scroll;
//overflow: hidden;
//overflow-y: scroll;
} }
</style> </style>
<style lang="scss"> <style lang="scss">

1
src/page-subspecialty/router/index.js

@ -134,6 +134,7 @@ export function addDynamicRoute(routeParams, router) {
const createRouter = () => new Router({ const createRouter = () => new Router({
mode: 'history', mode: 'history',
base: process.env.NODE_ENV === 'staging' ? process.env.VUE_APP_BASE_SUF : '/',
scrollBehavior: () => ({ y: 0 }), scrollBehavior: () => ({ y: 0 }),
routes: pageRoutes.concat(moduleRoutes) routes: pageRoutes.concat(moduleRoutes)
}) })

2
src/page-subspecialty/views/modules/formList/screenReport.vue

@ -89,7 +89,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td>结果</td>
<td>结果 result</td>
<td colspan="2"> <td colspan="2">
<el-checkbox-group v-model="jgSelect"> <el-checkbox-group v-model="jgSelect">
<el-checkbox label="正常" /> <el-checkbox label="正常" />

2
vue.config.js

@ -13,7 +13,7 @@ function resolve(dir) {
module.exports = { module.exports = {
parallel: false, parallel: false,
publicPath: '/', // 多页面情况 process.env.NODE_ENV === 'production' ? './' : '/',
publicPath: process.env.NODE_ENV === 'staging' ? process.env.VUE_APP_BASE_SUF : '/',
assetsDir: 'static', assetsDir: 'static',
chainWebpack: config => { chainWebpack: config => {
config.entry('main').add('babel-polyfill') config.entry('main').add('babel-polyfill')

Loading…
Cancel
Save