Merge branch 'developer' of http://git.caimei365.com/caimei365/caimei365-manager-ui into developerA

package.json

@@ -28,6 +28,7 @@
     "js-cookie": "2.2.0",
     "jsonlint": "1.6.3",
     "jszip": "3.2.1",
+    "moment": "^2.29.4",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",

src/views/library/keyword/list.vue

@@ -4,23 +4,28 @@
     <div class="filter-container">
       <div class="filter-control">
         <span>关键词:</span>
-        <el-input v-model="listQuery.keyword" placeholder="关键词" clearable @keyup.enter.native="getList"
-                  @clear="getList"
+        <el-input
+          v-model="listQuery.keyword"
+          placeholder="关键词"
+          clearable
+          @keyup.enter.native="getList"
+          @clear="getList"
         />
       </div>
       <div class="filter-control">
         <span>搜索统计:</span>
-        <el-date-picker v-model="time" type="daterange" unlink-panels range-separator="至" start-placeholder="开始日期"
-                        end-placeholder="结束日期" :picker-options="pickerOptions" value-format="yyyy-MM-dd" @change="getList"
+        <el-date-picker
+          v-model="time"
+          type="daterange"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :picker-options="pickerOptions"
+          value-format="yyyy-MM-dd"
+          @change="getList"
         />
       </div>
-      <div class="filter-control">
-        <span>标签库状态:</span>
-        <el-select v-model="listQuery.labelStatus" clearable @change="getList">
-          <el-option :value="0" label="未添加" />
-          <el-option :value="1" label="已添加" />
-        </el-select>
-      </div>
       <div class="filter-control">
         <el-button type="primary" @click="getList">查询</el-button>
         <el-button v-permission="'keyword:list:join'" type="primary" :disabled="disabled" @click="handleAddLibrary">
@@ -33,14 +38,24 @@
     </div>
 
     <!-- 关键词列表 -->
-    <el-table ref="table" v-loading="isLoading" :data="list" border
-              :default-sort="{ prop: 'frequency', order: 'descending' }" @selection-change="handleSelectionChange"
+    <el-table
+      ref="table"
+      v-loading="isLoading"
+      :data="list"
+      border
+      :default-sort="{ prop: 'frequency', order: 'descending' }"
+      @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" :index="indexMethod" type="index" sortable="custom" align="center" width="80" />
       <el-table-column prop="keyword" label="关键词" align="center" />
-      <el-table-column prop="pv" label="搜索次数" width="120" align="center" sortable
-                       :sort-orders="['ascending', 'descending']"
+      <el-table-column
+        prop="pv"
+        label="搜索次数"
+        width="120"
+        align="center"
+        sortable
+        :sort-orders="['ascending', 'descending']"
       />
       <el-table-column label="最近搜索时间" align="center">
         <template slot-scope="{ row }">
@@ -48,9 +63,6 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column width="140" label="标签库状态" align="center">
-        <template slot-scope="{ row }">{{ row.labelStatus === 1 ? '已添加' : '未添加' }}</template>
-      </el-table-column>
       <el-table-column label="操作" align="center" width="240">
         <template slot-scope="{ row }">
           <div class="labelCenter">
@@ -61,9 +73,7 @@
               </el-button>
             </template>
             <template v-else>
-              <el-button class="labelPoint" type="primary" size="mini">
-                加入标签库
-              </el-button>
+              <el-button class="labelPoint" type="primary" size="mini"> 加入标签库 </el-button>
             </template>
           </div>
         </template>
@@ -71,8 +81,11 @@
     </el-table>
 
     <!-- 页码 -->
-    <pagination :total="total" :page.sync="listQuery.pageNum" :limit.sync="listQuery.pageSize"
-                @pagination="fetchKeywordList"
+    <pagination
+      :total="total"
+      :page.sync="listQuery.pageNum"
+      :limit.sync="listQuery.pageSize"
+      @pagination="fetchKeywordList"
     />
 
     <!-- 去搜索跳转 -->