Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety

gassafety-web/src/assets/styles/gassafety.scss

@@ -272,3 +272,23 @@
     display: none;
   }
 }
+// 所有的提示框标题
+.el-dialog__header{
+  padding-bottom:0;
+  padding:0px;
+  height: 51px;
+  line-height: 50px;
+  background-color: #053b6a;
+  .el-dialog__title{
+    display: inline-block;
+    margin-left:22px;
+    color:#fff;
+
+  }
+  .el-dialog__headerbtn{
+    i{
+      color: #fff;
+    }
+  }
+  // background-color: ;
+}
\ No newline at end of file

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

 <template>
   <el-dialog
-    title="新增"
+    :title="myTitle"
     :visible.sync="dialogVisible"
     :before-close="handleClose"
   >
@@ -9,8 +9,8 @@
         :rules="rules"
         ref="editForm"
         :model="editForm"
-        label-width="120px"
-        size="mini"
+        label-width="135px"
+
       >
         <el-col>
           <el-form-item v-show="false" label="管道id" prop="pipeId">
@@ -224,6 +224,15 @@ export default {
       },
     };
   },
+  computed:{
+    myTitle(){
+      if(this.editForm.pipeId){
+        return `修改管道信息`
+      }else{
+        return `新增管道信息`
+      }
+    }
+  },
   created() {
     console.log("lineData", this.lineData, this.lnglatsArr, this.pipeLength);
     if (this.lineData?.pipeId) {

gassafety-web/src/utils/gaodeMap.js

@@ -602,7 +602,7 @@ class gaodeMap {
       lineData: { pipeName }
     } = obj.getExtData();
     vue
-      .$confirm(`是否删除${pipeName}`, "提示", {
+      .$confirm(`是否删除名称为${pipeName}的管道 ?`, "提示", {
         // confirmButtonText: "确定",
         // cancelButtonText: "取消",
         type: "warning"