zhaoen 4 miesięcy temu
rodzic
commit
1d77939a0a

+ 31 - 31
src/views/dataManagement/threeModelManagement/index.vue

@@ -63,7 +63,7 @@
         <!--<el-table-column prop="secretLevel" label="密级" width="80" align="center"/>-->
         <!--<el-table-column prop="modelCategory" label="文件大小" width="100" align="center"/>-->
         <!--<el-table-column prop="uploader" label="上传人" width="100" align="center"/>-->
-        <el-table-column prop="creator" label="创建人" min-width="180" align="center" sortable/>
+        <el-table-column prop="createBy" label="创建人" min-width="180" align="center" sortable/>
         <el-table-column prop="createTime" label="创建时间" min-width="180" align="center" sortable/>
         <el-table-column label="操作" fixed="right" align="center" width="220">
           <template slot-scope="{ row }">
@@ -132,15 +132,15 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="模型分类" prop="modelCategory">
-              <el-select v-model="addForm.modelCategory" placeholder="请选择">
-                <el-option label="ZB模型" value="ZB"/>
-                <el-option label="场景模型" value="SCENE"/>
-                <el-option label="环境模型" value="ENV"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="12">-->
+          <!--  <el-form-item label="模型分类" prop="modelCategory">-->
+          <!--    <el-select v-model="addForm.modelCategory" placeholder="请选择">-->
+          <!--      <el-option label="ZB模型" value="ZB"/>-->
+          <!--      <el-option label="场景模型" value="SCENE"/>-->
+          <!--      <el-option label="环境模型" value="ENV"/>-->
+          <!--    </el-select>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
 
           <el-col :span="12">
             <el-form-item label="模型格式" prop="modelFormat">
@@ -189,21 +189,21 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="24">
-            <el-form-item label="模型标签" prop="tags">
-              <el-select
-                v-model="addForm.tags"
-                multiple
-                filterable
-                allow-create
-                default-first-option
-                placeholder="输入并回车可创建新标签"
-                style="width:100%"
-              >
-                <el-option v-for="t in tagOptions" :key="t" :label="t" :value="t"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="24">-->
+          <!--  <el-form-item label="模型标签" prop="tags">-->
+          <!--    <el-select-->
+          <!--      v-model="addForm.tags"-->
+          <!--      multiple-->
+          <!--      filterable-->
+          <!--      allow-create-->
+          <!--      default-first-option-->
+          <!--      placeholder="输入并回车可创建新标签"-->
+          <!--      style="width:100%"-->
+          <!--    >-->
+          <!--      <el-option v-for="t in tagOptions" :key="t" :label="t" :value="t"/>-->
+          <!--    </el-select>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
         </el-row>
       </el-form>
 
