lianghanqiang 4 жил өмнө
parent
commit
b49328d15d

+ 40 - 39
src/views/device/videodevice/devicePlayer.vue

@@ -23,8 +23,8 @@
                           </template>
                         </el-input>
                     </div>-->
-                    <div style="display: flex; margin-bottom: 0.5rem;">
-                        <span style="width: 1.5rem; line-height: 0.5rem; text-align: right">播放地址:</span>
+                    <div style="display: flex; margin-bottom: 0.5rem;" class="center">
+                        <span style="width: 5rem; line-height: 0.5rem; text-align: right">播放地址:</span>
                         <el-input v-model="getPlayerShared.sharedRtmp" :disabled="true" >
                           <template slot="append">
                             <i class="cpoy-btn el-icon-document-copy"  title="点击拷贝" v-clipboard="getPlayerShared.sharedRtmp" @success="$message({type:'success', message:'成功拷贝到粘贴板'})"></i>
@@ -50,7 +50,7 @@
                 </el-tab-pane>
                 <!--遥控界面-->
                 <el-tab-pane label="云台控制" name="control" v-if="showPtz">
-                    <div style="display: flex; justify-content: left;">
+                    <div  style="display: flex; justify-content: left;">
                         <div class="control-wrapper">
                             <div class="control-btn control-top" @mousedown="ptzCamera(0, 2, 0)" @mouseup="ptzCamera(0, 0, 0)">
                                 <i class="el-icon-caret-top"></i>
@@ -71,41 +71,42 @@
                             <div class="control-round">
                                 <div class="control-round-inner"><i class="fa fa-pause-circle"></i></div>
                             </div>
-                            <div style="position: absolute; left: 1.5rem; top: 0.2rem" @mousedown="ptzCamera(0, 0, 1)" @mouseup="ptzCamera(0, 0, 0)"><i class="el-icon-zoom-in control-zoom-btn" style="font-size: 0.4rem;"></i></div>
-                            <div style="position: absolute; left: 1.5rem; top: 0.6rem; font-size: 0.4rem;" @mousedown="ptzCamera(0, 0, 2)" @mouseup="ptzCamera(0, 0, 0)"><i class="el-icon-zoom-out control-zoom-btn"></i></div>
-                             <div class="contro-speed" style="position: absolute; left: 4px; top: 1.4rem; width: 1.9rem;">
+                            <div style="position: absolute; left: 130px; top: 20px" @mousedown="ptzCamera(0, 0, 1)" @mouseup="ptzCamera(0, 0, 0)"><i class="el-icon-zoom-in control-zoom-btn" style="font-size: 1.5rem;"></i></div>
+                            <div style="position: absolute; left: 130px; top: 60px; font-size: 1.5rem;" @mousedown="ptzCamera(0, 0, 2)" @mouseup="ptzCamera(0, 0, 0)"><i class="el-icon-zoom-out control-zoom-btn"></i></div>
+                             <div class="contro-speed" style="position: relative; left: 4px; top: 130px; width: 160px;">
                                  <el-slider v-model="controSpeed" :max="255"></el-slider>
                              </div>
                         </div>
 
                         <div class="control-panel">
                             <el-button-group>
