From ab939cf330ff4c9a8644a37a6334590a688b00cb Mon Sep 17 00:00:00 2001
From: xk_jiangfeng <XK_jiangfeng123>
Date: Wed, 19 Apr 2023 11:41:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/finance/order/OrderInfoList.vue | 3 -
.../finance/order/OrderPersonalInfoList.vue | 2 -
src/views/finance/order/OrderTfInfoList.vue | 3 +-
src/views/site/oilSiteInfo/OilInfoAdd.vue | 6 +-
.../site/oilSiteInfo/OilInfoAddUpdate.vue | 6 +-
.../site/oilSiteInfo/OilSiteInfoAdd copy.vue | 7 +-
src/views/site/oilSiteInfo/OilSiteInfoAdd.vue | 8 +-
.../site/oilSiteInfo/OilSiteInfoUpdate.vue | 9 +-
.../OilSitePriceAdjustTaskUpdate.vue | 7 +-
.../OilSitePriceAdjustTaskVerify.vue | 7 +-
vue.config.js | 258 +++++++++---------
11 files changed, 140 insertions(+), 176 deletions(-)
diff --git a/src/views/finance/order/OrderInfoList.vue b/src/views/finance/order/OrderInfoList.vue
index 6d8bcc0..9f6f864 100644
--- a/src/views/finance/order/OrderInfoList.vue
+++ b/src/views/finance/order/OrderInfoList.vue
@@ -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>
diff --git a/src/views/finance/order/OrderPersonalInfoList.vue b/src/views/finance/order/OrderPersonalInfoList.vue
index 4270452..c13d1e1 100644
--- a/src/views/finance/order/OrderPersonalInfoList.vue
+++ b/src/views/finance/order/OrderPersonalInfoList.vue
@@ -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>
diff --git a/src/views/finance/order/OrderTfInfoList.vue b/src/views/finance/order/OrderTfInfoList.vue
index 1247973..8c557df 100644
--- a/src/views/finance/order/OrderTfInfoList.vue
+++ b/src/views/finance/order/OrderTfInfoList.vue
@@ -821,6 +821,7 @@ export default {
break;
case -1:
convertStatusName = '转化失败'
+ break;
case 2:
convertStatusName = '转换中'
break;
@@ -841,7 +842,7 @@ export default {
// </div>
// } },
{
- prop: "createTime",
+ prop: "orderTime",
minWidth: 160,
sortable: "custom",
label: "创建时间",
diff --git a/src/views/site/oilSiteInfo/OilInfoAdd.vue b/src/views/site/oilSiteInfo/OilInfoAdd.vue
index 6b1d9df..0e0ac27 100644
--- a/src/views/site/oilSiteInfo/OilInfoAdd.vue
+++ b/src/views/site/oilSiteInfo/OilInfoAdd.vue
@@ -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' }],
diff --git a/src/views/site/oilSiteInfo/OilInfoAddUpdate.vue b/src/views/site/oilSiteInfo/OilInfoAddUpdate.vue
index 8b54cbb..4b09f82 100644
--- a/src/views/site/oilSiteInfo/OilInfoAddUpdate.vue
+++ b/src/views/site/oilSiteInfo/OilInfoAddUpdate.vue
@@ -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: {
diff --git a/src/views/site/oilSiteInfo/OilSiteInfoAdd copy.vue b/src/views/site/oilSiteInfo/OilSiteInfoAdd copy.vue
index 4b5a44e..3d986b9 100644
--- a/src/views/site/oilSiteInfo/OilSiteInfoAdd copy.vue
+++ b/src/views/site/oilSiteInfo/OilSiteInfoAdd copy.vue
@@ -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: '一点加油（壳牌）' }
-
]
}
},
diff --git a/src/views/site/oilSiteInfo/OilSiteInfoAdd.vue b/src/views/site/oilSiteInfo/OilSiteInfoAdd.vue
index ae11994..1806c7b 100644
--- a/src/views/site/oilSiteInfo/OilSiteInfoAdd.vue
+++ b/src/views/site/oilSiteInfo/OilSiteInfoAdd.vue
@@ -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: [
diff --git a/src/views/site/oilSiteInfo/OilSiteInfoUpdate.vue b/src/views/site/oilSiteInfo/OilSiteInfoUpdate.vue
index f808e07..d3480f8 100644
--- a/src/views/site/oilSiteInfo/OilSiteInfoUpdate.vue
+++ b/src/views/site/oilSiteInfo/OilSiteInfoUpdate.vue
@@ -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: '中国石化' },
diff --git a/src/views/site/priceAdjustTask/OilSitePriceAdjustTaskUpdate.vue b/src/views/site/priceAdjustTask/OilSitePriceAdjustTaskUpdate.vue
index 5d1fd9b..7cccfd0 100644
--- a/src/views/site/priceAdjustTask/OilSitePriceAdjustTaskUpdate.vue
+++ b/src/views/site/priceAdjustTask/OilSitePriceAdjustTaskUpdate.vue
@@ -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: '星油' },
diff --git a/src/views/site/priceAdjustTask/OilSitePriceAdjustTaskVerify.vue b/src/views/site/priceAdjustTask/OilSitePriceAdjustTaskVerify.vue
index f078144..f61ef58 100644
--- a/src/views/site/priceAdjustTask/OilSitePriceAdjustTaskVerify.vue
+++ b/src/views/site/priceAdjustTask/OilSitePriceAdjustTaskVerify.vue
@@ -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: '星油' },
diff --git a/vue.config.js b/vue.config.js
index 080c65e..76cd529 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -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')
+ })
+ }
+}
--
2.36.2