diff --git a/src/components/QrCode/index.vue b/src/components/QrCode/index.vue
index 1ae436cfa..4a253e8a1 100644
--- a/src/components/QrCode/index.vue
+++ b/src/components/QrCode/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="title" :visible.sync="dialogVisible" width="35%" :before-close="done => {}" :show-close="false" center>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="35%" :before-close="done => {}" :show-close="false" center>
     <div style="text-align:center;  margin:auto;">
       <qrcode-vue v-loading="loading" :value="url" :size="400" />
     </div>
diff --git a/src/jmap/theme/batong_01/menus/dialog/childDialog/childDialog/noticeInfo.vue b/src/jmap/theme/batong_01/menus/dialog/childDialog/childDialog/noticeInfo.vue
index c5005cae8..3abfe099a 100644
--- a/src/jmap/theme/batong_01/menus/dialog/childDialog/childDialog/noticeInfo.vue
+++ b/src/jmap/theme/batong_01/menus/dialog/childDialog/childDialog/noticeInfo.vue
@@ -1,72 +1,81 @@
 <template>
-    <el-dialog class="fuzhou_01 notice-info" :title="title" :visible.sync="show" width="360px" :before-close="doClose"
-        :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <div class="context">
-            <template v-for="message in messages">
-                <span>{{message}}</span><br>
-            </template>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="10" :offset="8">
-                <el-button :id="domIdSure" type="primary" @click="commit">确定</el-button>
-            </el-col>
-        </el-row>
-        </span>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="fuzhou_01 notice-info"
+    :title="title"
+    :visible.sync="show"
+    width="360px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div class="context">
+      <template v-for="message in messages">
+        <span>{{ message }}</span><br>
+      </template>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="8">
+        <el-button :id="domIdSure" type="primary" @click="commit">确定</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/ConstDic';
 
-    export default {
-        name: 'NoticeInfo',
-        data() {
-            return {
-                dialogShow: false,
-                messages: ['命令下达失败'],
-                operate: null
-            }
-        },
-        computed: {
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            title() {
-                return '提示';
-            },
-            domIdSure() {
-                return this.dialogShow ? OperationEvent.Command.close.notice.domId : '';
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            doShow(operate, messages) {
-                this.operate = operate || {};
-                this.dialogShow = true;
-                this.messages = ['命令下达失败'];
-                if (messages) {
-                    this.messages = messages;
-                }
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                this.doClose();
-            },
-            cancel() {
-                this.doClose();
-            }
-        }
-    }
+export default {
+	name: 'NoticeInfo',
+	data() {
+		return {
+			dialogShow: false,
+			messages: ['命令下达失败'],
+			operate: null
+		};
+	},
+	computed: {
+		show() {
+			return this.dialogShow && !this.$store.state.menuOperation.break;
+		},
+		title() {
+			return '提示';
+		},
+		domIdSure() {
+			return this.dialogShow ? OperationEvent.Command.close.notice.domId : '';
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.$store.dispatch('training/tipReload');
+		});
+	},
+	methods: {
+		doShow(operate, messages) {
+			this.operate = operate || {};
+			this.dialogShow = true;
+			this.messages = ['命令下达失败'];
+			if (messages) {
+				this.messages = messages;
+			}
+			this.$nextTick(function () {
+				this.$store.dispatch('training/emitTipFresh');
+			});
+		},
+		doClose() {
+			this.dialogShow = false;
+			this.$store.dispatch('training/emitTipFresh');
+		},
+		commit() {
+			this.doClose();
+		},
+		cancel() {
+			this.doClose();
+		}
+	}
+};
 
 </script>
 <style>
@@ -74,4 +83,4 @@
         padding-bottom: 40px !important;
         border: 1px solid lightgray;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/beijing_01/menus/menuDialog/detainTrainContorl.vue b/src/jmap/theme/beijing_01/menus/menuDialog/detainTrainContorl.vue
index ba84a4ed5..15ac09aa4 100644
--- a/src/jmap/theme/beijing_01/menus/menuDialog/detainTrainContorl.vue
+++ b/src/jmap/theme/beijing_01/menus/menuDialog/detainTrainContorl.vue
@@ -1,13 +1,18 @@
 <template>
   <el-dialog
-class="beijing-01__systerm station-control"
-:title="title" :visible.sync="show" width="400px"
-             :before-close="doClose"
-:show-close="true" :z-index="2000" :modal="false" v-dialogDrag
-        :close-on-click-modal="false"
->
+    v-dialogDrag
+    class="beijing-01__systerm station-control"
+    :title="title"
+    :visible.sync="show"
+    width="400px"
+    :before-close="doClose"
+    :show-close="true"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
     <el-radio-group v-model="control" :disabled="true">
-      <el-row v-for="item in Object.keys(controlProps)" style="padding-bottom: 10px;padding-top:10px" :key="item">
+      <el-row v-for="item in Object.keys(controlProps)" :key="item" style="padding-bottom: 10px;padding-top:10px">
         <el-radio :label="item" disabled="false">{{ controlProps[item] }}</el-radio>
       </el-row>
     </el-radio-group>
@@ -16,7 +21,7 @@ class="beijing-01__systerm station-control"
       <el-button :id="domIdCancel" :disabled="disabledClose" style="margin-left: 200px" @click="cancel">退出
       </el-button>
     </el-row>
-    <notice-info ref="noticeInfo"/>
+    <notice-info ref="noticeInfo" />
   </el-dialog>
 </template>
 
diff --git a/src/jmap/theme/beijing_01/menus/menuDialog/viewTrainId.vue b/src/jmap/theme/beijing_01/menus/menuDialog/viewTrainId.vue
index 4cbeb6cb4..7449859bc 100644
--- a/src/jmap/theme/beijing_01/menus/menuDialog/viewTrainId.vue
+++ b/src/jmap/theme/beijing_01/menus/menuDialog/viewTrainId.vue
@@ -1,10 +1,15 @@
 <template>
   <el-dialog
-class="beijing-01__systerm view-train-id"
-title="列车识别号显示设置" :visible.sync="show" width="420px"
-             :before-close="doClose"
-:z-index="2000" :modal="false" v-dialogDrag :close-on-click-modal="false"
->
+    v-dialogDrag
+    class="beijing-01__systerm view-train-id"
+    title="列车识别号显示设置"
+    :visible.sync="show"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
     <div style="padding: 10px 20px; border: 1px double lightgray;">
       <span class="base-label">计划车显示模式</span>
       <el-radio-group v-model="planMode">
@@ -51,7 +56,7 @@ title="列车识别号显示设置" :visible.sync="show" width="420px"
       <span class="base-label">字体大小</span>
       <el-row>
         <el-col :span="10">
-          <el-input v-model="fontSize" size="small" min="16" max="99"/>
+          <el-input v-model="fontSize" size="small" min="16" max="99" />
         </el-col>
         <el-col :span="10" :offset="1">
           <span style="height:32px; line-height:32px;">（范围：16-99）</span>
@@ -66,7 +71,7 @@ title="列车识别号显示设置" :visible.sync="show" width="420px"
         <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
       </el-col>
     </el-row>
-    <notice-info ref="noticeInfo"/>
+    <notice-info ref="noticeInfo" />
   </el-dialog>
 </template>
 
