1.九公司的四色图

2.电子围栏功能

src/views/BI/index.vue

@@ -1115,7 +1115,7 @@ export default {
           {
             type: 'pie',
             startAngle: 0,
-            radius: [35, 100],
+            radius: [35, 95],
             center: ['40%', '30%'],
             roseType: 'area',
             avoidLabelOverlap: false,

src/views/keyprojects/platformelectronic/components/platformvideo.vue

@@ -0,0 +1,171 @@
+<template>
+  <el-dialog
+    v-if="visible"
+    :visible.sync="visible"
+    :before-close="handleClose"
+    :append-to-body="true"
+    title="固定摄像头"
+    width="60%">
+    <div class="app-container">
+      <div class="filter-container">
+        <el-form>
+          <el-row :gutter="20">
+            <el-col :span="6">  <el-form-item label="视频名称">
+              <el-input v-model="KEYWORDS" placeholder="请输入关键字" class="filter-item" style="width: 150px;"/>
+            </el-form-item></el-col>
+            <el-col :span="6">
+              <el-form-item >
+                <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+                  搜索
+                </el-button>
+                <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
+                  重置
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <el-table
+        v-loading="listLoading"
+        ref="multipleTable"
+        :data="varList"
+        :row-key="getRowKey"
+        :header-cell-style="{
+          'font-weight': 'bold',
+          'color': '#000'
+        }"
+        tooltip-effect="dark"
+        border
+        fit
+        highlight-current-row
+      >
+        <el-table-column
+          :reserve-selection="true"
+          type="selection"
+          width="55"
+          align="center"/>
+        <el-table-column type="index" label="序号" width="50" align="center" />
+        <el-table-column prop="name" label="视频名称" />
+        <el-table-column prop="regionName" label="区域" />
+        <el-table-column label="操作" align="left" width="500">
+          <template slot-scope="{row}">
+            <el-button v-show="row.in !== 1" type="success" icon="el-icon-caret-right" size="mini" @click="selectVideo(row)">选择</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="page-btn-group">
+        <div/>
+        <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="closeWindow">关 闭</el-button>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves'
+export default {
+  components: { Pagination },
+  directives: { waves },
+  data() {
+    return {
+      config: config,
+      visible: false,
+      listLoading: true,
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      total: 0,
+      KEYWORDS: '',
+      varList: [],
+      allCodes: []
+    }
+  },
+
+  methods: {
+    async init() {
+      this.visible = true
+      this.varList = []
+      this.KEYWORDS = ''
+      this.getList()
+    },
+    getRowKey(row) {
+      return row.PLATFORMVIDEOMANAGEMENT_ID
+    },
+    // 搜索
+    getQuery() {
+      this.$refs.multipleTable.clearSelection()
+      this.getList()
+    },
+
+    getAllList() {
+      return new Promise(resolve => {
+        requestFN(
+          '/videomanager/list?showCount=1000&currentPage=1',
+          {
+            OUTSOURCED_ID: this.$parent.$parent.OUTSOURCED_ID
+          }
+        ).then((data) => {
+          const tempList = data.varList
+          const allCodes = []
+          tempList.forEach(item => {
+            allCodes.push(item.INDEXCODE)
+          })
+          this.allCodes = allCodes
+          resolve()
+        }).catch((e) => {
+        })
+      })
+    },
+
+    // 获取列表
+    getList() {
+      this.listLoading = true
+      requestFN(
+        '/platformvideomanagement/platformList',
+        {
+          'pageNo': this.listQuery.page,
+          'pageSize': this.listQuery.limit,
+          'name': this.KEYWORDS
+        }
+      ).then((res) => {
+        this.listLoading = false
+        const tempList = res.data.list
+        this.varList = tempList
+        this.total = res.data.total
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+
+    selectVideo(row) {
+      this.$emit('handleSelected', row)
+      this.closeWindow()
+    },
+
+    goKeyReset() {
+      this.KEYWORDS = ''
+      this.getList()
+    },
+
+    handleClose() {
+      this.visible = false
+    },
+    closeWindow() {
+      this.handleClose()
+    }
+  }
+
+}
+
+</script>
+<style>
+.hide .el-upload--picture-card {
+  display: none;
+}
+</style>

src/views/keyprojects/platformelectronic/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-<!--    <el-form label-width="100px">
+     <el-form label-width="100px">
       <el-row>
         <el-col :span="6">
           <el-form-item label="关键字搜索">
@@ -18,7 +18,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-    </el-form>-->
+    </el-form>
     <el-table
       v-loading="listLoading"
       ref="multipleTable"
@@ -39,7 +39,9 @@
         width="55"
         align="center"/>
       <el-table-column type="index" label="序号" width="50" align="center" />
-      <el-table-column prop="name" label="视频名称" />
+      <el-table-column prop="corpName" label="企业名称" />
+      <el-table-column prop="NAME" label="视频名称" />
+      <el-table-column prop="fangquNames" label="所属区域" />
       <el-table-column prop="regionName" label="区域" />
       <el-table-column prop="POSITION" label="状态" width="100">
         <template slot-scope="{row}">
@@ -50,13 +52,17 @@
       <el-table-column label="操作" align="left" width="400">
         <template slot-scope="{row}">
           <el-button type="success" icon="el-icon-caret-right" size="mini" @click="showVideo(row)">播放</el-button>
-          <el-button type="info" icon="el-icon-location-information" size="mini" @click="handleMap(row)">定位</el-button>
+<!--          <el-button type="info" icon="el-icon-location-information" size="mini" @click="goEdit(row)">定位</el-button>-->
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="goEdit(row)">编辑</el-button>
         </template>
       </el-table-column>
     </el-table>
     <div class="page-btn-group">
-      <div/>
+      <div>
-      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
+<!--        <el-button type="success" icon="el-icon-caret-right" @click="showAll">播放全部</el-button>-->
+      </div>
+      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getAllList" />
     </div>
 
     <el-dialog v-if="dialogVideoHLS" :visible.sync="dialogVideoHLS" :before-close="handleBack" title="视频" width="600px">
@@ -68,11 +74,6 @@
 
     <el-dialog :visible.sync="dialogFormMap" title="定位" width="1050px" class="dy-dialog">
       <el-form ref="form" :model="form" :rules="rules">
-        <el-form-item label="所属企业" prop="CORPINFO_ID">
-          <el-select v-model="form.CORPINFO_ID" placeholder="请选择申请状态" clearable >
-            <el-option v-for="item in corpList" :key="item.CORPINFO_ID" :label="item.CORP_NAME" :value="item.CORPINFO_ID" />
-          </el-select>
-        </el-form-item>
         <el-form-item>
           <div id="map" />
         </el-form-item>
@@ -86,6 +87,50 @@
         <el-button type="primary" @click="setPosition">确 定</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :visible.sync="dialogForm" :title="msg==='add'?'新增':'编辑'" width="600px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px" style="width: 500px;">
+        <el-form-item label="所属企业" prop="CORPINFO_ID">
+          <el-select v-model="form.CORPINFO_ID" placeholder="请选择申请状态" clearable >
+            <el-option v-for="item in corpList" :key="item.CORPINFO_ID" :label="item.CORP_NAME" :value="item.CORPINFO_ID" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="所属区域" prop="bianjiequyu">
+          <el-select v-model="form.SUOSHUQUYU" placeholder="请选择">
+            <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="边界入侵区域" prop="bianjiequyu">
+          <el-select v-model="form.bianjiequyu" multiple placeholder="请选择监理单位" style="width: 100%;">
+            <el-option v-for="item in quyuList" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="form.VIDEO_TYPE===1" label="视频选择">
+          <el-button type="success" icon="el-icon-caret-right" size="mini" @click="selectVideo()">选择</el-button>
+        </el-form-item>
+        <el-form-item label="视频名称" prop="CODE">
+          <el-input :disabled="true" v-model="form.VIDEONAME" placeholder="这里输入视频名称..." />
+        </el-form-item>
+        <el-form-item v-if="form.VIDEO_TYPE===0" label="播放地址" prop="VIDEOURL">
+          <el-input :disabled="true" v-model="form.VIDEOURL" placeholder="这里输入播放地址..." />
+        </el-form-item>
+
+        <el-form-item label="摄像头编号" prop="CODE">
+          <el-input :disabled="true" v-model="form.CODE" placeholder="这里输入摄像头编号..." />
+        </el-form-item>
+        <el-form-item label="坐标">
+          <el-input v-model="form.LONGITUDEANDLATITUDE" style="width: 200px" placeholder="请输入内容" disabled />
+          <el-button type="info" icon="el-icon-location-information" size="mini" @click="handleMap(row)">定位</el-button>
+        </el-form-item>
+
+      </el-form>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogForm =false">取 消</el-button>
+        <el-button type="primary" @click="upload">确 定</el-button>
+      </div>
+    </el-dialog>
+    <platformvideo ref="platformvideo" @handleSelected="handleSelected"/>
   </div>
 </template>
 <script>
@@ -93,8 +138,10 @@ import Pagination from '@/components/Pagination' // 通过 el-pagination二次
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
 import TiandiMap from '../../../components/TianMap/TiandiMap'
+import Platformvideo from '../platformelectronic/components/platformvideo.vue'
+import SelectTree from '@/components/SelectTree'
 export default {
-  components: { Pagination, TiandiMap },
+  components: { Pagination, TiandiMap ,Platformvideo,SelectTree},
   directives: { waves },
   data() {
     // eslint-disable-next-line no-unused-vars
@@ -115,18 +162,53 @@ export default {
       player: {},
       dialogFormMap: false,
       corpList: [],
-      form: {},
+      form: {
+        CORPINFO_ID:'',
+        bianjiequyu:[],
+        PLATFORMELECTRONIC_ID:'',
+        LONGITUDEANDLATITUDE:'',
+        VIDEOMANAGER_ID: '',
+        VIDEO_RESOURCES_ID: '',
+        VIDEO_TYPE: 1,
+        VIDEONAME: '', //
+        VIDEOURL: '',
+        CODE: '',
+        PLATFORMVIDEOMANAGEMENT_ID: '',
+        LATITUDE: '',
+        LONGITUDE: '',
+        SUOSHUQUYU:''
+      },
       rules: {
         CORPINFO_ID: [
           { required: true, message: '请选择企业', trigger: 'blur' }
+        ],
+        bianjiequyu: [
+          { required: true, message: '请选择区域', trigger: 'blur' }
+        ],
+        CODE: [
+          { required: true, message: '请选择摄像头', trigger: 'blur' }
         ]
-      }
+      },
+      dialogForm : false,
+      msg:'add' ,
+      defaultProps: {
+        value: 'id',
+        children: 'nodes',
+        label: 'name'
+      },
+      quyuList :[],
+      shexiangtouForm:{},
+      statusList: [
+        { id: '0', name: '请选择' },
+        { id: '1', name: '油管区' },
+        { id: '2', name: '码头区' }
+      ],
     }
   },
   async created() {
     this.getCorpList()
     await this.getAllList()
-    this.getList()
+    await this.getquyuList()
   },
   methods: {
     getRowKey(row) {
@@ -137,14 +219,23 @@ export default {
     getQuery() {
       this.$refs.multipleTable.clearSelection()
       this.listQuery.page = 1
-      this.getList()
+      this.getAllList()
     },
     goKeyReset() {
       this.KEYWORDS = ''
       this.getQuery()
     },
-
+    getquyuList(){ //获取区域字典信息
-    getCorpList() {
+      requestFN(
+        '/dictionaries/listSelectTree',
+        {
+          DICTIONARIES_ID: '7da8205a07074a1785116fc8c9a7bfc4'
+        }
+      ).then((data) => {
+        this.quyuList = JSON.parse(data.zTreeNodes)
+      })
+    },
+    getCorpList() { //获取所有的企业信息
       requestFN(
         '/corpinfo/listAll',
         {}
@@ -154,65 +245,118 @@ export default {
       })
     },
 
-    getAllList() {
+    getAllList() { //获取公司的所有摄像头
       return new Promise(resolve => {
         requestFN(
-          '/platformelectronic/listAll',
+          '/platformelectronic/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
-          { }
+          {
+            KEYWORDS:this.KEYWORDS
+          }
         ).then((data) => {
-          this.tempList = data.varList
+          this.varList = data.varList
+          this.listLoading = false
+          this.total = data.page.totalResult
           resolve()
         }).catch((e) => {
+          this.listLoading = false
         })
       })
     },
+    handleAdd(row) {
+      this.msg = 'add'
+      this.resetForm()
+      this.dialogForm = true
+      // this.$refs.platformvideo.init()
+    },
+    resetForm(){
+      this.shexiangtouForm.LONGITUDE = ''
+      this.shexiangtouForm.LATITUDE = ''
+      this.shexiangtouForm.SUOSHUQUYU = ''
+      this.form.LONGITUDEANDLATITUDE =  ''
+      this.shexiangtouForm = {}
+      this.form= {
+        CORPINFO_ID:'',
+          bianjiequyu:'',
+          LONGITUDEANDLATITUDE:'',
+          VIDEOMANAGER_ID: '',
+          VIDEO_RESOURCES_ID: '',
+          VIDEO_TYPE: 1,
+          VIDEONAME: '', //
+          VIDEOURL: '',
+          CODE: '',
+          PLATFORMVIDEOMANAGEMENT_ID: '',
+          LATITUDE: '',
+          LONGITUDE: ''
+      }
+    },
 
-    // 获取列表
+    upload(){
-    getList() {
+      var _this = this
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.shexiangtouForm.CORPINFO_ID = this.form.CORPINFO_ID
+          if (_this.form.bianjiequyu) {
+            var bianjiequyu = ''
+            _this.form.bianjiequyu.forEach(item => {
+              bianjiequyu += item + ','
+            })
+            this.shexiangtouForm.FANGQU_IDS = bianjiequyu.substr(0, bianjiequyu.length - 1)
+          }
+          this.shexiangtouForm.SUOSHUQUYU = this.form.SUOSHUQUYU
+          this.dialogFormMap = false
+          this.dialogForm = false
           this.listLoading = true
           requestFN(
-        '/platformelectronic/platformList',
+            '/platformelectronic/savePosition',
-        {
+            this.shexiangtouForm
-          'pageNo': this.listQuery.page,
+          ).then(async(data) => {
-          'pageSize': this.listQuery.limit,
+            await this.getAllList()
-          'name': this.KEYWORDS
+            this.getList()
-        }
-      ).then((res) => {
-        this.listLoading = false
-        const tempList = res.data.list
-        tempList.forEach(item => {
-          for (let i = 0; i < this.tempList.length; i++) {
-            if (item.indexCode === this.tempList[i].INDEXCODE) {
-              console.log(item.indexCode === this.tempList[i].INDEXCODE)
-              item.PLATFORMELECTRONIC_ID = this.tempList[i].PLATFORMELECTRONIC_ID
-              item.LONGITUDE = this.tempList[i].LONGITUDE
-              item.LATITUDE = this.tempList[i].LATITUDE
-              item.CORPINFO_ID = this.tempList[i].CORPINFO_ID
-            }
-          }
-        })
-        this.varList = tempList
-        console.log(tempList)
-        this.total = res.data.total
           }).catch((e) => {
             this.listLoading = false
           })
+        } else {
+          return false
+        }
+      })
     },
-
+    selectVideo(row) {
-    handleIn(row) {
+      this.$refs.platformvideo.init()
-      this.$confirm('确认将[' + row.name + ']加入系统吗', {
+    },
-        confirmButtonText: '确定',
+    goEdit(row){
-        cancelButtonText: '取消',
+      this.dialogForm = true
-        type: 'warning'
-      }).then(() => {
       this.listLoading = true
+      return new Promise(resolve => {
         requestFN(
-          '/platformelectronic/add',
+          '/platformelectronic/goEdit',
           {
+            PLATFORMELECTRONIC_ID :row.PLATFORMELECTRONIC_ID
+          }
+        ).then((data) => {
+          this.shexiangtouForm = data.pd
+          this.form.bianjiequyu = data.pd.FANGQU_IDS.split(',')
+          this.form.CORPINFO_ID = data.pd.CORPINFO_ID
+          this.form.VIDEONAME = data.pd.NAME
+          this.form.CODE = data.pd.INDEXCODE
+          this.form.SUOSHUQUYU = data.pd.SUOSHUQUYU
+          this.form.LONGITUDEANDLATITUDE = data.pd.LONGITUDE + "," +data.pd.LATITUDE
+          this.listLoading = false
+          resolve()
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      })
+    },
+    handleSelected(row) {
+      this.shexiangtouForm = {
+        PLATFORMELECTRONIC_ID: row.PLATFORMELECTRONIC_ID,
+        CORPINFO_ID: row.CORPINFO_ID,
         INDEXCODE: row.indexCode,
         REGIONINDEXCODE: row.regionIndexCode,
         EXTERNALINDEXCODE: row.externalIndexCode,
         NAME: row.name,
+        LONGITUDE: row.LONGITUDE,
+        LATITUDE: row.LATITUDE,
         CAMERATYPE: row.cameraType,
         CASCADECODE: row.cascadeCode,
         DECODETAG: row.decodeTag,
@@ -225,42 +369,25 @@ export default {
         CASCADETYPE: row.cascadeType,
         REGIONNAME: row.regionName,
         REGIONPATH: row.regionPath,
-            REGIONPATHNAM: row.regionPathName
+        REGIONPATHNAM: row.regionPathName,
+        VIDEONAME : row.name,
+        CODE:row.indexCode
       }
-        ).then(() => {
+      this.$set(this.form, 'VIDEONAME', row.name)
-          this.$message({
+      this.$set(this.form, 'CODE', row.indexCode)
-            message: '加入成功',
+      // this.$set(this.form, 'LATITUDE', row.LATITUDE)
-            type: 'success'
+      // this.$set(this.form, 'LONGITUDE', row.longitude)
-          })
+      // this.$set(this.form, 'PLATFORMVIDEOMANAGEMENT_ID', row.PLATFORMVIDEOMANAGEMENT_ID)
-          this.listLoading = false
-          this.allCodes.push(row.indexCode)
-          this.varList = []
-          this.getList()
-        }).catch((e) => {
-          this.listLoading = false
-        })
-      }).catch(() => {
-      })
     },
-
+    // 获取列表
     setPosition() {
-      this.$refs.form.validate(valid => {
+      if(this.shexiangtouForm.PLATFORMELECTRONIC_ID != null){
-        if (valid) {
+
-          this.dialogFormMap = false
-          this.listLoading = true
-          requestFN(
-            '/platformelectronic/savePosition',
-            this.form
-          ).then(async(data) => {
-            await this.getAllList()
-            this.getList()
-          }).catch((e) => {
-            this.listLoading = false
-          })
-        } else {
-          return false
       }
-      })
+      this.shexiangtouForm.LONGITUDE = this.form.LONGITUDE
+      this.shexiangtouForm.LATITUDE = this.form.LATITUDE
+      this.form.LONGITUDEANDLATITUDE = this.form.LONGITUDE + ',' + this.form.LATITUDE
+      this.dialogFormMap = false
     },
 
     // 播放
@@ -295,30 +422,12 @@ export default {
     },
 
     handleMap(row) {
-      this.dialogFormMap = true
+      if(row != null){
-      this.form = {
+        this.form.LONGITUDE = row.LONGITUDE
-        PLATFORMELECTRONIC_ID: row.PLATFORMELECTRONIC_ID,
+        this.form.LATITUDE = row.LATITUDE
-        CORPINFO_ID: row.CORPINFO_ID,
+        this.shexiangtouForm =row
-        INDEXCODE: row.indexCode,
-        REGIONINDEXCODE: row.regionIndexCode,
-        EXTERNALINDEXCODE: row.externalIndexCode,
-        NAME: row.name,
-        LONGITUDE: row.LONGITUDE,
-        LATITUDE: row.LATITUDE,
-        CAMERATYPE: row.cameraType,
-        CASCADECODE: row.cascadeCode,
-        DECODETAG: row.decodeTag,
-        RESOURCETYPE: row.resourceType,
-        CREATETIME: row.createTime,
-        UPDATETIME: row.updateTime,
-        SORT: row.sort,
-        DISORDER: row.disOrder,
-        RECORDLOCATION: row.recordLocation,
-        CASCADETYPE: row.cascadeType,
-        REGIONNAME: row.regionName,
-        REGIONPATH: row.regionPath,
-        REGIONPATHNAM: row.regionPathName
       }
+      this.dialogFormMap = true
       this.$nextTick(() => {
         if (!this.map) this.initMap(this.form.LONGITUDE, this.form.LATITUDE, 16)
         else this.initCenter(this.form.LONGITUDE, this.form.LATITUDE, 16)

src/views/map/components/bianjieruqin.vue

@@ -186,9 +186,9 @@ export default {
         }
       ).then((data) => {
         data.varList.forEach(item => {
-          if (item.REGIONINDEXCODE === '3152c0150e93491fb37f5c015fbb943e') {
+          if (item.SUOSHUQUYU === '2') {
             this.block2OptionsList[0].count = item.co
-          } else if (item.REGIONINDEXCODE === '1b0f290142534d62957bf0b6f852c589') {
+          } else if (item.SUOSHUQUYU === '1') {
             this.block2OptionsList[1].count = item.co
           }
         })

src/views/map/js/dragentity.js

@@ -274,6 +274,7 @@ export default class DragEntity {
         polygon: {
           hierarchy: Cesium.Cartesian3.fromDegreesArray(latitudeAndLongitude),
           extrudedHeight: item.stretchHeight,
+          height: item.height,
           // eslint-disable-next-line new-cap
           material: new Cesium.Color.fromCssColorString(item.color),
           outline: !!item.strokeColor,