-                                <el-tag style="position :absolute; left: 0rem; top: 0rem; width: 1rem; text-align: center" size="medium" type="info">预置位编号</el-tag>
-                                <el-input-number style="position: absolute; left: 1rem; top: 0rem; width: 1.2rem" size="mini" v-model="presetPos" controls-position="right" :precision="0" :step="1" :min="1" :max="255"></el-input-number>
-                                <el-button style="position: absolute; left: 2.2rem; top: 0rem; width: 1rem" size="mini" icon="el-icon-add-location" @click="presetPosition(129, presetPos)">设置</el-button>
-                                <el-button style="position: absolute; left: 5.4rem; top: 0rem; width: 1rem" size="mini" type="primary" icon="el-icon-place" @click="presetPosition(130, presetPos)">调用</el-button>
-                                <el-button style="position: absolute; left: 3.2rem; top: 0rem; width: 1rem" size="mini" icon="el-icon-delete-location" @click="presetPosition(131, presetPos)">删除</el-button>
-                                <el-tag style="position :absolute; left: 0rem; top: 0.5rem; width: 1rem; text-align: center" size="medium" type="info">巡航速度</el-tag>
-                                <el-input-number style="position: absolute; left: 1rem; top: 0.49rem; width: 1.2rem" size="mini" v-model="cruisingSpeed" controls-position="right" :precision="0" :min="1" :max="4095"></el-input-number>
-                                <el-button style="position: absolute; left: 2.2rem; top: 0.5rem; width: 1rem" size="mini" icon="el-icon-loading" @click="setSpeedOrTime(134, cruisingGroup, cruisingSpeed)">设置</el-button>
-                                <el-tag style="position :absolute; left: 3.2rem; top: 0.5rem; width: 1rem; text-align: center" size="medium" type="info">停留时间</el-tag>
-                                <el-input-number style="position: absolute; left: 4.2rem; top: 0.49rem; width: 1.2rem" size="mini" v-model="cruisingTime" controls-position="right" :precision="0" :min="1" :max="4095"></el-input-number>
-                                <el-button style="position: absolute; left: 5.4rem; top: 0.49rem; width: 1rem" size="mini" icon="el-icon-timer" @click="setSpeedOrTime(135, cruisingGroup, cruisingTime)">设置</el-button>
-                                <el-tag style="position :absolute; left: 0rem; top: 0.9rem; width: 1rem; text-align: center" size="medium" type="info">巡航组编号</el-tag>
-                                <el-input-number style="position: absolute; left: 1rem; top: 0.89rem; width: 1.2rem" size="mini" v-model="cruisingGroup" controls-position="right" :precision="0" :min="0" :max="255"></el-input-number>
-                                <el-button style="position: absolute; left: 2.2rem; top: 0.9rem; width: 1rem" size="mini" icon="el-icon-add-location" @click="setCommand(132, cruisingGroup, presetPos)">添加点</el-button>
-                                <el-button style="position: absolute; left: 3.2rem; top: 0.9rem; width: 1rem" size="mini" icon="el-icon-delete-location" @click="setCommand(133, cruisingGroup, presetPos)">删除点</el-button>
-                                <el-button style="position: absolute; left: 4.2rem; top: 0.9rem; width: 1rem" size="mini" icon="el-icon-delete" @click="setCommand(133, cruisingGroup, 0)">删除组</el-button>
-                                <el-button style="position: absolute; left: 5.4rem; top: 1rem; width: 1rem" size="mini" type="primary" icon="el-icon-video-camera-solid" @click="setCommand(136, cruisingGroup, 0)">巡航</el-button>
-                                <el-tag style="position :absolute; left: 0rem; top: 1.4rem; width: 1rem; text-align: center" size="medium" type="info">扫描速度</el-tag>
-                                <el-input-number style="position: absolute; left: 1rem; top: 1.39rem; width: 1.2rem" size="mini" v-model="scanSpeed" controls-position="right" :precision="0" :min="1" :max="4095"></el-input-number>
-                                <el-button style="position: absolute; left: 2.2rem; top: 1.4rem; width: 1rem" size="mini" icon="el-icon-loading" @click="setSpeedOrTime(138, scanGroup, scanSpeed)">设置</el-button>
-                                <el-tag style="position :absolute; left: 0rem; top: 1.8rem; width: 1rem; text-align: center" size="medium" type="info">扫描组编号</el-tag>
-                                <el-input-number style="position: absolute; left: 1rem; top: 1.79rem; width: 1.2rem" size="mini" v-model="scanGroup" controls-position="right" :precision="0" :step="1" :min="0" :max="255"></el-input-number>
-                                <el-button style="position: absolute; left: 2.2rem; top: 1.8rem; width: 1rem" size="mini" icon="el-icon-d-arrow-left" @click="setCommand(137, scanGroup, 1)">左边界</el-button>
-                                <el-button style="position: absolute; left: 3.2rem; top: 1.8rem; width: 1rem" size="mini" icon="el-icon-d-arrow-right" @click="setCommand(137, scanGroup, 2)">右边界</el-button>
-                                <el-button style="position: absolute; left: 5.4rem; top: 1.41rem; width: 1rem" size="mini" type="primary" icon="el-icon-video-camera-solid" @click="setCommand(137, scanGroup, 0)">扫描</el-button>
-                                <el-button style="position: absolute; left: 5.4rem; top: 1.81rem; width: 1rem" size="mini" type="danger" icon="el-icon-switch-button" @click="ptzCamera(0, 0, 0)">停止</el-button>
+                                <el-tag style="position:absolute; left: 0rem; top: 0rem; width: 5rem; text-align: center" size="medium" type="info">预置位编号</el-tag>
+                                <el-input-number style="position: absolute; left: 5.1rem; top: 0rem; width: 5rem" size="mini" v-model="presetPos" controls-position="right" :precision="0" :step="1" :min="1" :max="255"></el-input-number>
+                                <el-button style="position: absolute; left: 10.2rem; top: 0rem; width: 5rem" size="mini" icon="el-icon-add-location" @click="presetPosition(129, presetPos)">设置</el-button>
+                                <el-button style="position: absolute; left: 25.5rem; top: 0rem; width: 5rem" size="mini" type="primary" icon="el-icon-place" @click="presetPosition(130, presetPos)">调用</el-button>
+                                <el-button style="position: absolute; left: 15.3rem; top: 0rem; width: 5rem" size="mini" icon="el-icon-delete-location" @click="presetPosition(131, presetPos)">删除</el-button>
+                                <el-tag style="position :absolute; left: 0rem; top: 2rem; width: 5rem; text-align: center" size="medium" type="info">巡航速度</el-tag>
+                                <el-input-number style="position: absolute; left: 5.1rem; top: 2rem; width: 5rem" size="mini" v-model="cruisingSpeed" controls-position="right" :precision="0" :min="1" :max="4095"></el-input-number>
+                                <el-button style="position: absolute; left: 10.2rem; top: 2rem; width: 5rem" size="mini" icon="el-icon-loading" @click="setSpeedOrTime(134, cruisingGroup, cruisingSpeed)">设置</el-button>
+                                <el-tag style="position :absolute; left: 15.3rem; top: 2rem; width: 5rem; text-align: center" size="medium" type="info">停留时间</el-tag>
+                                <el-input-number style="position: absolute; left: 20.4rem; top: 2rem; width: 5rem" size="mini" v-model="cruisingTime" controls-position="right" :precision="0" :min="1" :max="4095"></el-input-number>
+                                <el-button style="position: absolute; left: 25.5rem; top: 2rem; width: 5rem" size="mini" icon="el-icon-timer" @click="setSpeedOrTime(135, cruisingGroup, cruisingTime)">设置</el-button>
+                                <el-tag style="position :absolute; left: 0rem; top: 4rem; width: 5rem; text-align: center" size="medium" type="info">巡航组编号</el-tag>
+                                <el-input-number style="position: absolute; left: 5.1rem; top: 4rem; width: 5rem" size="mini" v-model="cruisingGroup" controls-position="right" :precision="0" :min="0" :max="255"></el-input-number>
+                                <el-button style="position: absolute; left: 10.2rem; top: 4rem; width: 5rem" size="mini" icon="el-icon-add-location" @click="setCommand(132, cruisingGroup, presetPos)">添加点</el-button>
+                                <el-button style="position: absolute; left: 15.3rem; top: 4rem; width: 5rem" size="mini" icon="el-icon-delete-location" @click="setCommand(133, cruisingGroup, presetPos)">删除点</el-button>
+                                <el-button style="position: absolute; left: 20.4rem; top: 4rem; width: 5rem" size="mini" icon="el-icon-delete" @click="setCommand(133, cruisingGroup, 0)">删除组</el-button>
+                                <el-button style="position: absolute; left: 25.5rem; top: 4rem; width: 5rem" size="mini" type="primary" icon="el-icon-video-camera-solid" @click="setCommand(136, cruisingGroup, 0)">巡航</el-button>
+                                <el-tag style="position :absolute; left: 0rem; top: 6rem; width: 5rem; text-align: center" size="medium" type="info">扫描速度</el-tag>
+                                <el-input-number style="position: absolute; left: 5.1rem; top: 6rem; width: 5rem" size="mini" v-model="scanSpeed" controls-position="right" :precision="0" :min="1" :max="4095"></el-input-number>
+                                <el-button style="position: absolute; left: 10.2rem; top: 6rem; width: 5rem" size="mini" icon="el-icon-loading" @click="setSpeedOrTime(138, scanGroup, scanSpeed)">设置</el-button>
+                                <el-tag style="position :absolute; left: 0rem; top: 8rem; width: 5rem; text-align: center" size="medium" type="info">扫描组编号</el-tag>
+                                <el-input-number style="position: absolute; left: 5.1rem; top: 8rem; width: 5rem" size="mini" v-model="scanGroup" controls-position="right" :precision="0" :step="1" :min="0" :max="255"></el-input-number>
+
+                                <el-button style="position: absolute; left: 10.2rem; top: 8rem; width: 5rem" size="mini" icon="el-icon-d-arrow-left" @click="setCommand(137, scanGroup, 1)">左边界</el-button>
+                                <el-button style="position: absolute; left: 15.3rem; top: 8rem; width: 5rem" size="mini" icon="el-icon-d-arrow-right" @click="setCommand(137, scanGroup, 2)">右边界</el-button>
+                                <el-button style="position: absolute; left: 25.5rem; top: 6rem; width: 5rem" size="mini" type="primary" icon="el-icon-video-camera-solid" @click="setCommand(137, scanGroup, 0)">扫描</el-button>
+                                <el-button style="position: absolute; left: 25.5rem; top: 8rem; width: 5rem" size="mini" type="danger" icon="el-icon-switch-button" @click="ptzCamera(0, 0, 0)">停止</el-button>
                             </el-button-group>
                         </div>
                     </div>
@@ -572,10 +573,10 @@ export default {
 <style>
 .control-wrapper {
     position: relative;
-    width: 1.25rem;
-    height: 1.25rem;
-    max-width: 1.25rem;
-    max-height: 1.25rem;
+    width: 120px;
+    height: 120px;
+    /* max-width: 1.25rem;
+    max-height: 1.25rem; */
     border-radius: 100%;
     margin-top: 0.3rem;
     margin-left: 0.1rem;
@@ -585,9 +586,9 @@ export default {
 .control-panel {
     position: relative;
     top: 0;
-    left: 1rem;
-    height: 2.2rem;
-    max-height: 2.2rem;
+    left: 70px;
+    height: 170px;
+    /* max-height: 2.2rem; */
 }
 
 .control-btn {