优化材质和审核

src/api/material/index.ts

@@ -11,7 +11,6 @@ import request from '@/axios'
 //资源管理分页接口
 export const getMaterial = (params: any) => {
   params.page = params.page - 1
-  params.materialType = 1
   return request.post({ url: '/material/pageQuery', params })
 }
 
@@ -22,7 +21,6 @@ export const upIcon = (params: any) => {
 
 //保存材质接口
 export const saveResource = (params: any) => {
-  params.materialType = 1
   return request.post({ url: '/material/save', data: params })
 }
 //批量保存材质接口

src/views/Audit/AuditManage.vue

@@ -120,7 +120,11 @@ const deletetab = async (data: TableSlotDefault) => {
     const res = await deleteAudit(arr)
     refresh()
     if (res.code == 200) {
-      ElMessage.success('删除成功')
+      if (res.message.includes('成功')) {
+        ElMessage.success(res.message)
+      } else {
+        ElMessage.error(res.message)
+      }
     }
     refresh()
   })
@@ -145,7 +149,11 @@ const getSelections = async () => {
         const res = await deleteAudit(arr)
         console.log('kkkkkkss', res)
         if (res.code == 200) {
-          ElMessage.success('删除成功')
+          if (res.message.includes('成功')) {
+            ElMessage.success(res.message)
+          } else {
+            ElMessage.error(res.message)
+          }
         }
         refresh()
       })

src/views/Login/components/LoginForm.vue

@@ -77,7 +77,7 @@ const schema = reactive<FormSchema[]>([
       span: 24
     },
     componentProps: {
-      placeholder: '请输入用户名',
+      placeholder: '请输入账号',
       prefixIcon: <Icon icon="mdi:account" />
     }
   },

src/views/Material/MaterialMange.vue

@@ -7,7 +7,7 @@
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <script setup lang="tsx">
-import { ElInput } from 'element-plus'
+import { ElInput, ElSelect, ElOption } from 'element-plus'
 import { ref } from 'vue'
 import { Dialog } from '@/components/Dialog'
 import { ContentWrap } from '@/components/ContentWrap'
@@ -25,10 +25,13 @@ import { useForm } from '@/hooks/web/useForm'
 import { BaseButton } from '@/components/Button'
 import { useUserStore } from '@/store/modules/user'
 import { log } from 'console'
+import { json } from 'stream/consumers'
 const PATH_URL = window.VITE_API_BASE_PATH
-
+const tietu = ref('')
 const { required } = useValidator()
 const text = ref('')