@@ -76,20 +81,20 @@ import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
 
 export default {
 	name: 'ViewTrainId',
-        components: {
-            NoticeInfo
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                operate: null,
-                operation: '',
-                planMode: 5,
-                headMode: 5,
-                fontSize: 16,
-            }
-        },
+	components: {
+		NoticeInfo
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			operate: null,
+			operation: '',
+			planMode: 5,
+			headMode: 5,
+			fontSize: 16
+		};
+	},
 	computed: {
 		show() {
 			return this.dialogShow && !this.$store.state.menuOperation.break;
diff --git a/src/jmap/theme/chengdu_03/menus/menuDialog/viewTrainId.vue b/src/jmap/theme/chengdu_03/menus/menuDialog/viewTrainId.vue
index d3cde99aa..b21f46e0f 100644
--- a/src/jmap/theme/chengdu_03/menus/menuDialog/viewTrainId.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuDialog/viewTrainId.vue
@@ -1,10 +1,15 @@
 <template>
   <el-dialog
-class="chengdou-03__systerm view-train-id"
-title="列车识别号显示设置" :visible.sync="show" width="420px"
-             :before-close="doClose"
-:z-index="2000" :modal="false" v-dialogDrag :close-on-click-modal="false"
->
+    v-dialogDrag
+    class="chengdou-03__systerm view-train-id"
+    title="列车识别号显示设置"
+    :visible.sync="show"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
     <div style="padding: 10px 20px; border: 1px double lightgray;">
       <span class="base-label">计划车显示模式</span>
       <el-radio-group v-model="planMode">
@@ -51,7 +56,7 @@ title="列车识别号显示设置" :visible.sync="show" width="420px"
       <span class="base-label">字体大小</span>
       <el-row>
         <el-col :span="10">
-          <el-input v-model="fontSize" size="small" min="16" max="99"/>
+          <el-input v-model="fontSize" size="small" min="16" max="99" />
         </el-col>
         <el-col :span="10" :offset="1">
           <span style="height:32px; line-height:32px;">（范围：16-99）</span>
@@ -66,7 +71,7 @@ title="列车识别号显示设置" :visible.sync="show" width="420px"
         <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
       </el-col>
     </el-row>
-    <notice-info ref="noticeInfo"/>
+    <notice-info ref="noticeInfo" />
   </el-dialog>
 </template>
 
@@ -76,20 +81,20 @@ import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
 
 export default {
 	name: 'ViewTrainId',
-        components: {
-            NoticeInfo
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                operate: null,
-                operation: '',
-                planMode: 5,
-                headMode: 5,
-                fontSize: 16,
-            }
-        },
+	components: {
+		NoticeInfo
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			operate: null,
+			operation: '',
+			planMode: 5,
+			headMode: 5,
+			fontSize: 16
+		};
+	},
 	computed: {
 		show() {
 			return this.dialogShow && !this.$store.state.menuOperation.break;
diff --git a/src/layout/components/Language.vue b/src/layout/components/Language.vue
index 074e651ba..7140c0f5e 100644
--- a/src/layout/components/Language.vue
+++ b/src/layout/components/Language.vue
@@ -1,9 +1,11 @@
 <template>
   <el-dialog
+    v-dialogDrag
     :title="$t('global.switchLanguage')"
     :visible.sync="visible"
     width="360px"
     :before-close="doClose"
+    class="language_box"
   >
     <div style="">
       <span>{{ $t('global.language') }}：</span>
@@ -53,3 +55,9 @@ export default {
 	}
 };
 </script>
+
+<style rel="stylesheet/scss" lang="scss">
+	.language_box .el-dialog__header{
+		padding: 0 20px 10px;
+	}
+</style>
diff --git a/src/layout/components/Qcode.vue b/src/layout/components/Qcode.vue
index 205a284c6..39ee5418d 100644
--- a/src/layout/components/Qcode.vue
+++ b/src/layout/components/Qcode.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="$t('global.chooseRoom')" :visible.sync="centerDialogVisible" width="30%" center>
+  <el-dialog v-dialogDrag :title="$t('global.chooseRoom')" :visible.sync="centerDialogVisible" width="30%" center>
     <el-input v-model="input" :placeholder="$t('global.inputRoomNumber')" />
     <span slot="footer" class="dialog-footer">
       <el-button @click="centerDialogVisible = false">{{ $t('global.cancel') }}</el-button>
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index d1854ce6c..871e8ec9c 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -5,7 +5,7 @@ export function getBaseUrl() {
 		// BASE_API = 'https://joylink.club/jlcloud';
 		BASE_API = 'https://test.joylink.club/jlcloud';
 		// BASE_API = 'http://192.168.3.5:9000'; // 袁琪
-		// BASE_API = 'http://192.168.10.4:9000'; // 旭强
+		// BASE_API = 'http://192.168.3.6:9000'; // 旭强
 		// BASE_API = 'http://192.168.3.41:9000'; // 王兴杰
 	} else {
 		BASE_API = process.env.VUE_APP_BASE_API;
diff --git a/src/views/components/limits/distribute.vue b/src/views/components/limits/distribute.vue
index 0460bb11a..c454346e3 100644
--- a/src/views/components/limits/distribute.vue
+++ b/src/views/components/limits/distribute.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="title" :visible.sync="dialogVisible" width="35%" :before-close="handleClose" center>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="35%" :before-close="handleClose" center>
     <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
     <span slot="footer" class="dialog-footer">
       <el-button type="primary" @click="handleSure">{{ $t('global.confirm') }}</el-button>
diff --git a/src/views/components/limits/transfer.vue b/src/views/components/limits/transfer.vue
index 9e9c70a69..892d8ac2d 100644
--- a/src/views/components/limits/transfer.vue
+++ b/src/views/components/limits/transfer.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="title" :visible.sync="dialogVisible" width="35%" :before-close="handleClose" center>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="35%" :before-close="handleClose" center>
     <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
     <span slot="footer" class="dialog-footer">
       <el-button type="primary" @click="handleSure">{{ $t('global.confirm') }}</el-button>
diff --git a/src/views/display/demon/addQuest.vue b/src/views/display/demon/addQuest.vue
index 55c7195e5..6f931c78d 100644
--- a/src/views/display/demon/addQuest.vue
+++ b/src/views/display/demon/addQuest.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <el-dialog
+      v-dialogDrag
       :title="$t('display.script.scriptList')"
       :visible.sync="show"
       top="50px"
@@ -17,6 +18,7 @@
       />
     </el-dialog>
     <el-dialog
+      v-dialogDrag
       :title="$t('display.script.roleSelect')"
       :visible.sync="roleShow"
       top="50px"
@@ -41,8 +43,8 @@
         </el-form>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="roleDoClose">{{$t('global.cancel')}}</el-button>
-        <el-button type="primary" @click="confirm">{{$t('global.confirm')}}</el-button>
+        <el-button @click="roleDoClose">{{ $t('global.cancel') }}</el-button>
+        <el-button type="primary" @click="confirm">{{ $t('global.confirm') }}</el-button>
       </span>
     </el-dialog>
   </div>
diff --git a/src/views/display/demon/faultChoose.vue b/src/views/display/demon/faultChoose.vue
index b72efb3c8..0845baac2 100644
--- a/src/views/display/demon/faultChoose.vue
+++ b/src/views/display/demon/faultChoose.vue
@@ -1,161 +1,160 @@
 <template>
-    <el-dialog :title="title" :visible.sync="dialogShow" width="800px" :before-close="doClose" :modal="false">
-        <div class="draft">
-            <el-radio-group v-model="auto">
-                <el-radio :label="false" border>{{$t('display.faultChoose.manual')}}</el-radio>
-                <el-radio :label="true" border>{{$t('display.faultChoose.automatic')}}</el-radio>
-            </el-radio-group>
-        </div>
-        <div class="card" v-if="auto">
-            <QueryListPage ref="pageRules" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList">
-            </QueryListPage>
-        </div>
-        <span slot="footer" class="dialog-footer">
-            <el-button @click="dialogShow = false">{{$t('global.cancel')}}</el-button>
-            <el-button type="primary" @click="handleConfirm" :loading="loading">{{$t('global.confirm')}}</el-button>
-        </span>
-    </el-dialog>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogShow" width="800px" :before-close="doClose" :modal="false">
+    <div class="draft">
+      <el-radio-group v-model="auto">
+        <el-radio :label="false" border>{{ $t('display.faultChoose.manual') }}</el-radio>
+        <el-radio :label="true" border>{{ $t('display.faultChoose.automatic') }}</el-radio>
+      </el-radio-group>
+    </div>
+    <div v-if="auto" class="card">
+      <QueryListPage ref="pageRules" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogShow = false">{{ $t('global.cancel') }}</el-button>
+      <el-button type="primary" :loading="loading" @click="handleConfirm">{{ $t('global.confirm') }}</el-button>
+    </span>
+  </el-dialog>
 </template>
 
 <script>
-    import { getFailureGenerateRules, setFailureMode } from '@/api/simulation'
-    import { FaultStatusEnum } from '@/scripts/FaultDic';
-    import ModelType from "@/jmap/constant/deviceType";
+import { getFailureGenerateRules, setFailureMode } from '@/api/simulation';
+import { FaultStatusEnum } from '@/scripts/FaultDic';
+import ModelType from '@/jmap/constant/deviceType';
 
-    export default {
-        name: 'FaultChoose',
-        props: {
-            group: {
-                type: String,
-                required: true
-            }
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                deviceMap: {},
-                auto: false,
-                pagerConfig: {
-                    pageSize: 'pageSize',
-                    pageIndex: 'pageNum'
-                },
-                queryForm: {
-                    reset: true,
-                    labelWidth: '80px',
-                    queryObject: {
-                        condition: {
-                            type: 'text',
-                            label: this.$t('display.faultChoose.settingCondition')
-                        }
-                    }
-                },
-                queryList: {
-                    query: null,
-                    selectCheckShow: false,
-                    radioShow: true,
-                    columns: [
-                        {
-                            title: this.$t('display.faultChoose.settingCondition'),
-                            prop: 'condition'
-                        },
-                        {
-                            title: this.$t('display.faultChoose.triggerTarget'),
-                            prop: 'target'
-                        }
-                    ]
-                },
-            }
-        },
-        computed: {
-            title() {
-                return this.$t('display.faultChoose.selectFault')
-            },
-            skinCode() {
-                return this.$route.query.skinCode;
-            }
-        },
-        mounted() {
-            this.$Dictionary.physicalViewType().then(list => {
-                this.deviceMap = [];
-                list.forEach(elem => {
-                    this.deviceMap[elem.code] = elem.name;
-                })
-            });
-        },
-        methods: {
-            formatNameByCode(code) {
-                let name = '';
-                let device = this.$store.getters['map/getDeviceByCode'](code);
-                if (device) {
-                    switch (device._type) {
-                        case ModelType.Signal:
-                        case ModelType.Switch:
-                        case ModelType.Station:
-                        case ModelType.Section: {
-                            name += device.name;
-                            break
-                        }
-                    }
-                    if (device.stationCode) {
-                        let station = this.$store.getters['map/getDeviceByCode'](device.stationCode);
-                        if (station) {
-                            name += '【' + station.name + '】';
-                        }
-                    }
-                }
+export default {
+	name: 'FaultChoose',
+	props: {
+		group: {
+			type: String,
+			required: true
+		}
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			deviceMap: {},
+			auto: false,
+			pagerConfig: {
+				pageSize: 'pageSize',
+				pageIndex: 'pageNum'
+			},
+			queryForm: {
+				reset: true,
+				labelWidth: '80px',
+				queryObject: {
+					condition: {
+						type: 'text',
+						label: this.$t('display.faultChoose.settingCondition')
+					}
+				}
+			},
+			queryList: {
+				query: null,
+				selectCheckShow: false,
+				radioShow: true,
+				columns: [
+					{
+						title: this.$t('display.faultChoose.settingCondition'),
+						prop: 'condition'
+					},
+					{
+						title: this.$t('display.faultChoose.triggerTarget'),
+						prop: 'target'
+					}
+				]
+			}
+		};
+	},
+	computed: {
+		title() {
+			return this.$t('display.faultChoose.selectFault');
+		},
+		skinCode() {
+			return this.$route.query.skinCode;
+		}
+	},
+	mounted() {
+		this.$Dictionary.physicalViewType().then(list => {
+			this.deviceMap = [];
+			list.forEach(elem => {
+				this.deviceMap[elem.code] = elem.name;
+			});
+		});
+	},
+	methods: {
+		formatNameByCode(code) {
+			let name = '';
+			const device = this.$store.getters['map/getDeviceByCode'](code);
+			if (device) {
+				switch (device._type) {
+				case ModelType.Signal:
+				case ModelType.Switch:
+				case ModelType.Station:
+				case ModelType.Section: {
+					name += device.name;
+					break;
+				}
+				}
+				if (device.stationCode) {
+					const station = this.$store.getters['map/getDeviceByCode'](device.stationCode);
+					if (station) {
+						name += '【' + station.name + '】';
+					}
+				}
+			}
 
-                return name;
-            },
-            doShow() {
-                this.dialogShow = true;
-                this.queryList.data = [];
-                getFailureGenerateRules({ skin: this.skinCode, group: this.group }).then(response => {
-                    let data = response.data;
-                    data.forEach(elem => {
-                        this.queryList.data.push({
-                            id: elem.id,
-                            condition: `${this.deviceMap[elem.condition.triggerDeviceType]}${this.formatNameByCode(elem.condition.triggerDeviceCode)} 状态：${FaultStatusEnum[elem.condition.triggerDeviceType][elem.condition.triggerDeviceStatus]}`,
-                            target: `${this.deviceMap[elem.targetDeviceType]}${this.formatNameByCode(elem.targetDeviceCode)}`
-                        });
-                    });
-                })
-            },
-            doClose() {
-                this.dialogShow = false;
-            },
-            getFailureModel(auto) {
-                let model = { auto };
-                if (auto) {
-                    const choose = this.$refs.pageRules.currentChoose();
-                    if (choose) {
-                        choose.id ? Object.assign(model, { ruleId: choose.id }) : this.$messageBox(this.$t('display.faultChoose.selectRules'));
-                    }
-                }
+			return name;
+		},
+		doShow() {
+			this.dialogShow = true;
+			this.queryList.data = [];
+			getFailureGenerateRules({ skin: this.skinCode, group: this.group }).then(response => {
+				const data = response.data;
+				data.forEach(elem => {
+					this.queryList.data.push({
+						id: elem.id,
+						condition: `${this.deviceMap[elem.condition.triggerDeviceType]}${this.formatNameByCode(elem.condition.triggerDeviceCode)} 状态：${FaultStatusEnum[elem.condition.triggerDeviceType][elem.condition.triggerDeviceStatus]}`,
+						target: `${this.deviceMap[elem.targetDeviceType]}${this.formatNameByCode(elem.targetDeviceCode)}`
+					});
+				});
+			});
+		},
+		doClose() {
+			this.dialogShow = false;
+		},
+		getFailureModel(auto) {
+			const model = { auto };
+			if (auto) {
+				const choose = this.$refs.pageRules.currentChoose();
+				if (choose) {
+					choose.id ? Object.assign(model, { ruleId: choose.id }) : this.$messageBox(this.$t('display.faultChoose.selectRules'));
+				}
+			}
 
-                return model;
-            },
-            handleConfirm() {
-                this.$nextTick(() => {
-                    let faultModel = this.getFailureModel(this.auto);
-                    setFailureMode(faultModel, this.group).then(() => {
-                        this.$message.success(this.$t('display.faultChoose.setFaultSuccess'));
-                    }).catch(error => {
-                        this.$messageBox(this.$t('display.faultChoose.setFaultFail'));
-                    })
+			return model;
+		},
+		handleConfirm() {
+			this.$nextTick(() => {
+				const faultModel = this.getFailureModel(this.auto);
+				setFailureMode(faultModel, this.group).then(() => {
+					this.$message.success(this.$t('display.faultChoose.setFaultSuccess'));
+				}).catch(error => {
+					this.$messageBox(this.$t('display.faultChoose.setFaultFail'));
+				});
 
-                    this.doClose();
-                })
-            },
-            reloadTable() {
-                this.queryList.reload()
-            }
-        }
-    }
+				this.doClose();
+			});
+		},
+		reloadTable() {
+			this.queryList.reload();
+		}
+	}
+};
 </script>
 <style scoped rel="stylesheet/scss" lang="scss">
     .draft {
         text-align: center;
         margin-bottom: 10px;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/display/demon/runPlanView.vue b/src/views/display/demon/runPlanView.vue
index 7f16fc34b..e07eab2f1 100644
--- a/src/views/display/demon/runPlanView.vue
+++ b/src/views/display/demon/runPlanView.vue
@@ -1,5 +1,6 @@
 <template>
   <el-dialog
+    v-dialogDrag
     :title="title"
     :visible.sync="dialogShow"
     width="100%"
diff --git a/src/views/display/demon/scheduling.vue b/src/views/display/demon/scheduling.vue
index 03ae5c688..522ce7a21 100644
--- a/src/views/display/demon/scheduling.vue
+++ b/src/views/display/demon/scheduling.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <el-dialog
+      v-dialogDrag
       :title="title"
       :visible.sync="show"
       top="50px"
@@ -45,8 +46,8 @@
               <el-col :span="6">
                 <el-form-item style="text-align: right">
                   <el-button-group>
-                    <el-button size="small" type="warning" @click="handleCheck">{{$t('display.schedule.check')}}</el-button>
-                    <el-button size="small" type="primary" @click="handleSave">{{$t('display.schedule.save')}}</el-button>
+                    <el-button size="small" type="warning" @click="handleCheck">{{ $t('display.schedule.check') }}</el-button>
+                    <el-button size="small" type="primary" @click="handleSave">{{ $t('display.schedule.save') }}</el-button>
                   </el-button-group>
                 </el-form-item>
               </el-col>
diff --git a/src/views/display/demon/setTime.vue b/src/views/display/demon/setTime.vue
index 86f89aeef..fa6bdff07 100644
--- a/src/views/display/demon/setTime.vue
+++ b/src/views/display/demon/setTime.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="title" :visible.sync="show" width="550px" :before-close="doClose">
+  <el-dialog v-dialogDrag :title="title" :visible.sync="show" width="550px" :before-close="doClose">
     <el-form ref="form" label-width="120px" :model="formModel" :rules="rules">
       <el-form-item :label="$t('display.setTime.systemTime')" prop="initTime">
         <el-time-picker
diff --git a/src/views/error-page/401.vue b/src/views/error-page/401.vue
index a697c763a..3b44ee832 100644
--- a/src/views/error-page/401.vue
+++ b/src/views/error-page/401.vue
@@ -28,7 +28,7 @@
         <img :src="errGif" width="313" height="428" alt="Girl has dropped her ice cream.">
       </el-col>
     </el-row>
-    <el-dialog :visible.sync="dialogVisible" :title="this.$t('error.casualLook')">
+    <el-dialog v-dialogDrag :visible.sync="dialogVisible" :title="this.$t('error.casualLook')">
       <img :src="ewizardClap" class="pan-img">
     </el-dialog>
   </div>
diff --git a/src/views/lesson/lessoncategory/edit/chapter/list.vue b/src/views/lesson/lessoncategory/edit/chapter/list.vue
index 69ecf2f26..e35b6c16f 100644
--- a/src/views/lesson/lessoncategory/edit/chapter/list.vue
+++ b/src/views/lesson/lessoncategory/edit/chapter/list.vue
@@ -1,5 +1,6 @@
 <template>
   <el-dialog
+    v-dialogDrag
     :title="this.$t('lesson.trainingList')"
     :visible.sync="show"
     top="20px"
@@ -12,7 +13,6 @@
 </template>
 
 <script>
-import { listPublishMap, putMapProductOnLine, putMapProductOffLine } from '@/api/jmap/mapdraft';
 import { getProductList } from '@/api/management/mapprd';
 import { pageQueryTraining } from '@/api/jmap/training';
 import { getSkinCodeList } from '@/api/management/mapskin';
@@ -23,10 +23,16 @@ export default {
 	name: 'TrainList',
 	props: {
 		trainings: {
-			type: Array
+			type: Array,
+			default() {
+				return null;
+			}
 		},
 		detail: {
-			type: Object
+			type: Object,
+			default() {
+				return null;
+			}
 		}
 	},
 	data() {
@@ -63,7 +69,7 @@ export default {
 						type: 'select',
 						label: this.$t('lesson.automaticOrManual'),
 						config: {
-							data: [{ value: '02', label: this.$t('lesson.automatic'), }, { value: '01', label: this.$t('lesson.manual'), }]
+							data: [{ value: '02', label: this.$t('lesson.automatic') }, { value: '01', label: this.$t('lesson.manual') }]
 						}
 					}
 				}
diff --git a/src/views/lesson/lessoncategory/edit/create/index.vue b/src/views/lesson/lessoncategory/edit/create/index.vue
index 1a1dfc1b1..849993964 100644
--- a/src/views/lesson/lessoncategory/edit/create/index.vue
+++ b/src/views/lesson/lessoncategory/edit/create/index.vue
@@ -1,88 +1,87 @@
 <template>
-    <el-dialog :title="this.$t('lesson.createNewCoursesFromRelease')" :visible.sync="dialogShow" width="600px" :before-close="doClose">
-        <el-form ref="form" :model="courseModel" :rules="rules" label-width="120px" size="mini">
-            <el-form-item :label="this.$t('lesson.publishCourseName')" prop="code">
-                <el-select v-model="courseModel.code" :placeholder="$t('rules.pleaseSelect')">
-                    <el-option v-for="item in lessonList" :key="item.code" :value="item.code" :label="item.name">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item :label="this.$t('lesson.draftCourseName')" prop="name">
-                <el-input v-model="courseModel.name"></el-input>
-            </el-form-item>
-        </el-form>
-        <span slot="footer" class="dialog-footer">
-            <el-button @click="dialogShow = false">{{$t('global.cancel')}}</el-button>
-            <el-button type="primary" @click="create" :loading="loading">{{$t('global.confirm')}}</el-button>
-        </span>
-    </el-dialog>
+  <el-dialog v-dialogDrag :title="this.$t('lesson.createNewCoursesFromRelease')" :visible.sync="dialogShow" width="600px" :before-close="doClose">
+    <el-form ref="form" :model="courseModel" :rules="rules" label-width="120px" size="mini">
+      <el-form-item :label="this.$t('lesson.publishCourseName')" prop="code">
+        <el-select v-model="courseModel.code" :placeholder="$t('rules.pleaseSelect')">
+          <el-option v-for="item in lessonList" :key="item.code" :value="item.code" :label="item.name" />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="this.$t('lesson.draftCourseName')" prop="name">
+        <el-input v-model="courseModel.name" />
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogShow = false">{{ $t('global.cancel') }}</el-button>
+      <el-button type="primary" :loading="loading" @click="create">{{ $t('global.confirm') }}</el-button>
+    </span>
+  </el-dialog>
 
 </template>
 
 <script>
-    import { getPublishLessonList } from '@/api/jmap/lesson';
-    import { createLessonFromPublish } from '@/api/jmap/lessondraft';
+import { getPublishLessonList } from '@/api/jmap/lesson';
+import { createLessonFromPublish } from '@/api/jmap/lessondraft';
 
-    export default {
-        name: 'MapCreate',
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                lessonList: [],
-                courseModel: {
-                    code: '',
-                    name: '',
-                }
-            }
-        },
-        computed: {
-            rules() {
-                let baseRules = {
-                    code: [
-                        { required: true, message: this.$t('rules.selectCourseName'), trigger: 'change' }
-                    ],
-                    name: [
-                        { required: true, message: this.$t('rules.enterCourseName'), trigger: 'change' }
-                    ]
-                }
-                return baseRules;
-            }
-        },
-        mounted() {
-            this.lessonList = [];
-            getPublishLessonList().then(response => {
-                this.lessonList = response.data.map(elem => { return { code: elem.id, name: elem.name }; })
-            }).catch(error => {
-                this.$messageBox(this.$t('error.refreshFailed'))
-            });
-        },
-        methods: {
-            doShow(node) {
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.dialogShow = false;
-            },
-            create() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        let model = {
-                            id: this.courseModel.code,
-                            name: this.courseModel.name,
-                        }
-                        createLessonFromPublish(model).then(response => {
-                            this.$emit('refresh');
-                            this.doClose();
-                            this.$message.success(this.$t('tip.createSuccess'));
-                        }).catch(error => {
-                            this.$messageBox(this.$t('tip.creatingFailed'))
-                        });
-                    }
-                });
-            }
-        }
-    }
+export default {
+	name: 'MapCreate',
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			lessonList: [],
+			courseModel: {
+				code: '',
+				name: ''
+			}
+		};
+	},
+	computed: {
+		rules() {
+			const baseRules = {
+				code: [
+					{ required: true, message: this.$t('rules.selectCourseName'), trigger: 'change' }
+				],
+				name: [
+					{ required: true, message: this.$t('rules.enterCourseName'), trigger: 'change' }
+				]
+			};
+			return baseRules;
+		}
+	},
+	mounted() {
+		this.lessonList = [];
+		getPublishLessonList().then(response => {
+			this.lessonList = response.data.map(elem => { return { code: elem.id, name: elem.name }; });
+		}).catch(error => {
+			this.$messageBox(this.$t('error.refreshFailed'));
+		});
+	},
+	methods: {
+		doShow(node) {
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.dialogShow = false;
+		},
+		create() {
+			this.$refs.form.validate((valid) => {
+				if (valid) {
+					const model = {
+						id: this.courseModel.code,
+						name: this.courseModel.name
+					};
+					createLessonFromPublish(model).then(response => {
+						this.$emit('refresh');
+						this.doClose();
+						this.$message.success(this.$t('tip.createSuccess'));
+					}).catch(error => {
+						this.$messageBox(this.$t('tip.creatingFailed'));
+					});
+				}
+			});
+		}
+	}
+};
 </script>
 <style>
     .option-group {
diff --git a/src/views/lesson/lessoncategory/edit/lesson/publish.vue b/src/views/lesson/lessoncategory/edit/lesson/publish.vue
index 7e8cc2256..498edc7b8 100644
--- a/src/views/lesson/lessoncategory/edit/lesson/publish.vue
+++ b/src/views/lesson/lessoncategory/edit/lesson/publish.vue
@@ -1,136 +1,140 @@
 <template>
-    <el-dialog :title="this.$t('lesson.courseRelease')" :visible.sync="dialogShow" width="30%" :before-doClose="doClose">
-        <div>
-            <el-form label-position="right" ref="form" :rules="rules" :model="editModel" label-width="140px"
-                @submit.native.prevent>
-                <el-form-item :label="this.$t('lesson.releaseAssociatedCity')" prop="cityCode">
-                    <el-select v-model="editModel.cityCode" @change="cityChange" :placeholder="this.$t('rules.pleaseSelect')">
-                        <el-option v-for="item in cityList" :key="item.code" :label="item.name" :value="item.code">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item :label="this.$t('lesson.releaseAssociatedMap')" prop="mapId">
-                    <el-select v-model="editModel.mapId" @change="mapChange" :placeholder="this.$t('rules.pleaseSelect')">
-                        <el-option v-for="item in mapList" :key="item.id" :label="item.name" :value="item.id">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item :label="this.$t('lesson.publishCourseName')" prop="name">
-                    <el-input v-model="editModel.name"></el-input>
-                </el-form-item>
-            </el-form>
-        </div>
-        <span slot="footer" class="dialog-footer">
-            <el-button @click="dialogShow = false">{{$t('global.cancel')}}</el-button>
-            <el-button type="primary" @click="doSave" :loading="loading">{{$t('global.confirm')}}</el-button>
-        </span>
-    </el-dialog>
+  <el-dialog v-dialogDrag :title="this.$t('lesson.courseRelease')" :visible.sync="dialogShow" width="30%" :before-do-close="doClose">
+    <div>
+      <el-form
+        ref="form"
+        label-position="right"
+        :rules="rules"
+        :model="editModel"
+        label-width="140px"
+        @submit.native.prevent
+      >
+        <el-form-item :label="this.$t('lesson.releaseAssociatedCity')" prop="cityCode">
+          <el-select v-model="editModel.cityCode" :placeholder="this.$t('rules.pleaseSelect')" @change="cityChange">
+            <el-option v-for="item in cityList" :key="item.code" :label="item.name" :value="item.code" />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="this.$t('lesson.releaseAssociatedMap')" prop="mapId">
+          <el-select v-model="editModel.mapId" :placeholder="this.$t('rules.pleaseSelect')" @change="mapChange">
+            <el-option v-for="item in mapList" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="this.$t('lesson.publishCourseName')" prop="name">
+          <el-input v-model="editModel.name" />
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogShow = false">{{ $t('global.cancel') }}</el-button>
+      <el-button type="primary" :loading="loading" @click="doSave">{{ $t('global.confirm') }}</el-button>
+    </span>
+  </el-dialog>
 </template>
 
 <script>
-    import { getPublishMapListBySkinCode } from '@/api/jmap/map';
-    import { getLessonNameByMapIdAndLessonId } from '@/api/jmap/lessondraft';
-    import { publishLesson } from '@/api/jmap/lessondraft';
+import { getPublishMapListBySkinCode } from '@/api/jmap/map';
+import { getLessonNameByMapIdAndLessonId } from '@/api/jmap/lessondraft';
+import { publishLesson } from '@/api/jmap/lessondraft';
 
-    export default {
-        name: 'LessonPublish',
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                mapList: [],
-                cityList: [],
-                cityMapDict: {},
-                editModel: {
-                    id: '',
-                    name: '',
-                    mapId: '',
-                    prdCode: '',
-                    cityCode: '',
-                }
-            }
-        },
-        computed: {
-            rules() {
-                return {
-                    id: [
-                        { required: true, message: this.$t('rules.courseIdIsEmpty'), trigger: 'change' }
-                    ],
-                    cityCode: [
-                        { required: true, message: this.$t('rules.selectCity'), trigger: 'change' }
-                    ],
-                    mapId: [
-                        { required: true, message: this.$t('rules.selectMapName'), trigger: 'change' }
-                    ],
-                    name: [
-                        { required: true, message: this.$t('rules.pleaseEnterMapName'), trigger: 'change' }
-                    ],
-                }
-            }
-        },
-        methods: {
-            cityChange(code) {
-                this.editModel.mapId = '';
-                this.mapList = this.cityMapDict[code];
-            },
-            async mapChange(mapId) {
-                let resp = await getLessonNameByMapIdAndLessonId({ mapId: mapId, lessonId: this.editModel.id });
-                if (resp && resp.data) {
-                    this.editModel.name = resp.data.name;
-                }
-            },
-            doShow(model) {
-                this.mapList = [];
-                this.cityList = [];
-                this.cityMapDict = {};
-                this.editModel = {
-                    id: model.id,
-                    name: model.name,
-                    mapId: '',
-                    prdCode: model.prdCode,
-                    cityCode: model.cityCode,
-                }
+export default {
+	name: 'LessonPublish',
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			mapList: [],
+			cityList: [],
+			cityMapDict: {},
+			editModel: {
+				id: '',
+				name: '',
+				mapId: '',
+				prdCode: '',
+				cityCode: ''
+			}
+		};
+	},
+	computed: {
+		rules() {
+			return {
+				id: [
+					{ required: true, message: this.$t('rules.courseIdIsEmpty'), trigger: 'change' }
+				],
+				cityCode: [
+					{ required: true, message: this.$t('rules.selectCity'), trigger: 'change' }
+				],
+				mapId: [
+					{ required: true, message: this.$t('rules.selectMapName'), trigger: 'change' }
+				],
+				name: [
+					{ required: true, message: this.$t('rules.pleaseEnterMapName'), trigger: 'change' }
+				]
+			};
+		}
+	},
+	methods: {
+		cityChange(code) {
+			this.editModel.mapId = '';
+			this.mapList = this.cityMapDict[code];
+		},
+		async mapChange(mapId) {
+			const resp = await getLessonNameByMapIdAndLessonId({ mapId: mapId, lessonId: this.editModel.id });
+			if (resp && resp.data) {
+				this.editModel.name = resp.data.name;
+			}
+		},
+		doShow(model) {
+			this.mapList = [];
+			this.cityList = [];
+			this.cityMapDict = {};
+			this.editModel = {
+				id: model.id,
+				name: model.name,
+				mapId: '',
+				prdCode: model.prdCode,
+				cityCode: model.cityCode
+			};
 
-                if (model.skinCode && model.id) {
-                    getPublishMapListBySkinCode(model.skinCode).then(resp => {
-                        let list = resp.data || [];
-                        list.forEach(elem => {
-                            if (!this.cityMapDict[elem.cityCode]) {
-                                this.cityMapDict[elem.cityCode] = [];
-                            }
-                            this.cityMapDict[elem.cityCode].push(elem);
-                        });
+			if (model.skinCode && model.id) {
+				getPublishMapListBySkinCode(model.skinCode).then(resp => {
+					const list = resp.data || [];
+					list.forEach(elem => {
+						if (!this.cityMapDict[elem.cityCode]) {
+							this.cityMapDict[elem.cityCode] = [];
+						}
+						this.cityMapDict[elem.cityCode].push(elem);
+					});
 
-                        this.$Dictionary.cityType().then(list => {
-                            this.cityList = list.filter(elem => { return this.cityMapDict[elem.code] });
-                        })
-                    })
-                }
+					this.$Dictionary.cityType().then(list => {
+						this.cityList = list.filter(elem => { return this.cityMapDict[elem.code]; });
+					});
+				});
+			}
 
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.$refs.form.resetFields();
-                this.dialogShow = false;
-            },
-            doSave() {
-                this.loading = true;
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        publishLesson(this.editModel).then(response => {
-                            this.loading = false;
-                            this.$message.success(this.$t('tip.coursePublishSuccessful'));
-                            this.doClose();
-                        }).catch(error => {
-                            this.loading = false;
-                            this.$messageBox(this.$t('tip.coursePublishFailed'));
-                        });
-                    } else {
-                        this.loading = false;
-                    }
-                });
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.$refs.form.resetFields();
+			this.dialogShow = false;
+		},
+		doSave() {
+			this.loading = true;
+			this.$refs['form'].validate((valid) => {
+				if (valid) {
+					publishLesson(this.editModel).then(response => {
+						this.loading = false;
+						this.$message.success(this.$t('tip.coursePublishSuccessful'));
+						this.doClose();
+					}).catch(error => {
+						this.loading = false;
+						this.$messageBox(this.$t('tip.coursePublishFailed'));
+					});
+				} else {
+					this.loading = false;
+				}
+			});
 
-            }
-        }
-    }
+		}
+	}
+};
 </script>
