shared-ritm 1.3.26 → 1.3.28

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,7 @@
1
1
  import { Api_Status_DTO, Api_Tasks_Task_Dto } from '@/api/types/Api_Tasks';
2
2
  import { Api_Project_Category } from '@/api/types/Api_Projects';
3
3
  import { Api_User_Dto } from '@/api/types/Api_Controls';
4
+ import { Api_Work_Zone_Search } from '@/api/types/Api_Video';
4
5
  export type Api_Team = {
5
6
  id: string;
6
7
  display_name: string;
@@ -45,6 +46,17 @@ export type Api_Task_Video_Source = {
45
46
  name: string;
46
47
  work_zones_by_tasks: Api_Work_Zone_By_Tasks[];
47
48
  };
49
+ export type Api_Task_Video_Source_Shape = {
50
+ id: string;
51
+ label: string;
52
+ text: string | null;
53
+ points: unknown[];
54
+ shape_type: string;
55
+ };
56
+ export type Api_Task_Video_Source_Work_Zone = Pick<Api_Work_Zone_Search, 'id' | 'detect_helmet' | 'detect_mask' | 'detect_work_time' | 'detect_work_zone' | 'is_parent' | 'name' | 'x0' | 'x1' | 'y0' | 'y1' | 'video_source_id' | 'parent_id' | 'type' | 'title'> & {
57
+ points: unknown[];
58
+ tasks: Pick<Api_Tasks_Task_Dto, 'id' | 'deadline' | 'expired' | 'name' | 'plan_date' | 'responsible' | 'status' | 'time_to_complete_sec'>[];
59
+ };
48
60
  export type Api_Task_Video_Source_Stream = {
49
61
  id: string;
50
62
  name: string;
@@ -54,14 +66,17 @@ export type Api_Task_Video_Source_Stream = {
54
66
  fps: string;
55
67
  login: string;
56
68
  password: string;
57
- comment: unknown;
58
- work_zones: unknown[];
59
- video_source: unknown[];
60
- related_video_sources: unknown[];
69
+ comment: string | null;
70
+ work_zones: Api_Task_Video_Source_Work_Zone[];
71
+ video_source: Partial<Api_Task_Video_Source_Stream>[];
72
+ related_video_sources: {
73
+ id: string;
74
+ name: string;
75
+ }[];
61
76
  interactive_zones: unknown;
62
77
  domed: boolean;
63
78
  snapshot_path: string;
64
- shapes: unknown[];
79
+ shapes: Api_Task_Video_Source_Shape[];
65
80
  };
66
81
  export type Api_Create_Repair_With_Equipments = {
67
82
  name: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "shared-ritm",
3
- "version": "1.3.26",
3
+ "version": "1.3.28",
4
4
  "private": false,
5
5
  "files": [
6
6
  "dist",
@@ -24,7 +24,8 @@
24
24
  "build": "vite build && tsc --emitDeclarationOnly",
25
25
  "typecheck": "vue-tsc --noEmit",
26
26
  "lint": "eslint --fix",
27
- "format": "prettier -w -u ."
27
+ "format": "prettier -w -u .",
28
+ "yalc:push": "vite build && npx yalc push"
28
29
  },
29
30
  "dependencies": {
30
31
  "@quasar/extras": "^1.16.17",
@@ -38,7 +39,6 @@
38
39
  "vue": "^3.5.12"
39
40
  },
40
41
  "devDependencies": {
41
- "vue": "^3.5.12",
42
42
  "@quasar/vite-plugin": "^1.9.0",
43
43
  "@rollup/pluginutils": "^5.1.3",
44
44
  "@types/node": "^22.7.9",
@@ -54,7 +54,6 @@
54
54
  "install": "^0.13.0",
55
55
  "npm": "^11.4.0",
56
56
  "prettier": "^2.3.0",
57
- "quasar": "^2.18.1",
58
57
  "rollup-plugin-visualizer": "^5.14.0",
59
58
  "sass": "^1.80.4",
60
59
  "typescript": "^5.6.3",
@@ -1,6 +1,7 @@
1
1
  import { Api_Status_DTO, Api_Tasks_Task_Dto } from '@/api/types/Api_Tasks'
2
2
  import { Api_Project_Category } from '@/api/types/Api_Projects'
3
3
  import { Api_User_Dto } from '@/api/types/Api_Controls'
4
+ import { Api_Work_Zone_Search } from '@/api/types/Api_Video'
4
5
 
5
6
  export type Api_Team = {
6
7
  id: string
@@ -49,6 +50,39 @@ export type Api_Task_Video_Source = {
49
50
  work_zones_by_tasks: Api_Work_Zone_By_Tasks[]
50
51
  }
51
52
 
53
+ export type Api_Task_Video_Source_Shape = {
54
+ id: string
55
+ label: string
56
+ text: string | null
57
+ points: unknown[]
58
+ shape_type: string
59
+ }
60
+
61
+ export type Api_Task_Video_Source_Work_Zone = Pick<
62
+ Api_Work_Zone_Search,
63
+ | 'id'
64
+ | 'detect_helmet'
65
+ | 'detect_mask'
66
+ | 'detect_work_time'
67
+ | 'detect_work_zone'
68
+ | 'is_parent'
69
+ | 'name'
70
+ | 'x0'
71
+ | 'x1'
72
+ | 'y0'
73
+ | 'y1'
74
+ | 'video_source_id'
75
+ | 'parent_id'
76
+ | 'type'
77
+ | 'title'
78
+ > & {
79
+ points: unknown[]
80
+ tasks: Pick<
81
+ Api_Tasks_Task_Dto,
82
+ 'id' | 'deadline' | 'expired' | 'name' | 'plan_date' | 'responsible' | 'status' | 'time_to_complete_sec'
83
+ >[]
84
+ }
85
+
52
86
  export type Api_Task_Video_Source_Stream = {
53
87
  id: string
54
88
  name: string
@@ -58,14 +92,14 @@ export type Api_Task_Video_Source_Stream = {
58
92
  fps: string
59
93
  login: string
60
94
  password: string
61
- comment: unknown
62
- work_zones: unknown[]
63
- video_source: unknown[]
64
- related_video_sources: unknown[]
95
+ comment: string | null
96
+ work_zones: Api_Task_Video_Source_Work_Zone[]
97
+ video_source: Partial<Api_Task_Video_Source_Stream>[]
98
+ related_video_sources: { id: string; name: string }[]
65
99
  interactive_zones: unknown
66
100
  domed: boolean
67
101
  snapshot_path: string
68
- shapes: unknown[]
102
+ shapes: Api_Task_Video_Source_Shape[]
69
103
  }
70
104
 
71
105
  export type Api_Create_Repair_With_Equipments = {
@@ -9,8 +9,18 @@
9
9
  <p>{{ content }}</p>
10
10
  </q-card-section>
11
11
  <q-card-section :class="$style.footer">
12
- <app-button :class="$style['footer__btn--ok']" label="Подтвердить" @click="onDialogOK" />
13
- <app-button :class="$style['footer__btn--cancel']" label="Отменить" @click="onDialogHide" />
12
+ <app-button
13
+ data-test="confirm-button"
14
+ :class="$style['footer__btn--ok']"
15
+ label="Подтвердить"
16
+ @click="onDialogOK"
17
+ />
18
+ <app-button
19
+ data-test="cancel-button"
20
+ :class="$style['footer__btn--cancel']"
21
+ label="Отменить"
22
+ @click="onDialogHide"
23
+ />
14
24
  </q-card-section>
15
25
  </q-card>
16
26
  </q-dialog>
@@ -84,6 +84,7 @@
84
84
  </q-item-section>
85
85
  <q-item-section>{{ option.name }}</q-item-section>
86
86
  </q-item>
87
+ <div v-if="!filteredOptions[col.name]?.length" class="no-data">Нет данных</div>
87
88
  </q-list>
88
89
  </q-scroll-area>
89
90
 
@@ -213,6 +214,10 @@ watch(
213
214
  )
214
215
  </script>
215
216
  <style scoped lang="scss">
217
+ .no-data {
218
+ text-align: center;
219
+ }
220
+
216
221
  .fixed {
217
222
  background-color: #f2f7fb;
218
223
  position: sticky;
@@ -60,7 +60,7 @@
60
60
  <div class="q-pa-sm">
61
61
  <q-item>
62
62
  <q-item-section class="wrapper-empty-text">
63
- {{ emptyText || 'Ничего не найдено' }}
63
+ {{ emptyText || 'Нет данных' }}
64
64
  <button
65
65
  v-if="allowCreate && internalSearch && internalSearch.trim()"
66
66
  class="add-new-items"
@@ -59,7 +59,7 @@
59
59
  :loading="field.loading"
60
60
  :label="field.label"
61
61
  :is-show-required="mode !== 'view'"
62
- empty-text="Ничего не найдено"
62
+ empty-text="Нет данных"
63
63
  option-label="label"
64
64
  option-value="value"
65
65
  chip-color="#e9eff9"