zhaoen 4 месяцев назад
Родитель
Сommit
d8d2dfe7fb

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

@@ -156,25 +156,25 @@
           <!--  </el-form-item>-->
           <!--</el-col>-->
 
-          <!--<el-col :span="24">-->
-          <!--  <el-form-item label="模型文件" prop="modelFilePath">-->
-          <!--    <el-upload-->
-          <!--      ref="uploader"-->
-          <!--      :auto-upload="false"-->
-          <!--      :limit="1"-->
-          <!--      :show-file-list="true"-->
-          <!--      :on-change="onFileChange"-->
-          <!--      :on-remove="onFileRemove"-->
-          <!--      :before-upload="() => false"-->
-          <!--    >-->
-          <!--      <el-button icon="el-icon-upload2" type="primary" size="small">选择文件</el-button>-->
-          <!--      <span style="margin-left:10px;color:#94a3b8">支持 glb/gltf/fbx/obj/dae/stl(演示态不实际上传)</span>-->
-          <!--    </el-upload>-->
-          <!--    <div v-if="addForm.modelSize" style="margin-top:6px;color:#9fb3c8">-->
-          <!--      文件大小:{{ formatSize(addForm.modelSize) }},路径:{{ addForm.modelFilePath }}-->
-          <!--    </div>-->
-          <!--  </el-form-item>-->
-          <!--</el-col>-->
+          <el-col :span="24">
+            <el-form-item label="模型文件" prop="modelFilePath">
+              <el-upload
+                ref="uploader"
+                :auto-upload="false"
+                :limit="1"
+                :show-file-list="true"
+                :on-change="onFileChange"
+                :on-remove="onFileRemove"
+                :before-upload="() => false"
+              >
+                <el-button icon="el-icon-upload2" type="primary" size="small">选择文件</el-button>
+                <span style="margin-left:10px;color:#94a3b8">支持 glb/gltf/fbx/obj/dae/stl(演示态不实际上传)</span>
+              </el-upload>
+              <div v-if="addForm.modelSize" style="margin-top:6px;color:#9fb3c8">
+                文件大小:{{ formatSize(addForm.modelSize) }},路径:{{ addForm.modelFilePath }}
+              </div>
+            </el-form-item>
+          </el-col>
 
           <el-col :span="24">
             <el-form-item label="模型描述" prop="description">

+ 19 - 23
src/views/dataManagement/threeModelTypeManagement/index.vue

@@ -73,7 +73,7 @@
         />
         <el-table-column
           prop="typeCode"
-          label="三维模型类型码"
+          label="三维模型类型码"
           min-width="160"
           align="center"
           :filters="[{text:'ADMIN',value:'ADMIN'},{text:'EQUIP',value:'EQUIP'},{text:'ASSET',value:'ASSET'}]"
@@ -147,29 +147,25 @@
         <el-form-item label="类型名称" prop="typeName">
           <el-input v-model.trim="addForm.typeName" maxlength="100" show-word-limit placeholder="请输入类型名称" />
         </el-form-item>
-        <el-form-item label="类型码" prop="typeCode">
-          <el-select v-model="addForm.typeCode" placeholder="请选择类型码" style="width: 220px">
-            <el-option label="ADMIN" value="ADMIN" />
-            <el-option label="EQUIP" value="EQUIP" />
-            <el-option label="ASSET" value="ASSET" />
-          </el-select>
+        <el-form-item label="类型编码" prop="typeCode">
+          <el-input v-model.trim="addForm.typeCode" placeholder="请输入类型编码" />
         </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-select>
-        </el-form-item>
-        <el-form-item label="类型描述" prop="typeCategory">
+        <!--<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-select>-->
+        <!--</el-form-item>-->
+        <el-form-item label="类型描述" prop="description">
           <el-input type="textarea" v-model="addForm.description" placeholder="请输入类型描述" />
         </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-select v-model="addForm.status" placeholder="请选择状态" style="width: 220px">
-            <el-option label="禁用" value="0" />
-            <el-option label="启用" value="1" />
-          </el-select>
-        </el-form-item>
+        <!--<el-form-item label="状态" prop="status">-->
+        <!--  <el-select v-model="addForm.status" placeholder="请选择状态" style="width: 220px">-->
+        <!--    <el-option label="禁用" value="0" />-->
+        <!--    <el-option label="启用" value="1" />-->
+        <!--  </el-select>-->
+        <!--</el-form-item>-->
         <!--<el-form-item label="创建人" prop="creator">-->
         <!--  <el-input v-model.trim="addForm.creator" placeholder="例如:ADMIN/张三" />-->
         <!--</el-form-item>-->
@@ -226,9 +222,9 @@ export default {
       addForm: {
         typeName: '',
         typeCode: '',
-        typeCategory: '',
+        // typeCategory: '',
         description: '',
-        status: '',
+        // status: '',
         // creator: 'ADMIN',
         // createTime: ''
       },