6a9aa02cc3
# Conflicts: # src/jmapNew/theme/components/menus/dialog/setFault.vue # src/jmapNew/theme/datie_01/menus/menuDialog/helpAbout.vue # src/jmapNew/theme/datie_02/menus/menuSection.vue # src/jmapNew/theme/datie_jd1a/menus/menuDialog/helpAbout.vue # src/jmapNew/theme/datie_ksk/menus/menuDialog/helpAbout.vue # src/scripts/ConstConfig.js # src/views/newMap/display/chatBox.vue # src/views/newMap/display/memberManage/membersManage.vue # src/views/newMap/display/simulationMenu/simulationMenu.vue # src/views/newMap/display/terminals/equipmentConstructionTable.vue # src/views/newMap/display/terminals/registerBook.vue # src/views/newMap/display/terminals/terminalMenu.vue # src/views/newMap/display/trainingList/trainingMenu.vue # src/views/newMap/display/trainingList/trainingTip.vue |
||
---|---|---|
build | ||
public | ||
src | ||
static | ||
tests/unit | ||
.editorconfig | ||
.env.development | ||
.env.heb | ||
.env.local-test | ||
.env.ntyl | ||
.env.production | ||
.env.sai | ||
.env.staging | ||
.eslintignore | ||
.eslintrc.js | ||
.gitignore | ||
.postcssrc.js | ||
.travis.yml | ||
babel.config.js | ||
index.html | ||
Jenkinsfile-prd | ||
Jenkinsfile-test | ||
jest.config.js | ||
LICENSE | ||
package.json | ||
README-zh.md | ||
README.md | ||
vue.config.js |