Refactor operation goods and warn result views: remove unused buttons, enhance UI layout, and improve form validation messages for better user experience.

src/views/system/operationGoods/index.vue

@@ -78,18 +78,7 @@
           >新增</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:operationGoods:edit']"
-          >修改</el-button
-        >
-      </el-col>
+      <el-col :span="1.5"> </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -126,30 +115,23 @@
     >
       <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"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        label="商品编号"
-        align="center"
-        prop="goodsSkuSn"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        label="商品URL"
-        align="center"
-        prop="goodsSkuUrl"
-      >
+      <el-table-column label="商品" align="center">
         <template slot-scope="scope">
-          <el-link type="primary" :href="scope.row.goodsSkuUrl" target="_blank">
-            查看商品
-          </el-link>
+          <div class="goods--info">
+            <el-link
+              type="primary"
+              :href="scope.row.goodsSkuUrl"
+              target="_blank"
+              :underline="false"
+              :title="scope.row.goodsSkuName"
+            >
+              {{ scope.row.goodsSkuName }}
+            </el-link>
+            <em>{{ scope.row.goodsSkuSn }}</em>
+          </div>
         </template>
       </el-table-column>
-      <el-table-column label="平台" align="center" prop="platform">
+      <el-table-column width="120" label="平台" align="center" prop="platform">
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.zs_operation_platform"
@@ -157,35 +139,41 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="基准价格" align="center" prop="initPrice" />
       <el-table-column
+        width="120"
+        label="基准价格"
+        align="center"
+        prop="initPrice"
+      />
+      <el-table-column
+        width="320"
         label="备注"
         align="center"
         prop="remark"
         show-overflow-tooltip
       />
-      <el-table-column label="是否启用" align="center" prop="isDisabled">
+      <el-table-column
+        width="120"
+        label="是否启用"
+        align="center"
+        prop="isDisabled"
+      >
         <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.zs_is_disabled"
-            :value="scope.row.isDisabled"
+          <el-switch
+            v-model="scope.row.isDisabled"
+            active-value="1"
+            inactive-value="0"
+            @change="handleSwitch(scope.row)"
           />
         </template>
       </el-table-column>
       <el-table-column
         label="操作"
         align="center"
+        width="120"
         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:operationGoods:edit']"
-            >修改</el-button
-          >
           <el-button
             size="mini"
             type="text"
@@ -208,8 +196,13 @@
 
     <!-- 添加或修改商品配置对话框 -->
     <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
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        label-position="top"
+      >
         <el-form-item label="商品名称" prop="goodsSkuName" v-show="isEdit">
           <el-input v-model="form.goodsSkuName" />
         </el-form-item>
@@ -223,17 +216,40 @@
             rows="4"
             placeholder="请输入商品URL"
           />
+          <p class="tips">
+            系统会根据商品URL，自动获取商品名称、编号、基准价格、备注信息，
+            提交信息的过程会较慢，请耐心等待，切勿关闭窗口。
+            如果商品URL获取失败，请重试。
+          </p>
         </el-form-item>
-        <el-form-item label="平台" prop="platform">
-          <el-select v-model="form.platform" placeholder="请选择平台">
-            <el-option
-              v-for="dict in dict.type.zs_operation_platform"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="平台" prop="platform">
+              <el-select v-model="form.platform" placeholder="请选择平台">
+                <el-option
+                  v-for="dict in dict.type.zs_operation_platform"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否启用" prop="isDisabled">
+              <el-select v-model="form.isDisabled" placeholder="请选择是否启用">
+                <el-option
+                  v-for="dict in dict.type.zs_is_disabled"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
         <el-form-item label="基准价格" prop="initPrice" v-show="isEdit">
           <el-input v-model="form.initPrice" placeholder="请输入基准价格" />
         </el-form-item>
@@ -244,25 +260,8 @@
             placeholder="请输入内容"
           />
         </el-form-item>
-        <el-form-item label="是否启用" prop="isDisabled">
-          <el-select v-model="form.isDisabled" placeholder="请选择是否启用">
-            <el-option
-              v-for="dict in dict.type.zs_is_disabled"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </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
@@ -323,6 +322,15 @@ export default {
       // 表单校验
       rules: {
         id: [{ required: true, message: "主键ID不能为空", trigger: "blur" }],
+        goodsSkuUrl: [
+          { required: true, message: "商品URL不能为空", trigger: "blur" },
+        ],
+        platform: [
+          { required: true, message: "平台不能为空", trigger: "blur" },
+        ],
+        isDisabled: [
+          { required: true, message: "是否启用不能为空", trigger: "blur" },
+        ],
       },
     };
   },
@@ -358,6 +366,12 @@ export default {
       };
       this.resetForm("form");
     },
+    /** 开关切换 */
+    handleSwitch(row) {
+      updateOperationGoods(row).then((response) => {
+        this.getList();
+      });
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -455,3 +469,34 @@ export default {
   },
 };
 </script>
