Merge remote-tracking branch 'origin/master'

src/views/index.vue

@@ -188,10 +188,7 @@ export default {
           { name: '钦州', value: '3' },
           { name: '南宁', value: '6' },
           { name: '北海', value: '7' },
-          { name: '贵港', value: '3' },
-          { name: '玉林', value: '5' },
-          { name: '柳州', value: '3' },
-          { name: '河池', value: '1' }
+          { name: '梧州', value: '3' },
         ],
         pie: [
           { name: '南宁保税区', value: '1' },

src/views/login.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="login" :style="{backgroundImage:'url('+url+')'}">
+  <div class="login" :style="{ backgroundImage: 'url(' + url + ')' }">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
       <div class="logo"><img src="../assets/logo/logo.png" class="img" /></div>
       <h3 class="title">欢迎登录广西综合保税区智慧管理平台</h3>
@@ -40,7 +40,7 @@
 </template>
 
 <script>
-import { getCodeImg , getSYSTEM } from '@/api/login';
+import { getCodeImg, getSYSTEM } from '@/api/login';
 import Cookies from 'js-cookie';
 import { encrypt, decrypt } from '@/utils/jsencrypt';
 
@@ -67,7 +67,7 @@ export default {
       // 注册开关
       register: false,
       redirect: undefined,
-      url:''
+      url: ''
     };
   },
   watch: {
@@ -81,13 +81,13 @@ export default {
   created() {
     this.getCode();
     this.getCookie();
-    this.getBgImg()
+    this.getBgImg();
   },
   methods: {
-    getBgImg(){
-      getSYSTEM(1).then(res=>{
-        this.url = res.data.systemPicture
-      })
+    getBgImg() {
+      getSYSTEM(1).then(res => {
+        this.url = this.baseUrl + res.data.systemPicture;
+      });
     },
     getCode() {
       getCodeImg().then(res => {

src/views/sys/index.vue

@@ -1,66 +1,10 @@
 <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
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['business:SYSTEM: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="['business:SYSTEM: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="['business:SYSTEM: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="['business:SYSTEM:export']"
-        >导出</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="SYSTEMList"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="SYSTEMList" @selection-change="handleSelectionChange">
       <el-table-column label="系统名称" align="center" prop="systemName">
         <template slot-scope="scope">
           {{ scope.row.systemName }}
@@ -68,85 +12,36 @@
       </el-table-column>
       <el-table-column label="系统背景图" align="center" prop="systemPicture">
         <template slot-scope="scope">
-          <el-image
-            style="width: 100px; height: 100px"
-            :src="scope.row.systemPicture"
-            :preview-src-list="[scope.row.systemPicture]"
-          >
-          </el-image>
+          <el-image style="width: 100px; height: 100px" :src="baseUrl + scope.row.systemPicture" :preview-src-list="[baseUrl + scope.row.systemPicture]"></el-image>
         </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"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['business:SYSTEM:edit']"
-            >修改</el-button
-          >
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['business:SYSTEM:edit']">修改</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
     <!-- 添加或修改系统管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="系统名称">
-          <el-input
-            v-model="form.systemName"
-            placeholder="请输入系统名称"
-          ></el-input>
+          <el-input v-model="form.systemName" placeholder="请输入系统名称"></el-input>
         </el-form-item>
         <el-form-item label="系统背景图">
-          <el-upload
-            action="#"
-            list-type="picture-card"
-            :limit="1"
-            :auto-upload="true"
-            :http-request="httprequest"
-            :before-upload="beforeupload"
-            :file-list="fileList"
-          >
+          <el-upload action="#" list-type="picture-card" :limit="1" :auto-upload="true" :http-request="httprequest" :before-upload="beforeupload" :file-list="fileList">
             <i slot="default" class="el-icon-plus"></i>
             <div slot="file" slot-scope="{ file }">
               <img class="el-upload-list__item-thumbnail" :src="file.url" />
               <!-- 放大预览 -->
               <span class="el-upload-list__item-actions">
-                <span
-                  class="el-upload-list__item-preview"
-                  @click="handlePictureCardPreview(file)"
-                >
+                <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
                   <i class="el-icon-zoom-in"></i>
                 </span>
-                <!-- 下载用的，暂时不需要 -->
-                <!-- <span
-                  v-if="!disabled"
-                  class="el-upload-list__item-delete"
-                  @click="handleDownload(file)"
-                >
-                  <i class="el-icon-download"></i>
-                </span> -->
-
                 <!-- 删除图片 -->
-                <span
-                  v-if="!disabled"
-                  class="el-upload-list__item-delete"
-                  @click="handleRemove(file)"
-                >
+                <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
                   <i class="el-icon-delete"></i>
                 </span>
               </span>
@@ -160,7 +55,6 @@
       </div>
     </el-dialog>
 
-
     <el-dialog :visible.sync="dialogVisible" fullscreen append-to-body @close="dialogVisible = false">
       <img width="100%" :src="form.systemPicture" alt="" />
     </el-dialog>
@@ -168,17 +62,10 @@
 </template>
 
 <script>
-import {
-  listSYSTEM,
-  getSYSTEM,
-  delSYSTEM,
-  addSYSTEM,
-  updateSYSTEM,
-  upload,
-} from "@/api/portal/sys/sys.js";
+import { listSYSTEM, getSYSTEM, delSYSTEM, addSYSTEM, updateSYSTEM, upload } from '@/api/portal/sys/sys.js';
 
 export default {
-  name: "SYSTEM",
+  name: 'SYSTEM',
   data() {
     return {
       dialogVisible: false,
@@ -201,7 +88,7 @@ export default {
       // 系统管理表格数据
       SYSTEMList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -216,26 +103,18 @@ export default {
         delFlag: null,
         deptId: null,
         systemName: null,
-        systemPicture: null,
+        systemPicture: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        id: [{ required: true, message: "主键id不能为空", trigger: "blur" }],
-        delFlag: [
-          { required: true, message: "删除标记不能为空", trigger: "blur" },
-        ],
-        deptId: [
-          { required: true, message: "部门id不能为空", trigger: "blur" },
-        ],
-        systemName: [
-          { required: true, message: "系统名称不能为空", trigger: "blur" },
-        ],
-        systemPicture: [
-          { required: true, message: "系统背景图不能为空", trigger: "blur" },
-        ],
-      },
+        id: [{ required: true, message: '主键id不能为空', trigger: 'blur' }],
+        delFlag: [{ required: true, message: '删除标记不能为空', trigger: 'blur' }],
+        deptId: [{ required: true, message: '部门id不能为空', trigger: 'blur' }],
+        systemName: [{ required: true, message: '系统名称不能为空', trigger: 'blur' }],
+        systemPicture: [{ required: true, message: '系统背景图不能为空', trigger: 'blur' }]
+      }
     };
   },
   created() {
@@ -245,19 +124,19 @@ export default {
     httprequest() {},
     beforeupload(file) {
       let formData = new FormData();
-      formData.append("file", file);
-      upload(formData).then((res) => {
-        this.form.systemPicture = res.url;
+      formData.append('file', file);
+      upload(formData).then(res => {
+        this.form.systemPicture = res.fileName;
       });
     },
     handleRemove(file) {
-      this.form.systemPicture = "";
+      this.form.systemPicture = '';
       this.fileList = [];
     },
     /** 查询系统管理列表 */
     getList() {
       this.loading = true;
-      listSYSTEM(this.queryParams).then((response) => {
+      listSYSTEM(this.queryParams).then(response => {
         this.SYSTEMList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -276,9 +155,9 @@ export default {
         delFlag: null,
         deptId: null,
         systemName: null,
-        systemPicture: null,
+        systemPicture: null
       };
-      this.resetForm("form");
+      this.resetForm('form');
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -287,12 +166,12 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.resetForm('queryForm');
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
+      this.ids = selection.map(item => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -300,39 +179,39 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加系统管理";
+      this.title = '添加系统管理';
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getSYSTEM(id).then((response) => {
+      getSYSTEM(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改系统管理";
+        this.title = '修改系统管理';
         this.fileList.push({
-          name: "xxx",
-          url: response.data.systemPicture,
+          name: 'xxx',
+          url: this.baseUrl + response.data.systemPicture
         });
       });
     },
     handlePictureCardPreview(file) {
-      this.form.systemPicture = file.url;
+      this.form.systemPicture = file.fileName;
       this.dialogVisible = true;
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updateSYSTEM(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
+            updateSYSTEM(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功');
               this.open = false;
               this.getList();
             });
           } else {
-            addSYSTEM(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
+            addSYSTEM(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功');
               this.open = false;
               this.getList();
             });
@@ -350,20 +229,20 @@ export default {
         })
         .then(() => {
           this.getList();
-          this.$modal.msgSuccess("删除成功");
+          this.$modal.msgSuccess('删除成功');
         })
         .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
       this.download(
-        "business/SYSTEM/export",
+        'business/SYSTEM/export',
         {
-          ...this.queryParams,
+          ...this.queryParams
         },
         `SYSTEM_${new Date().getTime()}.xlsx`
       );
-    },
-  },
+    }
+  }
 };
 </script>