Update favicon and enhance request timeout; improve UI consistency in operation goods and warn result views

src/utils/request.js

@@ -19,7 +19,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  timeout: 300000
 })
 
 // request拦截器

src/views/system/operationGoods/index.vue

@@ -1,10 +1,17 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="商品名字" prop="goodsSkuName">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      v-show="showSearch"
+      size="small"
+      :inline="true"
+      class="app-container--search"
+    >
+      <el-form-item label="商品名称" prop="goodsSkuName">
         <el-input
           v-model="queryParams.goodsSkuName"
-          placeholder="请输入商品名字"
+          placeholder="请输入商品名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -18,7 +25,11 @@
         />
       </el-form-item>
       <el-form-item label="平台" prop="platform">
-        <el-select v-model="queryParams.platform" placeholder="请选择平台" clearable>
+        <el-select
+          v-model="queryParams.platform"
+          placeholder="请选择平台"
+          clearable
+        >
           <el-option
             v-for="dict in dict.type.zs_operation_platform"
             :key="dict.value"
@@ -28,7 +39,11 @@
         </el-select>
       </el-form-item>
       <el-form-item label="是否启用" prop="isDisabled">
-        <el-select v-model="queryParams.isDisabled" placeholder="请选择是否启用" clearable>
+        <el-select
+          v-model="queryParams.isDisabled"
+          placeholder="请选择是否启用"
+          clearable
+        >
           <el-option
             v-for="dict in dict.type.zs_is_disabled"
             :key="dict.value"
@@ -38,8 +53,16 @@
         </el-select>
       </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>
+        <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
+        >
       </el-form-item>
     </el-form>
 
