浏览代码

边缘设备增删改

Huhu 2 年之前
父节点
当前提交
455a98d92f
共有 2 个文件被更改,包括 42 次插入47 次删除
  1. 30 39
      src/views/modules/generator/edgenodes-add-or-update.vue
  2. 12 8
      src/views/modules/generator/edgenodes.vue

+ 30 - 39
src/views/modules/generator/edgenodes-add-or-update.vue

@@ -8,18 +8,29 @@
       <el-input v-model="dataForm.edgenodesName" placeholder="名称"></el-input>
     </el-form-item>
     <el-form-item label="状态" prop="edgenodesStatus">
-      <el-input v-model="dataForm.edgenodesStatus" placeholder="状态"></el-input>
-    </el-form-item>
-    <el-form-item label="角色" prop="edgenodesRole">
+      <!-- <el-input v-model="dataForm.edgenodesStatus" placeholder="状态"></el-input> -->
+      <el-select
+          label="状态"
+          v-model="dataForm.edgenodesStatus"
+        >
+          <el-option
+            v-for="data in edgenodesStatusOption"
+            :key="data.type"
+            :label="data.label"
+            :value="data.type"
+          ></el-option>
+        </el-select>
+    </el-form-item>
+    <!-- <el-form-item label="角色" prop="edgenodesRole">
       <el-input v-model="dataForm.edgenodesRole" placeholder="角色"></el-input>
-    </el-form-item>
-    <el-form-item label="CPU" prop="cpu">
-      <el-input v-model="dataForm.cpu" placeholder="CPU"></el-input>
+    </el-form-item> -->
+    <el-form-item label="CPU核数" prop="cpu">
+      <el-input v-model="dataForm.cpu" placeholder="CPU核数"></el-input>
     </el-form-item>
     <el-form-item label="内存" prop="memory">
       <el-input v-model="dataForm.memory" placeholder="内存"></el-input>
     </el-form-item>
-    <el-form-item label="容器组" prop="edgenodesPods">
+    <!-- <el-form-item label="容器组" prop="edgenodesPods">
       <el-input v-model="dataForm.edgenodesPods" placeholder="容器组"></el-input>
     </el-form-item>
     <el-form-item label="已分配CPU" prop="allocatedCpu">
@@ -27,14 +38,14 @@
     </el-form-item>
     <el-form-item label="已分配内存" prop="allocatedMemory">
       <el-input v-model="dataForm.allocatedMemory" placeholder="已分配内存"></el-input>
-    </el-form-item>
+    </el-form-item> -->
     <el-form-item label="边缘节点IP" prop="edgenodesIp">
       <el-input v-model="dataForm.edgenodesIp" placeholder="边缘节点IP"></el-input>
     </el-form-item>
     <el-form-item label="操作系统(具体的类型 如:centos7)" prop="osImage">
       <el-input v-model="dataForm.osImage" placeholder="操作系统(具体的类型 如:centos7)"></el-input>
     </el-form-item>
-    <el-form-item label="操作系统类型(类似linux、mac、win)" prop="operatingSystem">
+    <!-- <el-form-item label="操作系统类型(类似linux、mac、win)" prop="operatingSystem">
       <el-input v-model="dataForm.operatingSystem" placeholder="操作系统类型(类似linux、mac、win)"></el-input>
     </el-form-item>
     <el-form-item label="内核版本" prop="kernelVersion">
@@ -48,10 +59,10 @@
     </el-form-item>
     <el-form-item label="系统架构" prop="architecture">
       <el-input v-model="dataForm.architecture" placeholder="系统架构"></el-input>
-    </el-form-item>
+    </el-form-item> 
     <el-form-item label="创建时间" prop="createdTime">
       <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-    </el-form-item>
+    </el-form-item>-->
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">取消</el-button>
@@ -91,49 +102,29 @@
           edgenodesStatus: [
             { required: true, message: '状态不能为空', trigger: 'blur' }
           ],
-          edgenodesRole: [
-            { required: true, message: '角色不能为空', trigger: 'blur' }
-          ],
+          
           cpu: [
             { required: true, message: 'CPU不能为空', trigger: 'blur' }
           ],
           memory: [
             { required: true, message: '内存不能为空', trigger: 'blur' }
           ],
-          edgenodesPods: [
-            { required: true, message: '容器组不能为空', trigger: 'blur' }
-          ],
-          allocatedCpu: [
-            { required: true, message: '已分配CPU不能为空', trigger: 'blur' }
-          ],
-          allocatedMemory: [
-            { required: true, message: '已分配内存不能为空', trigger: 'blur' }
-          ],
+          
           edgenodesIp: [
             { required: true, message: '边缘节点IP不能为空', trigger: 'blur' }
           ],
           osImage: [
             { required: true, message: '操作系统(具体的类型 如:centos7)不能为空', trigger: 'blur' }
           ],
-          operatingSystem: [
-            { required: true, message: '操作系统类型(类似linux、mac、win)不能为空', trigger: 'blur' }
-          ],
-          kernelVersion: [
-            { required: true, message: '内核版本不能为空', trigger: 'blur' }
-          ],
-          containerRuntimeVersion: [
-            { required: true, message: '容器版本不能为空', trigger: 'blur' }
-          ],
-          kubeletVersion: [
-            { required: true, message: 'Kubelet版本不能为空', trigger: 'blur' }
-          ],
-          architecture: [
-            { required: true, message: '系统架构不能为空', trigger: 'blur' }
-          ],
+          
           createdTime: [
             { required: true, message: '创建时间不能为空', trigger: 'blur' }
           ]
-        }
+        },
+        edgenodesStatusOption:[
+          {type:'1',label:'在线'},
+          {type:'2',label:'离线'}
+        ]
       }
     },
     methods: {

+ 12 - 8
src/views/modules/generator/edgenodes.vue

@@ -33,8 +33,12 @@
         header-align="center"
         align="center"
         label="状态">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.edgenodesStatus === '1'" size="small">在线</el-tag>
+          <el-tag v-else-if="scope.row.edgenodesStatus === '2'" size="small" type="danger">离线</el-tag>
+        </template>
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         prop="edgenodesId"
         header-align="center"
         align="center"
@@ -45,12 +49,12 @@
         header-align="center"
         align="center"
         label="角色">
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
         prop="cpu"
         header-align="center"
         align="center"
-        label="CPU">
+        label="CPU核数">
       </el-table-column>
       <el-table-column
         prop="memory"
@@ -58,7 +62,7 @@
         align="center"
         label="内存">
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         prop="edgenodesPods"
         header-align="center"
         align="center"
@@ -75,7 +79,7 @@
         header-align="center"
         align="center"
         label="已分配内存">
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
         prop="edgenodesIp"
         header-align="center"
@@ -88,7 +92,7 @@
         align="center"
         label="操作系统(具体的类型 如:centos7)">
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         prop="operatingSystem"
         header-align="center"
         align="center"
@@ -117,12 +121,12 @@
         header-align="center"
         align="center"
         label="系统架构">
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
         prop="createdTime"
         header-align="center"
         align="center"
-        label="创建时间">
+        label="修改时间">
       </el-table-column>
       <el-table-column
         fixed="right"