shared-ritm 1.2.118 → 1.2.120

package/src/api/types/Api_Video.ts

@@ -1,140 +1,140 @@
-import { Api_Status_DTO } from '@/api/types/Api_Tasks'
-import { Api_Work_Zone_By_Tasks } from '@/api/types/Api_Repairs'
-
-export type Api_Video_Source = {
-  id: string
-  name: string
-  login: string
-  password: string
-  camera_id: string | null
-  comment: string | null
-  data: unknown | null
-  snapshot_path: string | null
-  url: string
-  updated_at: string
-  created_at: string
-  fps: string
-  domed: boolean
-  height: number
-  width: number
-}
-
-export type Api_Work_Zone_Search = {
-  id: string
-  name: string
-  title: string
-  type: number
-  parent_id: string | null
-  created_at: string
-  deleted_at: string | null
-  updated_at: string
-  description: string
-  detect_face: boolean
-  detect_helmet: boolean
-  detect_mask: boolean
-  detect_work_time: boolean
-  detect_work_zone: boolean
-  has_tasks: boolean
-  is_parent: boolean
-  x0: number
-  x1: number
-  y0: number
-  y1: number
-  video_source: Api_Video_Source
-  video_source_id: string
-  warehouse_by_work_zone_instruments: unknown[]
-}
-
-export type Api_Work_Zone_Usage_User = {
-  id: string
-  user_id: string
-  user_full_name: string
-  work_zone_id: string
-  start_interval: string
-  end_interval: string
-  minutes: number
-}
-
-export type Api_Work_Zone_Task = {
-  id: string
-  name: string
-  plan_date: string
-  planned_start: null | string
-  planned_end: null | string
-  deadline: string
-  is_critical_path: boolean | null
-  is_expired: boolean
-  power_output_MWh: number
-  cost_per_MWh: number | null
-  fact_start_date: null | string
-  fact_end_date: null | string
-  time_to_complete_sec: number | null
-  status: Api_Status_DTO
-  usage_users: Api_Work_Zone_Usage_User[]
-}
-
-export type Api_Work_Zone_Coords = {
-  x0: number
-  x1: number
-  y0: number
-  y1: number
-}
-
-export type Api_Work_Zone = {
-  id: string
-  title: string
-  created_at: string
-  video_source: { id: string; name: string }
-  coordinates: Api_Work_Zone_Coords
-  warehouse_by_work_zone_instruments: unknown[]
-  tasks: Api_Work_Zone_Task[]
-}
-
-export type Api_Video_Source_Search = {
-  comment: string
-  domed: boolean
-  fps: string
-  height: number
-  id: string
-  interactive_zones: unknown
-  login: string
-  name: string
-  password: string
-  related_video_sources: unknown[]
-  shapes: unknown[]
-  snapshot_path: string
-  url: string
-  video_source: Api_Video_Source_Search[]
-  width: number
-  work_zones: unknown[]
-}
-
-export type Api_Video_Source_Create = {
-  fps: string
-  height: number
-  login: string
-  name: string
-  password: string
-  url: string
-  width: number
-  comment?: string
-  domed?: boolean
-  video_source_ids?: string[]
-  snapshot?: string
-}
-
-export type Api_Video_Source_By_Repair_Project = {
-  id: string
-  name: string
-  deadline: string
-}
-
-export type Api_Video_Source_By_Repair = {
-  list_video_source: {
-    id: string
-    name: string
-    url: string
-    work_zones_by_tasks: Api_Work_Zone_By_Tasks[]
-  }[]
-  project: Api_Video_Source_By_Repair_Project
-}
+import { Api_Status_DTO } from '@/api/types/Api_Tasks'
+import { Api_Work_Zone_By_Tasks } from '@/api/types/Api_Repairs'
+
+export type Api_Video_Source = {
+  id: string
+  name: string
+  login: string
+  password: string
+  camera_id: string | null
+  comment: string | null
+  data: unknown | null
+  snapshot_path: string | null
+  url: string
+  updated_at: string
+  created_at: string
+  fps: string
+  domed: boolean
+  height: number
+  width: number
+}
+
+export type Api_Work_Zone_Search = {
+  id: string
+  name: string
+  title: string
+  type: number
+  parent_id: string | null
+  created_at: string
+  deleted_at: string | null
+  updated_at: string
+  description: string
+  detect_face: boolean
+  detect_helmet: boolean
+  detect_mask: boolean
+  detect_work_time: boolean
+  detect_work_zone: boolean
+  has_tasks: boolean
+  is_parent: boolean
+  x0: number
+  x1: number
+  y0: number
+  y1: number
+  video_source: Api_Video_Source
+  video_source_id: string
+  warehouse_by_work_zone_instruments: unknown[]
+}
+
+export type Api_Work_Zone_Usage_User = {
+  id: string
+  user_id: string
+  user_full_name: string
+  work_zone_id: string
+  start_interval: string
+  end_interval: string
+  minutes: number
+}
+
+export type Api_Work_Zone_Task = {
+  id: string
+  name: string
+  plan_date: string
+  planned_start: null | string
+  planned_end: null | string
+  deadline: string
+  is_critical_path: boolean | null
+  is_expired: boolean
+  power_output_MWh: number
+  cost_per_MWh: number | null
+  fact_start_date: null | string
+  fact_end_date: null | string
+  time_to_complete_sec: number | null
+  status: Api_Status_DTO
+  usage_users: Api_Work_Zone_Usage_User[]
+}
+
+export type Api_Work_Zone_Coords = {
+  x0: number
+  x1: number
+  y0: number
+  y1: number
+}
+
+export type Api_Work_Zone = {
+  id: string
+  title: string
+  created_at: string
+  video_source: { id: string; name: string }
+  coordinates: Api_Work_Zone_Coords
+  warehouse_by_work_zone_instruments: unknown[]
+  tasks: Api_Work_Zone_Task[]
+}
+
+export type Api_Video_Source_Search = {
+  comment: string
+  domed: boolean
+  fps: string
+  height: number
+  id: string
+  interactive_zones: unknown
+  login: string
+  name: string
+  password: string
+  related_video_sources: unknown[]
+  shapes: unknown[]
+  snapshot_path: string
+  url: string
+  video_source: Api_Video_Source_Search[]
+  width: number
+  work_zones: unknown[]
+}
+
+export type Api_Video_Source_Create = {
+  fps: string
+  height: number
+  login: string
+  name: string
+  password: string
+  url: string
+  width: number
+  comment?: string
+  domed?: boolean
+  video_source_ids?: string[]
+  snapshot?: string
+}
+
+export type Api_Video_Source_By_Repair_Project = {
+  id: string
+  name: string
+  deadline: string
+}
+
+export type Api_Video_Source_By_Repair = {
+  list_video_source: {
+    id: string
+    name: string
+    url: string
+    work_zones_by_tasks: Api_Work_Zone_By_Tasks[]
+  }[]
+  project: Api_Video_Source_By_Repair_Project
+}

