Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev

.gitignore

@@ -15,3 +15,4 @@ src/utils/baseUrl.js
 *.ntvs*
 *.njsproj
 *.sln
+debug.log

src/jmap/theme/fuzhou_01/menus/menuDialog/passwordBox.vue

@@ -106,7 +106,7 @@ export default {
             this.model.password = '';
             this.operate = operate || {};
             this.operation = operate.operation;
-			this.model.username = this.$store.state.user.name;
+            this.model.username = this.$store.state.user.nickname;
         },
         doShow(operate) {
             /** 如果不是断点激活，而是第一次显示需要初始化数据*/

src/views/approval/runPlan/index.vue

@@ -110,9 +110,6 @@ export default {
                 this.queryList.reload();
             }
         },
-        goDetail() {
-            this.$router.push({path:``});
-        },
         async loadInitData() {
             try {
                 // 获取地图

src/views/components/systemTime/digit.vue

@@ -90,10 +90,10 @@ export default {
             return this.fine * 1;
         },
         w() {
-			return this.zoom * 4 + this.fine * 6 + this.p*2;
+            return this.zoom * 4 + this.fine * 6 + this.p * 2;
         },
         h() {
-			return this.zoom * 8 + this.fine * 6 + this.p*2;
+            return this.zoom * 8 + this.fine * 6 + this.p * 2;
         }
     },
     methods: {

src/views/planMonitor/editTool/index.vue

@@ -3,7 +3,6 @@
     <menu-bar ref="menuBar" :plan-convert="PlanConvert" @dispatchDialog="dispatchDialog" />
     <schedule
       ref="schedule"
-      :line-code="lineCode"
       :plan-convert="PlanConvert"
       :max-height="height"
       :max-width="width"
@@ -108,7 +107,7 @@ export default {
     mounted() {
         this.timeDemon = setInterval(() => {
             checkLoginLine();
-        }, 3000 * 60);
+        }, 5000 * 60);
     },
     beforeDestroy() {
         if (this.timeDemon) {
@@ -116,11 +115,6 @@ export default {
         }
     },
     methods: {
-        setPosition() {
-            this.$nextTick(() => {
-                this.$refs.schedule.setPosition();
-            });
-        },
         dispatchDialog(dialogObj) {
             this.$nextTick(() => {
                 if (this.$refs[dialogObj.name]) {

src/views/planMonitor/editTool/schedule.vue

@@ -38,14 +38,10 @@ export default {
         DataTable
     },
     props: {
-        lineCode: {
-            type: String,
+        planConvert: {
+            type: Object,
             required: true
         },
-        // planConvert: {
-        // 	type: Object,
-        // 	required: true
-        // },
         maxWidth: {
             type: Number,
             required: true
@@ -57,7 +53,6 @@ export default {
     },
     data() {
         return {
-            planConvert: null,
             top: 0,
             height: 0,
             mapName: '',
@@ -368,7 +363,7 @@ export default {
                         this.mapName = `${resp.data.name} (${this.$route.query.planName || ''})`;
                     });
                 }
-                this.planConvert = this.$theme.loadPlanConvert(this.lineCode);
+
                 this.$store.dispatch('runPlan/clear').then(() => {
                     this.loadInitChart().then(() => {
                         if (this.$route.query.mapId) {