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

305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
odjbin
f5303a281f Merge pull request 'master' (#147) from master into test 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/147
 2024-10-20 10:04:55 +00:00
odjbin
18e3c4337e Merge pull request 'fix : 屏蔽话务语音配置的批量删除, 修复所有页面按钮权限' (#146) from dj into master 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/146
 2024-10-20 10:04:47 +00:00
odjbin
f01efcc20e fix : 屏蔽话务语音配置的批量删除, 修复所有页面按钮权限 2024-10-20 18:04:34 +08:00
odjbin
b200df9d98 Merge pull request 'master' (#145) from master into test 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/145
 2024-10-19 19:03:44 +00:00
odjbin
dd31dd627e Merge pull request 'fix: 修改话术增删改查' (#144) from dj into master 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/144
 2024-10-19 19:03:15 +00:00
odjbin
c2abb10bb1 fix: 修改话术增删改查 2024-10-20 03:02:56 +08:00
odjbin
c6b4145784 Merge pull request 'master' (#143) from master into test 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/143
 2024-10-13 07:57:43 +00:00
odjbin
a070573d42 Merge pull request 'dd' (#142) from dd into master 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/142
 2024-10-13 07:57:31 +00:00
odjbin
4a6ce61091 feat : 获取工作台当前线路记录 2024-10-13 15:57:11 +08:00
odjbin
02b1cc03f7 feat : 语音话术配置添加字段 2024-10-13 15:20:06 +08:00
zhangkaihuai
fca6d319dd 更新 docker.sh 2024-10-13 05:33:50 +00:00
odjbin
80272fe80b fix : 修复socket地址 2024-10-08 23:21:22 +08:00
odjbin
4c86af02dc fix : 修复socket地址 2024-10-08 23:18:38 +08:00
odjbin
88b1052f14 fix : 测试字典接口没加token 2024-10-08 23:11:58 +08:00
odjbin
0aff2a5fab fix : 测试字典接口没加token 2024-10-08 23:07:46 +08:00
odjbin
0ddfde74a9 fix : 测试字典接口没加token 2024-10-08 23:00:50 +08:00
odjbin
768ae544d3 fix : 测试字典接口没加token 2024-10-08 22:57:27 +08:00
odjbin
d127df718d fix : 测试字典接口没加token 2024-10-08 22:55:14 +08:00
odjbin
b1ee9508ae fix : 测试字典接口没加token 2024-10-08 22:50:23 +08:00
odjbin
949915bb66 Merge remote-tracking branch 'origin/test' into test 2024-10-08 22:46:29 +08:00
odjbin
97522c6f1b fix : 测试字典接口没加token 2024-10-08 22:46:23 +08:00
odjbin
225b382e8d Merge pull request 'master' (#141) from master into test 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/141
 2024-10-08 14:33:54 +00:00
odjbin
a1cb22ca55 Merge pull request 'fix : 测试字典接口没加token' (#140) from dd into master 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/140
 2024-10-08 14:33:43 +00:00
odjbin
aa56640dae Merge remote-tracking branch 'origin/master' into dd 2024-10-08 22:33:14 +08:00
odjbin
79ef8bc022 fix : 测试字典接口没加token 2024-10-08 22:32:30 +08:00
clay
a3b3d68f60 Merge pull request 'master' (#139) from master into test 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/139
 2024-10-08 14:25:04 +00:00
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
935cc9dd2b Merge pull request 'master' (#134) from master into test 
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/134
 2024-10-06 11:27:38 +00: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