+
+<style lang="scss" scoped>
+.tips {
+  color: #303030;
+  font-size: 12px;
+  margin-bottom: 10px;
+  line-height: 1.5;
+  padding: 10px;
+  background-color: #f5f7fa;
+  border-radius: 4px;
+}
+.goods--info {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  text-align: left;
+  .el-link {
+    font-size: 14px;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    line-clamp: 2;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+  }
+  em {
+    font-size: 12px;
+    color: #999;
+    font-style: normal;
+  }
+}
+</style>

src/views/system/operationWarnconfig/index.vue

@@ -1,12 +1,5 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <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-form-item>
-    </el-form>
-
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -103,9 +96,10 @@
 
     <!-- 添加或修改预警配置对话框 -->
     <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="priceChangeThreshold">
-          <el-input v-model="form.priceChangeThreshold" placeholder="请输入价格变化比例阈值" />
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="监控阈值" prop="priceChangeThreshold">
+          <el-input v-model="form.priceChangeThreshold" type="number" placeholder="请输入" style="width: 100px;" />
+          <span style="margin-left: 10px;">单位：百分比</span>
         </el-form-item>
         <el-form-item label="监控频率" prop="monitorFrequency">
           <el-select v-model="form.monitorFrequency" placeholder="请选择监控频率">
@@ -127,8 +121,8 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="预警时间段" prop="warnTimeRange">
-          <el-select v-model="form.warnTimeRange" placeholder="请选择预警时间段">
+        <el-form-item label="预警时间" prop="warnTimeRange">
+          <el-select v-model="form.warnTimeRange" placeholder="请选择预警时间">
             <el-option
               v-for="dict in dict.type.zs_operation_warn_time_range"
               :key="dict.value"

src/views/system/operationWarnresult/index.vue

@@ -1,6 +1,13 @@
 <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="68px"
+    >
       <el-form-item label="预警时间">
         <el-date-picker
           v-model="daterangeWarnTime"
@@ -30,7 +37,11 @@
         />
       </el-form-item>
       <el-form-item label="处理状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择处理状态" clearable>
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择处理状态"
+          clearable
+        >
           <el-option
             v-for="dict in dict.type.zs_operation_status"
             :key="dict.value"
@@ -40,8 +51,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>
 
@@ -76,7 +95,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['system:operationWarnresult:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -86,41 +106,100 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['system:operationWarnresult: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="operationWarnresultList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="operationWarnresultList"
+      @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="warnTime" width="180">
+      <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} {h}:{i}:{s}")
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="商品" align="center" prop="goodsSkuName">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.warnTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <div class="goods--info">
+            <el-link
+              type="primary"
+              :underline="false"
+              :href="scope.row.goodsSkuUrl"
+              target="_blank"
+              :title="scope.row.goodsSkuName"
+            >
+              {{ scope.row.goodsSkuName }}
+            </el-link>
+            <em>{{ scope.row.goodsSkuSn }}</em>
+            <em>￥{{ scope.row.initPrice }}</em>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="预警价格" align="center" prop="initPrice">
+        <template slot-scope="scope">
+          <div v-if="scope.row.curPrice" class="price--info">
+            <span style="color: #303133; font-size: 14px; margin-right: 2px;">￥{{ scope.row.curPrice }}</span>
+            <i class="icon-arrow-up" style="color: green;" v-if="scope.row.curPrice > scope.row.initPrice"></i>
+            <i class="icon-arrow-down" style="color: red;" v-else></i>
+          </div>
         </template>
       </el-table-column>
-      <el-table-column label="商品名字" align="center" prop="goodsSkuName" />
-      <el-table-column label="商品编号" align="center" prop="goodsSkuSn" />
-      <el-table-column label="基准价格" align="center" prop="initPrice" />
-      <el-table-column label="当前价格" align="center" prop="curPrice" />
-      <el-table-column label="价格变动幅度" align="center" prop="priceChangeRatio" />
       <el-table-column label="预警方式" align="center" prop="warnTypes">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.zs_operation_warn_types" :value="scope.row.warnTypes"/>
+          <dict-tag
+            :options="dict.type.zs_operation_warn_types"
+            :value="scope.row.warnTypes"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="通知内容/结果" align="center" prop="warnContent" />
+      <el-table-column
+        label="通知内容/结果"
+        align="center"
+        prop="warnContent"
+      />
       <el-table-column label="处理状态" align="center" prop="status">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.zs_operation_status" :value="scope.row.status"/>
+          <dict-tag
+            :options="dict.type.zs_operation_status"
+            :value="scope.row.status"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="图片快照" align="center" prop="snapshotUrl" width="100">
+      <el-table-column
+        label="图片快照"
+        align="center"
+        prop="snapshotUrl"
+        width="100"
+      >
         <template slot-scope="scope">