package/src/common/app-input-new/AppInputNew.vue

@@ -1,175 +1,175 @@
-<template>
-  <div class="app-input-new">
-    <label v-if="label" class="app-input-new__label">
-      {{ label }}
-      <span v-if="required" class="required">*</span>
-    </label>
-
-    <q-input
-      v-model="model"
-      filled
-      :type="inputType"
-      :rules="rules"
-      :placeholder="placeholder"
-      :disable="disable"
-      :readonly="readonly"
-      :class="inputClass"
-      :error="error"
-      :autocomplete="autocomplete"
-      @blur="emit('blur')"
-    >
-      <slot />
-      <template #append>
-        <slot name="append" />
-        <q-icon
-          v-if="type === 'password'"
-          :name="isVisiblePass ? 'visibility' : 'visibility_off'"
-          color="primary"
-          class="cursor-pointer"
-          @click="isVisiblePass = !isVisiblePass"
-        />
-        <q-icon
-          v-if="clearable && String(model)?.length"
-          name="close"
-          class="cursor-pointer clear-input"
-          @click="model = null"
-        />
-        <q-btn
-          v-if="uuid && !disable && !readonly"
-          flat
-          no-caps
-          label="UUID"
-          size="sm"
-          class="q-ml-sm uuid-btn"
-          @click="model = uuidv4()"
-        />
-        <q-icon
-          v-if="copyable"
-          name="content_copy"
-          class="cursor-pointer q-ml-sm copy-icon"
-          color="primary"
-          :disable="!model"
-          @click="copyToClipboard"
-        />
-      </template>
-    </q-input>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { defineEmits, defineProps, computed, ref } from 'vue'
-import { uuidv4 } from '@/utils/helpers'
-import { notificationSettings } from '@/utils/notification'
-import { QInputProps, useQuasar } from 'quasar'
-
-const props = defineProps<
-  QInputProps & {
-    modelValue?: string | number | null
-    label?: string
-    placeholder?: string
-    rules?: ((val: string | number | null | undefined) => boolean | string)[]
-    inputClass?: string
-    required?: boolean
-    readonly?: boolean
-    disable?: boolean
-    uuid?: boolean
-    clearable?: boolean
-    copyable?: boolean
-    error?: boolean
-    autocomplete?: string
-  }
->()
-
-const emit = defineEmits<{
-  (e: 'update:modelValue', val?: string | number | null): void
-  (e: 'blur', val?: string | number | null): void
-}>()
-
-const $q = useQuasar()
-
-const isVisiblePass = ref(false)
-
-const model = computed({
-  get: () => getValue(props.modelValue),
-  set: (newValue?: string | number | null) => emit('update:modelValue', getValue(newValue)),
-})
-
-const inputType = computed(() => (props.type === 'password' && isVisiblePass.value ? 'text' : props.type))
-
-const getValue = (value?: string | number | null) => {
-  if (props.type === 'number') return value ? +value : value
-
-  return value
-}
-
-const copyToClipboard = () => {
-  if (!model.value && model.value !== 0) return
-
-  navigator.clipboard.writeText(model.value.toString()).then(() => {
-    $q.notify(notificationSettings('success', 'Данные скопированы'))
-  })
-}
-</script>
-
-<style scoped lang="scss">
-.app-input-new {
-  display: flex;
-  flex-direction: column;
-  margin-bottom: 15px;
-
-  &__label {
-    font-size: 14px;
-    font-weight: 700;
-    color: #7d8592;
-  }
-
-  .required {
-    color: #f65160;
-    font-weight: bold;
-  }
-
-  .clear-input {
-    color: #d8e0f0;
-  }
-
-  .uuid-btn {
-    height: 32px;
-    padding: 0 10px;
-    border: 1px solid #3f8cff;
-    color: #3f8cff;
-    font-weight: 700;
-    font-size: 14px;
-    background: white;
-    border-radius: 6px;
-
-    :deep(.block) {
-      line-height: normal;
-    }
-  }
-
-  :deep(.q-placeholder) {
-    color: #7d8592;
-  }
-
-  :deep(.q-field__control) {
-    min-height: 58px;
-    border-radius: 8px;
-    border: 1px solid #d8e0f0;
-    background: #fff;
-    box-shadow: 0 1px 2px 0 rgba(184, 200, 224, 0.22);
-  }
-
-  :deep(.q-field--filled .q-field__control:before) {
-    background: #fff !important;
-    border: none;
-  }
-
-  :deep(.q-field--with-bottom) {
-    padding-bottom: 0;
-  }
-
-  :deep(.q-field__bottom) {
-    padding: 0;
-  }
-}
-</style>
+<template>
+  <div class="app-input-new">
+    <label v-if="label" class="app-input-new__label">
+      {{ label }}
+      <span v-if="required" class="required">*</span>
+    </label>
+
+    <q-input
+      v-model="model"
+      filled
+      :type="inputType"
+      :rules="rules"
+      :placeholder="placeholder"
+      :disable="disable"
+      :readonly="readonly"
+      :class="inputClass"
+      :error="error"
+      :autocomplete="autocomplete"
+      @blur="emit('blur')"
+    >
+      <slot />
+      <template #append>
+        <slot name="append" />
+        <q-icon
+          v-if="type === 'password'"
+          :name="isVisiblePass ? 'visibility' : 'visibility_off'"
+          color="primary"
+          class="cursor-pointer"
+          @click="isVisiblePass = !isVisiblePass"
+        />
+        <q-icon
+          v-if="clearable && String(model)?.length"
+          name="close"
+          class="cursor-pointer clear-input"
+          @click="model = null"
+        />
+        <q-btn
+          v-if="uuid && !disable && !readonly"
+          flat
+          no-caps
+          label="UUID"
+          size="sm"
+          class="q-ml-sm uuid-btn"
+          @click="model = uuidv4()"
+        />
+        <q-icon
+          v-if="copyable"
+          name="content_copy"
+          class="cursor-pointer q-ml-sm copy-icon"
+          color="primary"
+          :disable="!model"
+          @click="copyToClipboard"
+        />
+      </template>
+    </q-input>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineEmits, defineProps, computed, ref } from 'vue'
+import { uuidv4 } from '@/utils/helpers'
+import { notificationSettings } from '@/utils/notification'
+import { QInputProps, useQuasar } from 'quasar'
+
+const props = defineProps<
+  QInputProps & {
+    modelValue?: string | number | null
+    label?: string
+    placeholder?: string
+    rules?: ((val: string | number | null | undefined) => boolean | string)[]
+    inputClass?: string
+    required?: boolean
+    readonly?: boolean
+    disable?: boolean
+    uuid?: boolean
+    clearable?: boolean
+    copyable?: boolean
+    error?: boolean
+    autocomplete?: string
+  }
+>()
+
+const emit = defineEmits<{
+  (e: 'update:modelValue', val?: string | number | null): void
+  (e: 'blur', val?: string | number | null): void
+}>()
+
+const $q = useQuasar()
+
+const isVisiblePass = ref(false)
+
+const model = computed({
+  get: () => getValue(props.modelValue),
+  set: (newValue?: string | number | null) => emit('update:modelValue', getValue(newValue)),
+})
+
+const inputType = computed(() => (props.type === 'password' && isVisiblePass.value ? 'text' : props.type))
+
+const getValue = (value?: string | number | null) => {
+  if (props.type === 'number') return value ? +value : value
+
+  return value
+}
+
+const copyToClipboard = () => {
+  if (!model.value && model.value !== 0) return
+
+  navigator.clipboard.writeText(model.value.toString()).then(() => {
+    $q.notify(notificationSettings('success', 'Данные скопированы'))
+  })
+}
+</script>
+
+<style scoped lang="scss">
+.app-input-new {
+  display: flex;
+  flex-direction: column;
+  margin-bottom: 15px;
+
+  &__label {
+    font-size: 14px;
+    font-weight: 700;
+    color: #7d8592;
+  }
+
+  .required {
+    color: #f65160;
+    font-weight: bold;
+  }
+
+  .clear-input {
+    color: #d8e0f0;
+  }
+
+  .uuid-btn {
+    height: 32px;
+    padding: 0 10px;
+    border: 1px solid #3f8cff;
+    color: #3f8cff;
+    font-weight: 700;
+    font-size: 14px;
+    background: white;
+    border-radius: 6px;
+
+    :deep(.block) {
+      line-height: normal;
+    }
+  }
+
+  :deep(.q-placeholder) {
+    color: #7d8592;
+  }
+
+  :deep(.q-field__control) {
+    min-height: 58px;
+    border-radius: 8px;
+    border: 1px solid #d8e0f0;
+    background: #fff;
+    box-shadow: 0 1px 2px 0 rgba(184, 200, 224, 0.22);
+  }
+
+  :deep(.q-field--filled .q-field__control:before) {
+    background: #fff !important;
+    border: none;
+  }
+
+  :deep(.q-field--with-bottom) {
+    padding-bottom: 0;
+  }
+
+  :deep(.q-field__bottom) {
+    padding: 0;
+  }
+}
+</style>

