优化页面逻辑

gassafety-web/src/components/PopWindow/flowMeter.vue

@@ -9,7 +9,11 @@
         <el-row>
           <el-col :span="11">
             <el-form-item label="所属管道" prop="pipeCode">
-              <el-select v-model="form.pipeCode" placeholder="请选择所属管道" style="width: 100%">
+              <el-select
+                v-model="form.pipeCode"
+                placeholder="请选择所属管道"
+                style="width: 100%"
+              >
                 <el-option
                   v-for="item in pipeList"
                   :key="item.pipeCode"
@@ -75,7 +79,12 @@
 
         <el-col :span="11">
           <el-form-item label="联系电话" prop="phone">
-            <el-input v-model="form.phone" placeholder="请输入联系电话" />
+            <el-input
+              type="number"
+              maxlength="11"
+              v-model="form.phone"
+              placeholder="请输入联系电话"
+            />
           </el-form-item>
         </el-col>
 
@@ -171,7 +180,10 @@ export default {
           { required: true, message: "请输入物联网编号", trigger: "blur" },
         ],
         linkman: [{ required: true, message: "请输入联系人", trigger: "blur" }],
-        phone: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
+        phone: [
+          { required: true, message: "请输入联系电话", trigger: "blur" },
+          { min: 11, max: 11, message: "长度11个数字", trigger: "blur" },
+        ],
         iconUrl: [{ required: true, message: "请上传图片", trigger: "change" }],
         installationTime: [
           {
@@ -232,19 +244,19 @@ export default {
       this.form.url = "";
       this.fileArr = [];
     },
-    getPipeInfos(){
+    getPipeInfos() {
       pipeAllInfoList({}).then((response) => {
         this.pipeList = response.data;
       });
-    }
+    },
   },
-  watch:{
-    dialogVisible(val){
-      if(val){
+  watch: {
+    dialogVisible(val) {
+      if (val) {
         this.getPipeInfos();
       }
-    }
-  }
+    },
+  },
 };
 </script>
 

gassafety-web/src/components/PopWindow/pressureGage.vue

@@ -2,13 +2,18 @@
   <el-dialog
     :title="title"
     :visible.sync="dialogVisible"
-    :before-close="handleClose">
+    :before-close="handleClose"
+  >
     <el-row>
       <el-form ref="form" :model="form" :rules="rules" label-width="135px">
         <el-row>
           <el-col :span="11">
             <el-form-item label="所属管道" prop="pipeCode">
-              <el-select v-model="form.pipeCode" placeholder="请选择所属管道" style="width: 100%">
+              <el-select
+                v-model="form.pipeCode"
+                placeholder="请选择所属管道"
+                style="width: 100%"
+              >
                 <el-option
                   v-for="item in pipeList"
                   :key="item.pipeCode"
@@ -24,13 +29,19 @@
         <el-row>
           <el-col :span="11">
             <el-form-item label="设备名称" prop="deviceName">
-              <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
+              <el-input
+                v-model="form.deviceName"
+                placeholder="请输入设备名称"
+              />
             </el-form-item>
           </el-col>
 
           <el-col :span="11">
             <el-form-item label="设备型号" prop="deviceModel">
-              <el-input v-model="form.deviceModel" placeholder="请输入设备型号" />
+              <el-input
+                v-model="form.deviceModel"
+                placeholder="请输入设备型号"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -69,7 +80,12 @@
 
         <el-col :span="11">
           <el-form-item label="联系电话" prop="phone">
-            <el-input v-model="form.phone" placeholder="请输入联系电话" />
+            <el-input
+              type="number"
+              maxlength="11"
+              v-model="form.phone"
+              placeholder="请输入联系电话"
+            />
           </el-form-item>
         </el-col>
 
@@ -157,7 +173,10 @@ export default {
           { required: true, message: "请输入物联网编号", trigger: "blur" },
         ],
         linkman: [{ required: true, message: "请输入联系人", trigger: "blur" }],
-        phone: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
+        phone: [
+          { required: true, message: "请输入联系电话", trigger: "blur" },
+          { min: 11, max: 11, message: "长度11个数字", trigger: "blur" },
+        ],
         iconUrl: [{ required: true, message: "请上传图片", trigger: "change" }],
         installationTime: [
           {

gassafety-web/src/components/PopWindow/regulatorBox.vue

@@ -2,13 +2,18 @@
   <el-dialog
     :title="title"
     :visible.sync="dialogVisible"
-    :before-close="handleClose">
+    :before-close="handleClose"
+  >
     <el-row>
       <el-form ref="form" :model="form" :rules="rules" label-width="135px">
         <el-row>
           <el-col :span="11">
             <el-form-item label="所属管道" prop="pipeCode">
-              <el-select v-model="form.pipeCode" placeholder="请选择所属管道" style="width: 100%">
+              <el-select
+                v-model="form.pipeCode"
+                placeholder="请选择所属管道"
+                style="width: 100%"
+              >
                 <el-option
                   v-for="item in pipeList"
                   :key="item.pipeCode"
@@ -24,13 +29,19 @@
         <el-row>
           <el-col :span="11">
             <el-form-item label="设备名称" prop="deviceName">
-              <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
+              <el-input
+                v-model="form.deviceName"
+                placeholder="请输入设备名称"
+              />
             </el-form-item>
           </el-col>
 
           <el-col :span="11">
             <el-form-item label="设备型号" prop="deviceModel">
-              <el-input v-model="form.deviceModel" placeholder="请输入设备型号" />
+              <el-input
+                v-model="form.deviceModel"
+                placeholder="请输入设备型号"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -69,7 +80,12 @@
 
         <el-col :span="11">
           <el-form-item label="联系电话" prop="phone">
-            <el-input v-model="form.phone" placeholder="请输入联系电话" />
+            <el-input
+              type="number"
+              maxlength="11"
+              v-model="form.phone"
+              placeholder="请输入联系电话"
+            />
           </el-form-item>
         </el-col>
 
@@ -118,126 +134,128 @@
 </template>
 
 <script>
+import {
+  getAllDeviceInfo,
+  addDeviceInfo,
+  updateDeviceInfo,
+} from "@/api/device/deviceInfo";
+import { pipeAllInfoList } from "@/api/device/pipe";
+import MyFileUpload from "@/components/MyFileUpload";
+import { DEVICE_TYPE } from "utils/gaodeMap.js";
 
-  import { getAllDeviceInfo ,addDeviceInfo, updateDeviceInfo } from "@/api/device/deviceInfo";
-  import { pipeAllInfoList } from "@/api/device/pipe";
-  import MyFileUpload from "@/components/MyFileUpload";
-  import { DEVICE_TYPE } from "utils/gaodeMap.js";
-
-  export default {
-    props: {
-      title: { type: String }
+export default {
+  props: {
+    title: { type: String },
+  },
+  data() {
+    return {
+      form: {
+        deviceType: "1",
+      },
+      dialogVisible: false,
+      fileList: [],
+      map: null,
+      obj: null,
+      gaoMap: null,
+      fileArr: [],
+      pipeList: [],
+      rules: {
+        pipeCode: [
+          { required: true, message: "请选择所属管道", trigger: "blur" },
+          // { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" },
+        ],
+        deviceName: [
+          { required: true, message: "请输入设备名称", trigger: "blur" },
+        ],
+        deviceModel: [
+          { required: true, message: "请输入设备型号", trigger: "blur" },
+        ],
+        deviceAddr: [
+          { required: true, message: "请输入所在地址", trigger: "blur" },
+        ],
+        iotNo: [
+          { required: true, message: "请输入物联网编号", trigger: "blur" },
+        ],
+        linkman: [{ required: true, message: "请输入联系人", trigger: "blur" }],
+        phone: [
+          { required: true, message: "请输入联系电话", trigger: "blur" },
+          { min: 11, max: 11, message: "长度11个数字", trigger: "blur" },
+        ],
+        iconUrl: [{ required: true, message: "请上传图片", trigger: "change" }],
+        installationTime: [
+          {
+            // type: "date",
+            required: true,
+            message: "请选择日期",
+            trigger: "change",
+          },
+        ],
+      },
+    };
+  },
+  components: {
+    MyFileUpload,
+  },
+  methods: {
+    show() {
+      this.dialogVisible = true;
+      //this.getPipeInfo();
     },
-    data () {
-      return {
-        form : {
-          deviceType : "1"
-        },
-        dialogVisible : false,
-        fileList: [],
-        map : null,
-        obj : null,
-        gaoMap : null,
-        fileArr: [],
-        pipeList: [],
-        rules: {
-          pipeCode: [
-            { required: true, message: "请选择所属管道", trigger: "blur" },
-            // { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" },
-          ],
-          deviceName: [
-            { required: true, message: "请输入设备名称", trigger: "blur" },
-          ],
-          deviceModel: [
-            { required: true, message: "请输入设备型号", trigger: "blur" },
-          ],
-          deviceAddr: [
-            { required: true, message: "请输入所在地址", trigger: "blur" },
-          ],
-          iotNo: [
-            { required: true, message: "请输入物联网编号", trigger: "blur" },
-          ],
-          linkman: [
-            { required: true, message: "请输入联系人", trigger: "blur" },
-          ],
-          phone: [
-            { required: true, message: "请输入联系电话", trigger: "blur" },
-          ],
-          iconUrl: [{ required: true, message: "请上传图片", trigger: "change" }],
-          installationTime: [
-            {
-              // type: "date",
-              required: true,
-              message: "请选择日期",
-              trigger: "change",
-            },
-          ],
-        },
-      }
+    hide() {
+      this.remove();
     },
-    components: {
-      MyFileUpload
+    getFileInfo(res) {
+      this.form.iconUrl = res.url;
     },
-    methods: {
-      show () {
-        this.dialogVisible = true;
-        //this.getPipeInfo();
-      },
-      hide () {
-        this.remove()
-      },
-      getFileInfo(res){
-        this.form.iconUrl = res.url;
-      },
-      submitForm() {
-       this.$refs["form"].validate(valid => {
-          if (valid) {
-            if (this.form.deviceId != null) {
-              updateDeviceInfo(this.form).then(response => {
-                this.dialogVisible = false;
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.deviceId != null) {
+            updateDeviceInfo(this.form).then((response) => {
+              this.dialogVisible = false;
+              this.map.remove(this.obj);
+              this.gaoMap.addMarker(this.gaoMap.deviceType, this.form);
+              this.msgSuccess("修改成功");
+            });
+          } else {
+            addDeviceInfo(this.form).then((response) => {
+              if (response.code == 200) {
+                this.remove();
                 this.map.remove(this.obj);
-                this.gaoMap.addMarker(this.gaoMap.deviceType,this.form);
-                this.msgSuccess("修改成功");
-              });
-            } else {
-              addDeviceInfo(this.form).then(response => {
-                if(response.code == 200){
-                  this.remove();
-                  this.map.remove(this.obj);
-                  this.form.deviceId = response.data;
-                  this.gaoMap.addMarker(this.gaoMap.deviceType,this.form);
-                  //this.gaoMap.placeSearch.clear();
-                  this.gaoMap.closeAddMarker();
-                  this.msgSuccess("新增成功");
-                }else{
-                  this.msgSuccess("新增失败");
-                }
-              });
-            }
+                this.form.deviceId = response.data;
+                this.gaoMap.addMarker(this.gaoMap.deviceType, this.form);
+                //this.gaoMap.placeSearch.clear();
+                this.gaoMap.closeAddMarker();
+                this.msgSuccess("新增成功");
+              } else {
+                this.msgSuccess("新增失败");
+              }
+            });
           }
-        });
-      },
-      listRemove(e) {
-        this.form.url = "";
-        this.fileArr = [];
-      },
-      handleClose(done) {
-        done();
-      },
-      getPipeInfos(){
-        pipeAllInfoList({}).then((response) => {
-          this.pipeList = response.data;
-        });
-      }
-    },
-    watch:{
-      dialogVisible(val){
-        if(val){
-          this.getPipeInfos();
         }
+      });
+    },
+    listRemove(e) {
+      this.form.url = "";
+      this.fileArr = [];
+    },
+    handleClose(done) {
+      done();
+    },
+    getPipeInfos() {
+      pipeAllInfoList({}).then((response) => {
+        this.pipeList = response.data;
+      });
+    },
+  },
+  watch: {
+    dialogVisible(val) {
+      if (val) {
+        this.getPipeInfos();
       }
-    }
-  }
+    },
+  },
+};
 </script>
 
 

gassafety-web/src/components/PopWindow/valveWell.vue

@@ -2,13 +2,18 @@
   <el-dialog
     :title="title"
     :visible.sync="dialogVisible"
-    :before-close="handleClose">
+    :before-close="handleClose"
+  >
     <el-row>
       <el-form ref="form" :model="form" :rules="rules" label-width="135px">
         <el-row>
           <el-col :span="11">
             <el-form-item label="所属管道" prop="pipeCode">
-              <el-select v-model="form.pipeCode" placeholder="请选择所属管道" style="width: 100%">
+              <el-select
+                v-model="form.pipeCode"
+                placeholder="请选择所属管道"
+                style="width: 100%"
+              >
                 <el-option
                   v-for="item in pipeList"
                   :key="item.pipeCode"
@@ -24,13 +29,19 @@
         <el-row>
           <el-col :span="11">
             <el-form-item label="设备名称" prop="deviceName">
-              <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
+              <el-input
+                v-model="form.deviceName"
+                placeholder="请输入设备名称"
+              />
             </el-form-item>
           </el-col>
 
           <el-col :span="11">
             <el-form-item label="设备型号" prop="deviceModel">
-              <el-input v-model="form.deviceModel" placeholder="请输入设备型号" />
+              <el-input
+                v-model="form.deviceModel"
+                placeholder="请输入设备型号"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -68,7 +79,12 @@
 
         <el-col :span="11">
           <el-form-item label="联系电话" prop="phone">
-            <el-input v-model="form.phone" placeholder="请输入联系电话" />
+            <el-input
+              type="number"
+              maxlength="11"
+              v-model="form.phone"
+              placeholder="请输入联系电话"
+            />
           </el-form-item>
         </el-col>
 
@@ -117,125 +133,127 @@
 </template>
 
 <script>
+import {
+  getAllDeviceInfo,
+  addDeviceInfo,
+  updateDeviceInfo,
+} from "@/api/device/deviceInfo";
+import { pipeAllInfoList } from "@/api/device/pipe";
+import MyFileUpload from "@/components/MyFileUpload";
+import { DEVICE_TYPE } from "utils/gaodeMap.js";
 
-  import { getAllDeviceInfo ,addDeviceInfo, updateDeviceInfo } from "@/api/device/deviceInfo";
-  import { pipeAllInfoList } from "@/api/device/pipe";
-  import MyFileUpload from "@/components/MyFileUpload";
-  import { DEVICE_TYPE } from "utils/gaodeMap.js";
-
-  export default {
-    props: {
-      title: { type: String }
+export default {
+  props: {
+    title: { type: String },
+  },
+  data() {
+    return {
+      form: {
+        deviceType: "2",
+      },
+      dialogVisible: false,
+      fileList: [],
+      map: null,
+      obj: null,
+      gaoMap: null,
+      fileArr: [],
+      pipeList: [],
+      rules: {
+        pipeCode: [
+          { required: true, message: "请选择所属管道", trigger: "blur" },
+          // { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" },
+        ],
+        deviceName: [
+          { required: true, message: "请输入设备名称", trigger: "blur" },
+        ],
+        deviceModel: [
+          { required: true, message: "请输入设备型号", trigger: "blur" },
+        ],
+        deviceAddr: [
+          { required: true, message: "请输入所在地址", trigger: "blur" },
+        ],
+        iotNo: [
+          { required: true, message: "请输入物联网编号", trigger: "blur" },
+        ],
+        linkman: [{ required: true, message: "请输入联系人", trigger: "blur" }],
+        phone: [
+          { required: true, message: "请输入联系电话", trigger: "blur" },
+          { min: 11, max: 11, message: "长度11个数字", trigger: "blur" },
+        ],
+        iconUrl: [{ required: true, message: "请上传图片", trigger: "change" }],
+        installationTime: [
+          {
+            // type: "date",
+            required: true,
+            message: "请选择日期",
+            trigger: "change",
+          },
+        ],
+      },
+    };
+  },
+  components: {
+    MyFileUpload,
+  },
+  methods: {
+    show() {
+      this.dialogVisible = true;
     },
-    data () {
-      return {
-        form : {
-          deviceType : "2"
-        },
-        dialogVisible : false,
-        fileList: [],
-        map : null,
-        obj : null,
-        gaoMap : null,
-        fileArr: [],
-        pipeList: [],
-        rules: {
-          pipeCode: [
-            { required: true, message: "请选择所属管道", trigger: "blur" },
-            // { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" },
-          ],
-          deviceName: [
-            { required: true, message: "请输入设备名称", trigger: "blur" },
-          ],
-          deviceModel: [
-            { required: true, message: "请输入设备型号", trigger: "blur" },
-          ],
-          deviceAddr: [
-            { required: true, message: "请输入所在地址", trigger: "blur" },
-          ],
-          iotNo: [
-            { required: true, message: "请输入物联网编号", trigger: "blur" },
-          ],
-          linkman: [
-            { required: true, message: "请输入联系人", trigger: "blur" },
-          ],
-          phone: [
-            { required: true, message: "请输入联系电话", trigger: "blur" },
-          ],
-          iconUrl: [{ required: true, message: "请上传图片", trigger: "change" }],
-          installationTime: [
-            {
-              // type: "date",
-              required: true,
-              message: "请选择日期",
-              trigger: "change",
-            },
-          ],
-        },
-      }
+    hide() {
+      this.remove();
     },
-    components: {
-      MyFileUpload,
+    getFileInfo(res) {
+      this.form.iconUrl = res.url;
     },
-    methods: {
-      show () {
-        this.dialogVisible = true;
-      },
-      hide () {
-        this.remove()
-      },
-      getFileInfo(res){
-        this.form.iconUrl = res.url;
-      },
-      submitForm() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            if (this.form.deviceId != null) {
-              updateDeviceInfo(this.form).then(response => {
-                this.dialogVisible = false;
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.deviceId != null) {
+            updateDeviceInfo(this.form).then((response) => {
+              this.dialogVisible = false;
+              this.map.remove(this.obj);
+              this.gaoMap.addMarker(this.gaoMap.deviceType, this.form);
+              this.msgSuccess("修改成功");
+            });
+          } else {
+            addDeviceInfo(this.form).then((response) => {
+              if (response.code == 200) {
+                this.remove();
                 this.map.remove(this.obj);
-                this.gaoMap.addMarker(this.gaoMap.deviceType,this.form);
-                this.msgSuccess("修改成功");
-              });
-            } else {
-              addDeviceInfo(this.form).then(response => {
-                if(response.code == 200){
-                  this.remove();
-                  this.map.remove(this.obj);
-                  this.form.deviceId = response.data;
-                  this.gaoMap.addMarker(this.gaoMap.deviceType,this.form);
-                  //this.gaoMap.placeSearch.clear();
-                  this.gaoMap.closeAddMarker();
-                  this.msgSuccess("新增成功");
-                }else{
-                  this.msgSuccess("新增失败");
-                }
-              });
-            }
+                this.form.deviceId = response.data;
+                this.gaoMap.addMarker(this.gaoMap.deviceType, this.form);
+                //this.gaoMap.placeSearch.clear();
+                this.gaoMap.closeAddMarker();
+                this.msgSuccess("新增成功");
+              } else {
+                this.msgSuccess("新增失败");
+              }
+            });
           }
-        });
-      },
-      handleClose(done) {
-        done();
-      },
-      listRemove(e) {
-        this.form.url = "";
-        this.fileArr = [];
-      },
-      getPipeInfos(){
-        pipeAllInfoList({}).then((response) => {
-          this.pipeList = response.data;
-        });
-      }
-    },
-    watch:{
-      dialogVisible(val){
-        if(val){
-          this.getPipeInfos();
         }
+      });
+    },
+    handleClose(done) {
+      done();
+    },
+    listRemove(e) {
+      this.form.url = "";
+      this.fileArr = [];
+    },
+    getPipeInfos() {
+      pipeAllInfoList({}).then((response) => {
+        this.pipeList = response.data;
+      });
+    },
+  },
+  watch: {
+    dialogVisible(val) {
+      if (val) {
+        this.getPipeInfos();
       }
-    }
-  }
+    },
+  },
+};
 </script>
 
 

gassafety-web/src/components/PopWindowGis/workerManView.vue

@@ -131,6 +131,18 @@ export default {
     ok() {
       this.$refs.formData.validate((valid) => {
         if (valid) {
+          if (
+            moment(this.formData.beginTime).valueOf() >
+            moment(this.formData.endTime).valueOf()
+          ) {
+            this.msgError(
+              "开始时间不能大于结束时间"
+            );
+            this.formData.endTime = "";
+
+            return;
+          }
+
           this.okLoading = true;
           this.formData.beginTime = moment(this.formData.beginTime).format(
             "YYYY-MM-DD HH:mm:ss"
@@ -138,6 +150,7 @@ export default {
           this.formData.endTime = moment(this.formData.endTime).format(
             "YYYY-MM-DD HH:mm:ss"
           );
+
           console.log(this.formData);
 
           // 找到哪个值班人员
@@ -176,7 +189,7 @@ export default {
                 message: res.msg,
               });
               this.dialogVisible = false;
-              this.gaodeMap.trackBack(target, arr,data)
+              this.gaodeMap.trackBack(target, arr, data);
             }
           });
         }

gassafety-web/src/views/enterprise/mapView/index.vue

@@ -758,7 +758,7 @@ export default {
 // 左边的bar
 .leftBar-wrapper {
   position: fixed;
-  left: 100px;
+  left: 10px;
   top: 150px;
   .box {
     width: 180px;
@@ -976,13 +976,13 @@ input[type="radio"] {
 .search-input {
   position: fixed;
   top: 100px;
-  left: 7%;
+  left: 10px;
   width: 240px;
 }
 .search-but {
   position: fixed;
   top: 100px;
-  left: 23%;
+  left: 260px;
   width: 85px;
   color: white;
   background-color: #053b6a;
@@ -991,7 +991,7 @@ input[type="radio"] {
 .refresh-but {
   position: fixed;
   top: 100px;
-  left: 28%;
+  left: 345px;
   width: 85px;
   color: white;
   background-color: #053b6a;