Merge remote-tracking branch 'origin/master'

src/views/nuPlatformServerInfo/NuPlatformServerInfoList.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="p-2">
     <!--查询区域-->
-    <div class="jeecg-basic-table-form-container">
+    <!-- <div class="jeecg-basic-table-form-container">
       <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
         </a-row>
       </a-form>
-    </div>
+    </div> -->
     <!--引用表格-->
     <BasicTable @register="registerTable" >
       <!--插槽:table标题-->

src/views/nuPlatformServerInfo/NuPlatformServerLogListModal.vue

@@ -24,7 +24,7 @@
    * 新增
    */
   function init(record) {
-    title.value = '配置详情';
+    title.value = '维护详情';
     visible.value = true;
     nextTick(() => {
       registerForm.value.init(record);

src/views/nuPlatformServerInfo/components/NuPlatformServerLogForm.vue

@@ -16,7 +16,8 @@
 						</a-col>
 						<a-col :span="24">
 							<a-form-item label="维护日志" v-bind="validateInfos.content" id="NuPlatformServerLogForm-content" name="content">
-								<a-textarea v-model:value="formData.content" :rows="4" placeholder="请输入维护日志" />
+								<a-textarea v-if="!disabled" v-model:value="formData.content" :rows="4" placeholder="请输入维护日志" />
+                <div v-else style="margin-top:5px;">{{ formData.content }}</div>
 							</a-form-item>
 						</a-col>
           </a-row>