diff --git a/src/views/lesson/taskmanage/createTask.vue b/src/views/lesson/taskmanage/createTask.vue
index 7b8ea98a2..561fca430 100644
--- a/src/views/lesson/taskmanage/createTask.vue
+++ b/src/views/lesson/taskmanage/createTask.vue
@@ -1,100 +1,100 @@
 <template>
-    <el-dialog :title="title" :visible.sync="dialogVisible" width="25%" :before-close="doClose" center>
-        <data-form ref="dataform" :form="form" :formModel="formModel" :rules="rules"></data-form>
-        <span slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="doSave">{{$t('global.confirm')}}</el-button>
-            <el-button @click="doClose">{{$t('global.cancel')}}</el-button>
-        </span>
-    </el-dialog>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="25%" :before-close="doClose" center>
+    <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
 </template>
 
 <script>
-    import { addTrainingRulesList } from '@/api/management/dictionary';
-    import { listPublishMap } from '@/api/jmap/mapdraft';
-    import { OperationList } from '@/scripts/OperationConfig';
-    import { addAutoGenerateTask } from '@/api/management/task';
-    import { getSkinCodeList } from '@/api/management/mapskin'
+import { addTrainingRulesList } from '@/api/management/dictionary';
+import { listPublishMap } from '@/api/jmap/mapdraft';
+import { OperationList } from '@/scripts/OperationConfig';
+import { addAutoGenerateTask } from '@/api/management/task';
+import { getSkinCodeList } from '@/api/management/mapskin';
 