+const materialType = ref('')
+
 const userStore = useUserStore()
 defineOptions({
   name: 'TemplateManage'
@@ -40,7 +43,8 @@ const { tableRegister, tableState, tableMethods } = useTable({
     const res = await getMaterial({
       page: unref(currentPage),
       pageSize: unref(pageSize),
-      name: unref(text)
+      name: unref(text),
+      materialType: unref(materialType)
     })
     res.data.content.map((item) => {
       item.materialIcon = PATH_URL + item.materialIcon
@@ -72,6 +76,17 @@ const columns = reactive<TableColumn[]>([
     type: 'index'
   },
   {
+    field: 'materialName',
+    label: '材质名称'
+  },
+  {
+    field: 'materialType',
+    label: '材质类型',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue === 1 ? '贴图' : cellValue === 2 ? '颜色' : ''
+    }
+  },
+  {
     field: 'icon',
     label: '图标'
   },
@@ -95,6 +110,7 @@ const columns = reactive<TableColumn[]>([
   }
 ])
 const imageUrl = ref('')
+const imageUrl2 = ref('')
 const isedit = ref('添加')
 //删除
 const deletetab = async (data: TableSlotDefault) => {
@@ -128,6 +144,48 @@ const { getElFormExpose, getFormData } = formMethods
 
 const schema = reactive<FormSchema[]>([
   {
+    field: 'materialType',
+    label: '材质类型',
+    component: 'Select',
+    colProps: {
+      span: 24
+    },
+    componentProps: {
+      options: [
+        { label: '贴图', value: 1 },
+        { label: '颜色', value: 2 }
+      ],
+      placeholder: '请选择材质类型',
+      onChange: (value) => {
+        if (value === 2) {
+          schema.find((item) => item.field === 'TIETU').colProps.span = 0
+        } else {
+          schema.find((item) => item.field === 'TIETU').colProps.span = 24
+        }
+      }
+    },
+    formItemProps: {
+      rules: [required()]
+    }
+  },
+  {
+    field: 'materialName',
+    label: '材质名称',
+    component: 'Input',
+    colProps: {
+      span: 24
+    },
+    componentProps: {
+      style: {
+        width: '100%'
+      },
+      placeholder: '请输入材质名称'
+    },
+    formItemProps: {
+      rules: [required()]
+    }
+  },
+  {
     field: 'materialIcon',
     component: 'Upload',
     colProps: {
@@ -170,50 +228,62 @@ const schema = reactive<FormSchema[]>([
     }
   },
   {
-    field: 'jsonPath',
+    field: 'TIETU',
     component: 'Upload',
-    label: '材质内容',
     colProps: {
       span: 24
     },
+    label: '贴图图片',
+    formItemProps: {},
     componentProps: {
-      limit: 1,
-      action: PATH_URL + '/resource/v1/addJsonFile',
+      action: PATH_URL + '/resource/manage/uploadImg',
       headers: headers,
-      fileList: [],
-      multiple: true,
-      onPreview: (uploadFile) => {
-        console.log(uploadFile)
-      },
-      onRemove: async (file) => {
-        const formData = await getFormData()
-        formData.jsonPath = ''
-        formData.compressFileName = ''
-        formData.uploadCompress = false
-      },
+      showFileList: false,
       onSuccess: async (_response, uploadFile) => {
-        console.log('kankan_response', uploadFile)
+        imageUrl2.value = URL.createObjectURL(uploadFile.raw!)
         const formData = await getFormData()
-        formData.jsonPath = _response.data
-        formData.compressFileName = uploadFile.name
-      },
-      beforeRemove: (uploadFile) => {},
-      onExceed: (files, uploadFiles) => {
-        ElMessage.warning('只能上传一个资源，请移除后重新上传')
+        formData.TIETU = _response.data
+        console.log('asdhjasdkj', formData)
       },
       beforeUpload: (rawFile) => {
-        console.log('kokokoko', rawFile)
-        // if (rawFile.type !== 'application/x-zip-compressed' && rawFile.name.indexOf('.rar') == -1) {
-        //   ElMessage.error('只能上传RAR、ZIP文件')
-        //   return false
-        // }
-        // return true
+        console.log('kankangeshi', rawFile)
+        if (rawFile.type !== 'image/png' && rawFile.type !== 'image/jpeg') {
+          ElMessage.error('上传格式：png、jpg!')
+          return false
+        }
+        return true
       },
       slots: {
-        default: () => <BaseButton type="primary">点击上传</BaseButton>,
-        tip: () => <div class="el-upload__tip">文件类型：JSON</div>
+        default: () => (
+          <>
+            {imageUrl2.value ? <img src={imageUrl2.value} class="avatar" /> : null}
+            {!imageUrl2.value ? (
+              <ElIcon class="avatar-uploader-icon" size="large" style="font-size: 50px">
+                +
+              </ElIcon>
+            ) : null}
+          </>
+        ),
+        tip: () => <div class="el-upload__tip">上传格式：png、jpg，大小：56x56px；</div>
       }
     }
+  },
+  {
+    field: 'jsonValue',
+    label: '材质内容',
+    component: 'Input',
+    colProps: {
+      span: 24
+    },
+    componentProps: {
+      type: 'textarea',
+      rows: 4,
+      placeholder: '请输入材质内容'
+    },
+
+    formItemProps: {
+      rules: [required()]
+    }
   }
 ])
 const schema2 = reactive<FormSchema[]>([
@@ -272,10 +342,21 @@ const edittab = async (data: TableSlotDefault) => {
   const formData = await getFormData()
   formData.compressFileName = data.row.compressFileName
   formData.jsonPath = data.row.jsonPath
+  formData.TIETU = data.row.jsonValue.texture
+
   formData.materialName = data.row.materialName
 
+  let a = JSON.parse(JSON.stringify(data.row.jsonValue))
+  tietu.value = a.texture
+  imageUrl2.value = PATH_URL + data.row.jsonValue.texture
+  delete a.texture
+  formData.jsonValue = JSON.stringify(a)
+
+  formData.materialType = data.row.materialType
+
   formData.materialIcon = data.row.materialIcon.replace(PATH_URL, '')
   imageUrl.value = data.row.materialIcon
+
   formData.materialId = data.row.materialId
   schema[1].componentProps.fileList = [
     {
@@ -283,12 +364,33 @@ const edittab = async (data: TableSlotDefault) => {
       url: data.row.jsonPath
     }
   ]
+
+  // 如果材质类型是颜色，不显示贴图图标
+  if (formData.materialType === 2) {
+    schema.find((item) => item.field === 'TIETU').colProps.span = 0
+  } else {
+    schema.find((item) => item.field === 'TIETU').colProps.span = 24
+  }
 }
 // 添加编辑模板管理
 const signIn = async () => {
   const formRef = await getElFormExpose()
   const formData = await getFormData()
+  console.log('asdhajgsh', formData.jsonValue)
+
+  if (!formData.TIETU && formData.materialType == 1) {
+    ElMessage.warning('请上传贴图图标')
+    return
+  }
+
+  formData.jsonValue = JSON.parse(formData.jsonValue)
 
+  console.log('shdjasd1', formData.TIETU)
+  if (formData.TIETU) {
+    formData.jsonValue.texture = formData.TIETU
+  } else {
+    formData.jsonValue.texture = tietu.value
+  }
   //如果是编辑去掉icon的拼接
   console.log('kakkkkak', formData)
   await formRef?.validate(async (isValid) => {
@@ -296,6 +398,7 @@ const signIn = async () => {
       const res = await saveResource(formData)
       if (res) {
         dialogVisible.value = false
+        ElMessage.success('保存成功')
         refresh()
       }
     }
@@ -350,23 +453,69 @@ const getSelections = async () => {
     ElMessage.warning('请选择数据')
   }
 }
+
+const options = [
+  {
+    value: 1,
+    label: '贴图'
+  },
+  {
+    value: 2,
+    label: '颜色'
+  }
+]
+
+//搜索
+const handersearch = function () {
+  tableState.currentPage.value = 1
+  refresh()
+}
+
 const tianjia = async () => {
   imageUrl.value = ''
+  imageUrl2.value = ''
   isedit.value = '添加'
   schema[1].componentProps.fileList = []
   dialogVisible.value = true
 }
-const batchtianjia = async () => {
-  dialogVisible2.value = true
-}
 </script>
 
 <template>
   <ContentWrap>
     <div style="margin-bottom: 10px">
+      <span style="color: #606266"> 材质名称：</span>
+      <el-input
+        v-model="text"
+        style="width: 200px; height: 43px; margin: 7px"
+        placeholder="请输入材质名称"
+      />
+      <span style="color: #606266"> 材质状态：</span>
+      <el-select
+        v-model="materialType"
+        clearable
+        placeholder="全部"
+        size="large"
+        style="width: 240px"
+      >
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        />
+      </el-select>
+
+      <ElButton
+        style="margin-left: 20px"
+        type="primary"
+        size="large"
+        @click="handersearch"
+        :icon="Search"
+        >搜索</ElButton
+      >
+
       <ElButton type="success" size="large" @click="tianjia" :icon="Edit">添加</ElButton>
       <ElButton type="danger" size="large" @click="getSelections" :icon="Delete">删除</ElButton>
-      <ElButton type="success" size="large" @click="batchtianjia" :icon="Edit">批量上传</ElButton>
     </div>
 
     <Table
@@ -388,7 +537,7 @@ const batchtianjia = async () => {
     />
   </ContentWrap>
 
-  <Dialog v-model="dialogVisible" maxHeight="390px" width="35rem" :title="isedit">
+  <Dialog v-model="dialogVisible" maxHeight="580px" width="35rem" :title="isedit">
     <Form :schema="schema" @register="formRegister" />
     <template #footer>
       <div style="width: 100%; display: flex; justify-content: center">