Compare commits

..

No commits in common. "23362cd6e533a6cbb452bd7f292ca11035231041" and "50a193e8f502fdc432d9b64fafc0bd1a29df0e09" have entirely different histories.

4 changed files with 116 additions and 116 deletions

View File

@ -66,38 +66,38 @@
v-hasPermi="['system:category:add']" v-hasPermi="['system:category:add']"
>新增</el-button> >新增</el-button>
</el-col> </el-col>
<!-- <el-col :span="1.5">--> <el-col :span="1.5">
<!-- <el-button--> <el-button
<!-- type="success"--> type="success"
<!-- plain--> plain
<!-- icon="el-icon-edit"--> icon="el-icon-edit"
<!-- size="mini"--> size="mini"
<!-- :disabled="single"--> :disabled="single"
<!-- @click="handleUpdate"--> @click="handleUpdate"
<!-- v-hasPermi="['system:category:edit']"--> v-hasPermi="['system:category:edit']"
<!-- >修改</el-button>--> >修改</el-button>
<!-- </el-col>--> </el-col>
<!-- <el-col :span="1.5">--> <el-col :span="1.5">
<!-- <el-button--> <el-button
<!-- type="danger"--> type="danger"
<!-- plain--> plain
<!-- icon="el-icon-delete"--> icon="el-icon-delete"
<!-- size="mini"--> size="mini"
<!-- :disabled="multiple"--> :disabled="multiple"
<!-- @click="handleDelete"--> @click="handleDelete"
<!-- v-hasPermi="['system:category:remove']"--> v-hasPermi="['system:category:remove']"
<!-- >删除</el-button>--> >删除</el-button>
<!-- </el-col>--> </el-col>
<!-- <el-col :span="1.5">--> <el-col :span="1.5">
<!-- <el-button--> <el-button
<!-- type="warning"--> type="warning"
<!-- plain--> plain
<!-- icon="el-icon-download"--> icon="el-icon-download"
<!-- size="mini"--> size="mini"
<!-- @click="handleExport"--> @click="handleExport"
<!-- v-hasPermi="['system:category:export']"--> v-hasPermi="['system:category:export']"
<!-- >导出</el-button>--> >导出</el-button>
<!-- </el-col>--> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
@ -145,8 +145,8 @@
<el-form-item label="分类名称" prop="categoryName"> <el-form-item label="分类名称" prop="categoryName">
<el-input v-model="form.categoryName" placeholder="请输入分类名称" /> <el-input v-model="form.categoryName" placeholder="请输入分类名称" />
</el-form-item> </el-form-item>
<el-form-item label="上级分类" prop="parentId"> <el-form-item label="父ID" prop="parentId">
<el-input v-model="form.parentId" placeholder="请选择上级分类" /> <el-input v-model="form.parentId" placeholder="请输入父ID" />
</el-form-item> </el-form-item>
<el-form-item label="排序" prop="sort"> <el-form-item label="排序" prop="sort">
<el-input v-model="form.sort" placeholder="请输入排序" /> <el-input v-model="form.sort" placeholder="请输入排序" />
@ -154,11 +154,11 @@
<el-form-item label="分类描述" prop="description"> <el-form-item label="分类描述" prop="description">
<el-input v-model="form.description" placeholder="请输入分类描述" /> <el-input v-model="form.description" placeholder="请输入分类描述" />
</el-form-item> </el-form-item>
<!-- <el-form-item label="删除标志" prop="delFlag">--> <el-form-item label="删除标志" prop="delFlag">
<!-- <el-input v-model="form.delFlag" placeholder="请输入删除标志" />--> <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
<!-- </el-form-item>--> </el-form-item>
<el-form-item label="语言标签" prop="categoryTags"> <el-form-item label="标签" prop="categoryTags">
<el-input v-model="form.categoryTags" placeholder="请选择语言标签" /> <el-input v-model="form.categoryTags" placeholder="请输入标签" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">

View File

@ -1,14 +1,14 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="素材分组" prop="groupId"> <!-- <el-form-item label="分组id" prop="groupId">-->
<el-input <!-- <el-input-->
v-model="queryParams.groupId" <!-- v-model="queryParams.groupId"-->
placeholder="请选择素材分组" <!-- placeholder="请输入分组id"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="素材名称" prop="materialName"> <el-form-item label="素材名称" prop="materialName">
<el-input <el-input
v-model="queryParams.materialName" v-model="queryParams.materialName"

View File