-    export default {
-        name: 'CreateTask',
-        data() {
-            return {
-                dialogVisible: false,
-                skinCodeList: [],
-                taskStatusList: [],
-                formModel: {
-                    parameter: '',
-                    type: '01',
-                },
-                isShow: false,
-            }
-        },
-        computed: {
-            form() {
-                let isAdd = this.type === 'ADD'
-                let form = {
-                    labelWidth: '120px',
-                    items: [
-                        { prop: 'parameter', label: this.$t('lesson.skinType'), type: 'select', required: true, options: this.skinCodeList },
-                    ]
-                }
-                return form
-            },
-            rules() {
-                let crules = {
-                    parameter: [
-                        { required: true, message: this.$t('rules.mapInput'), trigger: 'change' },
-                    ]
-                }
-                return crules
-            },
-            title() {
-                return this.$t('lesson.generationOperation')
-            }
-        },
-        mounted() {
-            this.loadInitData();
-        },
-        methods: {
-            loadInitData() {
-                this.skinCodeList = [];
-                getSkinCodeList().then(response => {
-                    this.skinCodeList = response.data.map(elem => { return { value: elem.code, label: elem.name } });
-                })
+export default {
+	name: 'CreateTask',
+	data() {
+		return {
+			dialogVisible: false,
+			skinCodeList: [],
+			taskStatusList: [],
+			formModel: {
+				parameter: '',
+				type: '01'
+			},
+			isShow: false
+		};
+	},
+	computed: {
+		form() {
+			const isAdd = this.type === 'ADD';
+			const form = {
+				labelWidth: '120px',
+				items: [
+					{ prop: 'parameter', label: this.$t('lesson.skinType'), type: 'select', required: true, options: this.skinCodeList }
+				]
+			};
+			return form;
+		},
+		rules() {
+			const crules = {
+				parameter: [
+					{ required: true, message: this.$t('rules.mapInput'), trigger: 'change' }
+				]
+			};
+			return crules;
+		},
+		title() {
+			return this.$t('lesson.generationOperation');
+		}
+	},
+	mounted() {
+		this.loadInitData();
+	},
+	methods: {
+		loadInitData() {
+			this.skinCodeList = [];
+			getSkinCodeList().then(response => {
+				this.skinCodeList = response.data.map(elem => { return { value: elem.code, label: elem.name }; });
+			});
 
-                this.taskStatusList = [];
-                this.$Dictionary.taskStatus().then(list => {
-                    this.taskStatusList = list.map(elem => { return { value: elem.code, label: elem.name } });
-                })
-            },
-            doShow() {
-                this.dialogVisible = true
-            },
-            doSave() {
-                let self = this
-                this.$refs.dataform.validateForm(() => {
-                    self.create()
-                })
-            },
-            doClose() {
-                this.formModel = {
-                    parameter: '',
-                    type: '01',
-                }
-                this.$refs.dataform.resetForm();
-                this.isShow = false;
-                this.dialogVisible = false
-            },
-            async create() {
-                let self = this
-                try {
-                    let res = await addAutoGenerateTask(this.formModel);
-                    self.doClose()
-                    self.$emit('reloadTable');  // 刷新列表
-                } catch (error) {
-                    this.$messageBox(this.$t('tip.creatingFailed'));
-                }
-            }
-        }
-    }
+			this.taskStatusList = [];
+			this.$Dictionary.taskStatus().then(list => {
+				this.taskStatusList = list.map(elem => { return { value: elem.code, label: elem.name }; });
+			});
+		},
+		doShow() {
+			this.dialogVisible = true;
+		},
+		doSave() {
+			const self = this;
+			this.$refs.dataform.validateForm(() => {
+				self.create();
+			});
+		},
+		doClose() {
+			this.formModel = {
+				parameter: '',
+				type: '01'
+			};
+			this.$refs.dataform.resetForm();
+			this.isShow = false;
+			this.dialogVisible = false;
+		},
+		async create() {
+			const self = this;
+			try {
+				const res = await addAutoGenerateTask(this.formModel);
+				self.doClose();
+				self.$emit('reloadTable'); // 刷新列表
+			} catch (error) {
+				this.$messageBox(this.$t('tip.creatingFailed'));
+			}
+		}
+	}
+};
 </script>
diff --git a/src/views/lesson/trainingRule/addBatch.vue b/src/views/lesson/trainingRule/addBatch.vue
index 82dfe070e..a80e01584 100644
--- a/src/views/lesson/trainingRule/addBatch.vue
+++ b/src/views/lesson/trainingRule/addBatch.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="title" :visible.sync="dialogVisible" width="25%" :before-close="handleClose" center>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="25%" :before-close="handleClose" center>
     <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
     <span slot="footer" class="dialog-footer">
       <el-button v-loading="loading" type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
diff --git a/src/views/lesson/trainingRule/addEdit.vue b/src/views/lesson/trainingRule/addEdit.vue
index 99384e442..8df4c5b9c 100644
--- a/src/views/lesson/trainingRule/addEdit.vue
+++ b/src/views/lesson/trainingRule/addEdit.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center>
     <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
     <span slot="footer" class="dialog-footer">
       <el-button v-loading="loading" type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
diff --git a/src/views/lesson/trainingRule/detail/edit.vue b/src/views/lesson/trainingRule/detail/edit.vue
index 88cc87e3d..e504c0da6 100644
--- a/src/views/lesson/trainingRule/detail/edit.vue
+++ b/src/views/lesson/trainingRule/detail/edit.vue
@@ -1,173 +1,172 @@
 <template>
-    <el-dialog :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center>
-        <data-form ref="dataform" :form="form" :formModel="formModel" :rules="rules"></data-form>
-        <span slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
-            <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
-        </span>
-    </el-dialog>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center>
+    <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
 </template>
 
 <script>
