diff --git a/src/assets/image/workbench/progress1.png b/src/assets/image/workbench/progress1.png
new file mode 100644
index 0000000..c1feb51
Binary files /dev/null and b/src/assets/image/workbench/progress1.png differ
diff --git a/src/assets/image/workbench/progress2.png b/src/assets/image/workbench/progress2.png
new file mode 100644
index 0000000..946fe88
Binary files /dev/null and b/src/assets/image/workbench/progress2.png differ
diff --git a/src/assets/image/workbench/progress3.png b/src/assets/image/workbench/progress3.png
new file mode 100644
index 0000000..8f6c272
Binary files /dev/null and b/src/assets/image/workbench/progress3.png differ
diff --git a/src/assets/image/workbench/progress4.png b/src/assets/image/workbench/progress4.png
new file mode 100644
index 0000000..e4fe246
Binary files /dev/null and b/src/assets/image/workbench/progress4.png differ
diff --git a/src/assets/image/workbench/progress5.png b/src/assets/image/workbench/progress5.png
new file mode 100644
index 0000000..cbbd293
Binary files /dev/null and b/src/assets/image/workbench/progress5.png differ
diff --git a/src/assets/image/workbench/progress6.png b/src/assets/image/workbench/progress6.png
new file mode 100644
index 0000000..2c508c2
Binary files /dev/null and b/src/assets/image/workbench/progress6.png differ
diff --git a/src/assets/image/workbench/progress7.png b/src/assets/image/workbench/progress7.png
new file mode 100644
index 0000000..2709069
Binary files /dev/null and b/src/assets/image/workbench/progress7.png differ
diff --git a/src/assets/image/workbench/progress8.png b/src/assets/image/workbench/progress8.png
new file mode 100644
index 0000000..da9164f
Binary files /dev/null and b/src/assets/image/workbench/progress8.png differ
diff --git a/src/pages/layout/components/LayoutHeader.vue b/src/pages/layout/components/LayoutHeader.vue
index 81208d5..214f206 100644
--- a/src/pages/layout/components/LayoutHeader.vue
+++ b/src/pages/layout/components/LayoutHeader.vue
@@ -165,7 +165,7 @@
diff --git a/src/pages/mediation-page/components/VideoRoom.vue b/src/pages/mediation-page/components/VideoRoom.vue
index c2b47f4..85eee49 100644
--- a/src/pages/mediation-page/components/VideoRoom.vue
+++ b/src/pages/mediation-page/components/VideoRoom.vue
@@ -221,7 +221,7 @@ export default {
this.trtc = TRTC.create();
try {
await this.trtc.enterRoom({
- strRoomId: this.roomId,
+ strRoomId: this.roomId.toString(),
// sdkAppId: parseInt(this.sdkAppId, 10),
sdkAppId: this.sdkAppId,
userId: this.userId,
diff --git a/src/pages/system-management/user-management/components/addOrEditUserDialog.vue b/src/pages/system-management/user-management/components/addOrEditUserDialog.vue
index b9b860b..6267d64 100644
--- a/src/pages/system-management/user-management/components/addOrEditUserDialog.vue
+++ b/src/pages/system-management/user-management/components/addOrEditUserDialog.vue
@@ -46,6 +46,18 @@
+
+
+
+
+
+
+
@@ -175,7 +187,8 @@ export default {
deptId:'',
deptIds:[],
type: 2,
- status:1
+ status:1,
+ cardNo:''
},
rulesClient: {
password: [
@@ -185,6 +198,10 @@ export default {
realName: [
{ required: true, message: '请输入员工姓名', trigger: ['blur','change'] }
],
+ cardNo: [
+ { required: false, message: '请输入身份证号', trigger: 'change',},
+ { pattern: /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/, message: '请输入正确的身份证号', trigger: ['blur', 'change']}
+ ],
roleIds: [
{ required: true, message: '请选择员工角色', trigger: ['blur','change'] }
],
@@ -352,6 +369,7 @@ export default {
this.userInfo.roleIds = dataJson.roleIds;
this.userInfo.regionId = '';
this.userInfo.teamId = '';
+ this.userInfo.cardNo = dataJson.cardNo;
// this.userInfo.regionId = '0'
// this.userInfo.teamId = ''
// this.userInfo.teamId = ''
diff --git a/src/pages/workbench/index.vue b/src/pages/workbench/index.vue
index 0e22800..b6610df 100644
--- a/src/pages/workbench/index.vue
+++ b/src/pages/workbench/index.vue
@@ -149,26 +149,26 @@
事项追踪