729位置修改

src/view/components/Fengmen.vue

@@ -32,7 +32,8 @@
                           </template>
                           <el-table-column prop="fanname" label="风机名称" />
                           <el-table-column prop="pname" label="选择巷道" />
-                        <el-table-column prop="site" label="相对位置" />
+                        <!-- <el-table-column prop="site" label="相对位置" /> -->
+                         <el-table-column property="siteremark" label="位置"/>
                         <el-table-column prop="pa" >
                             <template v-slot:header>
                             <span >增压</span><br>
@@ -109,7 +110,8 @@
                           </template>
                           <el-table-column prop="doorname" label="风门名称" />
                           <el-table-column prop="pname" label="选择巷道" />
-                        <el-table-column prop="site" label="相对位置" />
+                        <!-- <el-table-column prop="site" label="相对位置" /> -->
+                         <el-table-column property="siteremark" label="位置"/>
                         <el-table-column prop="dragcoe" label="阻力系数" />
                         <el-table-column prop="onoff" label="开启状态">
                           <template #default="scope">
@@ -199,7 +201,8 @@
           <el-table-column type="index" label="编号" width="70" />
           <el-table-column property="fanname" label="风机名称" />
           <el-table-column property="pname" label="巷道名称"  />
-          <el-table-column property="site" label="相对位置" />
+          <!-- <el-table-column property="site" label="相对位置" /> -->
+          <el-table-column property="siteremark" label="位置"/>
           <el-table-column prop="pa" >
                             <template v-slot:header>
                             <span >增压</span><br>
@@ -292,7 +295,7 @@
           <el-button type="primary" @click="Dclick('fj')">3D巷道选择</el-button>
         </div>
       </div>
-      <div class="input">
+      <!-- <div class="input">
         <el-form-item label="相对位置" :label-width="formLabelWidth6">
           <el-input-number
             v-model="source.site"
@@ -306,7 +309,14 @@
             @change="inputnuberChange"
           />
         </el-form-item>
-      </div>
+      </div> -->
+      <el-form-item label="位置" :label-width="formLabelWidth6">
+        <el-input
+          v-model="fjobj.siteremark"
+          class="w-50 m-2"
+          placeholder="请输入位置说明"
+        />
+      </el-form-item>
       <div style="display: flex;" >
                   <span class="switchppm">开启状态</span>
                 <el-switch 
@@ -382,7 +392,8 @@
           <el-table-column type="index" label="编号" width="70" />
           <el-table-column property="doorname" label="风门名称" />
           <el-table-column property="pname" label="巷道名称"  />
-          <el-table-column property="site" label="相对位置" />
+          <!-- <el-table-column property="site" label="相对位置" /> -->
+           <el-table-column property="siteremark" label="位置"/>
           <el-table-column prop="dragcoe" label="阻力系数" />
           <el-table-column prop="onoff" label="开启状态">
                           <template #default="scope">
@@ -471,7 +482,7 @@
           <el-button type="primary" @click="Dclick('fm')">3D巷道选择</el-button>
         </div>
       </div>
-      <div class="input">
+      <!-- <div class="input">
         <el-form-item label="相对位置" :label-width="formLabelWidth6">
           <el-input-number
             v-model="source.site"
@@ -485,7 +496,14 @@
             @change="inputnuberChange1"
           />
         </el-form-item>
-      </div>
+      </div> -->
+      <el-form-item label="位置" :label-width="formLabelWidth6">
+        <el-input
+          v-model="fmobj.siteremark"
+          class="w-50 m-2"
+          placeholder="请输入位置说明"
+        />
+      </el-form-item>
       <div style="display: flex;" >
                   <span class="switchppm">开启状态</span>
                 <el-switch 