@ -66,38 +66,38 @@
v-hasPermi="['system:materialGroup:add']" v-hasPermi="['system:materialGroup:add']"
>新增</el-button> >新增</el-button>
</el-col> </el-col>
<!-- <el-col :span="1.5">--> <el-col :span="1.5">
<!-- <el-button--> <el-button
<!-- type="success"--> type="success"
<!-- plain--> plain
<!-- icon="el-icon-edit"--> icon="el-icon-edit"
<!-- size="mini"--> size="mini"
<!-- :disabled="single"--> :disabled="single"
<!-- @click="handleUpdate"--> @click="handleUpdate"
<!-- v-hasPermi="['system:materialGroup:edit']"--> v-hasPermi="['system:materialGroup:edit']"
<!-- >修改</el-button>--> >修改</el-button>
<!-- </el-col>--> </el-col>
<!-- <el-col :span="1.5">--> <el-col :span="1.5">
<!-- <el-button--> <el-button
<!-- type="danger"--> type="danger"
<!-- plain--> plain
<!-- icon="el-icon-delete"--> icon="el-icon-delete"
<!-- size="mini"--> size="mini"
<!-- :disabled="multiple"--> :disabled="multiple"
<!-- @click="handleDelete"--> @click="handleDelete"
<!-- v-hasPermi="['system:materialGroup:remove']"--> v-hasPermi="['system:materialGroup:remove']"
<!-- >删除</el-button>--> >删除</el-button>
<!-- </el-col>--> </el-col>
<!-- <el-col :span="1.5">--> <el-col :span="1.5">
<!-- <el-button--> <el-button
<!-- type="warning"--> type="warning"
<!-- plain--> plain
<!-- icon="el-icon-download"--> icon="el-icon-download"
<!-- size="mini"--> size="mini"
<!-- @click="handleExport"--> @click="handleExport"
<!-- v-hasPermi="['system:materialGroup:export']"--> v-hasPermi="['system:materialGroup:export']"
<!-- >导出</el-button>--> >导出</el-button>
<!-- </el-col>--> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
@ -141,9 +141,9 @@
<!-- 添加或修改素材分组管理对话框 --> <!-- 添加或修改素材分组管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="70%" append-to-body> <el-dialog :title="title" :visible.sync="open" width="70%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<!-- <el-form-item label="父ID" prop="parentId">--> <el-form-item label="父ID" prop="parentId">
<!-- <el-input v-model="form.parentId" placeholder="请输入父ID" />--> <el-input v-model="form.parentId" placeholder="请输入父ID" />
<!-- </el-form-item>--> </el-form-item>
<!-- <el-form-item label="部门ID" prop="deptId">--> <!-- <el-form-item label="部门ID" prop="deptId">-->
<!-- <el-input v-model="form.deptId" placeholder="请输入部门ID" />--> <!-- <el-input v-model="form.deptId" placeholder="请输入部门ID" />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->

View File

@ -9,10 +9,10 @@
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="标签名称" prop="tagName"> <el-form-item label="分类名称" prop="tagName">
<el-input <el-input
v-model="queryParams.tagName" v-model="queryParams.tagName"
placeholder="请输入标签名称" placeholder="请输入分类名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@ -50,38 +50,38 @@
v-hasPermi="['system:tags:add']" v-hasPermi="['system:tags:add']"
>新增</el-button> >新增</el-button>
</el-col> </el-col>
<!-- <el-col :span="1.5">--> <el-col :span="1.5">
<!-- <el-button--> <el-button
<!-- type="success"--> type="success"
<!-- plain--> plain
<!-- icon="el-icon-edit"--> icon="el-icon-edit"
<!-- size="mini"--> size="mini"
<!-- :disabled="single"--> :disabled="single"
<!-- @click="handleUpdate"--> @click="handleUpdate"
<!-- v-hasPermi="['system:tags:edit']"--> v-hasPermi="['system:tags:edit']"
<!-- >修改</el-button>--> >修改</el-button>
<!-- </el-col>--> </el-col>
<!-- <el-col :span="1.5">--> <el-col :span="1.5">
<!-- <el-button--> <el-button
<!-- type="danger"--> type="danger"
<!-- plain--> plain
<!-- icon="el-icon-delete"--> icon="el-icon-delete"
<!-- size="mini"--> size="mini"
<!-- :disabled="multiple"--> :disabled="multiple"
<!-- @click="handleDelete"--> @click="handleDelete"
<!-- v-hasPermi="['system:tags:remove']"--> v-hasPermi="['system:tags:remove']"
<!-- >删除</el-button>--> >删除</el-button>
<!-- </el-col>--> </el-col>
<!-- <el-col :span="1.5">--> <el-col :span="1.5">
<!-- <el-button--> <el-button
<!-- type="warning"--> type="warning"
<!-- plain--> plain
<!-- icon="el-icon-download"--> icon="el-icon-download"
<!-- size="mini"--> size="mini"
<!-- @click="handleExport"--> @click="handleExport"
<!-- v-hasPermi="['system:tags:export']"--> v-hasPermi="['system:tags:export']"
<!-- >导出</el-button>--> >导出</el-button>
<!-- </el-col>--> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>