@@ -243,22 +243,22 @@ export default {
       addForm: {
         modelName: '',
         modelTypeId: '',
-        modelCategory: '',
+        // modelCategory: '',
         modelFilePath: '',
         modelSize: 0,
         modelFormat: '',
         description: '',
-        tags: [],
+        // tags: [],
         status: '0'
       },
       addRules: {
         modelName: [{required: true, message: '请输入模型名称', trigger: 'blur'}],
         modelTypeId: [{required: true, message: '请选择模型类型', trigger: 'change'}],
-        modelCategory: [{required: true, message: '请选择模型分类', trigger: 'change'}],
+        // modelCategory: [{required: true, message: '请选择模型分类', trigger: 'change'}],
         modelFilePath: [{required: true, message: '请选择模型文件', trigger: 'change'}],
         modelFormat: [{required: true, message: '请选择或确认格式', trigger: 'change'}],
         description: [{min: 0, max: 500, message: '不超过500字', trigger: 'blur'}],
-        tags: [{type: 'array', required: true, message: '至少添加1个标签', trigger: 'change'}]
+        // tags: [{type: 'array', required: true, message: '至少添加1个标签', trigger: 'change'}]
       },
       tagOptions: ['建筑', '场景', '环境', '机密', '标准件', '高精度'],
       allTypeList: [],
@@ -389,12 +389,12 @@ export default {
       this.addForm = {
         modelName: '',
         modelTypeId: '',
-        modelCategory: '',
+        // modelCategory: '',
         modelFilePath: '',
         modelSize: 0,
         modelFormat: '',
         description: '',
-        tags: [],
+        // tags: [],
         status: '0'
       }
       this.addOrUpdateTitle = '新建'

+ 11 - 15
src/views/dataManagement/threeModelTypeManagement/index.vue

@@ -18,9 +18,7 @@
           filterable
           style="width: 180px"
         >
-          <el-option label="ADMIN" value="ADMIN"/>
-          <el-option label="EQUIP" value="EQUIP"/>
-          <el-option label="ASSET" value="ASSET"/>
+          <el-option v-for="(item, index) in $getDictList('sys_type_category')" :key="index" :label="item.dictName" :value="item.dictName"/>
         </el-select>
       </el-form-item>
       <!--<el-form-item label="创建时间">-->
@@ -41,13 +39,13 @@
       <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
       <el-button @click="resetQuery">重置</el-button>
       <el-button type="primary" icon="el-icon-plus" @click="openAdd">新建</el-button>
-      <el-button
-        type="danger"
-        icon="el-icon-delete"
-        :disabled="!selectedRows.length"
-        @click="handleBatchDelete"
-      >批量删除
-      </el-button>
+      <!--<el-button-->
+      <!--  type="danger"-->
+      <!--  icon="el-icon-delete"-->
+      <!--  :disabled="!selectedRows.length"-->
+      <!--  @click="handleBatchDelete"-->
+      <!--&gt;批量删除-->
+      <!--</el-button>-->
     </template>
 
     <!-- 主内容区表格 -->
@@ -62,7 +60,7 @@
       >
         <el-table-column type="selection" width="55"/>
         <el-table-column type="index" label="序号" width="60"/>
-        <el-table-column prop="id" label="编号" width="100" sortable align="center"/>
+        <!--<el-table-column prop="id" label="编号" width="100" sortable align="center"/>-->
         <el-table-column
           prop="typeName"
           label="类型名称"
@@ -81,7 +79,7 @@
             <el-tag type="danger" v-else>否</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="creator" label="创建人" width="120" align="center"/>
+        <el-table-column prop="createBy" label="创建人" width="120" align="center"/>
         <el-table-column prop="createTime" label="创建时间" align="center" sortable/>
         <el-table-column label="操作" fixed="right" align="center" width="220">
           <template slot-scope="{ row }">
@@ -153,9 +151,7 @@
         </el-form-item>
         <el-form-item label="类型分类" prop="typeCategory">
           <el-select v-model="addForm.typeCategory" placeholder="请选择类型分类" style="width: 220px">
-            <el-option label="分类一" value="ADMIN"/>
-            <el-option label="分类二" value="EQUIP"/>
-            <el-option label="分类三" value="ASSET"/>
+            <el-option v-for="(item, index) in $getDictList('sys_type_category')" :key="index" :label="item.dictName" :value="item.dictName"/>
           </el-select>
         </el-form-item>
         <el-form-item label="类型描述" prop="description">

+ 1 - 1
src/views/equipment/equipment.vue

@@ -58,7 +58,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="createTime" label="创建时间" align="center" sortable/>
-        <el-table-column prop="userName" label="创建人" align="center" sortable/>
+        <el-table-column prop="createBy" label="创建人" align="center" sortable/>
         <el-table-column label="操作" fixed="right" align="center" width="220">
           <template slot-scope="{ row }">
             <div class="action-bar">

+ 1 - 1
src/views/equipment/equipmentModel.vue

@@ -45,7 +45,7 @@
             <vab-icon :icon="['fas', row.zbModelIcon]" />
           </template>
         </el-table-column>
-        <el-table-column prop="userName" label="创建人" width="120" align="center" sortable/>
+        <el-table-column prop="createBy" label="创建人" width="120" align="center" sortable/>
         <el-table-column prop="createTime" label="创建时间" width="180" align="center" sortable/>
         <el-table-column label="操作" fixed="right" align="center" width="220">
           <template slot-scope="{ row }">

+ 1 - 2
src/views/equipment/equipmentType.vue

@@ -31,10 +31,9 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55"/>
-        <el-table-column type="index" label="序号" width="60"/>
         <el-table-column prop="zbTypeName" label="装备类型名称" width="120" align="center"/>
         <el-table-column prop="zbTypeRemark" label="装备类型备注"  align="center" show-overflow-tooltip/>
-        <el-table-column prop="userName" label="创建人" width="120" align="center" sortable/>
+        <el-table-column prop="createBy" label="创建人" width="120" align="center" sortable/>
         <el-table-column prop="createTime" label="创建时间" width="180" align="center" sortable/>
         <el-table-column label="操作" fixed="right" align="center" width="220">
           <template slot-scope="{ row }">