Pre Merge pull request !36 from 阿斌/N/A

行政规划错误。江苏南通海门市，修改为海门区，浙江杭州删除下城区、江干区，新增钱塘区，临平区

Signed-off-by: 阿斌 <38912748@qq.com>

doc/_content/introduction/compile.md

@@ -89,7 +89,7 @@ git clone https://github.com/648540858/wvp-GB28181-pro.git
 ```shell script
 cd wvp-GB28181-pro/web/
 npm --registry=https://registry.npmmirror.com install
-npm npm run build:prod
+npm run build:prod
 ```
 
 编译如果报错, 一般都是网络问题, 导致的依赖包下载失败  

src/main/resources/civilCode.csv

@@ -861,7 +861,7 @@
 320623,如东县,3206
 320681,启东市,3206
 320682,如皋市,3206
-320684,海门市,3206
+320684,海门区,3206
 320685,海安市,3206
 3207,连云港市,32
 320703,连云区,3207
@@ -918,8 +918,6 @@
 33,浙江省, 
 3301,杭州市,33
 330102,上城区,3301
-330103,下城区,3301
-330104,江干区,3301
 330105,拱墅区,3301
 330106,西湖区,3301
 330108,滨江区,3301
@@ -927,6 +925,8 @@
 330110,余杭区,3301
 330111,富阳区,3301
 330112,临安区,3301
+330113,临平区,3301
+330114,钱塘区,3301
 330122,桐庐县,3301
 330127,淳安县,3301
 330182,建德市,3301

web/src/api/frontEnd.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 // 前端控制
 
-export function setSpeedForScan(deviceId, channelDeviceId, scanId, speed) {
+export function setSpeedForScan([deviceId, channelDeviceId, scanId, speed]) {
   return request({
     method: 'get',
     url: `/api/front-end/scan/set/speed/${deviceId}/${channelDeviceId}`,

web/src/views/common/ptzPreset.vue

@@ -99,7 +99,7 @@ export default {
     },
     gotoPreset: function(preset) {
       console.log(preset)
-      this.$store.dispatch('frontEnd/callPreset', [this.deviceId, this.channelDeviceId, this.ptzPresetId])
+      this.$store.dispatch('frontEnd/callPreset', [this.deviceId, this.channelDeviceId, preset.presetId])
         .then(data => {
           this.$message({
             showClose: true,
@@ -128,7 +128,7 @@ export default {
           spinner: 'el-icon-loading',
           background: 'rgba(0, 0, 0, 0.7)'
         })
-        this.$store.dispatch('frontEnd/deletePreset', [this.deviceId, this.channelDeviceId, this.ptzPresetId])
+        this.$store.dispatch('frontEnd/deletePreset', [this.deviceId, this.channelDeviceId, preset.presetId])
           .then(data => {
             setTimeout(() => {
               this.getPresetList()

web/src/views/dialog/devicePlayer.vue

@@ -1,8 +1,15 @@
 <template>
   <div id="devicePlayer" v-loading="isLoging">
 
-    <el-dialog v-el-drag-dialog v-if="showVideoDialog" title="视频播放" top="0" :close-on-click-modal="false"
-               :visible.sync="showVideoDialog" @close="close()">
+    <el-dialog
+      v-if="showVideoDialog"
+      v-el-drag-dialog
+      title="视频播放"
+      top="0"
+      :close-on-click-modal="false"
+      :visible.sync="showVideoDialog"
+      @close="close()"
+    >
       <div style="width: 100%; height: 100%">
         <el-tabs
           v-if="Object.keys(this.player).length > 1"
@@ -285,7 +292,7 @@
                     <div title="光圈+" @mousedown="irisCamera('in')" @mouseup="irisCamera('stop')">
                       <i class="iconfont icon-guangquan control-zoom-btn" style="font-size: 1.5rem;" />
                     </div>
-                    <div title="光圈-" @mousedown="pirisCamera('out')" @mouseup="irisCamera('stop')">
+                    <div title="光圈-" @mousedown="irisCamera('out')" @mouseup="irisCamera('stop')">
                       <i class="iconfont icon-guangquan- control-zoom-btn" style="font-size: 1.5rem;" />
                     </div>
                   </div>
@@ -365,7 +372,6 @@ import ptzSwitch from '../common/ptzSwitch.vue'
 import mediaInfo from '../common/mediaInfo.vue'
 import H265web from '../common/h265web.vue'
 
-
 export default {
   name: 'DevicePlayer',
   directives: { elDragDialog },