Merge branch 'master' of http://192.168.1.22:3000/frontend/admin-sjzx

# Conflicts:
#	src/views/system/bpm/task/todo/index.vue

src/views/pqs/supervise/terminal/index.vue

@@ -43,8 +43,6 @@ watch(() => route.query.t, async (newValue, oldValue) => {
     let type = (route.query.type as string) || 'null'
     if (type == '1') {
       activeName.value = '1'
-    } else {
-      activeName.value = '4'
     }
     id.value = (route.query.id as string) || 'null'
     id.value = id.value + '@' + route.query.t