提交首页折线图修改

src/api/baseUrl.js

@@ -3,9 +3,9 @@ import axios from "axios";
 console.log(process.env.NODE_ENV);
 console.log(process.env.NODE_ENV);
 switch (process.env.NODE_ENV) {
 switch (process.env.NODE_ENV) {
   case "development":
   case "development":
-    baseUrl = "http://192.168.9.133:20080"; // 测试环境url
+    // baseUrl = "http://192.168.9.133:20080"; // 测试环境url
     // baseUrl = "http://192.168.9.61:8086";
     // baseUrl = "http://192.168.9.61:8086";
-    // baseUrl = 'http://vion-panda.51vip.biz:52510';
+    baseUrl = 'http://vion-panda.51vip.biz:52510';
     break;
     break;
   case "pre":
   case "pre":
     baseUrl = "https://pre-server.feleti.cn"; // 预上线环境url
     baseUrl = "https://pre-server.feleti.cn"; // 预上线环境url

src/views/resource/videoEquipment.vue

@@ -60,6 +60,12 @@
 				<el-form-item label="取流地址">
 				<el-form-item label="取流地址">
 				<el-input v-model="videoEditParam.video_url" disabled></el-input>
 				<el-input v-model="videoEditParam.video_url" disabled></el-input>
 				</el-form-item>
 				</el-form-item>
+					<el-form-item label="经度">
+					<el-input v-model="videoEditParam.longitude"></el-input>
+				</el-form-item>
+					<el-form-item label="纬度">
+					<el-input v-model="videoEditParam.latitude"></el-input>
+				</el-form-item>
 				</el-form>
 				</el-form>
 			</div>
 			</div>
 			<span slot="footer" class="dialog-footer">
 			<span slot="footer" class="dialog-footer">
@@ -94,7 +100,9 @@
 				videoTree:[],
 				videoTree:[],
 				videoEditParam:{
 				videoEditParam:{
 					vchan_name:'',
 					vchan_name:'',
-					video_url:''
+					video_url:'',
+					longitude:'',
+					latitude:''
 				},
 				},
 				videoEditVisible:false,
 				videoEditVisible:false,
 				vchan_duid:'',
 				vchan_duid:'',
@@ -286,11 +294,15 @@
 				this.vchan_duid=row.vchan_duid;
 				this.vchan_duid=row.vchan_duid;
 				this.videoEditParam.vchan_name = row.vchan_name;
 				this.videoEditParam.vchan_name = row.vchan_name;
 				this.videoEditParam.video_url = row.video_url;
 				this.videoEditParam.video_url = row.video_url;
+				this.videoEditParam.longitude = row.longitude;
+				this.videoEditParam.latitude = row.latitude;
 				this.videoEditVisible=true;
 				this.videoEditVisible=true;
 			},
 			},
 			editSave(){
 			editSave(){
 				this.$api.resource.editVideo({
 				this.$api.resource.editVideo({
-					name:this.videoEditParam.vchan_name 
+					name:this.videoEditParam.vchan_name,
+					longitude : this.videoEditParam.longitude,
+					latitude: 	this.videoEditParam.latitude
 				},this.dev_unid,this.vchan_duid).then(res=>{
 				},this.dev_unid,this.vchan_duid).then(res=>{
 					if(res.ecode==200){
 					if(res.ecode==200){
 						this.$message({
 						this.$message({

src/views/trafficShow/illegaltrend.vue

@@ -289,10 +289,22 @@ export default {
       this.illageList = JSON.parse(localStorage.getItem("违法类型"));
       this.illageList = JSON.parse(localStorage.getItem("违法类型"));
     },
     },
     getTrafficHour() {
     getTrafficHour() {
+      let date = new Date();
+      let Y = date.getFullYear();
+      let M = date.getMonth() > 10 ? date.getMonth() : `0${date.getMonth() + 1}`;
+      let D = date.getDate() > 10 ? date.getDate() : `0${date.getDate()}`;
+      let h = date.getHours() > 10 ? date.getHours() : `0${date.getHours()}`;
+      let m =
+        date.getMinutes() > 10 ? date.getMinutes() : `0${date.getMinutes()}`;
+      let s = date.getSeconds();
+      let startDate = `${Y}-${M}-${D} 00:00:00`;
+      let curDate = `${Y}-${M}-${D} ${h}:${m}:${s}`;
       let data = {
       let data = {
         illegal_type: this.illtype,
         illegal_type: this.illtype,
         event_type: this.eventtype,
         event_type: this.eventtype,
-        key_vehicle_type: this.special_type
+        key_vehicle_type: this.special_type,
+        start_dt:startDate,
+        end_dt:curDate,
       };
       };
       this.$api.show.getTrafficHour(data).then(res => {
       this.$api.show.getTrafficHour(data).then(res => {
         console.log('违法事件趋势',res);
         console.log('违法事件趋势',res);

src/views/trafficShow/index.vue

@@ -195,6 +195,7 @@ export default {
   },
   },
   methods: {
   methods: {
     alarmevent(data) {
     alarmevent(data) {
+      console.log('alarmdata',data);
       //移动地图
       //移动地图
       this.$refs.map.movemap(data,null,2);
       this.$refs.map.movemap(data,null,2);
     },
     },

src/views/trafficShow/map.vue

@@ -444,9 +444,7 @@ export default {
   },
   },
   watch:{
   watch:{
     mapopen(){
     mapopen(){
-      debugger
       map.updateSize();
       map.updateSize();
-      // this.InitMap();
     }
     }
   },
   },
   mounted() {
   mounted() {