odjbin/SmartOpsWeb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
278 Commits 9 Branches 0 Tags
7b53540e170835f10aab666939c8eac111996eb2
Commit Graph

278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
clay
7b53540e17 Merge pull request '更新 docker.sh' (#138) from clay-patch-3 into master 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/138
 2024-10-08 14:24:38 +00:00
clay
52af20bec8 更新 docker.sh 2024-10-08 14:24:30 +00:00
clay
6121fcd25e Merge pull request '更新 nginx.conf' (#137) from clay-patch-2 into master 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/137
 2024-10-08 14:23:44 +00:00
clay
e5be1bebe9 更新 nginx.conf 2024-10-08 14:23:37 +00:00
odjbin
f87033dbcb Merge pull request 'fix : 区分工作台实时数据新旧对话' (#136) from dd into master 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/136
 2024-10-08 05:29:30 +00:00
odjbin
6b7376b45d fix : 区分工作台实时数据新旧对话 2024-10-08 13:28:45 +08:00
odjbin
31c167d212 Merge pull request 'dd' (#135) from dd into master 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/135
 2024-10-06 11:40:56 +00:00
odjbin
bd2e5366aa fix : 修复工作台实时数据线路显示 2024-10-06 19:40:32 +08:00
odjbin
c6f93e586f Merge remote-tracking branch 'origin/test' into test 2024-10-06 19:26:26 +08:00
odjbin
ade322708e Merge pull request 'dd' (#133) from dd into master 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/133
 2024-10-06 11:26:18 +00:00
odjbin
d6e6843ecb fix : 修复工作台历史记录弹窗数据显示bug 2024-10-06 19:25:02 +08:00
zhangkaihuai
3b17cdc519 Merge pull request '更新 vite.config.js' (#132) from zhangkaihuai-patch-1 into test 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/132
 2024-10-04 10:51:48 +00:00
zhangkaihuai
2046b486ee 更新 vite.config.js 2024-10-04 10:51:32 +00:00
odjbin
25da31b034 build : 启动npm install 2024-10-03 17:25:47 +08:00
odjbin
925b3de4f9 build : 启动npm install 2024-10-03 17:21:26 +08:00
odjbin
20f1b568fa fix : 修复角色分配用户单个添加时报错 2024-10-03 17:06:27 +08:00
odjbin
9f2df9b3aa Merge remote-tracking branch 'origin/master' into test 
# Conflicts:
#	docker.sh
 2024-10-03 17:05:18 +08:00
zhangkaihuai
de83cc57da Merge pull request '更新 docker.sh' (#130) from zhangkaihuai-patch-1 into master 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/130
 2024-10-03 09:03:25 +00:00
zhangkaihuai
c32232a388 更新 docker.sh 2024-10-03 09:03:18 +00:00
odjbin
5c7a82ce0c Merge pull request 'fix : 修复角色分配用户单个添加时报错' (#129) from dd into master 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/129
 2024-09-30 07:35:13 +00:00
odjbin
f4542e9ca9 fix : 修复角色分配用户单个添加时报错 2024-09-30 15:34:45 +08:00
odjbin
aa84769740 Merge pull request 'master' (#128) from master into test 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/128
 2024-09-30 07:29:17 +00:00
odjbin
75be56f30b Merge pull request 'fix : 清空默认登录账号' (#127) from dd into master 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/127
 2024-09-30 07:29:09 +00:00
odjbin
64c86783be fix : 清空默认登录账号 2024-09-30 15:28:55 +08:00
odjbin
a1860c4f01 Merge pull request 'master' (#126) from master into test 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/126
 2024-09-30 07:27:45 +00:00
odjbin
8e6ab64ce7 Merge pull request 'fix : 修改登录默认账号' (#125) from dd into master 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/125
 2024-09-30 07:27:31 +00:00
odjbin
44e3679787 fix : 修改登录默认账号 2024-09-30 15:27:13 +08:00
odjbin
8849e991b2 Merge pull request 'master' (#124) from master into test 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/124
 2024-09-28 14:56:48 +00:00
odjbin
46d951be4a Merge pull request 'fix : 移除话术ID和敏感词ID' (#123) from dd into master 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/123
 2024-09-28 14:56:28 +00:00
odjbin
7b9d7ed741 fix : 移除话术ID和敏感词ID 2024-09-28 22:55:28 +08:00
odjbin
e0ef98ef70 Merge pull request 'master' (#122) from master into test 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/122
 2024-09-28 12:40:04 +00:00
odjbin
3ac16d6eda Merge pull request 'dd' (#121) from dd into master 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/121
 2024-09-28 12:39:56 +00:00
odjbin
6bdd2620ca feat : 添加参数配置中外部配置类型 2024-09-28 20:39:47 +08:00
odjbin
f0fd5c543d fix : 修改所有工单时间格式 2024-09-28 20:39:21 +08:00
odjbin
e59ca5d96c Merge pull request 'master' (#120) from master into test 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/120
 2024-09-28 12:24:12 +00:00
odjbin
5bf8fbbed7 Merge pull request 'fix : 修改所有工单创建时间参数' (#119) from dd into master 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/119
 2024-09-28 12:24:02 +00:00
odjbin
75917c2e5b fix : 修改所有工单创建时间参数 2024-09-28 20:23:42 +08:00
odjbin
e9e1d7669f Merge pull request 'master' (#118) from master into test 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/118
 2024-09-28 12:22:31 +00:00
odjbin
1eb45c714e Merge pull request 'fix : 修改登录默认密码' (#117) from dd into master 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/117
 2024-09-28 12:22:07 +00:00
odjbin
26dcadc0c0 fix : 修改登录默认密码 2024-09-28 20:21:53 +08:00
springlog
a32651559f Merge pull request 'master' (#116) from master into test 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/116
 2024-09-27 11:22:29 +00:00
springlog
04a65335dd Merge pull request '更换wsrul' (#115) from wxy into master 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/115
 2024-09-27 11:21:23 +00:00
KindSeven
57b4adf408 更换wsrul 2024-09-27 19:21:20 +08:00
odjbin
de43201cc3 Merge pull request 'master' (#114) from master into test 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/114
 2024-09-27 09:04:13 +00:00
odjbin
b3cf22ec78 Merge pull request 'fix : 优化工单列表样式' (#113) from dd into master 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/113
 2024-09-27 09:03:57 +00:00
odjbin
08b33132da fix : 优化工单列表样式 2024-09-27 17:03:40 +08:00
springlog
7720295c0d Merge pull request 'master' (#112) from master into test 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/112
 2024-09-27 06:13:06 +00:00
springlog
afff92fb55 Merge pull request 'wxy' (#111) from wxy into master 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/111
 2024-09-27 06:12:49 +00:00
KindSeven
c3d602e585 fix:删除了历史工单工单状态搜索栏 2024-09-27 14:12:41 +08:00
KindSeven
459243bd80 Merge branch 'master' into wxy 2024-09-27 14:10:23 +08:00