@@ -971,7 +989,7 @@ const addrequest=()=>{
     pa:parseFloat(fjobj.value.pa),
     onoff:fjobj.value.onoff,
     aid:aid.value,
-
+    siteremark: fmobj.value.siteremark || ""
   };
   request(params)
     .then((res) => {
@@ -1181,6 +1199,7 @@ const addxiufm = () => {
     dragcoe: parseFloat(fmobj.value.dragcoe),
     onoff: fmobj.value.onoff,
     aid: aid.value,
+    siteremark: fmobj.value.siteremark || ""
   };
 
   request(params)

src/view/components/InfoDisaster.vue

@@ -28,7 +28,8 @@
                         <p>暂无数据</p>
                       </template>
                         <el-table-column prop="pname" label="选择巷道" />
-                        <el-table-column prop="site" label="相对位置" />
+                        <!-- <el-table-column prop="site" label="相对位置" /> -->
+                        <el-table-column property="siteremark" label="位置"/>
                         <!-- <el-table-column label="操作" >
                           <template #default="scope">
                             <el-button
@@ -160,7 +161,8 @@
                         <p>暂无数据</p>
                         </template>
                         <el-table-column prop="pname" label="选择巷道"  />
-                        <el-table-column prop="site" label="相对位置"  />
+                        <!-- <el-table-column prop="site" label="相对位置"  /> -->
+                        <el-table-column property="siteremark" label="位置"/>
                         <!-- <el-table-column label="操作" >
                           <template #default="scope">
                             <el-button
@@ -288,7 +290,8 @@
                         </template>
                         <el-table-column prop="pumpname" label="水泵名称"  />
                         <el-table-column prop="pname" label="选择巷道"  />
-                        <el-table-column prop="site" label="相对位置"  />
+                        <!-- <el-table-column prop="site" label="相对位置"  /> -->
+                        <el-table-column property="siteremark" label="位置"/>
                         <el-table-column prop="onoff" label="开启状态">
                           <template #default="scope">
                             {{
@@ -514,8 +517,9 @@
                         <p>暂无数据</p>
                         </template>
                         <el-table-column prop="pname" label="巷道" />
-                        <el-table-column prop="ssite" label="开始位置" />
-                        <el-table-column prop="esite" label="结束位置" />>
+                        <!-- <el-table-column prop="ssite" label="开始位置" />
+                        <el-table-column prop="esite" label="结束位置" /> -->
+                        <el-table-column property="siteremark" label="位置"/>
                       </el-table>
                       <div class="asdis_btn">
                         <!-- <div class="btnpading"> -->
@@ -627,7 +631,7 @@
         </div>
       </el-aside>
     </div>
-    <!-- 一维瓦斯爆炸 -->
+    <!-- 快速瓦斯爆炸 -->
     <div class="common-layout" style="margin: 0" v-show="sour.collGass1">
       <el-aside width="2.125rem" class="L_aside L_aside1 asideg asidegbg leftbgimg1">
         <div class="demo-collapse">
@@ -654,8 +658,9 @@
                         <p>暂无数据</p>
                       </template>
                         <el-table-column prop="pname" label="选择巷道" />
-                        <el-table-column prop="ssite" label="开始位置" />
-                        <el-table-column prop="esite" label="结束位置" />
+                        <!-- <el-table-column prop="ssite" label="开始位置" />
+                        <el-table-column prop="esite" label="结束位置" /> -->
+                        <el-table-column property="siteremark" label="位置"/>
                         <el-table-column prop="gasdensity" label="瓦斯爆炸区浓度"  />
                       </el-table>
                       <div class="asdis_btn">
@@ -736,7 +741,7 @@
           <el-button type="primary" @click="Dclick('ws')">3D巷道选择</el-button>
         </div>
       </div>
-      <div class="input">
+      <!-- <div class="input">
         <el-form-item label="开始位置" :label-width="formLabelWidth6">
           <el-input-number
             v-model="yiweiobj.ssite"
@@ -765,7 +770,14 @@
             @change="ywgess2"
           />
         </el-form-item>
-      </div>
+      </div> -->
+      <el-form-item label="位置" :label-width="formLabelWidth6">
+        <el-input
+          v-model="yiweiobj.siteremark"
+          class="w-50 m-2"
+          placeholder="请输入位置说明"
+        />
+      </el-form-item>
       <div class="input">
         <el-form-item label="瓦斯爆炸区浓度" :label-width="formLabelWidth6">
           <el-input-number
@@ -912,8 +924,7 @@
           <el-button type="primary" @click="Dclick('ws')">3D巷道选择</el-button>
         </div>
       </div>
-      <div class="input">
-        <!--          @change="gessanum1" -->
+      <!-- <div class="input">
         <el-form-item label="开始位置" :label-width="formLabelWidth5">
           <el-input-number
             v-model="wasi.ssite"
@@ -927,7 +938,6 @@
          
           />
         </el-form-item>
-        <!--    @change="gessanum2" -->
         <el-form-item label="结束位置" :label-width="formLabelWidth5">
           <el-input-number
             v-model="wasi.esite"
@@ -940,7 +950,14 @@
             @change="gessanum2"
           />
         </el-form-item>
-      </div>
+      </div> -->
+      <el-form-item label="位置" :label-width="formLabelWidth6">
+        <el-input
+          v-model="wasi.siteremark"
+          class="w-50 m-2"
+          placeholder="请输入位置说明"
+        />
+      </el-form-item>
       <div class="dialog-footer footer_div l_btn">
         <div class="footerbtn flex1">
           <div class="borderimg">
@@ -1068,7 +1085,7 @@
           <el-button type="primary" @click="Dclick()">3D巷道选择</el-button>
         </div>
       </div>
-      <div class="input">
+      <!-- <div class="input">
         <el-form-item label="相对位置" :label-width="formLabelWidth5">
           <el-input-number
             v-model="source.site"
@@ -1082,7 +1099,14 @@
             @change="inputnuberChange2"
           />
         </el-form-item>
-      </div>
+      </div> -->
+      <el-form-item label="位置" :label-width="formLabelWidth5">
+        <el-input
+          v-model="source.siteremark"
+          class="w-50 m-2"
+          placeholder="请输入位置说明"
+        />
+      </el-form-item>
       <div class="dialog-footer footer_div l_btn">
         <div class="footerbtn flex1">
           <div class="borderimg">
@@ -1143,7 +1167,8 @@
           <el-table-column type="index" label="编号" width="70" />
           <el-table-column property="pumpname" label="水泵名称" />
           <el-table-column property="pname" label="巷道名称"  />
-          <el-table-column property="site" label="相对位置" />
+          <!-- <el-table-column property="site" label="相对位置" /> -->
+          <el-table-column property="siteremark" label="位置"/>
           <el-table-column prop="onoff" label="开启状态">
                           <template #default="scope">
                             {{
@@ -1250,7 +1275,7 @@
           <el-button type="primary" @click="Dclick()">3D巷道选择</el-button>
         </div>
       </div>
-      <div class="input">
+      <!-- <div class="input">
         <el-form-item label="相对位置" :label-width="formLabelWidth6">
           <el-input-number
             v-model="source.site"
@@ -1264,7 +1289,14 @@
             @change="inputnuberChange1"
           />
         </el-form-item>
-      </div>
+      </div> -->
+      <el-form-item label="位置" :label-width="formLabelWidth6">
+        <el-input
+          v-model="pumpobj.siteremark"
+          class="w-50 m-2"
+          placeholder="请输入位置说明"
+        />
+      </el-form-item>
       <div style="display: flex;" >
                   <span class="switchppm">开启状态</span>
                 <el-switch 
@@ -1817,6 +1849,7 @@ let wasi=ref({
   options:[{ name:"空白区" ,value:'0'},{ name:"积聚区" ,value:'1'},{ name:"点火区" ,value:'2'}],
   type:'0',
   gasdensity:0,
+  siteremark: '',
 })
 // 水泵参数
 let  pumpobj=ref({
@@ -2338,6 +2371,7 @@ const xiugaiapi = () => {
     pid: firepid.value,
     site: source.site,
     sid: tableobj.value.sid,
+    siteremark: source.siteremark,
   };
   request(params)
     .then((res) => {
@@ -2742,6 +2776,7 @@ const wsbalastadd=()=>{
     ssite:wasi.value.ssite,
     esite: wasi.value.esite,
     gbid:wasi.value.gbid,
+    siteremark: wasi.value.siteremark || ""
   };
   request(params)
     .then((res) => {
@@ -3089,7 +3124,8 @@ const addrequest=()=>{
     pid: firepid.value,
     aid: aid.value,
     site: source.site,
-   onoff:pumpobj.value.onoff
+   onoff:pumpobj.value.onoff,
+   siteremark: pumpobj.value.siteremark || ""
   };
   request(params)
     .then((res) => {
@@ -3390,6 +3426,7 @@ const yehandleEdit=()=>{
     ssite:yiweiobj.value.ssite,
     esite:yiweiobj.value.esite,
     gasdensity:parseFloat(yiweiobj.value.gasdensity),
+    siteremark: yiweiobj.value.siteremark || "",
   };
   request(params)
     .then((res) => {

src/view/components/MenuCheck.vue

@@ -32,7 +32,8 @@
                                     <!-- <el-table-column prop="chcode" label="监测点编号"  width="100" /> -->
                                     <el-table-column prop="chname" label="监测点名称" />
                                     <el-table-column prop="pname" label="所在巷道" />
-                                    <el-table-column prop="site" label="相对位置" />
+                                    <!-- <el-table-column prop="site" label="相对位置" /> -->
+                                    <el-table-column property="siteremark" label="位置"/>
                                 </el-table>
                             </div>
                         </div>
@@ -113,7 +114,7 @@
           <div class="btn2">
           <el-button type="primary"  @click="fireclick();sdialog.dialogVisiblenode=true">选择巷道</el-button></div>
           </div>
-          <div class="input">
+          <!-- <div class="input">
           <el-form-item label="相对位置" :label-width="formLabelWidth5">
               <el-input-number v-model="source.site" :min="0" :max="1" 
               :precision="2" :step="0.1"
@@ -123,7 +124,14 @@
               @change="inputnumberChange"
               />
           </el-form-item>
-          </div>
+          </div> -->
+          <el-form-item label="位置" :label-width="formLabelWidth5">
+            <el-input
+              v-model="source.siteremark"
+              class="w-50 m-2"
+              placeholder="请输入位置说明"
+            />
+          </el-form-item>
           <div class="dialog-footer footer_div l_btn">
               <div class="footerbtn flex1"><div class="borderimg"><el-button @click="clearvtk();sdialog.dianadddialog=false">取消</el-button></div></div>
               <div class="footerbtn flex1"><div class="borderimg"><el-button  @click="addEditaip(); ">
@@ -288,8 +296,8 @@ let source=ref({
     selectstr:'',
     site:0,
     chname:'',
-    chcode:''
-
+    chcode:'',
+    siteremark:''
 
 })
 let  firepid=ref("")
@@ -394,7 +402,8 @@ const addEditaip=()=>{
         pid:firepid.value,
         site:source.value.site,
         chname:source.value.chname,
-        chcode:source.value.chcode
+        chcode:source.value.chcode,
+        siteremark:source.value.siteremark || ""
 
     }
     request(params)

src/view/components/Menupump.vue

@@ -40,7 +40,8 @@
                             />
                             <el-table-column prop="pumpname" label="水泵名称" />
                             <el-table-column prop="pname" label="巷道名称" />
-                            <el-table-column prop="site" label="相对位置" />
+                            <!-- <el-table-column prop="site" label="相对位置" /> -->
+                            <el-table-column property="siteremark" label="位置"/>
                             <el-table-column prop="onoff" label="开启状态">
                               <template #default="scope">
                                 {{
@@ -244,7 +245,7 @@
                 </div>
               </div>
 
-              <div class="input">
+              <!-- <div class="input">
                 <el-form-item label="相对位置" :label-width="formLabelWidth6">
                   <el-input-number
                     v-model="senobj.site"
@@ -258,7 +259,14 @@
                     @change="inputnumberChange"
                   />
                 </el-form-item>
-              </div>
+              </div> -->
+              <el-form-item label="位置" :label-width="formLabelWidth6">
+                <el-input
+                  v-model="senobj.siteremark"
+                  class="w-50 m-2"
+                  placeholder="请输入位置说明"
+                />
+              </el-form-item>
               <div style="display: flex">
                 <span class="switchppm">开启状态</span>
                 <el-switch
@@ -593,7 +601,8 @@ const addEied = () => {
     closehig: parseFloat(senobj.value.closehig),
     pid: senobj.value.pid,
     site: senobj.value.site,
-    onoff: senobj.value.onoff
+    onoff: senobj.value.onoff,
+    siteremark: senobj.value.siteremark || ""
   }
   console.log(params)
   request(params)

src/view/components/Menuventdoor.vue

@@ -34,7 +34,8 @@
                         </template>
                         <el-table-column prop="doorname" label="风门名称" />
                         <el-table-column prop="pname" label="巷道名称" />
-                        <el-table-column prop="site" label="相对位置" />
+                        <!-- <el-table-column prop="site" label="相对位置" /> -->
+                        <el-table-column property="siteremark" label="位置"/>
                         <el-table-column prop="dragcoe" label="阻力系数" />
                         <el-table-column prop="onoff" label="开启状态">
                           <template #default="scope">
@@ -117,7 +118,7 @@
                   >
                 </div>
               </div>
-              <div class="input">
+              <!-- <div class="input">
                 <el-form-item label="相对位置" :label-width="formLabelWidth6">
                   <el-input-number
                     v-model="fmObj.site"
@@ -131,7 +132,14 @@
                     @change="inputnumberChange"
                   />
                 </el-form-item>
-              </div>
+              </div> -->
+              <el-form-item label="位置" :label-width="formLabelWidth6">
+                <el-input
+                  v-model="fmObj.siteremark"
+                  class="w-50 m-2"
+                  placeholder="请输入位置说明"
+                />
+              </el-form-item>
               <div style="display: flex">
                 <span class="switchppm">开启状态</span>
                 <el-switch
@@ -269,6 +277,7 @@ const fmsave=()=>{
     site:fmObj.value.site,
     dragcoe:parseFloat(fmObj.value.dragcoe),
     onoff:fmObj.value.onoff,
+    siteremark: fmObj.value.siteremark,
   }
   request(params)
     .then((res) => {

src/view/components/Menuventfan.vue

@@ -33,8 +33,9 @@
                           <p>暂无数据</p>
                         </template>
                         <el-table-column prop="fanname" label="风机名称" />
-                          <el-table-column prop="pname" label="巷道名称" />
-                        <el-table-column prop="site" label="相对位置" />
+                        <el-table-column prop="pname" label="巷道名称" />
+                        <!-- <el-table-column prop="site" label="相对位置" /> -->
+                        <el-table-column property="siteremark" label="位置"/>
                         <el-table-column prop="pa" >
                             <template v-slot:header>
                             <span >增压</span><br>
@@ -142,7 +143,7 @@
                   >
                 </div>
               </div>
-              <div class="input">
+              <!-- <div class="input">
                 <el-form-item label="相对位置" :label-width="formLabelWidth6">
                   <el-input-number
                     v-model="femObj.site"
@@ -156,7 +157,14 @@
                     @change="inputnumberChange"
                   />
                 </el-form-item>
-              </div>
+              </div> -->
+              <el-form-item label="位置" :label-width="formLabelWidth6">
+                <el-input
+                  v-model="femObj.siteremark"
+                  class="w-50 m-2"
+                  placeholder="请输入位置说明"
+                />
+              </el-form-item>
               <div style="display: flex">
                 <span class="switchppm">开启状态</span>
                 <el-switch
@@ -275,6 +283,7 @@ const femsave=()=>{
     site:femObj.value.site,
     pa:parseFloat(femObj.value.pa),
     onoff:femObj.value.onoff,
+    siteremark: femObj.value.siteremark || "",
   }
   request(params)
     .then((res) => {

src/view/evolutionView.vue

@@ -32,7 +32,8 @@
        <el-table-column property="sid" label="编号" width="60"/>
        <el-table-column property="pname" label="管道名称"/>
        <el-table-column property="pid" label="管道编号" width="80" />
-       <el-table-column property="site" label="相对位置"/>
+       <!-- <el-table-column property="site" label="相对位置"/> -->
+       <el-table-column property="siteremark" label="位置"/>
        <el-table-column label="操作" width="220">
          <template #default="scope">
            <el-button
@@ -61,7 +62,7 @@
      <div class="btn2">
      <el-button type="primary"  @click="fireclick(); dialogVisiblenode = true;selenum=1">选择管道</el-button></div>
      </div>
-     <div class="input">
+     <!-- <div class="input">
      <el-form-item label="相对位置" :label-width="formLabelWidth5">
          <el-input-number v-model="source.site" :min="0" :max="1" 
          :precision="2" :step="0.1"
@@ -70,7 +71,14 @@
            placeholder="相对位置"
            />
        </el-form-item>
-     </div>
+     </div> -->
+     <el-form-item label="位置" :label-width="formLabelWidth5">
+        <el-input
+          v-model="source.siteremark"
+          class="w-50 m-2"
+          placeholder="请输入位置说明"
+        />
+      </el-form-item>
      <div  class="textright">
      <el-button type="primary"  @click="handleEditfire()">保存</el-button>
     </div>
@@ -229,7 +237,8 @@
        <el-table-column property="sid" label="编号" width="60"/>
        <el-table-column property="pname" label="管道名称"/>
        <el-table-column property="pid" label="管道编号" width="80" />
-       <el-table-column property="site" label="相对位置"/>
+       <!-- <el-table-column property="site" label="相对位置"/> -->
+       <el-table-column property="siteremark" label="位置"/>
        <el-table-column label="操作" width="220">
          <template #default="scope">
            <el-button
@@ -258,7 +267,7 @@
      <div class="btn2">
      <el-button type="primary"  @click="fireclick(); dialogVisiblenode = true;selenum=1">选择管道</el-button></div>
      </div>
-     <div class="input">
+     <!-- <div class="input">
      <el-form-item label="相对位置" :label-width="formLabelWidth5">
          <el-input-number v-model="source.site" :min="0" :max="1" 
          :precision="2" :step="0.1"
@@ -267,7 +276,14 @@
            placeholder="相对位置"
            />
        </el-form-item>
-     </div>
+     </div> -->
+     <el-form-item label="位置" :label-width="formLabelWidth5">
+        <el-input
+          v-model="source.siteremark"
+          class="w-50 m-2"
+          placeholder="请输入位置说明"
+        />
+      </el-form-item>
      <div  class="textright">
      <el-button type="primary"  @click="handleEditfire()">保存</el-button>
     </div>
@@ -403,7 +419,7 @@ let isdialogVisiblerz=ref(true);
    let waaddshow=ref(false);
    let isDisasterfire=ref(false);
    let isDisasterwater=ref(false);
-   let source=reactive({pname:"",site:0.1})
+   let source=reactive({pname:"",site:0.1,siteremark:""})
     let loading=ref(true)
    const dialogVisiblenode = ref(false)
    const dialogVisibleadd = ref(false)
@@ -436,6 +452,7 @@ let isdialogVisiblerz=ref(true);
       pname: 'Tom0',
       pid: 'No. 189, Grove St, Los Angeles',
       site:"30",
+      siteremark:""
      },
    
    ]);
@@ -581,7 +598,8 @@ function pipelinedata(searchtag){
         aid:aid.value,
         stype:activeName.value,
         site:source.site,
-        userId:userId.value
+        userId:userId.value,
+        siteremark:source.siteremark
         }
         request(params)
           .then((res) => { 
@@ -616,6 +634,7 @@ function pipelinedata(searchtag){
         site:source.site,
         sid:gdxiugai.value.sid,
         userId:userId.value,
+        siteremark:source.siteremark
         }
         request(params)
           .then((res) => {