Commit Graph

99 Commits

Author SHA1 Message Date
zhangkaihuai
cb35773c47 更新 .drone.yml 2024-09-15 09:51:58 +00:00
zhangkaihuai
19e04a76fc 更新 .drone.yml 2024-09-15 09:49:44 +00:00
zhangkaihuai
d6acc9cdb6 更新 .drone.yml 2024-09-15 09:48:21 +00:00
zhangkaihuai
22b495e037 更新 .drone.yml 2024-09-15 09:44:25 +00:00
zhangkaihuai
ef7f139dcc 更新 .drone.yml 2024-09-15 09:43:04 +00:00
zhangkaihuai
8c5e61721a Merge pull request '更新 vite.config.js' (#47) from zhangkaihuai-patch-1 into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/47
2024-09-15 09:37:54 +00:00
zhangkaihuai
b056e2b0e3 更新 vite.config.js 2024-09-15 09:37:45 +00:00
4fe43aaaed Merge pull request 'master' (#46) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/46
2024-09-15 09:34:13 +00:00
e5a0c14c2c Merge pull request 'fix : 修复drone.yml' (#45) from dd into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/45
2024-09-15 09:34:05 +00:00
ac3d2b199c fix : 修复drone.yml 2024-09-15 17:33:53 +08:00
e5c5c92723 Merge pull request 'master' (#44) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/44
2024-09-15 09:33:13 +00:00
c270ce206c Merge pull request 'dd' (#43) from dd into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/43
2024-09-15 09:33:06 +00:00
e27d1daa0c Merge remote-tracking branch 'origin/master' 2024-09-15 17:31:19 +08:00
407e76e914 fix : 修复drone.yml 2024-09-15 17:28:22 +08:00
zhangkaihuai
a531c98f45 Merge pull request '更新 .drone.yml' (#40) from dj into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/40
2024-09-15 09:27:04 +00:00
zhangkaihuai
b972359d41 更新 .drone.yml 2024-09-15 09:26:50 +00:00
zhangkaihuai
f5df7e63f7 Merge pull request '更新 .drone.yml' (#39) from dj into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/39
2024-09-15 09:24:50 +00:00
zhangkaihuai
f19d2bc5b9 更新 .drone.yml 2024-09-15 09:24:31 +00:00
8d9ff751cf Merge pull request 'master' (#38) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/38
2024-09-15 09:16:56 +00:00
407cdf3517 Merge pull request 'fix : 修复vite.config.js' (#37) from dj into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/37
2024-09-15 09:16:45 +00:00
d9bd058cf3 fix : 修复vite.config.js 2024-09-15 17:16:28 +08:00
springlog
d4c4fb7580 Merge pull request 'master' (#36) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/36
2024-09-14 20:45:41 +00:00
springlog
11b5a8efb4 Merge pull request 'wxy' (#35) from wxy into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/35
2024-09-14 20:45:24 +00:00
KindSeven
7fbc782993 feat:完成了工作台,修复了工单详情v-for不渲染的bug,增添了信息滚动条 2024-09-15 04:44:45 +08:00
KindSeven
91e6422384 fix:修改了部分字段错误 2024-09-15 01:20:13 +08:00
KindSeven
162bae7fc3 feat:搭好了工作台架子,增加了工单的搜索方法,修改了部分样式 2024-09-15 01:16:00 +08:00
b56e1dc181 Merge pull request 'master' (#34) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/34
2024-09-14 17:05:19 +00:00
6f51c7ed9a Merge pull request 'feat : 通话记录组件加上时间' (#33) from dj into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/33
2024-09-14 16:29:25 +00:00
689fa89c80 feat : 通话记录组件加上时间 2024-09-15 00:29:12 +08:00
540d0da1e1 Merge pull request 'feat : 通话记录组件及初始连接socket' (#32) from dj into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/32
2024-09-14 16:19:36 +00:00
f51a3af84d feat : 通话记录组件及初始连接socket 2024-09-15 00:19:22 +08:00
springlog
b3a27acca0 Merge pull request 'master' (#31) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/31
2024-09-14 15:53:13 +00:00
springlog
82a66196b6 Merge pull request 'wxy' (#30) from wxy into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/30
2024-09-14 15:52:32 +00:00
springlog
d1a4dd6968 Merge branch 'master' into wxy 2024-09-14 15:52:14 +00:00
KindSeven
18508b5ecc feat:完成了工单接口(关单,删除,获取工单列表)的对接,工单详情对了一部分,将其代码copy到了历史和待处理工单 2024-09-14 23:51:53 +08:00
KindSeven
5f2ae8db4d feat:完成了工单接口(关单,删除,获取工单列表)的对接,工单详情对了一部分 2024-09-14 23:45:12 +08:00
97085df811 Merge pull request 'master' (#29) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/29
2024-09-14 08:45:13 +00:00
e8aabfaf5b Merge pull request 'fix : 修复标签关闭bug, 表格组件列配置, 完善用户管理页面' (#28) from dj into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/28
2024-09-14 08:45:04 +00:00
5e6fd1420f fix : 修复标签关闭bug, 表格组件列配置, 完善用户管理页面 2024-09-14 16:44:45 +08:00
8f55b3ee94 Merge pull request 'master' (#27) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/27
2024-09-12 18:20:21 +00:00
556c87812a Merge pull request 'fix : 日期框100%' (#26) from dj into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/26
2024-09-12 18:20:11 +00:00
a527d6d53f fix : 日期框100% 2024-09-13 02:19:56 +08:00
springlog
44b399eebd Merge pull request 'master' (#25) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/25
2024-09-12 18:19:09 +00:00
springlog
d028ba4953 Merge pull request 'fix:更新了分支' (#24) from wxy into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/24
2024-09-12 18:17:37 +00:00
springlog
ed266f474d Merge branch 'master' into wxy 2024-09-12 18:17:17 +00:00
KindSeven
6698192027 fix:更新了分支 2024-09-13 02:12:40 +08:00
2d3a461f14 Merge pull request 'dj' (#23) from dj into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/23
2024-09-12 18:10:16 +00:00
030e6c2bb1 Merge remote-tracking branch 'origin/master' 2024-09-13 02:09:42 +08:00
1781a05b22 fix : 修改登录页样式 2024-09-13 02:08:44 +08:00
springlog
7b90a1ac05 Merge pull request 'feat:完成了个人中心的样式调整,修复了工单界面一些显示错误' (#22) from wxy into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/22
2024-09-12 18:07:10 +00:00