Commit Graph

97 Commits

Author SHA1 Message Date
fan
a732b9c19b 添加竞业达登录页面 2020-06-15 10:05:27 +08:00
fan
fc0772a11c iscs调整&站后折返显示调整 2020-06-05 18:59:35 +08:00
fan
d93e40ab48 iscs调整 2020-06-01 18:33:17 +08:00
zyy
1ae2793221 调整绘图界面字体皮肤配置 2020-05-25 15:06:34 +08:00
joylink_cuiweidong
526fefceec 竞赛代码调整 2020-05-22 17:30:17 +08:00
zyy
48523b2d0a 调整首页 2020-05-22 16:52:12 +08:00
fan
62d12e8ed5 iscs调整图元说明公共区域 2020-05-07 16:39:38 +08:00
fan
1bfe76c291 添加西安地铁页面&&项目配置规整(未完) 2020-04-16 13:47:40 +08:00
zyy
fd63b2cfa0 替换小程序图标 2020-03-24 17:40:36 +08:00
fan
5f014536cf PA调整 2020-01-20 18:33:47 +08:00
fan
662e38a22c 添加登录页哈尔滨盈达科技 2020-01-13 13:33:35 +08:00
fan
24ef3fd71d 添加贵州装备制造职业学院项目 2019-12-30 18:06:40 +08:00
joylink_cuiweidong
83ebe5eae9 设计平台轮播页面图片替换 2019-11-12 15:52:11 +08:00
fan
42d9e1e7a1 浏览器图标调整
# Conflicts:
#	src/App.vue
2019-11-06 10:49:32 +08:00
fan
d381ed6a88 西铁院title、logo修改,综合演练房间角色调整后,角色顺序不再变化 2019-11-04 11:29:35 +08:00
zyy
140d84bf56 desc: 调整登陆页面样式 2019-10-17 18:55:46 +08:00
fan
5ba5ca7ea7 Merge remote-tracking branch 'origin/dev_product' into dev
# Conflicts:
#	src/components/QueryListPage/QueryForm.vue
#	src/i18n/langs/en/rules.js
#	src/i18n/langs/en/scriptRecord.js
#	src/i18n/langs/zh/lesson.js
#	src/i18n/langs/zh/rules.js
#	src/i18n/langs/zh/scriptRecord.js
#	src/jmap/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
#	src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue
#	src/permission.js
#	src/router/index.js
#	src/utils/baseUrl.js
#	src/views/demonstration/detail/index.vue
#	src/views/display/tipExamList.vue
#	src/views/lesson/lessoncategory/edit/lesson/publish.vue
#	src/views/lesson/taskmanage/createTask.vue
#	src/views/lesson/trainingRule/list.vue
#	src/views/login/index.vue
#	src/views/planMonitor/editTool/statusBar.vue
#	src/views/scriptManage/home.vue
#	src/views/teach/category/tree.vue
#	src/views/trainRoom/index.vue
2019-10-17 09:16:40 +08:00
zyy
25cb199850 desc: 调整登陆页面样式 2019-09-29 19:20:10 +08:00
fan
1fb0cf3e94 产品分化调整 2019-09-26 15:08:53 +08:00
fan
522b94fcfe 产品分化调整 2019-09-25 09:18:28 +08:00
fan
0c9e367f3d ibp修改扶梯框边框宽度,调整select默认状态 2019-09-10 10:16:02 +08:00
fan
9ba4ce7681 ibp盘图片调整 2019-09-05 09:54:53 +08:00
fan
8a9092b2b4 ibp代码调整 2019-09-04 13:06:15 +08:00
fan
743fa388c4 代码调整 2019-09-04 10:56:44 +08:00
fan
cb1d6cc4ff ibp调整 2019-09-03 13:46:59 +08:00
fan
cc4a60687a ibp盘调整 2019-09-03 08:56:14 +08:00
joylink_cuiweidong
dec0da6c1a 电话端子添加到页面中 2019-08-30 14:15:10 +08:00
fan
240268a65f Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
#	src/ibp/shape/button.js
2019-08-30 10:34:25 +08:00
fan
5350e6ad39 ibp盘提交 2019-08-30 10:31:56 +08:00
joylink_cuiweidong
45e626d53b 钥匙组件添加 2019-08-30 09:38:19 +08:00
fan
094476bdb5 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-08-29 09:26:27 +08:00
fan
453a909f01 ibp盘 2019-08-29 09:26:14 +08:00
fan
94f803072f ibp盘提交 2019-08-29 09:25:06 +08:00
joylink_cuiweidong
9de6b0ff12 扶梯子模块封装 2019-08-28 16:58:53 +08:00
joylink_cuiweidong
0e569358b0 电话端子模块提交 2019-08-28 13:36:46 +08:00
joylink_cuiweidong
a960fcd1a8 允许联动 提示 图片调整 2019-08-28 13:27:42 +08:00
fan
3393a65f0d 代码调整:ibp盘 2019-08-28 13:22:17 +08:00
joylink_cuiweidong
446f8d684a 按钮组件调整 图片调整 2019-08-28 13:19:45 +08:00
joylink_cuiweidong
feac5e0e79 联动允许禁止提示 组件 2019-08-27 18:35:10 +08:00
joylink_cuiweidong
dc80bec6d8 报警按钮封装 以及按钮组件代码调整 2019-08-27 16:17:55 +08:00
joylink_cuiweidong
aeb424514f ibp盘 按钮组件封装调整 2019-08-27 13:55:48 +08:00
joylink_cuiweidong
4235afd00f ibp盘按钮组件封装 2019-08-26 19:18:03 +08:00
fan
4b7873c2d7 ibp盘 2019-08-26 10:12:39 +08:00
sunzhenyu
de7ee56d77 删除不用资源 2019-08-12 13:42:53 +08:00
sunzhenyu
c27aed050f 挂载threejs,添加静态文件插件 2019-08-06 14:10:21 +08:00
ival
9f5130a4f2 代码移植 2019-07-26 13:32:43 +08:00
ival
3780ebefad 增加nclient工程 2019-07-02 16:29:52 +08:00