fix: 修改对接图片上传，对接白名单

fix: 修改对接图片上传，对接白名单

sf-ui/src/api/FDS/whiteList.js

@@ -1,13 +1,44 @@
 import request from '@/utils/request'
 
-
-
-export function Document11691998078000list(query) {
+// 查询白名单列表列表
+export function listWhitelist (query) {
   return request({
-    url: '/forms/api/router/get/Document11691998078000list',
+    url: '/deployment/whitelist/list',
     method: 'get',
     params: query
   })
 }
 
+// 查询白名单列表详细
+export function getWhitelist (id) {
+  return request({
+    url: '/deployment/whitelist/' + id,
+    method: 'get'
+  })
+}
 
+// 新增白名单列表
+export function addWhitelist (data) {
+  return request({
+    url: '/deployment/whitelist',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改白名单列表
+export function updateWhitelist (data) {
+  return request({
+    url: '/deployment/whitelist',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除白名单列表
+export function delWhitelist (id) {
+  return request({
+    url: '/deployment/whitelist/' + id,
+    method: 'delete'
+  })
+}

sf-ui/src/components/ImageUpload/index.vue

@@ -102,9 +102,12 @@ export default {
           // 然后将数组转为对象数组
           this.fileList = list.map(item => {
             if (typeof item === 'string') {
+              console.log(333333)
               if (item.indexOf(this.baseUrl) === -1) {
-                item = { name: this.baseUrl + item, url: this.baseUrl + item }
+                item = { name: item, url: item }
+                console.log(item)
               } else {
+                console.log(7777)
                 item = { name: item, url: item }
               }
             }
@@ -191,6 +194,7 @@ export default {
     uploadedSuccessfully() {
       if (this.number > 0 && this.uploadList.length === this.number) {
         this.fileList = this.fileList.concat(this.uploadList)
+        console.log(this.fileList, '313211321312')
         this.uploadList = []
         this.number = 0
         console.log(this.listToString(this.fileList))
@@ -209,7 +213,8 @@ export default {
       separator = separator || ','
       for (let i in list) {
         if (list[i].url) {
-          strs += list[i].url.replace(this.baseUrl, '') + separator
+          strs += list[i].url
+          // strs += list[i].url.replace(this.baseUrl, '') + separator
         }
       }
       return strs != '' ? strs : ''

sf-ui/src/views/FDS/whiteListManagement/add.vue

@@ -8,17 +8,17 @@
       <el-main>
         <div class="form-main">
           <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-            <el-form-item label="白名单名称" prop="whiteListName">
+            <el-form-item label="白名单名称" prop="whitelistName">
               <el-input v-model="form.whiteListName" placeholder="请输入白名单名称"/>
             </el-form-item>
-            <el-form-item label="白名单类型" prop="whiteListType">
+            <el-form-item label="白名单类型" prop="whitelistType">
               <el-select v-model="form.whiteListType" clearable placeholder="请选择白名单类型">
                 <el-option label="白名单人员" value="0"/>
                 <el-option label="白名单设备" value="1"/>
               </el-select>
             </el-form-item>
 
-            <el-form-item label="白名单模式" prop="whitePattern">
+            <el-form-item label="白名单模式" prop="whitelistMode">
               <el-select v-model="form.whitePattern" clearable placeholder="请选择白名单模式">
                 <el-option label="正则模式" value="0"/>
                 <el-option label="普通模式" value="1"/>
@@ -27,7 +27,7 @@
 
 
             <el-form-item label="备注">
-              <el-input v-model="form.remark" placeholder="请输入内容" type="textarea"/>
+              <el-input v-model="form.remarks" placeholder="请输入内容" type="textarea"/>
             </el-form-item>
           </el-form>
         </div>
@@ -41,7 +41,7 @@
 
 </template>
 <script>
-import { addConfig } from '@/api/system/config'
+import { addWhitelist } from '@/api/FDS/whiteList'
 
 export default {
   name: 'WhiteAdd',
@@ -85,7 +85,7 @@ export default {
       this.$refs['form'].validate(valid => {
         if (valid) {
 
-          addConfig(this.form).then(response => {
+          addWhitelist(this.form).then(response => {
             this.$modal.msgSuccess('新增成功')
           })
           this.$router.push({ path: '/build/whiteListManagement' })

sf-ui/src/views/FDS/whiteListManagement/edit.vue

@@ -43,7 +43,7 @@
 
 </template>
 <script>
-import { updateConfig } from '@/api/system/config'
+import { updateConfig } from '@/api/FDS/whiteList'
 
 export default {
   name: 'WhiteAdd',
@@ -84,7 +84,7 @@ export default {
       this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.configId != undefined) {
-            updateConfig(this.form).then(response => {
+            updateWhitelist(this.form).then(response => {
               this.$modal.msgSuccess('修改成功')
             })
           }

sf-ui/src/views/FDS/whiteListManagement/index.vue

@@ -168,7 +168,7 @@
 </template>
 <script>
 import { delConfig, getConfig, listConfig } from '@/api/system/config'
-
+import { listWhitelist,delWhitelist} from '@/api/FDS/whiteList'
 export default {
   name: 'WhiteList',
   dicts: ['sys_yes_no'],
@@ -222,7 +222,7 @@ export default {
     /** 查询参数列表 */
     getList() {
       this.loading = true
-      listConfig(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listWhitelist(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
           this.configList = response.rows
           this.total = response.total
           this.loading = false
@@ -288,7 +288,7 @@ export default {
     handleDelete(row) {
       const configIds = row.configId || this.ids
       this.$modal.confirm('是否确认删除编号为"' + configIds + '"的数据项？').then(function() {
-        return delConfig(configIds)
+        return delWhitelist(configIds)
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess('删除成功')

sf-ui/src/views/service/goods/index.vue

@@ -1,16 +1,16 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="68px" size="small">
       <el-form-item label="商品编号" prop="goodsCode">
         <el-input
           v-model="queryParams.goodsCode"
-          placeholder="请输入商品编号"
           clearable
+          placeholder="请输入商品编号"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="审核状态" prop="reviewStatus">
-        <el-select v-model="queryParams.reviewStatus" placeholder="请选择审核状态" clearable>
+        <el-select v-model="queryParams.reviewStatus" clearable placeholder="请选择审核状态">
           <el-option
             v-for="dict in dict.type.goods_review_status"
             :key="dict.value"
@@ -22,21 +22,21 @@
       <el-form-item label="商品标题" prop="productTitle">
         <el-input
           v-model="queryParams.productTitle"
-          placeholder="请输入商品标题"
           clearable
+          placeholder="请输入商品标题"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="商品原价" prop="originalPrice">
         <el-input
           v-model="queryParams.originalPrice"
-          placeholder="请输入商品原价"
           clearable
+          placeholder="请输入商品原价"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="商品类型" prop="goodsType">
-        <el-select v-model="queryParams.goodsType" placeholder="请选择商品类型" clearable>
+        <el-select v-model="queryParams.goodsType" clearable placeholder="请选择商品类型">
           <el-option
             v-for="dict in dict.type.goods_type"
             :key="dict.value"
@@ -48,21 +48,21 @@
       <el-form-item label="商品规格" prop="goodsSpec">
         <el-input
           v-model="queryParams.goodsSpec"
-          placeholder="请输入商品规格"
           clearable
+          placeholder="请输入商品规格"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="商品型号" prop="goodsModel">
         <el-input
           v-model="queryParams.goodsModel"
-          placeholder="请输入商品型号"
           clearable
+          placeholder="请输入商品型号"
           @keyup.enter.native="handleQuery"
         />
       </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-search" size="mini" type="primary" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -70,106 +70,116 @@
     <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="['service:goods:add']"
-        >新增</el-button>
+          icon="el-icon-plus"
+          plain
+          size="mini"
+          type="primary"
+          @click="handleAdd"
+        >新增
+        </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="['service:goods:edit']"
-        >修改</el-button>
+          :disabled="single"
+          icon="el-icon-edit"
+          plain
+          size="mini"
+          type="success"
+          @click="handleUpdate"
+        >修改
+        </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="['service:goods:remove']"
-        >删除</el-button>
+          :disabled="multiple"
+          icon="el-icon-delete"
+          plain
+          size="mini"
+          type="danger"
+          @click="handleDelete"
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
           v-hasPermi="['service:goods:export']"
-        >导出</el-button>
+          icon="el-icon-download"
+          plain
+          size="mini"
+          type="warning"
+          @click="handleExport"
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="goodsList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="id" />
-      <el-table-column label="商品编号" align="center" prop="goodsCode" />
-      <el-table-column label="审核状态" align="center" prop="reviewStatus">
+      <el-table-column align="center" type="selection" width="55"/>
+      <el-table-column align="center" label="主键" prop="id"/>
+      <el-table-column align="center" label="商品编号" prop="goodsCode"/>
+      <el-table-column align="center" label="审核状态" prop="reviewStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.goods_review_status" :value="scope.row.reviewStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="商品标题" align="center" prop="productTitle" />
-      <el-table-column label="商品图片" align="center" prop="productPicture" width="100">
+      <el-table-column align="center" label="商品标题" prop="productTitle"/>
+      <el-table-column align="center" label="商品图片" prop="productPicture" width="100">
         <template slot-scope="scope">
-          <image-preview :src="scope.row.productPicture" :width="50" :height="50"/>
+          <image-preview :height="50" :src="scope.row.productPicture" :width="50"/>
         </template>
       </el-table-column>
-      <el-table-column label="商品原价" align="center" prop="originalPrice" />
-      <el-table-column label="商品描述" align="center" prop="productDesc" />
-      <el-table-column label="商品类型" align="center" prop="goodsType">
+      <el-table-column align="center" label="商品原价" prop="originalPrice">
+        <template slot-scope="scope">
+          <span>{{ scope.row.originalPrice / 100 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="商品描述" prop="productDesc"/>
+      <el-table-column align="center" label="商品类型" prop="goodsType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.goods_type" :value="scope.row.goodsType"/>
         </template>
       </el-table-column>
-      <el-table-column label="商品规格" align="center" prop="goodsSpec" />
-      <el-table-column label="商品型号" align="center" prop="goodsModel" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column align="center" label="商品规格" prop="goodsSpec"/>
+      <el-table-column align="center" label="商品型号" prop="goodsModel"/>
+      <el-table-column align="center" class-name="small-padding fixed-width" label="操作">
         <template slot-scope="scope">
           <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
             v-hasPermi="['service:goods:edit']"
-          >修改</el-button>
-          <el-button
+            icon="el-icon-edit"
             size="mini"
             type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
+            @click="handleUpdate(scope.row)"
+          >修改
+          </el-button>
+          <el-button
             v-hasPermi="['service:goods:remove']"
-          >删除</el-button>
+            icon="el-icon-delete"
+            size="mini"
+            type="text"
+            @click="handleDelete(scope.row)"
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
       v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.pageNum"
+      :total="total"
       @pagination="getList"
     />
 
     <!-- 添加或修改商品信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" append-to-body width="500px">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="商品编号" prop="goodsCode">
-          <el-input v-model="form.goodsCode" placeholder="请输入商品编号" />
+          <el-input v-model="form.goodsCode" placeholder="请输入商品编号"/>
         </el-form-item>
         <el-form-item label="审核状态" prop="reviewStatus">
           <el-radio-group v-model="form.reviewStatus">
@@ -177,20 +187,21 @@
               v-for="dict in dict.type.goods_review_status"
               :key="dict.value"
               :label="parseInt(dict.value)"
-            >{{dict.label}}</el-radio>
+            >{{ dict.label }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="商品标题" prop="productTitle">
-          <el-input v-model="form.productTitle" placeholder="请输入商品标题" />
+          <el-input v-model="form.productTitle" placeholder="请输入商品标题"/>
         </el-form-item>
         <el-form-item label="商品图片" prop="productPicture">
-          <image-upload v-model="form.productPicture"/>
+          <image-upload v-model="form.productPicture" :limit="1"/>
         </el-form-item>
         <el-form-item label="商品原价" prop="originalPrice">
-          <el-input v-model="form.originalPrice" placeholder="请输入商品原价" />
+          <el-input v-model="form.originalPrice" placeholder="请输入商品原价"/>
         </el-form-item>
         <el-form-item label="商品描述" prop="productDesc">
-          <el-input v-model="form.productDesc" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.productDesc" placeholder="请输入内容" type="textarea"/>
         </el-form-item>
         <el-form-item label="商品类型" prop="goodsType">
           <el-radio-group v-model="form.goodsType">
@@ -198,17 +209,18 @@
               v-for="dict in dict.type.goods_type"
               :key="dict.value"
               :label="parseInt(dict.value)"
-            >{{dict.label}}</el-radio>
+            >{{ dict.label }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="商品规格" prop="goodsSpec">
-          <el-input v-model="form.goodsSpec" placeholder="请输入商品规格" />
+          <el-input v-model="form.goodsSpec" placeholder="请输入商品规格"/>
         </el-form-item>
         <el-form-item label="排序" prop="orderNum">
-          <el-input v-model="form.orderNum" placeholder="请输入排序" />
+          <el-input v-model="form.orderNum" placeholder="请输入排序"/>
         </el-form-item>
         <el-form-item label="商品型号" prop="goodsModel">
-          <el-input v-model="form.goodsModel" placeholder="请输入商品型号" />
+          <el-input v-model="form.goodsModel" placeholder="请输入商品型号"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -220,10 +232,10 @@
 </template>
 
 <script>
-import { listGoods, getGoods, delGoods, addGoods, updateGoods } from "@/api/service/goods";
+import { addGoods, delGoods, getGoods, listGoods, updateGoods } from '@/api/service/goods'
 
 export default {
-  name: "Goods",
+  name: 'Goods',
   dicts: ['goods_review_status', 'goods_type'],
   data() {
     return {
@@ -242,7 +254,7 @@ export default {
       // 商品信息表格数据
       goodsList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -262,49 +274,49 @@ export default {
       // 表单校验
       rules: {
         goodsCode: [
-          { required: true, message: "商品编号不能为空", trigger: "blur" }
+          { required: true, message: '商品编号不能为空', trigger: 'blur' }
         ],
         reviewStatus: [
-          { required: true, message: "审核状态不能为空", trigger: "change" }
+          { required: true, message: '审核状态不能为空', trigger: 'change' }
         ],
         productTitle: [
-          { required: true, message: "商品标题不能为空", trigger: "blur" }
+          { required: true, message: '商品标题不能为空', trigger: 'blur' }
         ],
         productPicture: [
-          { required: true, message: "商品图片不能为空", trigger: "blur" }
+          { required: true, message: '商品图片不能为空', trigger: 'blur' }
         ],
         originalPrice: [
-          { required: true, message: "商品原价不能为空", trigger: "blur" }
+          { required: true, message: '商品原价不能为空', trigger: 'blur' }
         ],
         goodsType: [
-          { required: true, message: "商品类型不能为空", trigger: "change" }
+          { required: true, message: '商品类型不能为空', trigger: 'change' }
         ],
         goodsSpec: [
-          { required: true, message: "商品规格不能为空", trigger: "blur" }
+          { required: true, message: '商品规格不能为空', trigger: 'blur' }
         ],
         goodsModel: [
-          { required: true, message: "商品型号不能为空", trigger: "blur" }
+          { required: true, message: '商品型号不能为空', trigger: 'blur' }
         ]
       }
-    };
+    }
   },
   created() {
-    this.getList();
+    this.getList()
   },
   methods: {
     /** 查询商品信息列表 */
     getList() {
-      this.loading = true;
+      this.loading = true
       listGoods(this.queryParams).then(response => {
-        this.goodsList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
+        this.goodsList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
     },
     // 取消按钮
     cancel() {
-      this.open = false;
-      this.reset();
+      this.open = false
+      this.reset()
     },
     // 表单重置
     reset() {
@@ -327,72 +339,73 @@ export default {
         updateTime: null,
         goodsName: null,
         goodsModel: null
-      };
-      this.resetForm("form");
+      }
+      this.resetForm('form')
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+      this.queryParams.pageNum = 1
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
+      this.resetForm('queryForm')
+      this.handleQuery()
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加商品信息";
+      this.reset()
+      this.open = true
+      this.title = '添加商品信息'
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
+      this.reset()
       const id = row.id || this.ids
       getGoods(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改商品信息";
-      });
+        this.form = response.data
+        this.open = true
+        this.title = '修改商品信息'
+      })
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            let data = Object.assign({},this.form)
+            let data = Object.assign({}, this.form)
             delete data.explain
             updateGoods(data).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
           } else {
             addGoods(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
           }
         }
-      });
+      })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
+      const ids = row.id || this.ids
       this.$modal.confirm('是否确认删除商品信息编号为"' + ids + '"的数据项？').then(function() {
-        return delGoods(ids);
+        return delGoods(ids)
       }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -401,5 +414,5 @@ export default {
       }, `goods_${new Date().getTime()}.xlsx`)
     }
   }
-};
+}
 </script>