Merge pull request '唐润平：模型实际数值显示和排版修复' (#365) from trp_dev into dev

Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/365

src/components/content/tunnelScene/preEquComp/preDialog.vue

@@ -21,13 +21,17 @@
       <!-- <p>{{ params.equipmentType }}</p> -->
       <!-- </div> -->
       <div class="setting-item">
-        <p>设备名称</p>
+        <p>设备名称:</p>
         <!-- <el-select v-model="equipmentSetting.chooseEquipment" :fit-input-width="true" filterable clearable
           :placeholder="params.equipmentName" disabled>
           <el-option v-for="item in options2" :key="item.value" :label="item.label" :value="item.value" />
         </el-select> -->
         <p>{{ params.equipmentName }}</p>
       </div>
+      <div class="setting-item">
+        <p>参数:</p>
+        <p>31.3%</p>
+      </div>
       <!-- <input-num name="阈值" :placeholder="params.equipmentValue" @inputValue="handelInput"
         :disabled="isDisabledInputNum" />
       <p>{{ params.equipmentValue }}</p> -->
@@ -53,8 +57,19 @@ import {
 } from "vue";
 
 // 定义事件发射器，父组件监听
-const emit = defineEmits(["cancel", "removeEquipment", "addEquipment", "EquInf"]);
+const emit = defineEmits([
-const params = defineProps(["pointNum", "pointGap", "equipmentType", "equipmentName", "equipmentValue"]); //隧道第几个锚点
+  "cancel",
+  "removeEquipment",
+  "addEquipment",
+  "EquInf",
+]);
+const params = defineProps([
+  "pointNum",
+  "pointGap",
+  "equipmentType",
+  "equipmentName",
+  "equipmentValue",
+]); //隧道第几个锚点
 
 // 当前风压
 let p = ref(57);
@@ -68,18 +83,15 @@ let p = ref(57);
 // console.log(params.equipmentName);
 // console.log(params.equipmentValue);
 
-
-
 // let equipmentTypeInf = ref(params.equipmentType)
 // let equipmentNameInf = ref(params.equipmentName)
 // let equipmentValueInf = ref(params.equipmentValue)
 
-
-
 //计算锚点之间距离
 const pointDistance_str = computed(
   () =>
-    `${params.pointGap}米*${params.pointNum}=${params.pointGap * params.pointNum
+    `${params.pointGap}米*${params.pointNum}=${
+      params.pointGap * params.pointNum
     }米`
 );
 
@@ -173,8 +185,8 @@ const equipment = {
 <style lang="scss" scoped>
 #edit-dialog {
   // width: 540px;
-  width: 190px;
+  width: 230px;
-  height: 150px;
+  height: 120px;
   // min-height: 683px;
   background: rgba(7, 35, 72, 0.79);
   border-radius: 20px;
@@ -220,8 +232,6 @@ const equipment = {
     color: white;
     line-height: 35px;
     margin: 20px 30px 0px 30px;
-
-
   }
 
   .equ-info span {
@@ -230,20 +240,22 @@ const equipment = {
 
   .setting {
     .setting-item {
-      padding: 30px 30px 10px 30px;
+      padding: 15px 15px 5px 15px;
-
+      display: flex;
+      gap: 10px;
       p {
         width: 190px;
         height: 35px;
+        line-height: 35px;
         font-size: 18px;
         font-family: MicrosoftYaHei;
         color: #ffffff;
-        line-height: 35px;
+        text-align: right;
-        margin-bottom: 20px;
       }
 
       p:nth-child(2) {
-        color: #f7b500
+        color: #f7b500;
+        text-align: left;
       }
     }
 
@@ -289,14 +301,12 @@ const equipment = {
 
     button[disabled] {
       color: grey !important;
-      opacity: 1
+      opacity: 1;
     }
 
     button {
       cursor: pointer;
       transition: transform 0.1s linear 0s;
-
-
     }
 
     & :nth-child(1) {