wulin/wl_management_vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

忘记保存

Browse Source
This commit is contained in:
wulin 2020-08-25 16:53:24 +08:00
parent 8c3cbb16a7
commit 1c4f2e63b1
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/index.js
View File

@ -20,11 +20,7 @@ module.exports = {
// Various Dev Server settings // Various Dev Server settings
// host: '192.168.43.94', // can be overwritten by process.env.HOST // host: '192.168.43.94', // can be overwritten by process.env.HOST
<<<<<<< HEAD
host: IP, // can be overwritten by process.env.HOST host: IP, // can be overwritten by process.env.HOST
=======
//host: '192.168.43.94', // can be overwritten by process.env.HOST
>>>>>>> 963d9e51332d845e8277defde878642dd553bf1b
port: 8001, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined port: 8001, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true, autoOpenBrowser: true,
errorOverlay: true, errorOverlay: true,

3
src/views/modules/result/record/recorddetail.vue
View File

@ -174,10 +174,7 @@ export default {
loading: false, loading: false,
auth: [], auth: [],
recordType: 0, recordType: 0,
<<<<<<< HEAD
clientHeight: 0 clientHeight: 0
=======
>>>>>>> 963d9e51332d845e8277defde878642dd553bf1b
} }
}, },
components: { components: {