소스 검색

adm:feat > 修改60服务去掉4,配置nginx读取静态文件

shaun-sheep 4 년 전
부모
커밋
df34afe8d1

+ 74 - 73
build/utils.js

@@ -4,97 +4,98 @@ const config = require('../config')
 const ExtractTextPlugin = require('extract-text-webpack-plugin')
 const packageConfig = require('../package.json')
 
-exports.assetsPath = function(_path) {
-    const assetsSubDirectory =
-        process.env.NODE_ENV === 'production' ? config.build.assetsSubDirectory : config.dev.assetsSubDirectory
+exports.assetsPath = function (_path) {
+  const assetsSubDirectory =
+    process.env.NODE_ENV === 'production' ? config.build.assetsSubDirectory : config.dev.assetsSubDirectory
 
-    return path.posix.join(assetsSubDirectory, _path)
+  return path.posix.join(assetsSubDirectory, _path)
 }
 
-exports.cssLoaders = function(options) {
-    options = options || {}
+exports.cssLoaders = function (options) {
+  options = options || {}
 
-    const cssLoader = {
-        loader: 'css-loader',
-        options: {
-            sourceMap: options.sourceMap
-        }
+  const cssLoader = {
+    loader: 'css-loader',
+    options: {
+      sourceMap: options.sourceMap
     }
+  }
 
-    const postcssLoader = {
-        loader: 'postcss-loader',
-        options: {
-            sourceMap: options.sourceMap
-        }
+  const postcssLoader = {
+    loader: 'postcss-loader',
+    options: {
+      sourceMap: options.sourceMap
     }
+  }
 
-    // generate loader string to be used with extract text plugin
-    function generateLoaders(loader, loaderOptions) {
-        const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader]
-
-        if (loader) {
-            loaders.push({
-                loader: loader + '-loader',
-                options: Object.assign({}, loaderOptions, {
-                    sourceMap: options.sourceMap
-                })
-            })
-        }
-
-        // Extract CSS when that option is specified
-        // (which is the case during production build)
-        if (options.extract) {
-            return ExtractTextPlugin.extract({
-                use: loaders,
-                fallback: 'vue-style-loader'
-            })
-        } else {
-            return ['vue-style-loader'].concat(loaders)
-        }
+  // generate loader string to be used with extract text plugin
+  function generateLoaders(loader, loaderOptions) {
+    const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader]
+
+    if (loader) {
+      loaders.push({
+        loader: loader + '-loader',
+        options: Object.assign({}, loaderOptions, {
+          sourceMap: options.sourceMap
+        })
+      })
     }
 
-    // https://vue-loader.vuejs.org/en/configurations/extract-css.html
-    return {
-        css: generateLoaders(),
-        postcss: generateLoaders(),
-        less: generateLoaders('less'),
-        sass: generateLoaders('sass', { indentedSyntax: true }),
-        scss: generateLoaders('sass'),
-        stylus: generateLoaders('stylus'),
-        styl: generateLoaders('stylus')
+    // Extract CSS when that option is specified
+    // (which is the case during production build)
+    if (options.extract) {
+      return ExtractTextPlugin.extract({
+        use: loaders,
+        fallback: 'vue-style-loader',
+        publicPath: '../../'
+      })
+    } else {
+      return ['vue-style-loader'].concat(loaders)
     }
+  }
+
+  // https://vue-loader.vuejs.org/en/configurations/extract-css.html
+  return {
+    css: generateLoaders(),
+    postcss: generateLoaders(),
+    less: generateLoaders('less'),
+    sass: generateLoaders('sass', { indentedSyntax: true }),
+    scss: generateLoaders('sass'),
+    stylus: generateLoaders('stylus'),
+    styl: generateLoaders('stylus')
+  }
 }
 
 // Generate loaders for standalone style files (outside of .vue)
-exports.styleLoaders = function(options) {
-    const output = []
-    const loaders = exports.cssLoaders(options)
-
-    for (const extension in loaders) {
-        const loader = loaders[extension]
-        output.push({
-            test: new RegExp('\\.' + extension + '$'),
-            use: loader
-        })
-    }
-
-    return output
+exports.styleLoaders = function (options) {
+  const output = []
+  const loaders = exports.cssLoaders(options)
+
+  for (const extension in loaders) {
+    const loader = loaders[extension]
+    output.push({
+      test: new RegExp('\\.' + extension + '$'),
+      use: loader
+    })
+  }
+
+  return output
 }
 
 exports.createNotifierCallback = () => {
-    const notifier = require('node-notifier')
+  const notifier = require('node-notifier')
 
-    return (severity, errors) => {
-        if (severity !== 'error') return
+  return (severity, errors) => {
+    if (severity !== 'error') return
 
-        const error = errors[0]
-        const filename = error.file && error.file.split('!').pop()
+    const error = errors[0]
+    const filename = error.file && error.file.split('!').pop()
 
-        notifier.notify({
-            title: packageConfig.name,
-            message: severity + ': ' + error.name,
-            subtitle: filename || '',
-            icon: path.join(__dirname, 'logo.png')
-        })
-    }
+    notifier.notify({
+      title: packageConfig.name,
+      message: severity + ': ' + error.name,
+      subtitle: filename || '',
+      icon: path.join(__dirname, 'logo.png')
+    })
+  }
 }

+ 2 - 1
config/dev.env.js

@@ -10,8 +10,9 @@ module.exports = merge(prodEnv, {
   // BASE_URL: '"http://192.168.20.236"', //(新)测试iframe地址
   // SSO_SERVER: '"http://192.168.20.236:8086"', //(新)测试环境
   // MQTT_SERVICE: '"ws://172.16.42.210:61614/stomp/"' //MQ测试环境地址
+  // BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
+  BASE_URL: '"http://39.102.40.239"', //测试iframe地址
   SSO_SERVER: '"http://sso.sagacloud.cn"',  //正式环境
-  BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
   MQTT_SERVICE: '"ws://adm.sagacloud.cn/stomp/"' //MQ正式环境地址
 })
 

+ 1 - 1
config/index.js

@@ -355,7 +355,7 @@ module.exports = {
     // Paths
     assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
-    assetsPublicPath: '/',
+    assetsPublicPath: './',
 
     /**
      * Source Maps

+ 3 - 3
config/prod.env.js

@@ -1,12 +1,12 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_URL: '"http://192.168.12.15"', //测试iframe地址
+  BASE_URL: '"http://39.102.40.239"', //测试iframe地址
+  SSO_SERVER: '"http://mbi.sagacloud.cn"', //测试环境
+  MQTT_SERVICE: '"ws://172.16.42.210:61614/stomp/"' //MQ测试环境地址
   // SSO_SERVER: '"http://172.16.44.235:8081"', //测试环境
-  SSO_SERVER: '"http://192.168.12.238:8081"', //测试环境
   // BASE_URL: '"http://192.168.20.236"', //(新)测试iframe地址
   // SSO_SERVER: '"http://192.168.20.236:8086"', //(新)测试环境
-  MQTT_SERVICE: '"ws://172.16.42.210:61614/stomp/"' //MQ测试环境地址
   // BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
   // SSO_SERVER: '"http://sso.sagacloud.cn"',  //正式环境
   //  MQTT_SERVICE: '"ws://adm.sagacloud.cn/stomp/"' //MQ正式环境地址

+ 3 - 3
src/api/scan/config.js

@@ -5,15 +5,15 @@ export const api1 = '/scanbuilding-2';
 export const scan = '/scanbuilding';
 export const sass = 'sass';
 export const venders = '/venders'
-export const dataCenter = '/datacenter4'
-export const component = '/equip-component4'
+export const dataCenter = '/datacenter'
+export const component = '/equip-component'
 export const physics = '/data-platform-3';
 export const business = '/business-space'
 /******************* 适配新版数据字典接口 *********************/
 export const object = dataCenter + '/object'
 export const rel = dataCenter + '/rel'
 export const system = object + '/general-system'
-export const message = baseUrl + '/message-center4'
+export const message = baseUrl + '/message-center'
 
 
 export const shaft = dataCenter + '/shaft'

+ 5 - 5
src/components/relation/overview/Modal/RelationMaintain.vue

@@ -243,7 +243,7 @@
       <el-upload
           class="upload-demo"
           drag
-          action="/api/datacenter4/graphic/import"
+          action="/api/datacenter/graphic/import"
           multiple
           :show-file-list='false'
           name="file"
@@ -485,15 +485,15 @@
         let url;
         if (str === 'excel') {
           relType = this.ManualMaintenance.RelationType ? `&relType=${this.ManualMaintenance.RelationType}` : ''
-          // url = `/api/datacenter4/graphic/export?code=对象ID${relType}${zoneType}`
+          // url = `/api/datacenter/graphic/export?code=对象ID${relType}${zoneType}`
           if (zoneType) {
-            url = '/api/datacenter4/graphic/export?code=对象ID' + relType + zoneType
+            url = '/api/datacenter/graphic/export?code=对象ID' + relType + zoneType
 
           } else {
-            url = '/api/datacenter4/graphic/export?code=对象ID' + relType
+            url = '/api/datacenter/graphic/export?code=对象ID' + relType
           }
         } else {
-          url = `/api/datacenter4/graphic/report-downloads${relType}${zoneType}`
+          url = `/api/datacenter/graphic/report-downloads${relType}${zoneType}`
         }
         return url
       },

+ 4 - 4
src/components/relation/relationShip/Modal/exportExcel.vue

@@ -14,7 +14,7 @@
 
           <a :href="downloadProject('excel')">
 
-            <!--          <a :href=`/api/datacenter4/graphic/export?code=对象ID${localStorage.getItem('RelationType')?relType=${localStorage.getItem('RelationType')} : null}${ localStorage.getItem('ZoneType') ? `&zoneType=${localStorage.getItem('ZoneType')}` : null}` >-->
+            <!--          <a :href=`/api/datacenter/graphic/export?code=对象ID${localStorage.getItem('RelationType')?relType=${localStorage.getItem('RelationType')} : null}${ localStorage.getItem('ZoneType') ? `&zoneType=${localStorage.getItem('ZoneType')}` : null}` >-->
             <el-button
               type="primary"
               class="mt-10"
@@ -30,7 +30,7 @@
       <el-upload
         class="upload-demo"
         :drag="true"
-        action="/api/datacenter4/graphic/import"
+        action="/api/datacenter/graphic/import"
         multiple
         :show-file-list='false'
         name="file"
@@ -137,9 +137,9 @@
         let url;
         if (str === 'excel') {
           relType = localStorage.getItem('RelationType') ? `&relType=${localStorage.getItem('RelationType')}` : '';
-          url = `/api/datacenter4/graphic/export?projectId=${this.projectId}&code=对象ID${relType}${zoneType}`
+          url = `/api/datacenter/graphic/export?projectId=${this.projectId}&code=对象ID${relType}${zoneType}`
         } else {
-          url = `/api/datacenter4/graphic/report-downloads${relType}${zoneType}`
+          url = `/api/datacenter/graphic/report-downloads${relType}${zoneType}`
         }
         return url
       },

+ 1 - 1
src/framework/components/messagesever/index.vue

@@ -213,7 +213,7 @@ export default {
       this.unsubscribe()
     },
     handleClickSendMessage() {//发送消息
-      this.send('/topic/datacenter4.broadcast', this.sendMessage)
+      this.send('/topic/datacenter.broadcast', this.sendMessage)
     },
     allDetails() {
       this.noticeListShow = false;

+ 14 - 10
src/framework/layout/PageHeader.vue

@@ -18,16 +18,20 @@
       </el-select>
     </div>
     <div id='page-header-user-menu' class='user-menu'>
-      <el-dropdown trigger='hover' class='user-menu-dropdown' @command='userMenuCommand'>
-                <span class='el-dropdown-link'>
-                    {{ userInfo.userName }}
-                    <i class='el-icon-fa-user el-icon--right'></i>
-                </span>
-        <el-dropdown-menu slot='dropdown'>
-          <el-dropdown-item icon='el-icon-plus' command='logout'>退出</el-dropdown-item>
-          <el-dropdown-item icon='el-icon-circle-plus'>修改密码</el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
+        <span class='el-dropdown-link' style="margin-top: 11px;">
+              yanruolan
+              <i class='el-icon-fa-user el-icon--right'></i>
+          </span>
+<!--      <el-dropdown trigger='hover' class='user-menu-dropdown' @command='userMenuCommand'>-->
+<!--                <span class='el-dropdown-link'>-->
+<!--                    {{ userInfo.userName }}-->
+<!--                    <i class='el-icon-fa-user el-icon&#45;&#45;right'></i>-->
+<!--                </span>-->
+<!--        <el-dropdown-menu slot='dropdown'>-->
+<!--          <el-dropdown-item icon='el-icon-plus' command='logout'>退出</el-dropdown-item>-->
+<!--          <el-dropdown-item icon='el-icon-circle-plus'>修改密码</el-dropdown-item>-->
+<!--        </el-dropdown-menu>-->
+<!--      </el-dropdown>-->
       <ul class="header-nav">
         <li class="header-nav-Splitscreen">
           <a href="/splitScreen" target="_blank"><i class="el-icon-s-platform"></i></a>

+ 4 - 2
src/router/index.js

@@ -4,6 +4,7 @@ import frameworkApi from '@/api/framework'
 import demoRoute from '@/demo/demo-routes'
 import authutils from '@/utils/authutils'
 import systemRoute from './system'
+
 Vue.use(Router)
 
 let routes = []
@@ -11,8 +12,9 @@ let routes = []
 routes = routes.concat(systemRoute)
 
 const router = new Router({
-    mode: 'history',
-    routes: routes
+  mode: 'history',
+  base: "adm",
+  routes: routes
 })
 
 router.beforeEach(authutils.routerBeforeEach)