Kaynağa Gözat

feat(camera): camProvider parameter

Casper Dai 2 yıl önce
ebeveyn
işleme
c054729343

+ 0 - 1
src/views/device/detail/components/DeviceExternal/components/Record/components/PlayAxisDialog/components/PlayAxis.vue

@@ -174,7 +174,6 @@ export default {
     },
     onChange () {
       if (Date.parse(`${this.dateValue} 23:59:59`) < Date.now()) {
-        console.log(123)
         this.end = '24:00'
       } else {
         this.end = `${(Number(parseTime(new Date(), '{h}:00').split(':')[0]) + 1).toString().padStart(2, '0')}:00`

+ 2 - 1
src/views/external/camera/index.vue

@@ -112,7 +112,8 @@ export default {
       updateCamera({
         id: camera.id,
         username: camera.username,
-        remark: newVal
+        remark: newVal,
+        camProvider: 0
       }).catch(() => {
         camera.remark = oldVal
       })

+ 17 - 6
src/views/external/camera/snap/index.vue

@@ -20,7 +20,9 @@
           <br>
           黑屏告警推送会结合终端设备的运行时间
         </div>
-        <span class="c-grid-form__label">启用</span>
+        <span class="c-grid-form__label">
+          启用
+        </span>
         <div class="l-flex--row c-grid-form__option">
           <el-switch
             v-model="config.enabled"
@@ -28,7 +30,9 @@
             inactive-color="#ff4949"
           />
         </div>
-        <span class="c-grid-form__label">抓图时间范围</span>
+        <span class="c-grid-form__label">
+          抓图时间范围
+        </span>
         <el-time-picker
           v-model="range"
           class="u-width"
@@ -37,7 +41,9 @@
           value-format="HH:mm:ss"
           :clearable="false"
         />
-        <span class="c-grid-form__label">抓图间隔(s)</span>
+        <span class="c-grid-form__label">
+          抓图间隔(s)
+        </span>
         <el-input-number
           v-model="config.offset"
           class="has-info"
@@ -47,7 +53,9 @@
           :max="50"
           step-strictly
         />
-        <span class="c-grid-form__label">开机保护时间(s)</span>
+        <span class="c-grid-form__label">
+          开机保护时间(s)
+        </span>
         <el-input-number
           v-model="config.preserveSecond"
           class="has-info"
@@ -57,7 +65,9 @@
           :max="3600"
           step-strictly
         />
-        <span class="c-grid-form__label">确认黑屏持续时间(min)</span>
+        <span class="c-grid-form__label">
+          确认黑屏持续时间(min)
+        </span>
         <el-input-number
           v-model="config.confirmDuration"
           class="has-info"
@@ -191,7 +201,8 @@ export default {
       updateCamera({
         id: camera.id,
         username: camera.username,
-        remark: newVal
+        remark: newVal,
+        camProvider: 0
       }).catch(() => {
         camera.remark = oldVal
       })

+ 19 - 6
src/views/external/components/CameraConfigDialog.vue

@@ -5,7 +5,9 @@
     @confirm="onConfirm"
   >
     <div class="c-grid-form u-align-self--center">
-      <span class="c-grid-form__label u-required">厂商</span>
+      <span class="c-grid-form__label u-required">
+        厂商
+      </span>
       <schema-select
         ref="manufacturer"
         v-model="item.manufacturerKey"
@@ -13,28 +15,38 @@
         placeholder="请选择厂商"
         :schema="manufacturerSelectSchema"
       />
-      <span class="c-grid-form__label u-required">型号</span>
+      <span class="c-grid-form__label u-required">
+        型号
+      </span>
       <el-input
         v-model.trim="item.model"
         placeholder="最多50个字符"
         maxlength="50"
         clearable
       />
-      <span class="c-grid-form__label u-required">标识</span>
+      <span class="c-grid-form__label u-required">
+        标识
+      </span>
       <el-input
         v-model.trim="item.identifier"
         placeholder="仅支持数字和字母,最多30个字符"
         maxlength="30"
         clearable
       />
-      <span class="c-grid-form__label u-required">账号</span>
+      <span class="c-grid-form__label u-required">
+        账号
+      </span>
       <el-input v-model.trim="item.username" />
-      <span class="c-grid-form__label u-required">密码</span>
+      <span class="c-grid-form__label u-required">
+        密码
+      </span>
       <el-input
         v-model.trim="item.password"
         class="u-password"
       />
-      <span class="c-grid-form__label">备注</span>
+      <span class="c-grid-form__label">
+        备注
+      </span>
       <div
         class="has-info"
         data-info="备注将用于多摄像头展示时的区分"
@@ -134,6 +146,7 @@ export default {
       const key = this.item.manufacturerKey
       addCamera({
         manufacturerName: this.$refs.manufacturer.getOptions().find(({ value }) => value === key).label,
+        camProvider: 0,
         ...this.item
       }).then(() => {
         done()