修改

public/config.js

@@ -7,6 +7,6 @@ window.SERVICE_ID = {
   authTreeId: 18126, //获取表头
   roleListId: 10024,//角色列表
   userAuthorizationId: 10027,//用户授权
-  depTableId: 204, //机器维护表头
+  depTableId: 185, //机器维护表头
   serTableId: 203, //服务设置表头
 };

src/views/systemSettings/views/newMachine/components/table.vue

@@ -34,6 +34,21 @@
                 </span>
               </template>
             </el-table-column>
+            <el-table-column label="服务类型">
+              <template slot-scope="scope">
+                <div>{{ scope.row.serviceType == 1 ? '接收' :'采集' }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column label="采集频率单位">
+              <template slot-scope="scope">
+                <div>{{ scope.row.frequencyUnit ? scope.row.frequencyUnit + '秒' :'' }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column label="状态">
+              <template slot-scope="scope">
+                <div>{{ scope.row.runState ? '启用' :'停用' }}</div>
+              </template>
+            </el-table-column>
             <el-table-column fixed="right" label="操作" width="80px">
               <template slot-scope="scope">
                 <div class="hd-td">
@@ -472,8 +487,15 @@ export default {
     },
     //初始化表格
     initTableData () {
+      const newDatas = []
       this.tableColsCopy = this.tableCols.filter((item) => item.needShow);
       this.tableColsCopy = _.orderBy(this.tableColsCopy, ['orderNumber'], ['asc']);
+      this.tableColsCopy.map((item, index) => {
+        if (item.columnName == 'serviceType' || item.columnName == 'frequencyUnit' || item.columnName == 'runState') {
+          this.tableColsCopy.splice(index, 1)
+        }
+      })
+      console.log(this.tableColsCopy)
       this.tableDataCopy = _.cloneDeep(this.tableData);
       const datas = _.cloneDeep(this.tableColsCopy);
       // const reqUts = [];

src/views/systemSettings/views/newMachine/index.vue

@@ -35,21 +35,21 @@
               <div v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)">
                 <div v-for="(item,index) in dataList" :key="index" @click.stop="handleClick(item,index)" :class="index == activeIndex ? 'active':''" class="contents flex">
                   <div class="left">
-                    <span :class="item.runState ? 'success' : 'error'" class="box"></span>
+                    <span :class="item.deploystate ? 'success' : 'error'" class="box"></span>
                     <el-tooltip class="item" effect="dark" :content="item.deployNodeName" placement="top">
                       <span class="txt">{{ item.deployNodeName }}</span>
                     </el-tooltip>
                   </div>
                   <div v-show="activeIndex == index" class="right">
-                    <!-- <template v-if="!flag && item.deployNodeID">
+                    <template v-if="!flag && item.deployNodeID">
                       <template v-if="item.serviceType == 4">
-                        <span @click.stop="handleStart" v-if="!item.runState" class="start">启用</span>
+                        <span @click.stop="handleStart" v-if="!item.deploystate" class="start">启用</span>
                         <span @click.stop="handleStop" v-else class="stop">停用</span>
                       </template>
                       <template v-else>
                         <span @click.stop="handleRest(item)" class="rest">重置</span>
                       </template>
-                    </template> -->
+                    </template>
                     <span @click.stop="handleError" class="error">删除</span>
                   </div>
                 </div>
@@ -68,16 +68,24 @@
             <el-button type="primary" @click="handleSave" :disabled="flag" class="bcButton" size="small">保存</el-button>
           </div>
           <div class="demo-form">
-            <el-form :inline="true" :model="formInline" class="flex">
-              <el-form-item label="机器名称">
-                <el-input clearable v-model="formInline.deployNodeName" :disabled="activeIndex == null" size="small" placeholder="请输入服务名称"></el-input>
-              </el-form-item>
-              <el-form-item label="IP及端口">
-                <el-input clearable v-model="formInline.serviceURL" :disabled="activeIndex == null" size="small" placeholder="请输入IP及端口"></el-input>
-              </el-form-item>
-              <el-form-item label="部署位置">
-                <el-input clearable v-model="formInline.filepath" :disabled="activeIndex == null" size="small" placeholder="请输入部署位置"></el-input>
-              </el-form-item>
+            <el-form label-width="70px" :model="formInline">
+              <el-row :gutter="40">
+                <el-col :span="6">
+                  <el-form-item label="机器名称">
+                    <el-input clearable v-model="formInline.deployNodeName" :disabled="activeIndex == null" size="small" placeholder="请输入服务名称"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="IP及端口">
+                    <el-input clearable v-model="formInline.serviceURL" :disabled="activeIndex == null" size="small" placeholder="请输入IP及端口"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="部署位置">
+                    <el-input clearable v-model="formInline.filepath" :disabled="activeIndex == null" size="small" placeholder="请输入部署位置"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
             </el-form>
           </div>
         </div>