Merge pull request 'it_s' (#2) from it_s into master

Reviewed-on: #2
pull/3/head
gitea_admin 2 years ago
commit 30df2ea8b6
  1. 3
      src/views/finance/order/OrderInfoList.vue
  2. 2
      src/views/finance/order/OrderPersonalInfoList.vue
  3. 1
      src/views/finance/order/OrderTfInfoList.vue
  4. 6
      src/views/site/oilSiteInfo/OilInfoAdd.vue
  5. 6
      src/views/site/oilSiteInfo/OilInfoAddUpdate.vue
  6. 7
      src/views/site/oilSiteInfo/OilSiteInfoAdd copy.vue
  7. 8
      src/views/site/oilSiteInfo/OilSiteInfoAdd.vue
  8. 9
      src/views/site/oilSiteInfo/OilSiteInfoUpdate.vue
  9. 7
      src/views/site/priceAdjustTask/OilSitePriceAdjustTaskUpdate.vue
  10. 7
      src/views/site/priceAdjustTask/OilSitePriceAdjustTaskVerify.vue
  11. 258
      vue.config.js

@ -71,9 +71,6 @@
clearable
>
<el-option value="XOIL" label="星油" />
<el-option value="TY" label="团油" />
<el-option value="WJY" label="万金油" />
<el-option value="LV" label="老吕" />
</el-select>
</el-form-item>
<el-form-item>

@ -27,8 +27,6 @@
<el-form-item>
<el-select v-model="page.params.siteCode" placeholder="油站渠道" clearable>
<el-option value="XOIL" label="星油" />
<el-option value="TY" label="团油" />
<el-option value="WJY" label="万金油" />
</el-select>
</el-form-item>
<el-form-item>

@ -821,6 +821,7 @@ export default {
break;
case -1:
convertStatusName = '转化失败'
break;
case 2:
convertStatusName = '转换中'
break;

@ -904,12 +904,8 @@ export default {
results:[],
areaTree: [],
addrCode: [], // code
options11: [{ value: 'IMSITE', label: '综合' },
options11: [
{ value: 'XOIL', label: '星油' },
{ value: 'WJY', label: '万金油' },
{ value: 'LV', label: '老吕(找油网)' },
{ value: 'TY', label: '团油' },
{ value: 'YDJY', label: '一点加油(壳牌)' }
],
rules: {
// addrCode:[{ required: true, message: '', trigger: 'change' }],

@ -738,12 +738,8 @@ export default {
isShowMap: true, // div
areaTree: [],
addrCode: [], // code
options11: [{ value: 'IMSITE', label: '综合' },
options11: [
{ value: 'XOIL', label: '星油' },
{ value: 'WJY', label: '万金油' },
{ value: 'LV', label: '老吕(找油网)' },
{ value: 'TY', label: '团油' },
{ value: 'YDJY', label: '一点加油(壳牌)' }
],
numbs:0,
rules: {

@ -425,13 +425,8 @@ export default {
},
areaTree: [],
addrCode: [], // code
options11: [{ value: 'IMSITE', label: '综合' },
options11: [
{ value: 'XOIL', label: '星油' },
{ value: 'WJY', label: '万金油' },
{ value: 'LV', label: '老吕(找油网)' },
{ value: 'TY', label: '团油' },
{ value: 'YDJY', label: '一点加油(壳牌)' }
]
}
},

@ -475,12 +475,8 @@ export default {
},
areaTree: [],
addrCode: [], // code
options11: [{ value: 'IMSITE', label: '综合' },
{ value: 'XOIL', label: '星油' },
{ value: 'WJY', label: '万金油' },
{ value: 'LV', label: '老吕(找油网)' },
{ value: 'TY', label: '团油' },
{ value: 'YDJY', label: '一点加油(壳牌)' }
options11: [
{ value: 'XOIL', label: '星油' }
],
rules: {
siteName: [

@ -376,13 +376,8 @@ export default {
},
areaTree: [],
addrCode: [], // code
options11: [{ value: 'IMSITE', label: '综合' },
{ value: 'XOIL', label: '星油' },
{ value: 'WJY', label: '万金油' },
{ value: 'LV', label: '老吕(找油网)' },
{ value: 'TY', label: '团油' },
{ value: 'YDJY', label: '一点加油(壳牌)' }
options11: [
{ value: 'XOIL', label: '星油' }
],
optionsBrand: [{ value: '1', label: '中国石油' },
{ value: '2', label: '中国石化' },

@ -399,12 +399,7 @@ export default {
],
siteChannelArray: [
{ value: 'XOIL', label: '星油' },
{ value: 'WJY', label: '万金油' },
{ value: 'LV', label: '老吕(找油网)' },
{ value: 'TY', label: '团油' },
{ value: 'YDJY', label: '一点加油(壳牌)' }
{ value: 'XOIL', label: '星油' }
],
options11: [{ value: 'IMSITE', label: '综合' },
{ value: 'XOIL', label: '星油' },

@ -229,12 +229,7 @@ export default {
],
siteChannelArray: [
{ value: 'XOIL', label: '星油' },
{ value: 'WJY', label: '万金油' },
{ value: 'LV', label: '老吕(找油网)' },
{ value: 'TY', label: '团油' },
{ value: 'YDJY', label: '一点加油(壳牌)' }
{ value: 'XOIL', label: '星油' }
],
options11: [{ value: 'IMSITE', label: '综合' },
{ value: 'XOIL', label: '星油' },

@ -1,142 +1,142 @@
"use strict";
const path = require("path");
const defaultSettings = require("./src/settings.js");
'use strict'
const path = require('path')
const defaultSettings = require('./src/settings.js')
function resolve(dir) {
return path.join(__dirname, dir);
return path.join(__dirname, dir)
}
const name = defaultSettings.title || "星油能源调度管理平台";
const port = 9528;
const name = defaultSettings.title || '星油能源调度管理平台'
const port = 9528
module.exports = {
publicPath: "./",
outputDir: "dist",
assetsDir: "./static",
lintOnSave: process.env.NODE_ENV === "development",
productionSourceMap: false, // 改为false可一定程度上解决浏览器f12查看到源码的问题
devServer: {
disableHostCheck: true,
port: port,
overlay: {
warnings: false,
errors: true
},
proxy: {
[process.env.VUE_APP_BASE_API]: {
// target: "http://uat.xingoil.com/adminapi",
// target: 'https://www.xingoil.com/adminapi',
target: `http://192.168.0.27:38080`,
changeOrigin: true,
pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: ""
}
},
[process.env.VUE_APP_UPLOAD_URL]: {
target: `http://192.168.0.31:38080`,
changeOrigin: true,
pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: ""
}
},
[process.env.VUE_APP_BASE_LSM_API]: {
target: `http://121.41.3.91:8085`,
changeOrigin: true,
pathRewrite: {
["^" + process.env.VUE_APP_BASE_LSM_API]: ""
}
}
}
publicPath: './',
outputDir: 'dist',
assetsDir: './static',
lintOnSave: process.env.NODE_ENV === 'development',
productionSourceMap: false, // 改为false可一定程度上解决浏览器f12查看到源码的问题
devServer: {
disableHostCheck: true,
port: port,
overlay: {
warnings: false,
errors: true
},
configureWebpack: {
name: name,
resolve: {
alias: {
"@": resolve("src") // 别名。开启后@表示src下目录
}
},
externals: {
"./cptable": "var cptable",
AMap: "AMap"
proxy: {
[process.env.VUE_APP_BASE_API]: {
// target: "http://uat.xingoil.com/adminapi",
// target: 'https://www.xingoil.com/adminapi',
target: `http://192.168.0.22:38080`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
}
},
[process.env.VUE_APP_UPLOAD_URL]: {
target: `http://192.168.0.31:38080`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
}
},
[process.env.VUE_APP_BASE_LSM_API]: {
target: `http://121.41.3.91:8085`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_LSM_API]: ''
}
}
}
},
configureWebpack: {
name: name,
resolve: {
alias: {
'@': resolve('src') // 别名。开启后@表示src下目录
}
},
chainWebpack(config) {
config.plugins.delete("preload"); // TODO: need test
config.plugins.delete("prefetch"); // TODO: need test
config.entry.app = ["babel-polyfill", "./src/main.js"];
// set svg-sprite-loader
config.module
.rule("svg")
.exclude.add(resolve("src/icons"))
.end();
config.module
.rule("icons")
.test(/\.svg$/)
.include.add(resolve("src/icons"))
.end()
.use("svg-sprite-loader")
.loader("svg-sprite-loader")
.options({
symbolId: "icon-[name]"
})
.end();
externals: {
'./cptable': 'var cptable',
AMap: 'AMap'
}
},
chainWebpack(config) {
config.plugins.delete('preload') // TODO: need test
config.plugins.delete('prefetch') // TODO: need test
config.entry.app = ['babel-polyfill', './src/main.js']
// set svg-sprite-loader
config.module
.rule('svg')
.exclude.add(resolve('src/icons'))
.end()
config.module
.rule('icons')
.test(/\.svg$/)
.include.add(resolve('src/icons'))
.end()
.use('svg-sprite-loader')
.loader('svg-sprite-loader')
.options({
symbolId: 'icon-[name]'
})
.end()
if (process.env.use_analyzer) {
// 分析
config
.plugin("webpack-bundle-analyzer")
.use(require("webpack-bundle-analyzer").BundleAnalyzerPlugin);
}
if (process.env.use_analyzer) {
// 分析
config
.plugin('webpack-bundle-analyzer')
.use(require('webpack-bundle-analyzer').BundleAnalyzerPlugin)
}
// set preserveWhitespace
config.module
.rule("vue")
.use("vue-loader")
.loader("vue-loader")
.tap(options => {
options.compilerOptions.preserveWhitespace = true;
return options;
})
.end();
// set preserveWhitespace
config.module
.rule('vue')
.use('vue-loader')
.loader('vue-loader')
.tap(options => {
options.compilerOptions.preserveWhitespace = true
return options
})
.end()
config;
// https://webpack.js.org/configuration/devtool/#development.when(process.env.NODE_ENV === 'development', config => config.devtool('cheap-source-map'))
config
// https://webpack.js.org/configuration/devtool/#development.when(process.env.NODE_ENV === 'development', config => config.devtool('cheap-source-map'))
config.when(process.env.NODE_ENV !== "development", config => {
config
.plugin("ScriptExtHtmlWebpackPlugin")
.after("html")
.use("script-ext-html-webpack-plugin", [
{
// `runtime` must same as runtimeChunk name. default is `runtime`
inline: /runtime\..*\.js$/
}
])
.end();
config.optimization.splitChunks({
chunks: "all",
cacheGroups: {
libs: {
name: "chunk-libs",
test: /[\\/]node_modules[\\/]/,
priority: 10,
chunks: "initial" // only package third parties that are initially dependent
},
elementUI: {
name: "chunk-elementUI", // split elementUI into a single package
priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
},
commons: {
name: "chunk-commons",
test: resolve("src/components"), // can customize your rules
minChunks: 3, // minimum common number
priority: 5,
reuseExistingChunk: true
}
}
});
config.optimization.runtimeChunk("single");
});
}
};
config.when(process.env.NODE_ENV !== 'development', config => {
config
.plugin('ScriptExtHtmlWebpackPlugin')
.after('html')
.use('script-ext-html-webpack-plugin', [
{
// `runtime` must same as runtimeChunk name. default is `runtime`
inline: /runtime\..*\.js$/
}
])
.end()
config.optimization.splitChunks({
chunks: 'all',
cacheGroups: {
libs: {
name: 'chunk-libs',
test: /[\\/]node_modules[\\/]/,
priority: 10,
chunks: 'initial' // only package third parties that are initially dependent
},
elementUI: {
name: 'chunk-elementUI', // split elementUI into a single package
priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
},
commons: {
name: 'chunk-commons',
test: resolve('src/components'), // can customize your rules
minChunks: 3, // minimum common number
priority: 5,
reuseExistingChunk: true
}
}
})
config.optimization.runtimeChunk('single')
})
}
}

Loading…
Cancel
Save