修改

src/views/resContainerInstance/index.vue

@@ -88,8 +88,8 @@
           style="width: 150px"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="flag">
-        <el-select v-model="queryParams.flag" placeholder="请选择状态" clearable size="small">
+      <el-form-item label="状态" prop="dockerStatus">
+        <el-select v-model="queryParams.dockerStatus" placeholder="请选择状态" clearable size="small">
           <el-option
             v-for="dict in statusOptions"
             :key="dict.dictValue"
@@ -157,11 +157,11 @@
             {{ scope.row.superiName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="容器模版" prop="dockerTemplateId" width="130" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            {{ scope.row.quotaName || '-' }}
-          </template>
-        </el-table-column>
+<!--        <el-table-column label="容器模版" prop="dockerTemplateId" width="130" :show-overflow-tooltip="true">-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ scope.row.quotaName || '-' }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column label="CPU" prop="dockerCpu" width="60" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.dockerCpu || '-' }}
@@ -192,10 +192,10 @@
             {{ scope.row.imageName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column width="70" label="状态" prop="flag">
+        <el-table-column width="70" label="状态" prop="dockerStatus">
           <template slot-scope="scope">
             <el-switch
-              v-model="scope.row.flag"
+              v-model="scope.row.dockerStatus"
               class="switchDisabledStyle"
               inactive-value="0"
               active-value="1"
@@ -253,17 +253,24 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="容器模版" prop="dockerTemplateId">
-              <el-select v-model="form.dockerTemplateId" placeholder="请选择容器模版" @change="templateChange" clearable style="width: 205px">
-                <el-option v-for="item in resQuotaTemplateList" :key="item.businessId" :label="item.quotaName" :value="item.businessId" />
+            <el-form-item label="容器镜像" prop="dockerImageId">
+              <el-select v-model="form.dockerImageId" placeholder="请选择容器镜像" clearable style="width: 205px">
+                <el-option v-for="item in resPublicImageList" :key="item.businessId" :label="item.imageName" :value="item.businessId" />
               </el-select>
             </el-form-item>
           </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="容器模版" prop="dockerTemplateId">-->
+<!--              <el-select v-model="form.dockerTemplateId" placeholder="请选择容器模版" @change="templateChange" clearable style="width: 205px">-->
+<!--                <el-option v-for="item in resQuotaTemplateList" :key="item.businessId" :label="item.quotaName" :value="item.businessId" />-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <el-col v-if="title === '修改容器实例'" :span="12">
             <el-form-item label="容器状态" prop="dockerStatus">
-              <el-select v-model="form.dockerStatus" placeholder="请选择容器状态" clearable style="width: 205px">
+              <el-select v-model="form.dockerStatus" disabled placeholder="请选择容器状态" clearable style="width: 205px">
                 <el-option value="1" label="启动" />
                 <el-option value="2" label="退出" />
               </el-select>
@@ -316,21 +323,14 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="容器镜像" prop="dockerImageId">
-              <el-select v-model="form.dockerImageId" placeholder="请选择容器镜像" clearable style="width: 205px">
-                <el-option v-for="item in resPublicImageList" :key="item.businessId" :label="item.imageName" :value="item.businessId" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.flag">
-                <el-radio label="1">启用</el-radio>
-                <el-radio label="0">停用</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="状态">-->
+<!--              <el-radio-group v-model="form.flag">-->
+<!--                <el-radio label="1">启用</el-radio>-->
+<!--                <el-radio label="0">停用</el-radio>-->
+<!--              </el-radio-group>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
         <el-row>
           <el-col :span="24">

src/views/system/user/index.vue

@@ -285,7 +285,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="角色" prop="postId">
-              <el-select v-model="form.roleList" multiple placeholder="请选择" style="width: 100%" @change="roleChange">
+              <el-select v-model="form.roleList" placeholder="请选择" style="width: 100%" @change="roleChange">
                 <el-option
                   v-for="item in options"
                   :key="item.businessId"