-          <image-preview :src="scope.row.snapshotUrl" :width="50" :height="50"/>
+          <image-preview
+            :src="scope.row.snapshotUrl"
+            :width="50"
+            :height="50"
+          />
         </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"
@@ -129,20 +208,22 @@
             @click="handleUpdate(scope.row)"
             :disabled="scope.row.status === 1"
             v-hasPermi="['system:operationWarnresult:edit']"
-          >处理</el-button>
+            >处理</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:operationWarnresult: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"
@@ -154,7 +235,9 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
       </el-form>
       <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>
@@ -162,11 +245,17 @@
 </template>
 
 <script>
-import { listOperationWarnresult, getOperationWarnresult, delOperationWarnresult, addOperationWarnresult, updateOperationWarnresult } from "@/api/system/operationWarnresult";
+import {
+  listOperationWarnresult,
+  getOperationWarnresult,
+  delOperationWarnresult,
+  addOperationWarnresult,
+  updateOperationWarnresult,
+} from "@/api/system/operationWarnresult";
 
 export default {
   name: "OperationWarnresult",
-  dicts: ['zs_operation_warn_types', 'zs_operation_status'],
+  dicts: ["zs_operation_warn_types", "zs_operation_status"],
   data() {
     return {
       // 按钮loading
@@ -205,9 +294,9 @@ export default {
       // 表单校验
       rules: {
         snapshotUrl: [
-          { required: true, message: "图片快照不能为空", trigger: "blur" }
-        ]
-      }
+          { required: true, message: "图片快照不能为空", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {
@@ -218,11 +307,11 @@ export default {
     getList() {
       this.loading = true;
       this.queryParams.params = {};
-      if (null != this.daterangeWarnTime && '' != this.daterangeWarnTime) {
+      if (null != this.daterangeWarnTime && "" != this.daterangeWarnTime) {
         this.queryParams.params["beginWarnTime"] = this.daterangeWarnTime[0];
         this.queryParams.params["endWarnTime"] = this.daterangeWarnTime[1];
       }
-      listOperationWarnresult(this.queryParams).then(response => {
+      listOperationWarnresult(this.queryParams).then((response) => {
         this.operationWarnresultList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -246,7 +335,7 @@ export default {
         warnTypes: undefined,
         warnContent: undefined,
         status: undefined,
-        snapshotUrl: undefined
+        snapshotUrl: undefined,
       };
       this.resetForm("form");
     },
@@ -263,9 +352,9 @@ 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() {
@@ -277,14 +366,16 @@ export default {
     handleUpdate(row) {
       //将状态设置为已处理
       row.status = 1;
-      updateOperationWarnresult(row).then(response => {
-        this.$modal.msgSuccess("处理成功");
-        this.open = false;
-        this.getList();
-      }).finally(() => {
-        this.buttonLoading = false;
-      });
-/*       this.loading = true;
+      updateOperationWarnresult(row)
+        .then((response) => {
+          this.$modal.msgSuccess("处理成功");
+          this.open = false;
+          this.getList();
+        })
+        .finally(() => {
+          this.buttonLoading = false;
+        });
+      /*       this.loading = true;
       this.reset();
       const id = row.id || this.ids
       getOperationWarnresult(id).then(response => {
@@ -296,25 +387,29 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           this.buttonLoading = true;
           if (this.form.id != null) {
-            updateOperationWarnresult(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
+            updateOperationWarnresult(this.form)
+              .then((response) => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              })
+              .finally(() => {
+                this.buttonLoading = false;
+              });
           } else {
-            addOperationWarnresult(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
+            addOperationWarnresult(this.form)
+              .then((response) => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              })
+              .finally(() => {
+                this.buttonLoading = false;
+              });
           }
         }
       });
@@ -322,24 +417,54 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除预警结果编号为"' + ids + '"的数据项？').then(() => {
-        this.loading = true;
-        return delOperationWarnresult(ids);
-      }).then(() => {
-        this.loading = false;
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      }).finally(() => {
-        this.loading = false;
-      });
+      this.$modal
+        .confirm('是否确认删除预警结果编号为"' + ids + '"的数据项？')
+        .then(() => {
+          this.loading = true;
+          return delOperationWarnresult(ids);
+        })
+        .then(() => {
+          this.loading = false;
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {})
+        .finally(() => {
+          this.loading = false;
+        });
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/operationWarnresult/export', {
-        ...this.queryParams
-      }, `operationWarnresult_${new Date().getTime()}.xlsx`)
-    }
-  }
+      this.download(
+        "system/operationWarnresult/export",
+        {
+          ...this.queryParams,
+        },
+        `operationWarnresult_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>
+
+<style lang="scss" scoped>
+.goods--info {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  text-align: left;
+  .el-link {
+    font-size: 14px;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    line-clamp: 2;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+  }
+  em {
+    font-size: 12px;
+    color: #999;
+    font-style: normal;
+  }
+}
+</style>