-    import { create, checkDicDetailCodeExist, getData, update } from '@/api/management/dictionaryDetail';
-    import { postOperateStepData, putOperateStepData, getPlaceholderList } from '@/api/management/operation'
-    import { validateCharCode } from '@/utils/validate'
-    export default {
-        name: 'TrainingDetailEdit',
-        props: {
-            type: {
-                type: String,
-                required: true
-            },
-            dicId: {
-                type: String,
-                required: true
-            },
-            deviceList: {
-                type: Array,
-                default() {
-                    return []
-                }
-            }
-        },
-        data() {
-            return {
-                dialogVisible: false,
-                formModel: {
-                    operateCode: '',
-                    orderNum: '',
-                    deviceType: '',
-                    val: '',
-                    tip: ''
-                },
-                placeholderList: []
-            }
-        },
-        computed: {
-            form() {
-                let isAdd = this.type === 'ADD'
-                let form = {
-                    labelWidth: '120px',
-                    items: [
-                        { prop: 'orderNum', label: this.$t('lesson.stepNo'), type: 'text', required: true, disabled: !isAdd },
-                        { prop: 'operateCode', label: this.$t('lesson.operateCode'), type: 'text', required: true, disabled: !isAdd },
-                        { prop: 'deviceType', label: this.$t('lesson.deviceType'), type: 'select', required: true, options: this.deviceList, disabled: !isAdd },
-                        { prop: 'val', label: this.$t('lesson.stepReturn'), type: 'text', required: false, disabled: !isAdd },
-                        { label: '', type: 'button', options: this.placeholderList, style: 'margin-bottom: 0; margin-top: -10px;', typeBtn: 'info', click: this.addTrainRemark },
-                        { prop: 'tip', label: this.$t('lesson.stepTips'), type: 'textarea', required: true, tooltip: true, info: this.$t('lesson.tipExplainPlaceholderInfo') },
-                    ]
-                }
-                return form
-            },
-            rules() {
-                let crules = {
-                    operateCode: [
-                        { required: true, message: this.$t('rules.inputOperateCode'), trigger: 'blur' },
-                    ],
-                    orderNum: [
-                        { required: true, message: this.$t('rules.inputStepNo'), trigger: 'blur' },
-                    ],
-                    tip: [
-                        { required: true, max: 500, message: this.$t('rules.inputStepTips'), trigger: 'blur' }
-                    ]
-                }
-                return crules;
-            },
-            title() {
-                if (this.type === 'ADD') {
-                    return this.$t('lesson.createStepInfo');
-                } else {
-                    return this.$t('lesson.editStepInfo');
-                }
-            }
-        },
-        methods: {
-            async show(data) {
-                this.dialogVisible = true
-                let res = await getPlaceholderList({ trainingType: this.$route.query.type, skinCode: this.$route.query.skinCode });
-                this.placeholderList = res.data;
-                if (data && data.operateCode) {
-                    // 获取操作占位列表
-                    this.formModel = {
-                        operateCode: data.operateCode,
-                        orderNum: data.orderNum,
-                        deviceType: data.deviceType,
-                        definitionId: data.definitionId,
-                        val: data.val,
-                        id: data.id,
-                        tip: this.repliceName(data.tip, this.placeholderList)
-                    }
-                }
-            },
-            repliceName(fieldValue, enumList) {
-                if (enumList && enumList.length > 0) {
-                    for (let i = 0; enumList && i < enumList.length; i++) {
-                        if (fieldValue.includes(`{${enumList[i].id}}`)) {
-                            fieldValue = fieldValue.replace(`{${enumList[i].id}}`, `{${enumList[i].name}}`);
-                        }
-                    }
-                    return fieldValue;
-                }
-            },
-            addTrainRemark(val) {
-                this.formModel.tip = `${this.formModel.tip}{${val.name}}`;
-            },
-            doSave() {
-                let self = this
-                this.$refs.dataform.validateForm(() => {
-                    if (self.type === 'ADD') {
-                        self.create()
-                    } else {
-                        self.update()
-                    }
-                })
-            },
-            create() {
-                let self = this
-                this.placeholderList.forEach(item => {
-                    if (this.formModel.tip.includes(`{${item.name}}`)) {
-                        let tip = this.formModel.tip.replace(`{${item.name}}`, `{${item.id}}`);
-                        this.formModel.tip = tip;
-                    }
-                })
-                this.formModel.definitionId = this.$route.query.id;
-                this.formModel.orderNum = Number(this.formModel.orderNum);
-                postOperateStepData(this.formModel).then(response => {
-                    self.$message.success(this.$t('lesson.createOperateSuccess'))
-                    self.handleClose()
-                    self.$emit('reloadTable')
-                }).catch(error => {
-                    self.$message.error(`${this.$t('error.createOperateStepFailed')}:${error.message}`)
-                })
-            },
-            update() {
-                let self = this
-                this.placeholderList.forEach(item => {
-                    if (this.formModel.tip.includes(`{${item.name}}`)) {
-                        let tip = this.formModel.tip.replace(`{${item.name}}`, `{${item.id}}`);
-                        this.formModel.tip = tip;
-                    }
-                })
-                this.formModel.orderNum = Number(this.formModel.orderNum);
-                putOperateStepData(this.formModel).then(response => {
-                    self.$message.success(this.$t('lesson.updateOperateSuccess'))
-                    self.handleClose()
-                    self.$emit('reloadTable')
-                }).catch(error => {
-                    self.$message.error(`${this.$t('error.updateOperateStepFailed')}:${error.message}`)
-                })
-            },
-            handleClose() {
-                this.formModel = {
-                    operateCode: '',
-                    orderNum: '',
-                    deviceType: '',
-                    val: '',
-                    tip: ''
-                }
-                this.$refs.dataform.resetForm()
-                this.dialogVisible = false
-            }
-        }
-    }
-</script>
\ No newline at end of file
+import { postOperateStepData, putOperateStepData, getPlaceholderList } from '@/api/management/operation';
+
+export default {
+	name: 'TrainingDetailEdit',
+	props: {
+		type: {
+			type: String,
+			required: true
+		},
+		dicId: {
+			type: String,
+			required: true
+		},
+		deviceList: {
+			type: Array,
+			default() {
+				return [];
+			}
+		}
+	},
+	data() {
+		return {
+			dialogVisible: false,
+			formModel: {
+				operateCode: '',
+				orderNum: '',
+				deviceType: '',
+				val: '',
+				tip: ''
+			},
+			placeholderList: []
+		};
+	},
+	computed: {
+		form() {
+			const isAdd = this.type === 'ADD';
+			const form = {
+				labelWidth: '120px',
+				items: [
+					{ prop: 'orderNum', label: this.$t('lesson.stepNo'), type: 'text', required: true, disabled: !isAdd },
+					{ prop: 'operateCode', label: this.$t('lesson.operateCode'), type: 'text', required: true, disabled: !isAdd },
+					{ prop: 'deviceType', label: this.$t('lesson.deviceType'), type: 'select', required: true, options: this.deviceList, disabled: !isAdd },
+					{ prop: 'val', label: this.$t('lesson.stepReturn'), type: 'text', required: false, disabled: !isAdd },
+					{ label: '', type: 'button', options: this.placeholderList, style: 'margin-bottom: 0; margin-top: -10px;', typeBtn: 'info', click: this.addTrainRemark },
+					{ prop: 'tip', label: this.$t('lesson.stepTips'), type: 'textarea', required: true, tooltip: true, info: this.$t('lesson.tipExplainPlaceholderInfo') }
+				]
+			};
+			return form;
+		},
+		rules() {
+			const crules = {
+				operateCode: [
+					{ required: true, message: this.$t('rules.inputOperateCode'), trigger: 'blur' }
+				],
+				orderNum: [
+					{ required: true, message: this.$t('rules.inputStepNo'), trigger: 'blur' }
+				],
+				tip: [
+					{ required: true, max: 500, message: this.$t('rules.inputStepTips'), trigger: 'blur' }
+				]
+			};
+			return crules;
+		},
+		title() {
+			if (this.type === 'ADD') {
+				return this.$t('lesson.createStepInfo');
+			} else {
+				return this.$t('lesson.editStepInfo');
+			}
+		}
+	},
+	methods: {
+		async show(data) {
+			this.dialogVisible = true;
+			const res = await getPlaceholderList({ trainingType: this.$route.query.type, skinCode: this.$route.query.skinCode });
+			this.placeholderList = res.data;
+			if (data && data.operateCode) {
+				// 获取操作占位列表
+				this.formModel = {
+					operateCode: data.operateCode,
+					orderNum: data.orderNum,
+					deviceType: data.deviceType,
+					definitionId: data.definitionId,
+					val: data.val,
+					id: data.id,
+					tip: this.repliceName(data.tip, this.placeholderList)
+				};
+			}
+		},
+		repliceName(fieldValue, enumList) {
+			if (enumList && enumList.length > 0) {
+				for (let i = 0; enumList && i < enumList.length; i++) {
+					if (fieldValue.includes(`{${enumList[i].id}}`)) {
+						fieldValue = fieldValue.replace(`{${enumList[i].id}}`, `{${enumList[i].name}}`);
+					}
+				}
+				return fieldValue;
+			}
+		},
+		addTrainRemark(val) {
+			this.formModel.tip = `${this.formModel.tip}{${val.name}}`;
+		},
+		doSave() {
+			const self = this;
+			this.$refs.dataform.validateForm(() => {
+				if (self.type === 'ADD') {
+					self.create();
+				} else {
+					self.update();
+				}
+			});
+		},
+		create() {
+			const self = this;
+			this.placeholderList.forEach(item => {
+				if (this.formModel.tip.includes(`{${item.name}}`)) {
+					const tip = this.formModel.tip.replace(`{${item.name}}`, `{${item.id}}`);
+					this.formModel.tip = tip;
+				}
+			});
+			this.formModel.definitionId = this.$route.query.id;
+			this.formModel.orderNum = Number(this.formModel.orderNum);
+			postOperateStepData(this.formModel).then(response => {
+				self.$message.success(this.$t('lesson.createOperateSuccess'));
+				self.handleClose();
+				self.$emit('reloadTable');
+			}).catch(error => {
+				self.$message.error(`${this.$t('error.createOperateStepFailed')}:${error.message}`);
+			});
+		},
+		update() {
+			const self = this;
+			this.placeholderList.forEach(item => {
+				if (this.formModel.tip.includes(`{${item.name}}`)) {
+					const tip = this.formModel.tip.replace(`{${item.name}}`, `{${item.id}}`);
+					this.formModel.tip = tip;
+				}
+			});
+			this.formModel.orderNum = Number(this.formModel.orderNum);
+			putOperateStepData(this.formModel).then(response => {
+				self.$message.success(this.$t('lesson.updateOperateSuccess'));
+				self.handleClose();
+				self.$emit('reloadTable');
+			}).catch(error => {
+				self.$message.error(`${this.$t('error.updateOperateStepFailed')}:${error.message}`);
+			});
+		},
+		handleClose() {
+			this.formModel = {
+				operateCode: '',
+				orderNum: '',
+				deviceType: '',
+				val: '',
+				tip: ''
+			};
+			this.$refs.dataform.resetForm();
+			this.dialogVisible = false;
+		}
+	}
+};
+</script>
diff --git a/src/views/lesson/trainingRule/saveAs.vue b/src/views/lesson/trainingRule/saveAs.vue
index 2ebbaf0b8..d1e61f37e 100644
--- a/src/views/lesson/trainingRule/saveAs.vue
+++ b/src/views/lesson/trainingRule/saveAs.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="title" :visible.sync="dialogVisible" width="25%" :before-close="handleClose" center>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="25%" :before-close="handleClose" center>
     <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
     <span slot="footer" class="dialog-footer">
       <el-button v-loading="loading" type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
diff --git a/src/views/lesson/trainingmanage/draft.vue b/src/views/lesson/trainingmanage/draft.vue
index 467d96ab4..eebe47552 100644
--- a/src/views/lesson/trainingmanage/draft.vue
+++ b/src/views/lesson/trainingmanage/draft.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="operation.title" :visible.sync="dialogShow" width="500px" :before-close="close">
+  <el-dialog v-dialogDrag :title="operation.title" :visible.sync="dialogShow" width="500px" :before-close="close">
     <el-form ref="form" :model="operateModel" label-width="auto" :rules="rules" size="mini" label-position="right" class="dialog-form">
       <el-form-item :label="this.$t('lesson.skinType') + ':'" prop="skinCode">
         <el-select v-model="operateModel.skinCode" @change="skinCodeChoose">
diff --git a/src/views/lesson/trainingrecord/category/draft.vue b/src/views/lesson/trainingrecord/category/draft.vue
index a5fb84a5e..674684017 100644
--- a/src/views/lesson/trainingrecord/category/draft.vue
+++ b/src/views/lesson/trainingrecord/category/draft.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="operation.title" :visible.sync="dialogShow" width="30%" :before-close="close">
+  <el-dialog v-dialogDrag :title="operation.title" :visible.sync="dialogShow" width="30%" :before-close="close">
     <el-form ref="form" :model="operateModel" label-width="120px" :rules="rules" size="mini">
       <el-form-item :label="this.$t('lesson.trainingName')+':'" prop="name">
         <el-input v-model="operateModel.name" />
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index ffe0264bd..6bbf199a5 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -35,7 +35,7 @@
           <span class="svg-container svg-container_login">
             <svg-icon icon-class="user" />
           </span>
-          <el-input v-model="loginForm.username" name="username" type="text" placeholder="username" />
+          <el-input v-model="loginForm.username" name="username" type="text" placeholder="手机号/邮箱" />
         </el-form-item>
         <el-form-item prop="password" class="item_form_box">
           <span class="svg-container">
@@ -45,18 +45,24 @@
             v-model="loginForm.password"
             name="password"
             :type="pwdType"
-            placeholder="password"
+            placeholder="密码"
             @keyup.enter="handleLogin"
           />
           <span class="show-pwd" @click="showPwd">
             <svg-icon icon-class="eye" />
           </span>
         </el-form-item>
-        <!-- <el-form-item class="item_form_box">
-          <span class="svg-container" />
-          <el-radio>琏课堂</el-radio>
-        </el-form-item> -->
         <div class="tip-message">{{ tipsMsg }}</div>
+        <el-popover
+          placement="right"
+          title=""
+          width="200"
+          trigger="hover"
+          content="请在琏课堂小程序助手，完善个人信息，设置登陆密码，手机号或邮箱。"
+          class="popover_box"
+        >
+          <div slot="reference">无法登陆</div>
+        </el-popover>
         <el-form-item>
           <el-button type="primary" style="width:100%;" :loading="loading" @click.native.prevent="handleLogin">
             登陆
