Explorar el Código

优化了sdk 2020年7月9日22:53:37

linan-0110 hace 5 años
padre
commit
6e345e83c7

+ 6 - 9
src/sdk/index.js

@@ -82,9 +82,6 @@ class SDK {
 				params.data.meta = JSON.stringify(params.data.meta)
 			}
 		}
-		let sysParams = {
-			clientid: config.clientid
-		} // 客户端ID
 		// if (token) sysParams.token = token // 用户token,新的方式加入header了
 		let method = params.method ? params.method : config.method
 		let timeout = config.timeout;
@@ -95,12 +92,12 @@ class SDK {
 				'x-auth-token': token
 			},
 			data: {
-				...sysParams,
+				clientid: config.clientid,
 				...params.data
 			},
 			dataType: 'json',
 		}
-		switch (method) {
+		switch (method.toUpperCase()) {
 			case 'POST': {
 				axios.post(prepareData.url, qs.stringify(prepareData.data), { headers: prepareData.header, timeout })
 					.then(response => {
@@ -206,10 +203,10 @@ class SDK {
 		if (!params.api) throw new Error("api没有设置")
 	}
 	completeSDK(e, params) {
-		console.log('----------------------------completeSDK----------------------------')
-		console.log(e)
-		console.log(params)
-		console.log('----------------------------completeSDK end----------------------------')
+		// console.log('----------------------------completeSDK----------------------------')
+		// console.log(e)
+		// console.log(params)
+		// console.log('----------------------------completeSDK end----------------------------')
 		// setTimeout(()=>{
 		//   Loading.service().close()
 		// },500)

+ 95 - 87
src/views/common/rtsp-player/index.vue

@@ -2,106 +2,114 @@
     <div>
         <video id="video" style="width: 100%"></video>
         <canvas id="canvas" style="display: none"></canvas>
-        <canvas id="draw"  style="display: none"></canvas>
+        <canvas id="draw" style="display: none"></canvas>
     </div>
 </template>
 
 <script>
-    import Player from './libs/player'
+import Player from "./libs/player";
 
-    export default {
-        name: "index",
-        props:['rtspData'],
-        data(){
-            return{
-                options:{
-                    video:null,
-                    canvas: null,
-                    drawer: null,
-                    wsUrl:null,
-                    rtspUrl:null
-                },
-                player:null
-            }
-        },
-        watch:{
-            'rtspData': {
-                handler(nv,ov){
-                    console.log('新值1->',nv)
-                    if(nv != null && nv.rtsp && nv.ws && /rtsp:\/\/.+/.test(nv.rtsp) && /ws:\/\/.+/.test(nv.ws)){
-                        console.log('新值2->',nv)
-                        this.options.wsUrl = nv.ws
-                        this.options.rtspUrl = nv.rtsp
+export default {
+    name: "index",
+    props: ["rtspData"],
+    data() {
+        return {
+            options: {
+                video: null,
+                canvas: null,
+                drawer: null,
+                wsUrl: null,
+                rtspUrl: null
+            },
+            player: null
+        };
+    },
+    watch: {
+        rtspData: {
+            handler(nv, ov) {
+                console.log("新值1->", nv);
+                if (
+                    nv != null &&
+                    nv.rtsp &&
+                    nv.ws &&
+                    /rtsp:\/\/.+/.test(nv.rtsp) &&
+                    /ws:\/\/.+/.test(nv.ws)
+                ) {
+                    console.log("新值2->", nv);
+                    this.options.wsUrl = nv.ws;
+                    this.options.rtspUrl = nv.rtsp;
 
-                        if(this.options.video && this.options.wsUrl && this.options.rtspUrl) {
-                            console.log('---watch player---')
-                            this.createPlayer()
-                        }
+                    if (
+                        this.options.video &&
+                        this.options.wsUrl &&
+                        this.options.rtspUrl
+                    ) {
+                        console.log("---watch player---");
+                        this.createPlayer();
                     }
-                },
-                immediate:true
-            }
-        },
-        mounted() {
-            console.log('--mounted--')
-            this.options.video = document.getElementById('video')
-            this.options.canvas = document.getElementById('canvas')
-            this.options.drawer = document.getElementById('draw')
-            //this.player.connect()
-            if(this.options.rtspUrl && this.options.wsUrl){
-                console.log('---mounted player---')
-                //直接播放
-                this.createPlayer()
-            }
-        },
-        destroyed() {
-            if(this.player)
-                this.player.close()
-        },
-        methods:{
-            createPlayer(){
-                if(this.player !=null) this.player.close()
-                this.player = new Player(this.options)
-                this.player.init(this)
-                this.player.on('error', function () {
-                    console.log('连接失败')
-                })
-                this.player.on('noStream', function () {
-                    console.log('noStream');
-                    this.player.close();
-                    this.player = null;
-                    this.player = new Player(this.options);
-                    this.player.init();
-                    this.player.connect();
-                })
+                }
+            },
+            immediate: true
+        }
+    },
+    mounted() {
+        console.log("--mounted--");
+        this.options.video = document.getElementById("video");
+        this.options.canvas = document.getElementById("canvas");
+        this.options.drawer = document.getElementById("draw");
+        //this.player.connect()
+        if (this.options.rtspUrl && this.options.wsUrl) {
+            console.log("---mounted player---");
+            //直接播放
+            this.createPlayer();
+        }
+    },
+    destroyed() {
+        if (this.player) this.player.close();
+    },
+    methods: {
+        createPlayer() {
+            if (this.player != null) this.player.close();
+            this.player = new Player(this.options);
+            this.player.init(this);
+            this.player.on("error", function() {
+                console.log("连接失败");
+            });
+            this.player.on("noStream", function() {
+                console.log("noStream");
+                this.player.close();
+                this.player = null;
+                this.player = new Player(this.options);
+                this.player.init();
+                this.player.connect();
+            });
 
-                this.player.on('canplay', function () {
-                    //player.close();
-                })
+            this.player.on("canplay", function() {
+                //player.close();
+            });
 
-                this.player.on('initialCompleted', function () {
-                    // let data = [[
-                    //     {x: 2861, y: 4395},
-                    //     {x: 6403, y: 4013},
-                    //     {x: 3260, y: 7986},
-                    //     {x: 640, y: 6252}
-                    // ]];
-                    // console.log('initialCompleted')
-                    // player.setROI(data);
-                })
+            this.player.on("initialCompleted", function() {
+                // let data = [[
+                //     {x: 2861, y: 4395},
+                //     {x: 6403, y: 4013},
+                //     {x: 3260, y: 7986},
+                //     {x: 640, y: 6252}
+                // ]];
+                // console.log('initialCompleted')
+                // player.setROI(data);
+            });
 
-                this.player.on('ROIFinished', function () {
-                    console.log('ROIFinished');
-                })
-                this.player.connect()
-            },
-            close(){
-                player.close()
-            }
+            this.player.on("ROIFinished", function() {
+                console.log("ROIFinished");
+            });
+            this.player.connect();
+        },
+        close() {
+            player.close();
         }
     }
+};
 </script>
 
 <style scoped>
-
 </style>

+ 26 - 26
src/views/common/rtsp-player/libs/ROIDrawer.js

@@ -53,8 +53,8 @@ class ROIDrawer extends Drawer {
 
     _oncontextmenu(e) {
         e.preventDefault();
-        if(this.currentState === 'end') { //防止点击右键启动绘制
-            return ;
+        if (this.currentState === 'end') { //防止点击右键启动绘制
+            return;
         }
         if (this.points.length <= 2) {
             this._resetPoints();
@@ -67,7 +67,7 @@ class ROIDrawer extends Drawer {
             } else {
                 this.currentState = 'end';
                 this.polygons.push([...this.points]);
-                if(this.polygons.length < this.MAX_POLYGON) {
+                if (this.polygons.length < this.MAX_POLYGON) {
                     this._resetPoints();
                 } else {
                     this.onDrawROIFinishedCallback && this.onDrawROIFinishedCallback();
@@ -95,18 +95,18 @@ class ROIDrawer extends Drawer {
             } else {
                 //this._drawPolygons(this.points);
             }
-            if(this.currentState === 'begin') {
+            if (this.currentState === 'begin') {
                 this._drawText('区域' + (this.polygons.length + 1), pos.x, pos.y)
             }
         }
     }
 
     getROIData() {
-        if(this.currentState !== 'end') { //非完成状态
+        if (this.currentState !== 'end') { //非完成状态
             return null;
         }
         let polygons = [];
-        this.polygons.map((points, k) =>{
+        this.polygons.map((points, k) => {
             let data = points.slice(0, points.length - 1);
             data.map((point, k) => {
                 data[k] = this._to8191Coordinate(point, this.canvas);
@@ -118,17 +118,17 @@ class ROIDrawer extends Drawer {
     }
 
     setROI(polygons) {
-        if(!polygons) {
+        if (!polygons) {
             return;
         }
         let data = [];
-        this.polygons = []; 
+        this.polygons = [];
         polygons.map((points, k) => {
             points.map((point, k) => {
                 let result = this._toRealCoordinate(point.x, point.y);
-                data[k] = {x: result[0], y: result[1]};
+                data[k] = { x: result[0], y: result[1] };
             });
-            if(data.length) {
+            if (data.length) {
                 data[data.length] = data[0];
             }
             this.polygons.push([...data]);
@@ -171,7 +171,7 @@ class ROIDrawer extends Drawer {
 
     _drawPolygons(points) {
         this.context.clearRect(0, 0, this.canvas.width, this.canvas.height);
-        this.polygons.map((points, k)=> {
+        this.polygons.map((points, k) => {
             this._drawPolygon(points);
         });
         this._drawPolygon(points);
@@ -199,7 +199,7 @@ class ROIDrawer extends Drawer {
         }
         this.context.closePath();
 
-        this.polygons.map((points, k)=> {
+        this.polygons.map((points, k) => {
             this._drawText('区域' + (k + 1), points[0].x - 20, points[0].y - 10);
         });
     }
@@ -255,10 +255,10 @@ class StandingDrawer extends Drawer {
                 }
                 this.points.push(pos);
                 let points = this.points.length > 4 ? this.points.slice(0, 4) : this.points;
-                if(checkPolygon(points)) {
+                if (checkPolygon(points)) {
                     this.points.pop();
                 }
-                if(this.points.length === 6) {
+                if (this.points.length === 6) {
                     this.currentState = 'end';
                     this.onDrawROIFinishedCallback && this.onDrawROIFinishedCallback();
                 }
@@ -307,7 +307,7 @@ class StandingDrawer extends Drawer {
     }
 
     _drawPolygon(points) {
-        if(!points.length) {
+        if (!points.length) {
             return;
         }
         this.context.strokeStyle = '#00ff00';
@@ -322,7 +322,7 @@ class StandingDrawer extends Drawer {
     }
 
     _drawLine(points) {
-        if(points.length !== 2) {
+        if (points.length !== 2) {
             return;
         }
         this.context.strokeStyle = '#0000ff';
@@ -334,7 +334,7 @@ class StandingDrawer extends Drawer {
     }
 
     getROIData() {
-        if(this.currentState !== 'end') { //非完成状态
+        if (this.currentState !== 'end') { //非完成状态
             return null;
         }
         let points = [];
@@ -345,13 +345,13 @@ class StandingDrawer extends Drawer {
     }
 
     setROI(points) {
-        if(!points) {
+        if (!points) {
             return;
         }
         let data = [];
         points.map((point, k) => {
             let result = this._toRealCoordinate(point.x, point.y);
-            data[k] = {x: result[0], y: result[1]};
+            data[k] = { x: result[0], y: result[1] };
         });
         this.points = [...data];
         this._drawArea(data);
@@ -401,7 +401,7 @@ class SpeedLine extends Drawer {
     }
 
     _onClick(e) {
-        if(this.points.length === this.MAXLINE * 2) {
+        if (this.points.length === this.MAXLINE * 2) {
             return;
         }
         switch (this.currentState) {
@@ -420,7 +420,7 @@ class SpeedLine extends Drawer {
                     return;
                 }
                 this.points.push(currentPoint);
-                if(this.points.length === this.MAXLINE * 2) {
+                if (this.points.length === this.MAXLINE * 2) {
                     if (this._checkLine(this.points)) {
                         this.points.pop();
                     } else {
@@ -495,7 +495,7 @@ class SpeedLine extends Drawer {
     }
 
     getROIData() {
-        if(this.currentState !== 'end') { //非完成状态
+        if (this.currentState !== 'end') { //非完成状态
             return null;
         }
         let data = this.points;
@@ -508,7 +508,7 @@ class SpeedLine extends Drawer {
     setROI(data) {
         data.map((point, k) => {
             let result = this._toRealCoordinate(point.x, point.y);
-            data[k] = {x: result[0], y: result[1]};
+            data[k] = { x: result[0], y: result[1] };
         });
 
         this.currentState = 'end';
@@ -577,7 +577,7 @@ function getMousePos(canvas, event) {
     var x = event.clientX - rect.left * (canvas.width / rect.width);
     var y = event.clientY - rect.top * (canvas.height / rect.height);
     //console.log("x:"+x+",y:"+y);
-    return {x: x, y: y};
+    return { x: x, y: y };
 }
 
 function checkPolygon(points) {
@@ -621,9 +621,9 @@ function segmentsIntr(a, b, c, d) {
     var t = area_cda / (area_abd - area_abc);
     var dx = t * (b.x - a.x),
         dy = t * (b.y - a.y);
-    return {x: a.x + dx, y: a.y + dy};
+    return { x: a.x + dx, y: a.y + dy };
 
 }
 
 
-export  {ROIDrawer, StandingDrawer, SpeedLine, BlankROIDrawer};
+export { ROIDrawer, StandingDrawer, SpeedLine, BlankROIDrawer };

+ 36 - 36
src/views/common/rtsp-player/libs/websocketServer.js

@@ -1,10 +1,10 @@
 import WorkerManager from './workerManager.js';
-import {hex_md5}  from "./md5.js";
+import { hex_md5 } from "./md5.js";
 
 function WebSocketServer(options) {
     let videoElement = null;
     let canvasElement = null;
-    let ROIElement =null;
+    let ROIElement = null;
     let websocket = null;
     let wsURL = null;
     let rtspURL = null;
@@ -24,7 +24,7 @@ function WebSocketServer(options) {
     let getParameterInterval = null; //保活
     let AACCodecInfo = null;
 
-//RTP包处理相关
+    //RTP包处理相关
     let rtspinterleave = null;
     let RTPPacketTotalSize = 0;
     let rtpheader = null;
@@ -50,7 +50,7 @@ function WebSocketServer(options) {
 
     let v = null;
 
-    function constructor({video, canvas, ROI,wsUrl, rtspUrl,vue} = {options}) {
+    function constructor({ video, canvas, ROI, wsUrl, rtspUrl, vue } = { options }) {
         videoElement = video;
         canvasElement = canvas;
         ROIElement = ROI;
@@ -61,14 +61,14 @@ function WebSocketServer(options) {
         password = ret[2]
         ip = ret[3]
         port = ret[4]
-        wsURL = wsUrl+'?tcpaddr='+ encodeURIComponent(username+":"+password+"@"+ip+":"+port);
+        wsURL = wsUrl + '?tcpaddr=' + encodeURIComponent(username + ":" + password + "@" + ip + ":" + port);
         v = vue
     }
 
     constructor.prototype = {
         init() {
             workerManager = new WorkerManager();
-            workerManager.init(videoElement,canvasElement, ROIElement,v);
+            workerManager.init(videoElement, canvasElement, ROIElement, v);
         },
         connect() {
             websocket = new WebSocket(wsURL);
@@ -79,8 +79,8 @@ function WebSocketServer(options) {
                 websocket.send(option);
                 //console.log('websocket connect')
             };
-            websocket.onerror = ()=> {
-                if(connectFailCallback) {
+            websocket.onerror = () => {
+                if (connectFailCallback) {
                     connectFailCallback('websocket connect fail');
                 }
             }
@@ -90,20 +90,20 @@ function WebSocketServer(options) {
             clearInterval(getStreamInterval);
             SendRtspCommand(CommandConstructor("TEARDOWN", null));
             websocket.close();
-            if(workerManager) {
+            if (workerManager) {
                 workerManager.terminate();
             }
         },
         setCallBack(event, callback) {
             switch (event) {
                 case 'error':
-                    connectFailCallback = ()=>{
+                    connectFailCallback = () => {
                         callback();
                         this.close();
                     };
                     break;
                 case 'noStream':
-                    noStreamCallback = ()=>{
+                    noStreamCallback = () => {
                         callback();
                         this.close();
                     };
@@ -227,14 +227,14 @@ function WebSocketServer(options) {
         //console.log(stringMessage)
         //let seekPoint = stringMessage.search("CSeq: ") + 5;
         let rtspResponseMsg = parseRtsp(stringMessage);
-//console.log(rtspResponseMsg)
+        //console.log(rtspResponseMsg)
         if (rtspResponseMsg.ResponseCode === RTSP_STATE.UNAUTHORIZED && Authentication === "\r\n") { //需要鉴权
-            if(currentState === "Describe") {
+            if (currentState === "Describe") {
                 IsDescribe = false;
                 describekey = false;
             }
-			// username= getUser(rtspURL).username;//用url里覆盖配置
-			// password = getUser(rtspURL).password;
+            // username= getUser(rtspURL).username;//用url里覆盖配置
+            // password = getUser(rtspURL).password;
             //console.log(rtspResponseMsg)
             SendRtspCommand(formDigest(rtspResponseMsg));
             Authentication = "\r\n";
@@ -253,7 +253,7 @@ function WebSocketServer(options) {
                     //console.log(rtspSDPData.Sessions)
                     for (let idx = 0; idx < rtspSDPData.Sessions.length; idx++) {
                         let sdpInfoObj = {};
-                        if (rtspSDPData.Sessions[idx].CodecMime === "H264" ) { //暂时只支持H264
+                        if (rtspSDPData.Sessions[idx].CodecMime === "H264") { //暂时只支持H264
                             sdpInfoObj.codecName = rtspSDPData.Sessions[idx].CodecMime;
                             //sdpInfoObj.trackID = rtspSDPData.Sessions[idx].ControlURL;
                             sdpInfoObj.trackID = rtspSDPData.Sessions[idx].trackID;
@@ -262,7 +262,7 @@ function WebSocketServer(options) {
                             if (typeof rtspSDPData.Sessions[idx].Framerate !== "undefined") {
                                 sdpInfoObj.Framerate = parseInt(rtspSDPData.Sessions[idx].Framerate)
                             }
-                            if(typeof rtspSDPData.Sessions[idx].SPS !== "undefined") {
+                            if (typeof rtspSDPData.Sessions[idx].SPS !== "undefined") {
                                 sdpInfoObj.SPS = rtspSDPData.Sessions[idx].SPS;
                             }
                             SDPinfo.push(sdpInfoObj)
@@ -300,8 +300,8 @@ function WebSocketServer(options) {
                         SendRtspCommand(CommandConstructor("GET_PARAMETER", null))
                     }, SEND_GETPARM_INTERVAL);
 
-                    getStreamInterval = setInterval(()=>{
-                        if(!getBitStream()) {
+                    getStreamInterval = setInterval(() => {
+                        if (!getBitStream()) {
                             console.log('超时!');
                             noStreamCallback && noStreamCallback();
                         }
@@ -353,31 +353,31 @@ function WebSocketServer(options) {
     function CommandConstructor(method, trackID, interleaved) {
         let sendMessage;
         switch (method) {
-            case"OPTIONS":
-            case"TEARDOWN":
-            case"SET_PARAMETERS":
-            case"DESCRIBE":
+            case "OPTIONS":
+            case "TEARDOWN":
+            case "SET_PARAMETERS":
+            case "DESCRIBE":
                 //TODO: 保活
                 sendMessage = method + " " + rtspURL + " RTSP/1.0\r\nCSeq: " + CSeq + "\r\n" + Authentication;
                 break;
-            case"SETUP":
+            case "SETUP":
                 //console.log(trackID)
                 //TODO 多trackID的时候测试一下
                 sendMessage = method + " " + rtspURL + "/" + trackID + " RTSP/1.0\r\nCSeq: " + CSeq + Authentication + "Transport:RTP/AVP/TCP;unicast;interleaved=" + 2 * interleaved + "-" + (2 * interleaved + 1) + "\r\n";
-                if(sessionID == 0) {
+                if (sessionID == 0) {
                     sendMessage += "\r\n";
                 } else {
                     sendMessage += "Session: " + sessionID + "\r\n\r\n";
                 }
                 break;
-            case"PLAY":
+            case "PLAY":
                 sendMessage = method + " " + rtspURL + " RTSP/1.0\r\nCSeq: " + CSeq + "\r\nSession: " + sessionID + "\r\n" + "Range: npt=0.000-\r\n" + Authentication;
                 break;
-            case"PAUSE":
+            case "PAUSE":
                 sendMessage = method + " " + rtspURL + " RTSP/1.0\r\nCSeq: " + CSeq + "\r\nSession: " + sessionID + "\r\n\r\n";
                 break;
-            case"GET_PARAMETER":
-                sendMessage = method + " " + rtspURL + " RTSP/1.0\r\nCSeq: " + CSeq + "\r\nSession: " + sessionID + "\r\n"  + Authentication;
+            case "GET_PARAMETER":
+                sendMessage = method + " " + rtspURL + " RTSP/1.0\r\nCSeq: " + CSeq + "\r\nSession: " + sessionID + "\r\n" + Authentication;
                 break;
             default:
                 console.log('暂不支持的RTSP信令');
@@ -513,7 +513,7 @@ function WebSocketServer(options) {
             let SDPLineTokens = TokenziedDescribe[cnt].split("=");
             if (SDPLineTokens.length > 0) {
                 switch (SDPLineTokens[0]) {
-                    case"a":
+                    case "a":
                         let aLineToken = SDPLineTokens[1].split(":");
                         if (aLineToken.length > 1) {
                             if (aLineToken[0] === "control") {
@@ -594,7 +594,7 @@ function WebSocketServer(options) {
                             }
                         }
                         break;
-                    case"m":
+                    case "m":
                         let mLineToken = SDPLineTokens[1].split(" ");
                         let Session = {};
                         Session.Type = mLineToken[0];
@@ -603,7 +603,7 @@ function WebSocketServer(options) {
                         SDPData.Sessions.push(Session);
                         mediaFound = true;
                         break;
-                    case"b":
+                    case "b":
                         if (mediaFound === true) {
                             let bLineToken = SDPLineTokens[1].split(":");
                             SDPData.Sessions[SDPData.Sessions.length - 1].Bitrate = bLineToken[1]
@@ -616,7 +616,7 @@ function WebSocketServer(options) {
     };
 
     function formDigest(message) {
-        let {Nonce, Realm} = message;
+        let { Nonce, Realm } = message;
         //Realm = '54c415830ec4';
         //Nonce = 'fb01c51948704e59eb5a474b33caff8b';
         let user = {
@@ -629,18 +629,18 @@ function WebSocketServer(options) {
         let responce = hex_md5(hex1 + ":" + Nonce + ":" + hex2);
         Authentication = 'Authorization: Digest username="' + user.username + '", realm="' + Realm + '", nonce="' + Nonce + '",uri="' + rtspURL + '", response="' + responce + '"\r\n' + "Accept: application/sdp\r\n" + '\r\n';
 
-        return  currentState.toUpperCase() + " " + rtspURL + " RTSP/1.0\r\nCSeq: " + CSeq + "\r\n" + Authentication;
+        return currentState.toUpperCase() + " " + rtspURL + " RTSP/1.0\r\nCSeq: " + CSeq + "\r\n" + Authentication;
     }
 
     function getUser(rtspUrl) {
         let user = rtspUrl.split('rtsp://')[1].split('@')[0];
         let username = user.split(':')[0],
             password = user.split(':')[1];
-        return {username, password};
+        return { username, password };
     }
 
     function getBitStream() {
-        if(lastStreamTime === null) {
+        if (lastStreamTime === null) {
             lastStreamTime = Date.now();
         } else {
             //console.log(Date.now() - lastStreamTime)

+ 5 - 5
src/views/deviceManagement/Ad.vue

@@ -1,8 +1,9 @@
 <template>
     <div class="Ad">
-        <h1>Ad </h1>
+        <h1>Ad</h1>
     </div>
 </template>
+
 <script>
 import { mapActions } from "vuex";
 
@@ -13,14 +14,14 @@ export default {
     },
     created() {},
     methods: {
-		...mapActions(["fetch"]),
-		get() {
+        ...mapActions(["fetch"]),
+        get() {
             this.fetch({
                 api: "aaa",
                 method: "GET",
                 data: {},
                 success: res => {
-                    console.log(res)
+                    console.log(res);
                 },
                 fail: err => {
                     console.log(err);
@@ -32,4 +33,3 @@ export default {
     }
 };
 </script>
-

+ 1 - 1
src/views/messageManagement/MessagePoint.vue

@@ -36,7 +36,7 @@
                         <el-form-item label="消息点描述:" prop="description">
                             <el-input v-model="dyForm.description"></el-input>
                         </el-form-item>
-                        <el-form-item label="消息点描述:">
+                        <el-form-item label="备注:">
                             <el-input type="textarea" v-model="dyForm.remark"></el-input>
                         </el-form-item>
                         <el-form-item>