Merge remote-tracking branch 'origin/master'

gassafetyprogress-web/src/components/GetPos/index.vue

@@ -28,7 +28,7 @@
 
       <div @click="pos" class="positionBtn pos">
         <el-button type="primary" size="mini" icon="el-icon-position"
-          >定位</el-button
+          > 确定 </el-button
         >
       </div>
     </template>

gassafetyprogress-web/src/main.js

 /*
  * @Author: your name
  * @Date: 2022-01-07 11:29:13
- * @LastEditTime: 2022-02-17 11:35:38
+ * @LastEditTime: 2022-02-18 17:29:27
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /gassafety-progress/gassafetyprogress-web/src/main.js
  */
-import Vue from 'vue'
+import Vue from "vue";
 
-import Cookies from 'js-cookie'
+import Cookies from "js-cookie";
 
-import Element from 'element-ui'
-import './assets/styles/element-variables.scss'
+import Element from "element-ui";
+import "./assets/styles/element-variables.scss";
 
-import '@/assets/styles/index.scss' // global css
-import '@/assets/styles/zehong.scss' // zehong css
-import './assets/css/font.css'
-import './assets/styles/all.scss'
+import "@/assets/styles/index.scss"; // global css
+import "@/assets/styles/zehong.scss"; // zehong css
+import "./assets/css/font.css";
+import "./assets/styles/all.scss";
 
-import App from './App'
-import store from './store'
-import router from './router'
-import permission from './directive/permission'
-import * as echarts from 'echarts'
-import './assets/icons' // icon
-import './permission' // permission control
+import App from "./App";
+import store from "./store";
+import router from "./router";
+import permission from "./directive/permission";
+import * as echarts from "echarts";
+import "./assets/icons"; // icon
+import "./permission"; // permission control
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
-import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/zehong";
+import {
+  parseTime,
+  resetForm,
+  addDateRange,
+  selectDictLabel,
+  selectDictLabels,
+  download,
+  handleTree,
+} from "@/utils/zehong";
 import Pagination from "@/components/Pagination";
 // 自定义表格工具扩展
-import RightToolbar from "@/components/RightToolbar"
-
+import RightToolbar from "@/components/RightToolbar";
 
 // 全局方法挂载
-Vue.prototype.$echarts = echarts
+Vue.prototype.$echarts = echarts;
 Vue.prototype.$Vue = Vue;
-Vue.prototype.getDicts = getDicts
-Vue.prototype.getConfigKey = getConfigKey
-Vue.prototype.parseTime = parseTime
-Vue.prototype.resetForm = resetForm
-Vue.prototype.addDateRange = addDateRange
-Vue.prototype.selectDictLabel = selectDictLabel
-Vue.prototype.selectDictLabels = selectDictLabels
-Vue.prototype.download = download
-Vue.prototype.handleTree = handleTree
+Vue.prototype.getDicts = getDicts;
+Vue.prototype.getConfigKey = getConfigKey;
+Vue.prototype.parseTime = parseTime;
+Vue.prototype.resetForm = resetForm;
+Vue.prototype.addDateRange = addDateRange;
+Vue.prototype.selectDictLabel = selectDictLabel;
+Vue.prototype.selectDictLabels = selectDictLabels;
+Vue.prototype.download = download;
+Vue.prototype.handleTree = handleTree;
 
 Vue.prototype.msgSuccess = function (msg) {
   this.$message({ showClose: true, message: msg, type: "success" });
-}
+};
 
 Vue.prototype.msgError = function (msg) {
   this.$message({ showClose: true, message: msg, type: "error" });
-}
+};
 
 Vue.prototype.msgInfo = function (msg) {
   this.$message.info(msg);
-}
+};
 
 // 全局组件挂载
-Vue.component('Pagination', Pagination)
-Vue.component('RightToolbar', RightToolbar)
+Vue.component("Pagination", Pagination);
+Vue.component("RightToolbar", RightToolbar);
 
-Vue.use(permission)
+Vue.use(permission);
 
 /**
  * If you don't want to use mock-server
@@ -72,16 +79,19 @@ Vue.use(permission)
  * Currently MockJs will be used in the production environment,
  * please remove it before going online! ! !
  */
-
+// dialog只允许点关闭或者取消按钮关闭
+Element.Dialog.props.closeOnClickModal = false;
+Element.Dialog.props.closeOnPressEscape = false;
 Vue.use(Element, {
-  size: Cookies.get('size') || 'medium' // set element-ui default size
-})
+  size: Cookies.get("size") || "medium", // set element-ui default size
+});
+console.log(Element);
 
-Vue.config.productionTip = false
+Vue.config.productionTip = false;
 
 new Vue({
-  el: '#app',
+  el: "#app",
   router,
   store,
-  render: h => h(App)
-})
+  render: (h) => h(App),
+});