package/src/common/app-layout/components/AppLayoutHeader.vue

@@ -3,7 +3,10 @@
     <q-toolbar :class="$style.toolbar">
       <h1>{{ pageTitle }}</h1>
       <div :class="$style['action-buttons']">
-        <p v-if="settingsMenuItems?.find(x => x.name === 'root-on' && x.isShow)" style="color: red">Root-режим</p>
+        <div v-if="settingsMenuItems?.find(x => x.name === 'root-on' && x.isShow)" :class="$style['root-mode']">
+          <h1>Включен Root-режим</h1>
+        </div>
+
         <div :class="$style['person']" @click="clickProfile">
           <app-icon name="person-icon" />
           <div :class="$style['person__info']">
@@ -147,6 +150,25 @@ onClickOutside(refMenuSettings, () => (isSettingsOpened.value = false))
   background: white;
 }
 
+.root-mode {
+  display: flex;
+  align-items: center;
+  background-color: red;
+  padding: 14px;
+  border-radius: 10px;
+  box-shadow: 0 1px 5px rgba(0, 0, 0, 0.2), 0 2px 2px rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.12);
+  cursor: pointer;
+  user-select: none;
+  h1 {
+    font-size: 16px;
+    font-weight: 600;
+    font-family: 'Nunito Sans', sans-serif;
+  }
+  &:active {
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3), 0 4px 4px rgba(0, 0, 0, 0.2), 0 6px 2px -5px rgba(0, 0, 0, 0.2);
+  }
+}
+
 .person {
   display: flex;
   align-items: center;