@@ -195,10 +201,10 @@ export default {
 						this.loading = false;
 						this.tipsMsg = '';
 						this.$router.push({ path: '/' });
-					}).catch(error => {
-						this.tipsMsg = error.message;
+					}).catch(() => {
+						this.tipsMsg = '用户名或密码不正确，请重新输入。';
 						this.loading = false;
-						setTimeout(() => { this.tipsMsg = ''; }, 5000);
+						setTimeout(() => { this.tipsMsg = ''; }, 15000);
 					});
 				} else {
 					console.log('error submit!!');
@@ -214,8 +220,6 @@ export default {
   $bg:#fff;
   $light_gray:#eee;
 
-  /* reset element-ui css */
-
   .login-container {
     .el-input {
       height: 40px;
@@ -228,7 +232,7 @@ export default {
         border-radius: 0px;
         padding: 8px 9px 7px 5px;
         color: #000;
-		height: 100%;
+        height: 100%;
 
         &:-webkit-autofill {
           box-shadow: 0 0 0px 1000px $bg inset !important;
@@ -246,7 +250,8 @@ export default {
 	.tip-message {
 		color: #F56C61;
 		padding: 5px;
-		font-size: 12px;
+        font-size: 12px;
+        height: 23px;
 	}
   }
 </style>
@@ -257,6 +262,14 @@ export default {
   $dark_gray:#889aa4;
   $light_gray:#eee;
   $qrcodeSize: 270px;
+    .popover_box {
+        position: absolute;
+        right: 80px;
+        bottom: 97px;
+        cursor: pointer;
+        color: #6c6c6c;
+        font-size: 14px;
+    }
 
   .login-container {
     position: fixed;
@@ -278,6 +291,7 @@ export default {
         padding: 30px 30px 30px;
         margin-bottom: 20px;
         box-sizing: border-box;
+        position: relative;
     }
 
     .login-form {
diff --git a/src/views/login/loginEn.vue b/src/views/login/loginEn.vue
index cffe0d0d9..7e6d75493 100644
--- a/src/views/login/loginEn.vue
+++ b/src/views/login/loginEn.vue
@@ -35,7 +35,7 @@
           <span class="svg-container svg-container_login">
             <svg-icon icon-class="user" />
           </span>
-          <el-input v-model="loginForm.username" name="username" type="text" placeholder="username" />
+          <el-input v-model="loginForm.username" name="username" type="text" placeholder="Mobile phone number/email" />
         </el-form-item>
         <el-form-item prop="password" class="item_form_box">
           <span class="svg-container">
@@ -52,11 +52,17 @@
             <svg-icon icon-class="eye" />
           </span>
         </el-form-item>
-        <!-- <el-form-item class="item_form_box">
-          <span class="svg-container" />
-          <el-radio>琏课堂</el-radio>
-        </el-form-item> -->
         <div class="tip-message">{{ tipsMsg }}</div>
+        <el-popover
+          placement="right"
+          title=""
+          width="200"
+          trigger="hover"
+          content="Please in lian classroom small program assistant, perfect personal information, set login password, mobile phone number or email."
+          class="popover_box"
+        >
+          <div slot="reference">unable to login</div>
+        </el-popover>
         <el-form-item>
           <el-button type="primary" style="width:100%;" :loading="loading" @click.native.prevent="handleLogin">
             login
@@ -84,14 +90,14 @@ export default {
 	data() {
 		const validateUsername = (rule, value, callback) => {
 			if (value.length < 5) {
-				callback(new Error('请输入正确的用户名'));
+				callback(new Error('Please enter the correct user name'));
 			} else {
 				callback();
 			}
 		};
 		const validatePass = (rule, value, callback) => {
 			if (value.length < 5) {
-				callback(new Error('密码不能小于5位'));
+				callback(new Error('Password cannot be less than 5 digits'));
 			} else {
 				callback();
 			}
@@ -144,7 +150,7 @@ export default {
 			}).catch((error) => {
 				console.log(error);
 				this.loadingCode = false;
-				this.$messageBox('获取登陆二维码失败，请刷新重试');
+				this.$messageBox('Failed to get login qr code, please refresh and try again');
 			});
 		},
 		checkLoginStatus() {
@@ -204,8 +210,8 @@ export default {
 							this.$i18n.locale = 'en';
 							Cookies.set('user_lang', 'en');
 						});
-					}).catch(error => {
-						this.tipsMsg = error.message;
+					}).catch(() => {
+						this.tipsMsg = 'Incorrect user name or password, please retype.';
 						this.loading = false;
 						setTimeout(() => { this.tipsMsg = ''; }, 5000);
 					});
@@ -219,47 +225,6 @@ export default {
 };
 </script>
 
-<style rel="stylesheet/scss" lang="scss">
-  $bg:#fff;
-  $light_gray:#eee;
-
-  /* reset element-ui css */
-
-  .login-container {
-    .el-input {
-      height: 40px;
-      width: 85%;
-
-      input {
-        background: #fff !important;
-        border: 0px;
-        -webkit-appearance: none;
-        border-radius: 0px;
-        padding: 8px 9px 7px 5px;
-        color: #000;
-		height: 100%;
-
-        &:-webkit-autofill {
-          box-shadow: 0 0 0px 1000px $bg inset !important;
-          -webkit-text-fill-color: #000 !important;
-        }
-      }
-    }
-
-    .item_form_box {
-      border: 1px solid #ccc;
-      border-radius: 5px;
-      color: #454545;
-    }
-
-	.tip-message {
-		color: #F56C61;
-		padding: 5px;
-		font-size: 12px;
-	}
-  }
-</style>
-
 <style rel="stylesheet/scss" lang="scss" scoped>
   $bg:#f0f0f0;
   $qrbg:#fff;
@@ -267,6 +232,15 @@ export default {
   $light_gray:#eee;
   $qrcodeSize: 270px;
 
+  .popover_box {
+      position: absolute;
+      right: 80px;
+      bottom: 97px;
+      cursor: pointer;
+      color: #6c6c6c;
+      font-size: 14px;
+  }
+
   .login-container {
     position: fixed;
     display: flex;
@@ -287,6 +261,7 @@ export default {
         padding: 30px 30px 30px;
         margin-bottom: 20px;
         box-sizing: border-box;
+        position: relative;
     }
 
     .login-form {
diff --git a/src/views/login/loginPlan.vue b/src/views/login/loginPlan.vue
index 96fd15a38..1dec0c31f 100644
--- a/src/views/login/loginPlan.vue
+++ b/src/views/login/loginPlan.vue
@@ -35,7 +35,7 @@
           <span class="svg-container svg-container_login">
             <svg-icon icon-class="user" />
           </span>
-          <el-input v-model="loginForm.username" name="username" type="text" placeholder="username" />
+          <el-input v-model="loginForm.username" name="username" type="text" placeholder="手机号/邮箱" />
         </el-form-item>
         <el-form-item prop="password" class="item_form_box">
           <span class="svg-container">
@@ -45,18 +45,24 @@
             v-model="loginForm.password"
             name="password"
             :type="pwdType"
-            placeholder="password"
+            placeholder="密码"
             @keyup.enter="handleLogin"
           />
           <span class="show-pwd" @click="showPwd">
             <svg-icon icon-class="eye" />
           </span>
         </el-form-item>
-        <!-- <el-form-item class="item_form_box">
-          <span class="svg-container" />
-          <el-radio>琏计划</el-radio>
-        </el-form-item> -->
         <div class="tip-message">{{ tipsMsg }}</div>
+        <el-popover
+          placement="right"
+          title=""
+          width="200"
+          trigger="hover"
+          content="请在琏课堂小程序助手，完善个人信息，设置登陆密码，手机号或邮箱。"
+          class="popover_box"
+        >
+          <div slot="reference">无法登陆</div>
+        </el-popover>
         <el-form-item>
           <el-button type="primary" style="width:100%;" :loading="loading" @click.native.prevent="handleLogin">
             登陆
@@ -196,8 +202,8 @@ export default {
 						this.loading = false;
 						this.tipsMsg = '';
 						this.$router.push({ path: `${UrlConfig.plan.prefix}/home` });
-					}).catch(error => {
-						this.tipsMsg = error.message;
+					}).catch(() => {
+						this.tipsMsg = '用户名或密码不正确，请重新输入。';
 						this.loading = false;
 						setTimeout(() => { this.tipsMsg = ''; }, 5000);
 					});
@@ -212,47 +218,6 @@ export default {
 };
 </script>
 
-<style rel="stylesheet/scss" lang="scss">
-  $bg:#fff;
-  $light_gray:#eee;
-
-  /* reset element-ui css */
-
-  .login-container {
-    .el-input {
-      height: 40px;
-      width: 85%;
-
-      input {
-        background: #fff !important;
-        border: 0px;
-        -webkit-appearance: none;
-        border-radius: 0px;
-        padding: 8px 9px 7px 5px;
-        color: #000;
-		height: 100%;
-
-        &:-webkit-autofill {
-          box-shadow: 0 0 0px 1000px $bg inset !important;
-          -webkit-text-fill-color: #000 !important;
-        }
-      }
-    }
-
-    .item_form_box {
-      border: 1px solid #ccc;
-      border-radius: 5px;
-      color: #454545;
-    }
-
-	.tip-message {
-		color: #F56C61;
-		padding: 5px;
-		font-size: 12px;
-	}
-  }
-</style>
-
 <style rel="stylesheet/scss" lang="scss" scoped>
   $bg:#f0f0f0;
   $qrbg:#fff;
@@ -260,6 +225,15 @@ export default {
   $light_gray:#eee;
   $qrcodeSize: 270px;
 
+  .popover_box {
+      position: absolute;
+      right: 80px;
+      bottom: 97px;
+      cursor: pointer;
+      color: #6c6c6c;
+      font-size: 14px;
+  }
+
   .login-container {
     position: fixed;
     display: flex;
@@ -280,6 +254,7 @@ export default {
         padding: 30px 30px 30px;
         margin-bottom: 20px;
         box-sizing: border-box;
+        position: relative;
     }
 
     .login-form {
diff --git a/src/views/login/loginScreen.vue b/src/views/login/loginScreen.vue
index 5bfc342df..ff1a8fd7f 100644
--- a/src/views/login/loginScreen.vue
+++ b/src/views/login/loginScreen.vue
@@ -35,7 +35,7 @@
           <span class="svg-container svg-container_login">
             <svg-icon icon-class="user" />
           </span>
-          <el-input v-model="loginForm.username" name="username" type="text" placeholder="username" />
+          <el-input v-model="loginForm.username" name="username" type="text" placeholder="手机号/邮箱" />
         </el-form-item>
         <el-form-item prop="password" class="item_form_box">
           <span class="svg-container">
@@ -45,18 +45,24 @@
             v-model="loginForm.password"
             name="password"
             :type="pwdType"
-            placeholder="password"
+            placeholder="密码"
             @keyup.enter="handleLogin"
           />
           <span class="show-pwd" @click="showPwd">
             <svg-icon icon-class="eye" />
           </span>
         </el-form-item>
-        <!-- <el-form-item class="item_form_box">
-          <span class="svg-container" />
-          <el-radio>大屏系统</el-radio>
-        </el-form-item> -->
         <div class="tip-message">{{ tipsMsg }}</div>
+        <el-popover
+          placement="right"
+          title=""
+          width="200"
+          trigger="hover"
+          content="请在琏课堂小程序助手，完善个人信息，设置登陆密码，手机号或邮箱。"
+          class="popover_box"
+        >
+          <div slot="reference">无法登陆</div>
+        </el-popover>
         <el-form-item>
           <el-button type="primary" style="width:100%;" :loading="loading" @click.native.prevent="handleLogin">
             登陆
@@ -196,8 +202,8 @@ export default {
 						this.loading = false;
 						this.tipsMsg = '';
 						this.$router.push({ path: `${UrlConfig.dp.prefix}/home` });
-					}).catch(error => {
-						this.tipsMsg = error.message;
+					}).catch(() => {
+						this.tipsMsg = '用户名或密码不正确，请重新输入。';
 						this.loading = false;
 						setTimeout(() => { this.tipsMsg = ''; }, 5000);
 					});
@@ -212,47 +218,6 @@ export default {
 };
 </script>
 
-<style rel="stylesheet/scss" lang="scss">
-  $bg:#fff;
-  $light_gray:#eee;
-
-  /* reset element-ui css */
-
-  .login-container {
-    .el-input {
-      height: 40px;
-      width: 85%;
-
-      input {
-        background: #fff !important;
-        border: 0px;
-        -webkit-appearance: none;
-        border-radius: 0px;
-        padding: 8px 9px 7px 5px;
-        color: #000;
-		height: 100%;
-
-        &:-webkit-autofill {
-          box-shadow: 0 0 0px 1000px $bg inset !important;
-          -webkit-text-fill-color: #000 !important;
-        }
-      }
-    }
-
-    .item_form_box {
-      border: 1px solid #ccc;
-      border-radius: 5px;
-      color: #454545;
-    }
-
-	.tip-message {
-		color: #F56C61;
-		padding: 5px;
-		font-size: 12px;
-	}
-  }
-</style>
-
 <style rel="stylesheet/scss" lang="scss" scoped>
   $bg:#f0f0f0;
   $qrbg:#fff;
@@ -260,6 +225,15 @@ export default {
   $light_gray:#eee;
   $qrcodeSize: 270px;
 
+  .popover_box {
+      position: absolute;
+      right: 80px;
+      bottom: 97px;
+      cursor: pointer;
+      color: #6c6c6c;
+      font-size: 14px;
+  }
+
   .login-container {
     position: fixed;
     display: flex;
@@ -280,6 +254,7 @@ export default {
         padding: 30px 30px 30px;
         margin-bottom: 20px;
         box-sizing: border-box;
+        position: relative;
     }
 
     .login-form {
diff --git a/src/views/management/dictionary/edit.vue b/src/views/management/dictionary/edit.vue
index 4ecb5ba34..ea50415eb 100644
--- a/src/views/management/dictionary/edit.vue
+++ b/src/views/management/dictionary/edit.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center :close-on-click-modal="false">
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center :close-on-click-modal="false">
     <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
     <span slot="footer" class="dialog-footer">
       <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
diff --git a/src/views/management/dictionaryDetail/edit.vue b/src/views/management/dictionaryDetail/edit.vue
index 4f952c891..543ccf79f 100644
--- a/src/views/management/dictionaryDetail/edit.vue
+++ b/src/views/management/dictionaryDetail/edit.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center :close-on-click-modal="false">
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center :close-on-click-modal="false">
     <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
     <span slot="footer" class="dialog-footer">
       <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
diff --git a/src/views/management/userControl/correlationMap.vue b/src/views/management/userControl/correlationMap.vue
index 0f5b474c4..fd12c64fa 100644
--- a/src/views/management/userControl/correlationMap.vue
+++ b/src/views/management/userControl/correlationMap.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="this.$t('system.subscribeMap')" :visible.sync="dialogVisible" width="30%" :before-close="doClose" center :close-on-click-modal="false">
+  <el-dialog v-dialogDrag :title="this.$t('system.subscribeMap')" :visible.sync="dialogVisible" width="30%" :before-close="doClose" center :close-on-click-modal="false">
     <el-form ref="form" v-model="formModel" label-width="120px">
       <el-form-item :label="this.$t('system.subscribeToTheMapList')" prop="mapIdList">
         <el-select v-model="formModel.mapIdList" clearable multiple :placeholder="this.$t('rules.enterKeyword')" style="width: 80%">
diff --git a/src/views/management/userControl/edit.vue b/src/views/management/userControl/edit.vue
index f3a87f442..cf133840b 100644
--- a/src/views/management/userControl/edit.vue
+++ b/src/views/management/userControl/edit.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="$t('system.editUserPermission')" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center :close-on-click-modal="false">
+  <el-dialog v-dialogDrag :title="$t('system.editUserPermission')" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center :close-on-click-modal="false">
     <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
     <span slot="footer" class="dialog-footer">
       <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
diff --git a/src/views/management/userExam/edit.vue b/src/views/management/userExam/edit.vue
index ecf46f993..75cce7a85 100644
--- a/src/views/management/userExam/edit.vue
+++ b/src/views/management/userExam/edit.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center :close-on-click-modal="false">
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center :close-on-click-modal="false">
     <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
     <span slot="footer" class="dialog-footer">
       <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
diff --git a/src/views/management/userSimulation/add.vue b/src/views/management/userSimulation/add.vue
index 6d6d9af4e..4a6ab2348 100644
--- a/src/views/management/userSimulation/add.vue
+++ b/src/views/management/userSimulation/add.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center :close-on-click-modal="false">
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center :close-on-click-modal="false">
     <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
     <span slot="footer" class="dialog-footer">
       <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
diff --git a/src/views/management/userSimulation/edit.vue b/src/views/management/userSimulation/edit.vue
index 336de03b6..bfc5e0601 100644
--- a/src/views/management/userSimulation/edit.vue
+++ b/src/views/management/userSimulation/edit.vue
@@ -1,9 +1,9 @@
 <template>
-  <el-dialog :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center :close-on-click-modal="false">
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center :close-on-click-modal="false">
     <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
     <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="doSave">{{$t('global.confirm')}}</el-button>
-      <el-button @click="handleClose">{{$t('global.cancel')}}</el-button>
+      <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
     </span>
   </el-dialog>
 </template>
diff --git a/src/views/management/userTraining/add.vue b/src/views/management/userTraining/add.vue
index a010f8805..72addf576 100644
--- a/src/views/management/userTraining/add.vue
+++ b/src/views/management/userTraining/add.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center :close-on-click-modal="false">
+    <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center :close-on-click-modal="false">
       <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
diff --git a/src/views/management/userTraining/addTraining.vue b/src/views/management/userTraining/addTraining.vue
index eedd75042..d5ea1b432 100644
--- a/src/views/management/userTraining/addTraining.vue
+++ b/src/views/management/userTraining/addTraining.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="title" :visible.sync="dialogVisibles" width="30%" :before-close="handleClose" center :close-on-click-modal="false">
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisibles" width="30%" :before-close="handleClose" center :close-on-click-modal="false">
     <el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: '280px', width:'100%' }">
       <el-tree
         ref="tree"
diff --git a/src/views/management/userTraining/edit.vue b/src/views/management/userTraining/edit.vue
index 8868ec554..83b7593fb 100644
--- a/src/views/management/userTraining/edit.vue
+++ b/src/views/management/userTraining/edit.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center :close-on-click-modal="false">
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center :close-on-click-modal="false">
     <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
     <span slot="footer" class="dialog-footer">
       <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
diff --git a/src/views/map/mapdraft/mapedit/configMap.vue b/src/views/map/mapdraft/mapedit/configMap.vue
index 6aa56ac55..7efc08dc1 100644
--- a/src/views/map/mapdraft/mapedit/configMap.vue
+++ b/src/views/map/mapdraft/mapedit/configMap.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="$t('map.layerDisplay')" :visible.sync="dialogTableVisible" class="view_box" width="460px" :before-close="doClose" :modal-append-to-body="false">
+  <el-dialog v-dialogDrag :title="$t('map.layerDisplay')" :visible.sync="dialogTableVisible" class="view_box" width="460px" :before-close="doClose" :modal-append-to-body="false">
     <el-row type="flex" justify="center" class="content_box">
       <el-form label-width="80px" class="demo-ruleForm">
         <el-form-item :label="$t('map.viewShows')">
diff --git a/src/views/map/mapdraft/mapedit/dataRelation/automaticoperate/detail.vue b/src/views/map/mapdraft/mapedit/dataRelation/automaticoperate/detail.vue
index a45c87e3f..bda912f9d 100644
--- a/src/views/map/mapdraft/mapedit/dataRelation/automaticoperate/detail.vue
+++ b/src/views/map/mapdraft/mapedit/dataRelation/automaticoperate/detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="$t('map.automaticSignalList')" :visible.sync="show" width="85%" :before-do-close="doClose">
+  <el-dialog v-dialogDrag :title="$t('map.automaticSignalList')" :visible.sync="show" width="85%" :before-do-close="doClose">
     <div>
       <QueryListPage
         ref="queryListPage"
diff --git a/src/views/map/mapdraft/mapedit/dataRelation/automaticoperate/preview.vue b/src/views/map/mapdraft/mapedit/dataRelation/automaticoperate/preview.vue
index 15f9c3709..67f11e1e1 100644
--- a/src/views/map/mapdraft/mapedit/dataRelation/automaticoperate/preview.vue
+++ b/src/views/map/mapdraft/mapedit/dataRelation/automaticoperate/preview.vue
@@ -1,5 +1,6 @@
 <template>
   <el-dialog
+    v-dialogDrag
     :title="mapInfo.name + ' / ' + name + ' / ' + title"
     :visible.sync="show"
     width="30%"
diff --git a/src/views/map/mapdraft/mapedit/dataRelation/pathoperate/detail.vue b/src/views/map/mapdraft/mapedit/dataRelation/pathoperate/detail.vue
index 6cb070137..59c299ec8 100644
--- a/src/views/map/mapdraft/mapedit/dataRelation/pathoperate/detail.vue
+++ b/src/views/map/mapdraft/mapedit/dataRelation/pathoperate/detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="$t('map.pathUnitList')" :visible.sync="show" width="85%" :before-do-close="doClose">
+  <el-dialog v-dialogDrag :title="$t('map.pathUnitList')" :visible.sync="show" width="85%" :before-do-close="doClose">
     <div>
       <QueryListPage
         ref="queryListPage"
diff --git a/src/views/map/mapdraft/mapedit/dataRelation/pathoperate/pathRoute.vue b/src/views/map/mapdraft/mapedit/dataRelation/pathoperate/pathRoute.vue
index bd49f95f5..fffa7a426 100644
--- a/src/views/map/mapdraft/mapedit/dataRelation/pathoperate/pathRoute.vue
+++ b/src/views/map/mapdraft/mapedit/dataRelation/pathoperate/pathRoute.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="$t('map.pathUnitList')" :visible.sync="show" width="85%" :before-do-close="doClose">
+  <el-dialog v-dialogDrag :title="$t('map.pathUnitList')" :visible.sync="show" width="85%" :before-do-close="doClose">
     <div>
       <QueryListPage
         ref="queryListPage"
diff --git a/src/views/map/mapdraft/mapedit/dataRelation/routeoperate/detail.vue b/src/views/map/mapdraft/mapedit/dataRelation/routeoperate/detail.vue
index 914c1c13a..d7fe69fa0 100644
--- a/src/views/map/mapdraft/mapedit/dataRelation/routeoperate/detail.vue
+++ b/src/views/map/mapdraft/mapedit/dataRelation/routeoperate/detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="$t('map.routePreview')" :visible.sync="show" width="95%" :before-do-close="doClose">
+  <el-dialog v-dialogDrag :title="$t('map.routePreview')" :visible.sync="show" width="95%" :before-do-close="doClose">
     <div>
       <QueryListPage
         ref="queryListPage"
diff --git a/src/views/map/mapdraft/mapedit/dataRelation/routeoperate/preview.vue b/src/views/map/mapdraft/mapedit/dataRelation/routeoperate/preview.vue
index 39c28826a..73edd3014 100644
--- a/src/views/map/mapdraft/mapedit/dataRelation/routeoperate/preview.vue
+++ b/src/views/map/mapdraft/mapedit/dataRelation/routeoperate/preview.vue
@@ -1,5 +1,6 @@
 <template>
   <el-dialog
+    v-dialogDrag
     :title="mapInfo.name + ' / ' + name + ' / ' + title"
     :visible.sync="show"
     width="30%"
diff --git a/src/views/map/mapdraft/mapedit/dataRelation/routeoperate/related.vue b/src/views/map/mapdraft/mapedit/dataRelation/routeoperate/related.vue
index f84f142a6..288eed52a 100644
--- a/src/views/map/mapdraft/mapedit/dataRelation/routeoperate/related.vue
+++ b/src/views/map/mapdraft/mapedit/dataRelation/routeoperate/related.vue
@@ -1,5 +1,6 @@
 <template>
   <el-dialog
+    v-dialogDrag
     :title="mapInfo.name + ' / ' + editModel.name + ' / ' + title"
     :visible.sync="show"
     width="40%"
diff --git a/src/views/map/mapdraft/mapedit/dataRelation/routingoperate/detail.vue b/src/views/map/mapdraft/mapedit/dataRelation/routingoperate/detail.vue
index 54f410f1e..c8769cacb 100644
--- a/src/views/map/mapdraft/mapedit/dataRelation/routingoperate/detail.vue
+++ b/src/views/map/mapdraft/mapedit/dataRelation/routingoperate/detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="$t('map.thenList')" :visible.sync="show" width="85%" :before-do-close="doClose">
+  <el-dialog v-dialogDrag :title="$t('map.thenList')" :visible.sync="show" width="85%" :before-do-close="doClose">
     <div>
       <QueryListPage
         ref="queryListPage"
diff --git a/src/views/map/mapdraft/mapedit/dataRelation/routingoperate/preview.vue b/src/views/map/mapdraft/mapedit/dataRelation/routingoperate/preview.vue
index 48d052a9c..2392047b5 100644
--- a/src/views/map/mapdraft/mapedit/dataRelation/routingoperate/preview.vue
+++ b/src/views/map/mapdraft/mapedit/dataRelation/routingoperate/preview.vue
@@ -1,5 +1,6 @@
 <template>
   <el-dialog
+    v-dialogDrag
     :title="mapInfo.name + ' / ' + name + ' / ' + title"
     :visible.sync="show"
     width="30%"
diff --git a/src/views/map/mapdraft/mapedit/dataRelation/switchoperate/detail.vue b/src/views/map/mapdraft/mapedit/dataRelation/switchoperate/detail.vue
index 3c926d457..ea2789932 100644
--- a/src/views/map/mapdraft/mapedit/dataRelation/switchoperate/detail.vue
+++ b/src/views/map/mapdraft/mapedit/dataRelation/switchoperate/detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="$t('map.linkageSwitchList')" :visible.sync="show" width="85%" :before-do-close="doClose">
+  <el-dialog v-dialogDrag :title="$t('map.linkageSwitchList')" :visible.sync="show" width="85%" :before-do-close="doClose">
     <div>
       <QueryListPage
         ref="queryListPage"
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/train/create.vue b/src/views/map/mapdraft/mapedit/mapoperate/train/create.vue
index 15c37e308..ae8fe4592 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/train/create.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/train/create.vue
@@ -1,5 +1,6 @@
 <template>
   <el-dialog
+    v-dialogDrag
     :title="$t('map.createBatch')"
     :visible.sync="visible"
     width="400px"
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/train/trainmodel.vue b/src/views/map/mapdraft/mapedit/mapoperate/train/trainmodel.vue
index bd5b96529..802171bd8 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/train/trainmodel.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/train/trainmodel.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="isNew? $t('map.trainmodelCreate'): $t('map.trainmodelUpdate')" :visible.sync="dialogShow" width="30%" :before-close="doClose">
+  <el-dialog v-dialogDrag :title="isNew? $t('map.trainmodelCreate'): $t('map.trainmodelUpdate')" :visible.sync="dialogShow" width="30%" :before-close="doClose">
     <el-card shadow="never">
       <el-form
         ref="form"
diff --git a/src/views/map/mapdraft/mapmanage/create.vue b/src/views/map/mapdraft/mapmanage/create.vue
index 2aaae1390..d4f42d19c 100644
--- a/src/views/map/mapdraft/mapmanage/create.vue
+++ b/src/views/map/mapdraft/mapmanage/create.vue
@@ -1,5 +1,6 @@
 <template>
   <el-dialog
+    v-dialogDrag
     v-loading="loadingUpload"
     :title="$t('map.createNewMap')"
     :visible.sync="dialogShow"
diff --git a/src/views/map/mapdraft/mapmanage/edit.vue b/src/views/map/mapdraft/mapmanage/edit.vue
index 0f4036cf1..3c19b51b7 100644
--- a/src/views/map/mapdraft/mapmanage/edit.vue
+++ b/src/views/map/mapdraft/mapmanage/edit.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="$t('map.mapEditor')" :visible.sync="dialogShow" :close-on-click-modal="false" width="30%" :before-close="handleClose">
+  <el-dialog v-dialogDrag :title="$t('map.mapEditor')" :visible.sync="dialogShow" :close-on-click-modal="false" width="30%" :before-close="handleClose">
     <div>
       <template v-if="basicInfo">
         <el-form
diff --git a/src/views/map/mapdraft/mapmanage/publish.vue b/src/views/map/mapdraft/mapmanage/publish.vue
index 1337de939..ae56117dc 100644
--- a/src/views/map/mapdraft/mapmanage/publish.vue
+++ b/src/views/map/mapdraft/mapmanage/publish.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="$t('map.mapPublished')" :visible.sync="dialogShow" width="30%" :before-close="handleClose">
+  <el-dialog v-dialogDrag :title="$t('map.mapPublished')" :visible.sync="dialogShow" width="30%" :before-close="handleClose">
     <div>
       <el-form
         ref="form"
diff --git a/src/views/map/mapdraft/mapmanage/saveAs.vue b/src/views/map/mapdraft/mapmanage/saveAs.vue
index dd353826b..040453c82 100644
--- a/src/views/map/mapdraft/mapmanage/saveAs.vue
+++ b/src/views/map/mapdraft/mapmanage/saveAs.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="$t('map.saveMapAs')" :visible.sync="dialogShow" width="30%" :before-close="handleClose">
+  <el-dialog v-dialogDrag :title="$t('map.saveMapAs')" :visible.sync="dialogShow" width="30%" :before-close="handleClose">
     <div>
       <el-form
         ref="form"
diff --git a/src/views/map/runplan/draft/setting.vue b/src/views/map/runplan/draft/setting.vue
index ae2c131c3..25ec981c4 100644
--- a/src/views/map/runplan/draft/setting.vue
+++ b/src/views/map/runplan/draft/setting.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="this.$t('map.setupOperationGraph')" :visible.sync="dialogShow" width="600px" :before-close="doClose" append-to-body>
+  <el-dialog v-dialogDrag :title="this.$t('map.setupOperationGraph')" :visible.sync="dialogShow" width="600px" :before-close="doClose" append-to-body>
     <el-form ref="form" :model="formModel" label-width="160px" size="mini" :rules="rules">
       <el-form-item :label="this.$t('map.selectOperationGraphDataRange')+':'" prop="timeArea">
         <el-time-picker
diff --git a/src/views/map/runplan/manage/create.vue b/src/views/map/runplan/manage/create.vue
index c9b4a15d9..7f9b3ff2d 100644
--- a/src/views/map/runplan/manage/create.vue
+++ b/src/views/map/runplan/manage/create.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="this.$t('map.createNewOperationGraph')+selected.name" :visible.sync="dialogShow" width="600px" :before-close="close">
+  <el-dialog v-dialogDrag :title="this.$t('map.createNewOperationGraph')+selected.name" :visible.sync="dialogShow" width="600px" :before-close="close">
     <el-steps :active="active" finish-status="success" simple>
       <el-step :title="this.$t('map.setOperatingSpeed')" icon="el-icon-edit" />
       <el-step :title="this.$t('map.createOperationGraph')" icon="el-icon-upload" />
diff --git a/src/views/map/runplan/manage/import.vue b/src/views/map/runplan/manage/import.vue
index 644d254c4..2e70e2e90 100644
--- a/src/views/map/runplan/manage/import.vue
+++ b/src/views/map/runplan/manage/import.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="this.$t('map.importOperationGraph')" :visible.sync="dialogShow" width="600px" :before-close="close">
+  <el-dialog v-dialogDrag :title="this.$t('map.importOperationGraph')" :visible.sync="dialogShow" width="600px" :before-close="close">
     <el-form ref="form" label-position="right" :model="model" size="mini" :rules="rules">
       <el-form-item prop="filename">
         <el-input v-model="model.filename" type="file" accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel" />
diff --git a/src/views/map/runplan/manage/publish.vue b/src/views/map/runplan/manage/publish.vue
index d48d206a6..07b120db8 100644
--- a/src/views/map/runplan/manage/publish.vue
+++ b/src/views/map/runplan/manage/publish.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="this.$t('map.operationGraphPublished')" :visible.sync="dialogShow" width="30%" :before-close="handleClose">
+  <el-dialog v-dialogDrag :title="this.$t('map.operationGraphPublished')" :visible.sync="dialogShow" width="30%" :before-close="handleClose">
     <div>
       <el-form ref="form" label-position="right" :model="editModel" label-width="120px" size="mini" :rules="rules">
         <el-form-item :label="this.$t('map.operationGraphName')" prop="name">
diff --git a/src/views/orderauthor/author/create.vue b/src/views/orderauthor/author/create.vue
index 8092d376c..febef1714 100644
--- a/src/views/orderauthor/author/create.vue
+++ b/src/views/orderauthor/author/create.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="this.$t('orderAuthor.oneClickGenerationPermission')" :visible.sync="dialogShow" width="420px" :before-close="handleClose">
+  <el-dialog v-dialogDrag :title="this.$t('orderAuthor.oneClickGenerationPermission')" :visible.sync="dialogShow" width="420px" :before-close="handleClose">
     <div>
       <el-form
         ref="form"
diff --git a/src/views/orderauthor/author/detail.vue b/src/views/orderauthor/author/detail.vue
index 31d628282..3ead91c3a 100644
--- a/src/views/orderauthor/author/detail.vue
+++ b/src/views/orderauthor/author/detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="this.$t('orderAuthor.packingDetails')" :visible.sync="dialogShow" width="700px" :before-close="close">
+  <el-dialog v-dialogDrag :title="this.$t('orderAuthor.packingDetails')" :visible.sync="dialogShow" width="700px" :before-close="close">
     <div>
       <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
     </div>
diff --git a/src/views/orderauthor/author/draft/choosePermission.vue b/src/views/orderauthor/author/draft/choosePermission.vue
index a3eb6020e..fd2d476dd 100644
--- a/src/views/orderauthor/author/draft/choosePermission.vue
+++ b/src/views/orderauthor/author/draft/choosePermission.vue
@@ -1,5 +1,6 @@
 <template>
   <el-dialog
+    v-dialogDrag
     :title="title"
     :visible.sync="show"
     top="20px"
diff --git a/src/views/orderauthor/author/draft/edit.vue b/src/views/orderauthor/author/draft/edit.vue
index d481bec48..9d0d4d970 100644
--- a/src/views/orderauthor/author/draft/edit.vue
+++ b/src/views/orderauthor/author/draft/edit.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog :title="this.$t('orderAuthor.modifyPermissionContent')" :visible.sync="dialogShow" width="30%" :before-close="handleClose" :z-index="2000">
+    <el-dialog v-dialogDrag :title="this.$t('orderAuthor.modifyPermissionContent')" :visible.sync="dialogShow" width="30%" :before-close="handleClose" :z-index="2000">
       <div>
         <el-form
           ref="form"
diff --git a/src/views/orderauthor/commodity/addGoods.vue b/src/views/orderauthor/commodity/addGoods.vue
index 17c78b467..7c7199a28 100644
--- a/src/views/orderauthor/commodity/addGoods.vue
+++ b/src/views/orderauthor/commodity/addGoods.vue
@@ -1,5 +1,6 @@
 <template>
   <el-dialog
+    v-dialogDrag
     :title="this.$t('orderAuthor.selectPermission')"
     :visible.sync="show"
     top="20px"
diff --git a/src/views/orderauthor/order/addGoods.vue b/src/views/orderauthor/order/addGoods.vue
index c3c5340ef..5060f12f9 100644
--- a/src/views/orderauthor/order/addGoods.vue
+++ b/src/views/orderauthor/order/addGoods.vue
@@ -1,5 +1,6 @@
 <template>
   <el-dialog
+    v-dialogDrag
     :title="this.$t('orderAuthor.orderSelectionItem')"
     :visible.sync="show"
     top="20px"
diff --git a/src/views/orderauthor/order/detail.vue b/src/views/orderauthor/order/detail.vue
index 3f71f72b0..d6a0c590d 100644
--- a/src/views/orderauthor/order/detail.vue
+++ b/src/views/orderauthor/order/detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="this.$t('orderAuthor.orderDetails')" :visible.sync="show" width="500px" :before-do-close="doClose" :close-on-click-modal="false">
+  <el-dialog v-dialogDrag :title="this.$t('orderAuthor.orderDetails')" :visible.sync="show" width="500px" :before-do-close="doClose" :close-on-click-modal="false">
     <div>
       <el-scrollbar wrap-class="scrollbar-wrapper" style="height: 400px">
         <data-form ref="dataform" :form="form" :form-model="formModel" class="data-box" />
diff --git a/src/views/orderauthor/permission/Qcode.vue b/src/views/orderauthor/permission/Qcode.vue
index 5bdb118b5..f09f1e080 100644
--- a/src/views/orderauthor/permission/Qcode.vue
+++ b/src/views/orderauthor/permission/Qcode.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="this.$t('global.scan')" :visible.sync="centerDialogVisible" width="30%" center>
+  <el-dialog v-dialogDrag :title="this.$t('global.scan')" :visible.sync="centerDialogVisible" width="30%" center>
     <el-input v-model="input" :placeholder="$t('global.inputRoomNumber')" />
     <span slot="footer" class="dialog-footer">
       <el-button @click="centerDialogVisible = false">{{ $t('global.cancel') }}</el-button>
diff --git a/src/views/orderauthor/permission/create/list.vue b/src/views/orderauthor/permission/create/list.vue
index 7f03b3d15..6a17ad6ca 100644
--- a/src/views/orderauthor/permission/create/list.vue
+++ b/src/views/orderauthor/permission/create/list.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="this.$t('orderAuthor.packingDetails')" :visible.sync="dialogShow" width="800px" :before-close="close">
+  <el-dialog v-dialogDrag :title="this.$t('orderAuthor.packingDetails')" :visible.sync="dialogShow" width="800px" :before-close="close">
     <div style="height: 300px">
       <el-scrollbar wrap-class="scrollbar-wrapper" style="">
         <el-table :data="permissionList" border style="width: 100%">
diff --git a/src/views/orderauthor/permission/draft/choosePermission.vue b/src/views/orderauthor/permission/draft/choosePermission.vue
index 9f674a531..85536f320 100644
--- a/src/views/orderauthor/permission/draft/choosePermission.vue
+++ b/src/views/orderauthor/permission/draft/choosePermission.vue
@@ -1,5 +1,6 @@
 <template>
   <el-dialog
+    v-dialogDrag
     :title="title"
     :visible.sync="show"
     top="20px"
diff --git a/src/views/orderauthor/rules/detail.vue b/src/views/orderauthor/rules/detail.vue
index 0cbb46879..47bc5a519 100644
--- a/src/views/orderauthor/rules/detail.vue
+++ b/src/views/orderauthor/rules/detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="this.$t('orderAuthor.packingDetails')" :visible.sync="dialogShow" width="800px" :before-close="close">
+  <el-dialog v-dialogDrag :title="this.$t('orderAuthor.packingDetails')" :visible.sync="dialogShow" width="800px" :before-close="close">
     <div>
       <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
     </div>
diff --git a/src/views/orderauthor/rules/selectRole/list.vue b/src/views/orderauthor/rules/selectRole/list.vue
index 412745500..c3a970b16 100644
--- a/src/views/orderauthor/rules/selectRole/list.vue
+++ b/src/views/orderauthor/rules/selectRole/list.vue
@@ -1,5 +1,6 @@
 <template>
   <el-dialog
+    v-dialogDrag
     :title="$t('permission.userList')"
     :visible.sync="show"
     top="20px"
diff --git a/src/views/package/draft/editRule.vue b/src/views/package/draft/editRule.vue
index 025480e52..8db0fc8f2 100644
--- a/src/views/package/draft/editRule.vue
+++ b/src/views/package/draft/editRule.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="title" :visible.sync="show" width="800px" :before-close="doClose" center>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="show" width="800px" :before-close="doClose" center>
     <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
     <span slot="footer" class="dialog-footer">
       <el-button type="primary" @click="draftRule">{{ isAdd? $t('global.add'): $t('global.edit') }}
diff --git a/src/views/package/selectRole/list.vue b/src/views/package/selectRole/list.vue
index 412745500..c3a970b16 100644
--- a/src/views/package/selectRole/list.vue
+++ b/src/views/package/selectRole/list.vue
@@ -1,5 +1,6 @@
 <template>
   <el-dialog
+    v-dialogDrag
     :title="$t('permission.userList')"
     :visible.sync="show"
     top="20px"
diff --git a/src/views/publish/examRule/draft/editRule.vue b/src/views/publish/examRule/draft/editRule.vue
index 87c6d1689..c8c763f44 100644
--- a/src/views/publish/examRule/draft/editRule.vue
+++ b/src/views/publish/examRule/draft/editRule.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="title" :visible.sync="dialogShow" :before-close="handleCancel" :close-on-click-modal="false">
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogShow" :before-close="handleCancel" :close-on-click-modal="false">
     <el-form ref="form" :model="form" :rules="rules" label-width="140px">
       <el-form-item :label="$t('publish.trainingType')" prop="course">
         <el-select
diff --git a/src/views/publish/runPlanCommon/chooseTemplatePlan.vue b/src/views/publish/runPlanCommon/chooseTemplatePlan.vue
index 616de182d..ce90badbc 100644
--- a/src/views/publish/runPlanCommon/chooseTemplatePlan.vue
+++ b/src/views/publish/runPlanCommon/chooseTemplatePlan.vue
@@ -1,13 +1,5 @@
 <template>
-  <el-dialog
-    v-dialogDrag
-    :title="title"
-    :visible.sync="dialogShow"
-    width="80%"
-    :before-close="doClose"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogShow" width="80%" :before-close="doClose" :modal="false" :close-on-click-modal="false">
     <QueryListPage ref="pageRules" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
     <el-row type="flex" justify="center" class="button-group">
       <el-button type="primary" :loading="loading" @click="handleConfirm">{{ $t('global.select') }}</el-button>
diff --git a/src/views/publish/runPlanTemplate/copyPlan.vue b/src/views/publish/runPlanTemplate/copyPlan.vue
index 99fbc8ac1..f83230d39 100644
--- a/src/views/publish/runPlanTemplate/copyPlan.vue
+++ b/src/views/publish/runPlanTemplate/copyPlan.vue
@@ -1,10 +1,5 @@
 <template>
-  <el-dialog
-    :title="title"
-    :visible.sync="show"
-    width="30%"
-    :before-close="doClose"
-  >
+  <el-dialog v-dialogDrag :title="title" :visible.sync="show" width="30%" :before-close="doClose">
     <el-form ref="form" :model="formMdoel" :rules="rules" label-width="140px">
       <el-form-item :label="$t('publish.selectSkinCode')" prop="skinCode">
         <el-select v-model="formMdoel.skinCode">
diff --git a/src/views/publish/runPlanTemplate/mapSelect.vue b/src/views/publish/runPlanTemplate/mapSelect.vue
index 2e311eb31..011937e21 100644
--- a/src/views/publish/runPlanTemplate/mapSelect.vue
+++ b/src/views/publish/runPlanTemplate/mapSelect.vue
@@ -1,10 +1,5 @@
 <template>
-  <el-dialog
-    :title="title"
-    :visible.sync="show"
-    width="30%"
-    :before-close="doClose"
-  >
+  <el-dialog v-dialogDrag :title="title" :visible.sync="show" width="30%" :before-close="doClose">
     <el-form ref="form" :model="formMdoel" :rules="rules" label-width="140px">
       <el-form-item :label="$t('publish.selectMap')" prop="mapId">
         <el-select v-model="formMdoel.mapId">
diff --git a/src/views/trainRoom/addPerson.vue b/src/views/trainRoom/addPerson.vue
index d5fefdf67..ea25fc8ac 100644
--- a/src/views/trainRoom/addPerson.vue
+++ b/src/views/trainRoom/addPerson.vue
@@ -1,15 +1,5 @@
 <template>
-  <el-dialog
-    v-dialogDrag
-    class="default route-cancel"
-    :title="title"
-    :visible.sync="show"
-    width="20%"
-    :z-index="2000"
-    :modal="true"
-    :before-close="cancel"
-    :close-on-click-modal="false"
-  >
+  <el-dialog v-dialogDrag class="default route-cancel" :title="title" :visible.sync="show" width="20%" :z-index="2000" :modal="true" :before-close="cancel" :close-on-click-modal="false">
     <el-input v-model="filterText" :placeholder="this.$t('global.enterNameToFilter')" clearable />
     <ul class="listBox">
       <li v-for="(item,index) in list" :key="index" class="listLi">
@@ -25,8 +15,8 @@
       </li>
     </ul>
     <span slot="footer" class="dialog-footer">
-      <el-button @click="cancel">{{$t('global.cancel')}}</el-button>
-      <el-button type="primary" @click="commit">{{$t('global.confirm')}}</el-button>
+      <el-button @click="cancel">{{ $t('global.cancel') }}</el-button>
+      <el-button type="primary" @click="commit">{{ $t('global.confirm') }}</el-button>
     </span>
   </el-dialog>
 </template>