guoyuepeng
/
qa-prevention-gwj-vue
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

2024年1月19日V01.00.51

2024年1月19日V01.00.51
guoyuepeng 2024-01-19 17:46:54 +08:00
parent 8914ef8874
commit eb8383008e
7 changed files with 939 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/index.js
View File

@ -11,7 +11,7 @@ module.exports = {
assetsPublicPath: '/', assetsPublicPath: '/',
proxyTable: { proxyTable: {
'/api': { '/api': {
target: 'http://192.168.0.79:8091/', target: 'http://192.168.151.43:8091/',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/api': '' '^/api': ''

994
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

3
package.json
View File

@ -5,7 +5,7 @@
"author": "", "author": "",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js --host 192.168.151.56", "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js --host 192.168.151.43",
"start": "npm run dev", "start": "npm run dev",
"unit": "jest --config test/unit/jest.conf.js --coverage", "unit": "jest --config test/unit/jest.conf.js --coverage",
"e2e": "node test/e2e/runner.js", "e2e": "node test/e2e/runner.js",
@ -26,6 +26,7 @@
"jspdf": "^2.5.1", "jspdf": "^2.5.1",
"moment": "^2.29.3", "moment": "^2.29.3",
"motion": "^10.16.4", "motion": "^10.16.4",
"throttle-debounce": "^5.0.0",
"mqtt": "4.2.1", "mqtt": "4.2.1",
"normalize.css": "^8.0.1", "normalize.css": "^8.0.1",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",

2
src/views/corpInfo/information/info/components/corpEdit.vue
View File

@ -589,7 +589,7 @@ export default {
{ required: true, message: '请输入六位邮政编码', trigger: 'blur', pattern: /^[0-9]\d{5}$/ } { required: true, message: '请输入六位邮政编码', trigger: 'blur', pattern: /^[0-9]\d{5}$/ }
], ],
TOTALASSETS: [{ required: true, message: '资产总额不能为空', trigger: 'blur' }, TOTALASSETS: [{ required: true, message: '资产总额不能为空', trigger: 'blur' },
{ required: true, message: '长度在 3 到 5 个字符', trigger: 'blur', pattern: /^.{3,5}$/ } { required: true, message: '长度在 3 到 15 个字符', trigger: 'blur', pattern: /^.{3,15}$/ }
// { min: 1, max: 11, message: '长度在 3 到 5 个字符', trigger: 'blur' } // { min: 1, max: 11, message: '长度在 3 到 5 个字符', trigger: 'blur' }
], ],
CITY: [ CITY: [

2
src/views/hotwork/superapprove/pigeonhole/components/list.vue
View File

@ -54,7 +54,7 @@
<el-table-column prop="CREATORNAME" label="申请人" align="center" /> <el-table-column prop="CREATORNAME" label="申请人" align="center" />
<el-table-column prop="CREATTIME" label="申请时间" align="center" > <el-table-column prop="CREATTIME" label="申请时间" align="center" >
<template slot-scope="{row}"> <template slot-scope="{row}">
{{ formatDate(row.CREATTIME,'YYYY-MM-DD HH:mm:ss') }} {{ formatDate(row.OPERATTIME,'YYYY-MM-DD HH:mm:ss') }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="STATE" label="特级动火审批状态" align="center" > <el-table-column prop="STATE" label="特级动火审批状态" align="center" >

10
static/config.js
View File

@ -1,13 +1,13 @@
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
const config = { const config = {
weburl: 'http://192.168.151.43:8080/', // 前台地址 weburl: 'http://192.168.151.43:8080/', // 前台地址
httpurl: '/api', // 后台地址 httpurl: 'http://192.168.151.43:8091/', // 后台地址
qyurl: 'http://192.168.0.45:8080/', // 企业前台 qyurl: 'https://qgqy.qhdsafety.com/', // 企业前台
adminurl: 'https://www.qdkjchina.com/qa-prevention-admin/', adminurl: 'https://www.qdkjchina.com/qa-prevention-admin/',
// 正式 // 正式
fileUrl: 'https://qgqy.qhdsafety.com/file/', // 附件服务器地址 fileUrl: 'https://qgqy.qhdsafety.com/file/', // 附件服务器地址
weburlWaiwang: 'https://skqhdg.porthebei.com:9004/', // 服务器外网地址 weburlWaiwang: 'https://qgqy.qhdsafety.com/', // 服务器外网地址
httpurlWaiwang: 'https://skqhdg.porthebei.com:9004/qa-prevention-gwj/', // , httpurlWaiwang: 'https://qgqy.qhdsafety.com/qa-prevention-gwj/', // ,
fileUrlWaiwang: 'https://skqhdg.porthebei.com:9004/file/', // 服务器外网 附件地址, fileUrlWaiwang: 'https://qgqy.qhdsafety.com/file/', // 服务器外网 附件地址,
publicKey: 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2zCyUYSD0pNrbtaYdvGfHfWoRV+fo/2N9O2PLLz/jZvMkigkq4eAq4JO+Ek0wDHI9WxP6iTSLYCHhIOs9CQTPvyldJFm8riZtQZlBTD8Plkb3rjrgwTqbBi3w3+HKYdkSvGFXJIdSOPbpXnj5BzN8vlVaybs24R/vpUzG9178lwIDAQAB' publicKey: 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2zCyUYSD0pNrbtaYdvGfHfWoRV+fo/2N9O2PLLz/jZvMkigkq4eAq4JO+Ek0wDHI9WxP6iTSLYCHhIOs9CQTPvyldJFm8riZtQZlBTD8Plkb3rjrgwTqbBi3w3+HKYdkSvGFXJIdSOPbpXnj5BzN8vlVaybs24R/vpUzG9178lwIDAQAB'
} }

13
static/config_dev.js Normal file
View File

@ -0,0 +1,13 @@
// eslint-disable-next-line no-unused-vars
const config = {
weburl: 'http://192.168.151.43:8080/', // 前台地址
httpurl: 'http://qgqy.qhdsafety.com/qa-prevention-gwj/', // 后台地址
qyurl: 'https://qgqy.qhdsafety.com/', // 企业前台
adminurl: 'https://www.qdkjchina.com/qa-prevention-admin/',
// 正式
fileUrl: 'https://qgqy.qhdsafety.com/file/', // 附件服务器地址
weburlWaiwang: 'https://qgqy.qhdsafety.com/', // 服务器外网地址
httpurlWaiwang: 'https://qgqy.qhdsafety.com/qa-prevention-gwj/', // ,
fileUrlWaiwang: 'https://qgqy.qhdsafety.com/file/', // 服务器外网 附件地址,
publicKey: 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2zCyUYSD0pNrbtaYdvGfHfWoRV+fo/2N9O2PLLz/jZvMkigkq4eAq4JO+Ek0wDHI9WxP6iTSLYCHhIOs9CQTPvyldJFm8riZtQZlBTD8Plkb3rjrgwTqbBi3w3+HKYdkSvGFXJIdSOPbpXnj5BzN8vlVaybs24R/vpUzG9178lwIDAQAB'
}