台账修改

src/views/health/vibration.vue

@@ -50,7 +50,7 @@
             style="width: 150px"
           v-model="unitvalue"
           @change="getchedian"
-          size="small"
+
           placeholder="请选择"
         >
           <el-option
@@ -66,7 +66,7 @@
         测点：
         <el-select
           v-model="monitoringvalue"
-          size="small"
+
           clearable
           placeholder="请选择"
         >
@@ -83,7 +83,7 @@
         时间：
         <el-date-picker
           v-model="timevalue"
-          size="small"
+
           type="datetimerange"
           range-separator="至"
           start-placeholder="开始日期"

src/views/ledger/enterprise.vue

@@ -99,7 +99,7 @@
               @click="newcomer(scope.row, 'addChild')"
               type="text"
               size="small"
-              >新增</el-button
+              >新增子单位</el-button
             >
             <el-button
               v-if="scope.row.state == 0"

src/views/ledger/modules.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="global-variable">
+    <div class="condition">
     <h2 class="TitleH2">主轴</h2>
     <zhuzhou
       v-if="bearingBrandOptions.length > 0 && lubricantBrandOptions.length > 0"
@@ -30,8 +31,11 @@
       :fdjLQ="coolingoptions"
       @update="handleUpdate('unitDynamoDto', $event)"
     ></Fadianji>
+  </div>
+  <div style="text-align: right;margin-top: 10px;">
+    <el-button @click="ALLsubmit" type="primary">提交</el-button>
+  </div>
 
-    <el-button @click="ALLsubmit">提交</el-button>
   </div>
 </template>
 
@@ -310,4 +314,9 @@ export default {
   font-size: 28px;
   margin: 20px 0;
 }
+.condition{
+  max-height: 700px;
+  overflow: hidden;
+  overflow-y: auto;
+}
 </style>

src/views/ledger/windsite.vue

@@ -28,7 +28,7 @@
           <el-input
             v-model="formInline.windCompany"
             placeholder="所属公司"
-          size="small"
+            size="small"
             class="search-input"
           ></el-input>
         </el-form-item>
@@ -237,7 +237,7 @@
               </el-form-item>
             </div>
             <div class="condition">
-              <el-form-item label="空气密度:" prop="density">
+              <el-form-item label="空气密度kg/m³:" prop="density">
                 <el-input v-model="form.density"></el-input>
               </el-form-item>
             </div>
@@ -250,14 +250,13 @@
                   :list="parentOpt"
                   v-model="form.companyCode"
                   @change="parentChange"
-         
                 >
                 </selecttree>
               </el-form-item>
             </div>
             <div class="condition">
-              <el-form-item label="海拔高度:" prop="elevationHeight">
-                <el-input  v-model="form.elevationHeight"></el-input>
+              <el-form-item label="海拔高度/米:" prop="elevationHeight">
+                <el-input v-model="form.elevationHeight"></el-input>
               </el-form-item>
             </div>
           </div>
@@ -307,7 +306,7 @@
                   multiple
                   collapse-tags
                   placeholder="请选择"
-                         @focus="logClick"
+                  @focus="logClick"
                   value-key="anemometerCode"
                 >
                   <el-option
@@ -429,44 +428,46 @@
       width="85%"
       :before-close="batchhandleClose"
     >
-      <div
-        class="batch-processing"
-        v-for="(item, index) in batchList"
-        :key="index"
-      >
-        <p>
-          风机名称:
-          <span>
-            <el-input v-model="item.engineName" size="small"></el-input
-          ></span>
-        </p>
-        <p>
-          海拔高度:
-          <span>
-            <el-input v-model="item.hubHeight" size="small"></el-input
-          ></span>
-        </p>
-        <p>
-          额定容量:
-          <span>
-            <el-input v-model="item.ratedCapacity" size="small"></el-input
-          ></span>
-        </p>
-        <p>
-          经度:
-          <span>
-            <el-input v-model="item.longitude" size="small"></el-input
-          ></span>
-        </p>
-        <p>
-          维度:
-          <span>
-            <el-input v-model="item.latitude" size="small"></el-input
-          ></span>
-        </p>
+      <div class="batchclass">
+        <div
+          class="batch-processing"
+          v-for="(item, index) in batchList"
+          :key="index"
+        >
+          <p>
+            风机名称:
+            <span>
+              <el-input v-model="item.engineName" size="small"></el-input
+            ></span>
+          </p>
+          <p>
+            海拔高度:
+            <span>
+              <el-input v-model="item.hubHeight" size="small"></el-input
+            ></span>
+          </p>
+          <p>
+            额定容量:
+            <span>
+              <el-input v-model="item.ratedCapacity" size="small"></el-input
+            ></span>
+          </p>
+          <p>
+            经度:
+            <span>
+              <el-input v-model="item.longitude" size="small"></el-input
+            ></span>
+          </p>
+          <p>
+            维度:
+            <span>
+              <el-input v-model="item.latitude" size="small"></el-input
+            ></span>
+          </p>
+        </div>
       </div>
-      <div style="height: 30px">
-        <el-button class="batch-submit" size="small" @click="ONbatch"
+      <div style="height: 30px; text-align: right; margin-top: 10px" >
+        <el-button class="batch-submit" type="primary" size="small" @click="ONbatch"
           >提交</el-button
         >
       </div>
@@ -1195,6 +1196,12 @@ export default {
   height: 40px;
   font-size: 14px;
 }
+.batchclass {
+  max-height: 550px;
+  overflow: hidden;
+  overflow-y: auto;
+  position: relative;
+}
 .batch-processing {
   display: flex;
   justify-content: space-between;

vue.config.js

@@ -66,8 +66,8 @@ module.exports = {
         // target: "http://192.168.5.4:16200", // 石月
         // target: "http://192.168.50.235:16200", // 内网
         // target: "http://192.168.5.15:16200",
-        target: "http://192.168.50.235:16500", //演示环境
-        // target: "http://106.120.102.238:26500", //外网演示环境
+        // target: "http://192.168.50.235:16500", //演示环境
+        target: "http://106.120.102.238:26500", //外网演示环境
         // target: "http://106.120.102.238:16700", // 外网16700  生产16600
         // target: "http://10.96.137.5",
         changeOrigin: true,