@@ -52,7 +75,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:operationGoods:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -63,7 +87,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['system:operationGoods:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -74,7 +99,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['system:operationGoods:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -84,30 +110,73 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['system:operationGoods:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="operationGoodsList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="operationGoodsList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键ID" align="center" prop="id" v-if="false"/>
-      <el-table-column label="商品名字" align="center" prop="goodsSkuName" />
-      <el-table-column label="商品编号" align="center" prop="goodsSkuSn" />
-      <el-table-column label="商品url" align="center" prop="goodsSkuUrl" />
+      <el-table-column label="主键ID" align="center" prop="id" v-if="false" />
+      <el-table-column
+        label="商品名称"
+        align="center"
+        prop="goodsSkuName"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        label="商品编号"
+        align="center"
+        prop="goodsSkuSn"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        label="商品URL"
+        align="center"
+        prop="goodsSkuUrl"
+      >
+        <template slot-scope="scope">
+          <el-link type="primary" :href="scope.row.goodsSkuUrl" target="_blank">
+            查看商品
+          </el-link>
+        </template>
+      </el-table-column>
       <el-table-column label="平台" align="center" prop="platform">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.zs_operation_platform" :value="scope.row.platform"/>
+          <dict-tag
+            :options="dict.type.zs_operation_platform"
+            :value="scope.row.platform"
+          />
         </template>
       </el-table-column>
       <el-table-column label="基准价格" align="center" prop="initPrice" />
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column
+        label="备注"
+        align="center"
+        prop="remark"
+        show-overflow-tooltip
+      />
       <el-table-column label="是否启用" align="center" prop="isDisabled">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.zs_is_disabled" :value="scope.row.isDisabled"/>
+          <dict-tag
+            :options="dict.type.zs_is_disabled"
+            :value="scope.row.isDisabled"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -115,20 +184,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:operationGoods:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:operationGoods:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -137,15 +208,21 @@
 
     <!-- 添加或修改商品配置对话框 -->
     <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="goodsSkuName">
-          <el-input v-model="form.goodsSkuName" placeholder="请输入商品名字" />
+        <el-form-item label="商品名称" prop="goodsSkuName" v-show="isEdit">
+          <el-input v-model="form.goodsSkuName" />
         </el-form-item>
-        <el-form-item label="商品编号" prop="goodsSkuSn">
-          <el-input v-model="form.goodsSkuSn" placeholder="请输入商品编号" />
+        <el-form-item label="商品编号" prop="goodsSkuSn" v-show="isEdit">
+          <el-input v-model="form.goodsSkuSn" />
         </el-form-item>
-        <el-form-item label="商品url" prop="goodsSkuUrl">
-          <el-input v-model="form.goodsSkuUrl" placeholder="请输入商品url" />
+        <el-form-item label="商品URL" prop="goodsSkuUrl">
+          <el-input
+            v-model="form.goodsSkuUrl"
+            type="textarea"
+            rows="4"
+            placeholder="请输入商品URL"
+          />
         </el-form-item>
         <el-form-item label="平台" prop="platform">
           <el-select v-model="form.platform" placeholder="请选择平台">
@@ -157,11 +234,15 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="基准价格" prop="initPrice">
+        <el-form-item label="基准价格" prop="initPrice" v-show="isEdit">
           <el-input v-model="form.initPrice" placeholder="请输入基准价格" />
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        <el-form-item label="备注" prop="remark" v-show="isEdit">
+          <el-input
+            v-model="form.remark"
+            type="textarea"
+            placeholder="请输入内容"
+          />
         </el-form-item>
         <el-form-item label="是否启用" prop="isDisabled">
           <el-select v-model="form.isDisabled" placeholder="请选择是否启用">
@@ -174,8 +255,18 @@
           </el-select>
         </el-form-item>
       </el-form>
+      <el-alert v-show="!isEdit" :closable="false" show-icon style="margin-bottom: 20px;">
+        <div slot="title">
+          <span>提示</span>
+        </div>
+        <div>
+          系统会根据商品URL，自动获取商品名称、编号、基准价格、备注信息, 提交信息的过会较慢，请耐心等待，切勿关闭窗口。
+        </div>
+      </el-alert>
       <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm"
+          >确 定</el-button
+        >
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -183,11 +274,17 @@
 </template>
 
 <script>
-import { listOperationGoods, getOperationGoods, delOperationGoods, addOperationGoods, updateOperationGoods } from "@/api/system/operationGoods";
+import {
+  listOperationGoods,
+  getOperationGoods,
+  delOperationGoods,
+  addOperationGoods,
+  updateOperationGoods,
+} from "@/api/system/operationGoods";
 
 export default {
   name: "OperationGoods",
-  dicts: ['zs_is_disabled', 'zs_operation_platform'],
+  dicts: ["zs_is_disabled", "zs_operation_platform"],
   data() {
     return {
       // 按钮loading
@@ -210,6 +307,8 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // 是否编辑
+      isEdit: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -217,16 +316,14 @@ export default {
         goodsSkuName: undefined,
         goodsSkuSn: undefined,
         platform: undefined,
-        isDisabled: undefined
+        isDisabled: undefined,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        id: [
-          { required: true, message: "主键ID不能为空", trigger: "blur" }
-        ],
-      }
+        id: [{ required: true, message: "主键ID不能为空", trigger: "blur" }],
+      },
     };
   },
   created() {
@@ -236,7 +333,7 @@ export default {
     /** 查询商品配置列表 */
     getList() {
       this.loading = true;
-      listOperationGoods(this.queryParams).then(response => {
+      listOperationGoods(this.queryParams).then((response) => {
         this.operationGoodsList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -257,7 +354,7 @@ export default {
         platform: undefined,
         initPrice: undefined,
         remark: undefined,
-        isDisabled: undefined
+        isDisabled: undefined,
       };
       this.resetForm("form");
     },
@@ -273,49 +370,55 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
       this.open = true;
       this.title = "添加商品配置";
+      this.isEdit = false;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.loading = true;
       this.reset();
-      const id = row.id || this.ids
-      getOperationGoods(id).then(response => {
+      const id = row.id || this.ids;
+      getOperationGoods(id).then((response) => {
         this.loading = false;
         this.form = response.data;
         this.open = true;
         this.title = "修改商品配置";
+        this.isEdit = true;
       });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           this.buttonLoading = true;
           if (this.form.id != null) {
-            updateOperationGoods(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
+            updateOperationGoods(this.form)
+              .then((response) => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              })
+              .finally(() => {
+                this.buttonLoading = false;
+              });
           } else {
-            addOperationGoods(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
+            addOperationGoods(this.form)
+              .then((response) => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              })
+              .finally(() => {
+                this.buttonLoading = false;
+              });
           }
         }
       });
@@ -323,24 +426,32 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除商品配置编号为"' + ids + '"的数据项？').then(() => {
-        this.loading = true;
-        return delOperationGoods(ids);
-      }).then(() => {
-        this.loading = false;
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      }).finally(() => {
-        this.loading = false;
-      });
+      this.$modal
+        .confirm('是否确认删除商品配置编号为"' + ids + '"的数据项？')
+        .then(() => {
+          this.loading = true;
+          return delOperationGoods(ids);
+        })
+        .then(() => {
+          this.loading = false;
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {})
+        .finally(() => {
+          this.loading = false;
+        });
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/operationGoods/export', {
-        ...this.queryParams
-      }, `operationGoods_${new Date().getTime()}.xlsx`)
-    }
-  }
+      this.download(
+        "system/operationGoods/export",
+        {
+          ...this.queryParams,
+        },
+        `operationGoods_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>

src/views/system/operationWarnresult/index.vue

@@ -96,7 +96,7 @@
       <el-table-column label="主键ID" align="center" prop="id" v-if="false"/>
       <el-table-column label="预警时间" align="center" prop="warnTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.warnTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.warnTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="商品名字" align="center" prop="goodsSkuName" />