Skip to content

G
gassafety-progress
Commit 5bff06f2 authored by zhangjianqian's avatar zhangjianqian
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 4e081afc 38a8a5a9
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 22 deletions
gassafetyprogress-web/src/components/GetPos/index.vue
View file @ 5bff06f2
<!--
* @Author: your name
* @Date: 2022-02-12 11:07:10
* @LastEditTime: 2022-02-16 17:08:55
* @LastEditTime: 2022-02-22 15:08:10
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /test/hello-world/src/components/GetPos.vue/index.vue
......@@ -92,7 +92,9 @@ export default {
methods: {
init() {
this.$nextTick(() => {
this.map = new EditorMap("getposmap", {}, this);
const path = eval(this.$store.state.user.systemSetting.map_center);
console.log("path",path);
this.map = new EditorMap("getposmap", {center:path}, this);
// 如果不传值就是设备,传pipe就是管道
if (this.device == "") {
// 如果传了路径就创建一个marker，如果没传就直接激活手动创建
......
gassafetyprogress-web/src/views/bigWindow/index.vue
View file @ 5bff06f2
<!--
* @Author: your name
* @Date: 2022-01-11 13:44:17
* @LastEditTime: 2022-02-17 11:47:53
* @LastEditTime: 2022-02-22 15:09:22
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /test/hello-world/src/views/Home.vue
......@@ -182,9 +182,11 @@ export default {
},
},
mounted() {
const path = eval(this.$store.state.user.systemSetting.map_center);
this.map = new EditorMap(
"map",
{
center:path,
mapStyle: "amap://styles/f71d3a3d73e14f5b2bf5508bf1411758",
zoom: 14.5,
},
......
gassafetyprogress-web/src/views/regulation/device/index.vue
View file @ 5bff06f2
......@@ -564,19 +564,19 @@ export default {
rules: {
deviceName: [
{ required: true, message: "请输入设备名称", trigger: "blur" },
{ min: 0, max: 20, message: "长度20位", trigger: "blur" },
// { min: 0, max: 20, message: "长度20位", trigger: "blur" },
],
deviceCode: [
{ required: true, message: "请输入设备编号", trigger: "blur" },
{ min: 0, max: 20, message: "长度20位", trigger: "blur" },
// { min: 0, max: 20, message: "长度20位", trigger: "blur" },
],
deviceAddr: [
{ required: true, message: "请输入所在地址", trigger: "blur" },
{ min: 0, max: 30, message: "长度30位", trigger: "blur" },
// { min: 0, max: 30, message: "长度30位", trigger: "blur" },
],
deviceModel: [
{ required: true, message: "请输入设备型号", trigger: "blur" },
{ min: 0, max: 20, message: "长度20位", trigger: "blur" },
// { min: 0, max: 20, message: "长度20位", trigger: "blur" },
],
deviceType: [
{ required: true, message: "请选择设备类型", trigger: "blur" },
......@@ -746,6 +746,7 @@ export default {
this.form = response.data;
this.open = true;
this.title = "修改设备信息";
this.devicePos = [response.data.longitude, response.data.latitude];
});
},
/** 删除按钮操作 */
......
gassafetyprogress-web/src/views/regulation/gasuser/index.vue
View file @ 5bff06f2
......@@ -272,18 +272,18 @@ export default {
rules: {
username: [
{ required: true, message: "请输入用户账号", trigger: "blur" },
{ min: 0, max: 20, message: "长度20位", trigger: "blur" },
// { min: 0, max: 20, message: "长度20位", trigger: "blur" },
],
nickName: [
{ required: true, message: "请输入用户名称", trigger: "blur" },
{ min: 0, max: 20, message: "长度20位", trigger: "blur" },
// { min: 0, max: 20, message: "长度20位", trigger: "blur" },
],
userType: [
{ required: true, message: "请选择用户类型", trigger: "blur" },
],
address: [
{ required: true, message: "请输入地址", trigger: "blur" },
{ min: 0, max: 30, message: "长度30位", trigger: "blur" },
// { min: 0, max: 30, message: "长度30位", trigger: "blur" },
],
}
};
......
gassafetyprogress-web/src/views/regulation/info/index.vue
View file @ 5bff06f2
......@@ -237,15 +237,15 @@ export default {
rules: {
enterpriseName: [
{ required: true, message: "请输入企业名称", trigger: "blur" },
{ min: 0, max: 20, message: "长度20位", trigger: "blur" },
// { min: 0, max: 20, message: "长度20位", trigger: "blur" },
],
registerAddress: [
{ required: true, message: "请输入注册地址", trigger: "blur" },
{ min: 0, max: 20, message: "长度20位", trigger: "blur" },
// { min: 0, max: 20, message: "长度20位", trigger: "blur" },
],
legalRepresentative: [
{ required: true, message: "请输入法定代表人", trigger: "blur" },
{ min: 0, max: 20, message: "长度20位", trigger: "blur" },
// { min: 0, max: 20, message: "长度20位", trigger: "blur" },
],
}
};
......
gassafetyprogress-web/src/views/regulation/pipe/index.vue
View file @ 5bff06f2
......@@ -317,26 +317,26 @@ export default {
rules: {
pipeLength: [
{ required: true, message: "请输入管道长度", trigger: "blur" },
{ min: 0, max: 10, message: "长度10位", trigger: "blur" },
// { min: 0, max: 10, message: "长度10位", trigger: "blur" },
],
pipeDiameter: [
{ required: true, message: "请输入管径", trigger: "blur" },
{ min: 0, max: 15, message: "长度15位", trigger: "blur" },
// { min: 0, max: 15, message: "长度15位", trigger: "blur" },
],
pipePressure: [
{ required: true, message: "请输入压力", trigger: "blur" },
{ min: 0, max: 10, message: "长度10位", trigger: "blur" },
// { min: 0, max: 10, message: "长度10位", trigger: "blur" },
],
buildDate: [
{ required: true, message: "请选择建设年代", trigger: "blur" },
],
pipeMaterial: [
{ required: true, message: "请输入材质", trigger: "blur" },
{ min: 0, max: 10, message: "长度10位", trigger: "blur" },
// { min: 0, max: 10, message: "长度10位", trigger: "blur" },
],
buriedDepth:[
{ required: true, message: "请输入埋深", trigger: "blur" },
{ min: 0, max: 10, message: "长度10位", trigger: "blur" },
// { min: 0, max: 10, message: "长度10位", trigger: "blur" },
],
}
};
......
gassafetyprogress-web/src/views/regulation/station/index.vue
View file @ 5bff06f2
......@@ -596,7 +596,6 @@ export default {
selectTEnterprise().then(response => {
this.test = response.data;
});
const deviceId = row.siteStationId || this.ids
var tDeviceInfon={
id:deviceId,
......@@ -614,7 +613,9 @@ export default {
this.form = response.data;
this.open = true;
this.title = "修改场站信息";
this.devicePos = [response.data.longitude, response.data.latitude];
});
},
......
gassafetyprogress-web/src/views/regulation/supervise/index.vue
View file @ 5bff06f2
......@@ -254,14 +254,14 @@ export default {
rules: {
employedPeopleName: [
{ required: true, message: "请输入姓名", trigger: "blur" },
{ min: 0, max: 10, message: "长度10位", trigger: "blur" },
// { min: 0, max: 10, message: "长度10位", trigger: "blur" },
],
beyondEnterpriseId: [
{ required: true, message: "请选择受聘企业名称", trigger: "blur" },
],
idCard: [
{ required: true, message: "请输入身份证号", trigger: "blur" },
{ min: 0, max: 20, message: "长度20位", trigger: "blur" },
// { min: 0, max: 20, message: "长度20位", trigger: "blur" },
],
}
};
......
gassafetyprogress-web/vue.config.js
View file @ 5bff06f2
......@@ -34,7 +34,7 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://localhost:8903/gassafety`,
target: `http://222.223.203.154:8092/gassafety`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment