From 6a25a567cbe54d0e9b7bfc10d5ce4a612d607e45 Mon Sep 17 00:00:00 2001
From: long <18782126717@163.com>
Date: Tue, 5 Jul 2022 15:42:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E9=93=BE=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=A1=B5=E9=9D=A2=E3=80=81=E4=BF=AE=E6=94=B9=E4=B8=8A?=
 =?UTF-8?q?=E9=93=BE=E6=97=A5=E5=BF=97=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/log/index.vue  |  36 +++++--
 src/views/push/index.vue | 217 +++++++++++++++------------------------
 2 files changed, 105 insertions(+), 148 deletions(-)

diff --git a/src/views/log/index.vue b/src/views/log/index.vue
index 055a5b6..e261fb8 100644
--- a/src/views/log/index.vue
+++ b/src/views/log/index.vue
@@ -1,6 +1,6 @@
 <template>
   <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="120px">
       <el-form-item label="公司名称" prop="unitName">
         <el-input
           v-model="queryParams.unitName"
@@ -9,6 +9,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="调用的合同方法" prop="method">
+        <el-input
+          v-model="queryParams.method"
+          placeholder="请输入调用的合同方法"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="上链数量" prop="nftNum">
         <el-input
           v-model="queryParams.nftNum"
@@ -72,16 +80,16 @@
 <!--          v-hasPermi="['system:log:remove']"-->
 <!--        >删除</el-button>-->
 <!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="warning"-->
-<!--          plain-->
-<!--          icon="el-icon-download"-->
-<!--          size="mini"-->
-<!--          @click="handleExport"-->
-<!--          v-hasPermi="['system:log:export']"-->
-<!--        >导出</el-button>-->
-<!--      </el-col>-->
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:log:export']"
+        >导出</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -89,6 +97,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="" align="center" prop="id" />
       <el-table-column label="公司名称" align="center" prop="unitName" />
+      <el-table-column label="调用的合同方法" align="center" prop="method" />
       <el-table-column label="上链数量" align="center" prop="nftNum" />
       <el-table-column label="交易hash值" align="center" prop="hashCode" />
       <el-table-column label="消费的gas值" align="center" prop="gasUsed" />
@@ -126,6 +135,9 @@
         <el-form-item label="公司名称" prop="unitName">
           <el-input v-model="form.unitName" placeholder="请输入公司名称" />
         </el-form-item>
+        <el-form-item label="调用的合同方法" prop="method">
+          <el-input v-model="form.method" placeholder="请输入调用的合同方法" />
+        </el-form-item>
         <el-form-item label="上链数量" prop="nftNum">
           <el-input v-model="form.nftNum" placeholder="请输入上链数量" />
         </el-form-item>
@@ -174,6 +186,7 @@
           pageNum: 1,
           pageSize: 10,
           unitName: null,
+          method: null,
           nftNum: null,
           hashCode: null,
           gasUsed: null,
@@ -208,6 +221,7 @@
         this.form = {
           id: null,
           unitName: null,
+          method: null,
           nftNum: null,
           hashCode: null,
           gasUsed: null,
diff --git a/src/views/push/index.vue b/src/views/push/index.vue
index 66dd19a..9ee4cad 100644
--- a/src/views/push/index.vue
+++ b/src/views/push/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="项目名称" prop="unitName">
         <el-input
           v-model="queryParams.unitName"
@@ -9,7 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="藏品ID" prop="informationTableId">
+      <el-form-item label="上链藏品ID" prop="informationTableId">
         <el-input
           v-model="queryParams.informationTableId"
           placeholder="请输入上链藏品ID"
@@ -17,14 +17,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="通证ID" prop="nftId">
-        <el-input
-          v-model="queryParams.nftId"
-          placeholder="请输入nft通证 ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="合约地址" prop="contract">
         <el-input
           v-model="queryParams.contract"
@@ -33,7 +25,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="hash值" prop="hashCode">
+      <el-form-item label="交易的hash值" prop="hashCode">
         <el-input
           v-model="queryParams.hashCode"
           placeholder="请输入交易的hash值"
@@ -41,16 +33,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="gas值" prop="gasUsed">
-        <el-input
-          v-model="queryParams.gasUsed"
-          placeholder="请输入消费的gas值"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="铸造状态" prop="onChainStatus">
-        <el-select v-model="queryParams.onChainStatus" placeholder="请选择(0待铸造 1已铸造 2链上已确认)" clearable>
+      <el-form-item label="铸造 " prop="onChainStatus">
+        <el-select v-model="queryParams.onChainStatus" placeholder="请选择铸造 " clearable>
           <el-option
             v-for="dict in dict.type.sys_nft_push"
             :key="dict.value"
@@ -59,14 +43,24 @@
           />
         </el-select>
       </el-form-item>
-      <!--<el-form-item label="创建公司" prop="createdBy">
+      <el-form-item label="是否被转赠" prop="transferStatus">
+        <el-select v-model="queryParams.transferStatus" placeholder="请选择是否被转赠" clearable>
+          <el-option
+            v-for="dict in dict.type.sys_transfer"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建公司" prop="createdBy">
         <el-input
           v-model="queryParams.createdBy"
           placeholder="请输入创建公司"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>-->
+      </el-form-item>
       <el-form-item label="创建时间" prop="createdTime">
         <el-date-picker clearable
                         v-model="queryParams.createdTime"
@@ -75,14 +69,6 @@
                         placeholder="请选择创建时间">
         </el-date-picker>
       </el-form-item>
-    <!--  <el-form-item label="更新人" prop="updatedBy">
-        <el-input
-          v-model="queryParams.updatedBy"
-          placeholder="请输入更新人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="更新时间" prop="updatedTime">
         <el-date-picker clearable
                         v-model="queryParams.updatedTime"
@@ -90,7 +76,7 @@
                         value-format="yyyy-MM-dd"
                         placeholder="请选择更新时间">
         </el-date-picker>
-      </el-form-item>-->
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -98,38 +84,38 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-     <!-- <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:collection:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:collection:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:collection:remove']"
-        >删除</el-button>
-      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['system:collection:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['system:collection:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['system:collection:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -153,41 +139,45 @@
       <el-table-column label="合约地址" align="center" prop="contract" />
       <el-table-column label="交易的hash值" align="center" prop="hashCode" />
       <el-table-column label="消费的gas值" align="center" prop="gasUsed" />
-      <el-table-column label="(0待铸造 1已铸造 2链上已确认)" align="center" prop="onChainStatus">
+      <el-table-column label="铸造 " align="center" prop="onChainStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_nft_push" :value="scope.row.onChainStatus"/>
         </template>
       </el-table-column>
-   <!--   <el-table-column label="创建公司" align="center" prop="createdBy" />-->
+      <el-table-column label="是否被转赠" align="center" prop="transferStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_transfer" :value="scope.row.transferStatus"/>
+        </template>
+      </el-table-column>
+     <!-- <el-table-column label="创建公司" align="center" prop="createdBy" />-->
       <el-table-column label="创建时间" align="center" prop="createdTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-<!--      <el-table-column label="更新人" align="center" prop="updatedBy" />
-      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180">
+     <!-- <el-table-column label="更新时间" align="center" prop="updatedTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>-->
-<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:collection:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:collection:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>-->
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['system:collection:edit']"-->
+<!--          >修改</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['system:collection:remove']"-->
+<!--          >删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -201,51 +191,6 @@
     <!-- 添加或修改nft上链对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="项目名称" prop="unitName">
-          <el-input v-model="form.unitName" placeholder="请输入项目名称" />
-        </el-form-item>
-        <el-form-item label="上链藏品ID" prop="informationTableId">
-          <el-input v-model="form.informationTableId" placeholder="请输入上链藏品ID" />
-        </el-form-item>
-        <el-form-item label="图片地址" prop="nftUri">
-          <el-input v-model="form.nftUri" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="nft通证 ID" prop="nftId">
-          <el-input v-model="form.nftId" placeholder="请输入nft通证 ID" />
-        </el-form-item>
-        <el-form-item label="合约地址" prop="contract">
-          <el-input v-model="form.contract" placeholder="请输入合约地址" />
-        </el-form-item>
-        <el-form-item label="交易的hash值" prop="hashCode">
-          <el-input v-model="form.hashCode" placeholder="请输入交易的hash值" />
-        </el-form-item>
-        <el-form-item label="消费的gas值" prop="gasUsed">
-          <el-input v-model="form.gasUsed" placeholder="请输入消费的gas值" />
-        </el-form-item>
-        <el-form-item label="(0待铸造 1已铸造 2链上已确认)" prop="onChainStatus">
-          <el-select v-model="form.onChainStatus" placeholder="请选择(0待铸造 1已铸造 2链上已确认)">
-            <el-option
-              v-for="dict in dict.type.sys_nft_push"
-              :key="dict.value"
-              :label="dict.label"
-              :value="parseInt(dict.value)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="创建公司" prop="createdBy">
-          <el-input v-model="form.createdBy" placeholder="请输入创建公司" />
-        </el-form-item>
-        <el-form-item label="创建时间" prop="createdTime">
-          <el-date-picker clearable
-                          v-model="form.createdTime"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择创建时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="form.updatedBy" placeholder="请输入更新人" />
-        </el-form-item>
         <el-form-item label="更新时间" prop="updatedTime">
           <el-date-picker clearable
                           v-model="form.updatedTime"
@@ -268,7 +213,7 @@
 
   export default {
     name: "Collection",
-    dicts: ['sys_nft_push'],
+    dicts: ['sys_nft_push', 'sys_transfer'],
     data() {
       return {
         // 遮罩层
@@ -295,15 +240,12 @@
           pageSize: 10,
           unitName: null,
           informationTableId: null,
-          nftUri: null,
-          nftId: null,
           contract: null,
           hashCode: null,
-          gasUsed: null,
           onChainStatus: null,
+          transferStatus: null,
           createdBy: null,
           createdTime: null,
-          updatedBy: null,
           updatedTime: null
         },
         // 表单参数
@@ -342,7 +284,8 @@
           contract: null,
           hashCode: null,
           gasUsed: null,
-          onChainStatus: null,
+          onChainStatus: 0,
+          transferStatus: 0,
           createdBy: null,
           createdTime: null,
           updatedBy: null,