Merge remote-tracking branch 'origin/master'

src/api/login.js

@@ -56,4 +56,12 @@ export function getCodeImg() {
     method: 'get',
     timeout: 20000
   })
+}
+
+// 查询系统管理详细
+export function getSYSTEM(id) {
+  return request({
+    url: '/portal_api/SYSTEM/getInfo/' + id,
+    method: 'get'
+  })
 }

src/api/portal/BONDED/BONDED.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询保税区管理列表
+export function listBONDED(query) {
+  return request({
+    url: '/BONDED/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询保税区管理所有列表
+export function listAllBONDED(query) {
+  return request({
+    url: '/BONDED/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询保税区管理详细
+export function getBONDED(id) {
+  return request({
+    url: '/BONDED/getInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增保税区管理
+export function addBONDED(data) {
+  return request({
+    url: '/BONDED/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改保税区管理
+export function updateBONDED(data) {
+  return request({
+    url: '/BONDED/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除保税区管理
+export function delBONDED(id) {
+  return request({
+    url: '/BONDED/remove/' + id,
+    method: 'get'
+  })
+}

src/api/system/user.js

@@ -81,7 +81,7 @@ export function getUserProfile() {
 // 修改用户个人信息
 export function updateUserProfile(data) {
   return request({
-    url: '/system/user/profile',
+    url: '/system/user/profile/edit',
     method: 'post',
     data: data
   })
@@ -133,3 +133,13 @@ export function deptTreeSelect() {
     method: 'get'
   })
 }
+
+
+// 上传文件
+export function upload(data) {
+  return request({
+    url: '/common/upload/',
+    method: 'post',
+    data:data
+  })
+}

src/assets/styles/index.scss

@@ -129,6 +129,7 @@ aside {
   box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.08);
   position: relative;
   height: calc(100vh - 90px);
+  overflow: auto;
 }
 
 .components-container {

src/views/BONDED/index.vue

@@ -0,0 +1,331 @@
+<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:BONDED: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:BONDED: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:BONDED:remove']"
+          >删除</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="BONDEDList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="保税区名称" align="center" prop="bondedName">
+        <template slot-scope="scope">
+          {{ scope.row.bondedName }}
+        </template>
+      </el-table-column>
+      <el-table-column label="场站编号" align="center" prop="yardNumber">
+        <template slot-scope="scope">
+          {{ scope.row.yardNumber }}
+        </template>
+      </el-table-column>
+      <el-table-column label="成立时间" align="center" prop="establishedTime">
+        <template slot-scope="scope">
+          {{ scope.row.establishedTime }}
+        </template>
+      </el-table-column>
+      <el-table-column label="地址" align="center" prop="site">
+        <template slot-scope="scope">
+          {{ scope.row.site }}
+        </template>
+      </el-table-column>
+      <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:BONDED:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:BONDED:remove']"
+            >删除</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"
+    />
+
+    <!-- 添加或修改保税区管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="保税区名称" prop="bondedName">
+          <el-input
+            v-model="form.bondedName"
+            placeholder="请输入保税区名称"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="场站编号" prop="yardNumber">
+          <el-input
+            v-model="form.yardNumber"
+            placeholder="请输入场站编号"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="成立时间" prop="establishedTime">
+          <el-date-picker
+            v-model="form.establishedTime"
+            type="date"
+            placeholder="选择日期"
+            format="yyyy 年 MM 月 dd 日"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="地址" prop="site">
+          <el-input v-model="form.site" placeholder="请输入地址"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listBONDED,
+  getBONDED,
+  delBONDED,
+  addBONDED,
+  updateBONDED,
+} from "@/api/portal/BONDED/BONDED.js";
+
+export default {
+  name: "BONDED",
+  data() {
+    return {
+      // 根路径
+      baseURL: process.env.VUE_APP_BASE_API,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 保税区管理表格数据
+      BONDEDList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        id: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null,
+        delFlag: null,
+        deptId: null,
+        bondedName: null,
+        yardNumber: null,
+        establishedTime: null,
+        site: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [{ required: true, message: "主键id不能为空", trigger: "blur" }],
+        delFlag: [
+          { required: true, message: "删除标记不能为空", trigger: "blur" },
+        ],
+        deptId: [
+          { required: true, message: "部门id不能为空", trigger: "blur" },
+        ],
+        bondedName: [
+          { required: true, message: "保税区名称不能为空", trigger: "blur" },
+        ],
+        yardNumber: [
+          { required: true, message: "场站编号不能为空", trigger: "blur" },
+        ],
+        establishedTime: [
+          { required: true, message: "成立时间不能为空", trigger: "blur" },
+        ],
+        site: [{ required: true, message: "地址不能为空", trigger: "blur" }],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询保税区管理列表 */
+    getList() {
+      this.loading = true;
+      listBONDED(this.queryParams).then((response) => {
+        this.BONDEDList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        delFlag: null,
+        deptId: null,
+        bondedName: null,
+        yardNumber: null,
+        establishedTime: null,
+        site: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 注册按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加保税区管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getBONDED(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改保税区管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateBONDED(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addBONDED(this.form).then((response) => {
+              this.$modal.msgSuccess("注册成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm("是否确认删除？")
+        .then(function () {
+          return delBONDED(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "business/BONDED/export",
+        {
+          ...this.queryParams,
+        },
+        `BONDED_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>

src/views/LEAVEMESSAGE/index.vue

@@ -31,8 +31,8 @@
       <el-table-column label="留言详情" align="center" prop="questionDetail" :show-overflow-tooltip="true" />
       <el-table-column label="状态" align="center" prop="type">
         <template slot-scope="scope">
-          <span v-if="scope.row.type == 1"><el-tag type="danger">未回复</el-tag></span>
-          <span v-if="scope.row.type == 0"><el-tag>已回复</el-tag></span>
+          <span v-if="scope.row.type == 0"><el-tag type="danger">未回复</el-tag></span>
+          <span v-if="scope.row.type == 1"><el-tag>已回复</el-tag></span>
         </template>
       </el-table-column>
       <el-table-column label="留言时间" align="center" prop="questionTime">
@@ -76,8 +76,8 @@
           <el-col :span="24">
             <el-form-item label="回复内容" prop="replyContent">
               <template slot-scope="scope">
-                <el-input v-if="form.type == 1" v-model="form.replyContent" type="textarea" rows="5" placeholder="请输入内容" />
-                <el-input v-else-if="form.type == 0" disabled v-model="form.replyContent" rows="5" type="textarea" />
+                <el-input v-if="form.type == 0" v-model="form.replyContent" type="textarea" rows="5" placeholder="请输入内容" />
+                <el-input v-else-if="form.type == 1" disabled v-model="form.replyContent" rows="5" type="textarea" />
               </template>
             </el-form-item>
           </el-col>

src/views/index.vue

@@ -1,6 +1,10 @@
 <template>
   <div class="dashboard-editor-container">
-    <div class="mtitle">早上好，管理员！</div>
+    <div class="mtitle">
+      早上好，管理员！
+      <iframe allowtransparency="true" frameborder="0" width="180" height="36" scrolling="no" style="padding-top:10px;"
+      						src="//tianqi.2345.com/plugin/widget/index.htm?s=3&z=2&t=0&v=0&d=2&bd=0&k=&f=#545555&ltf=#545555&htf=ffffff&q=1&e=1&a=1&c=72036&w=180&h=36&align=center"></iframe>
+      </div>
     <div class="cbox">
       <div class="ctitle">各保税区综合评分概况</div>
       <div class="rows">

src/views/login.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="login">
+  <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 } from '@/api/login';
+import { getCodeImg , getSYSTEM } from '@/api/login';
 import Cookies from 'js-cookie';
 import { encrypt, decrypt } from '@/utils/jsencrypt';
 
@@ -66,7 +66,8 @@ export default {
       captchaEnabled: true,
       // 注册开关
       register: false,
-      redirect: undefined
+      redirect: undefined,
+      url:''
     };
   },
   watch: {
@@ -80,8 +81,14 @@ export default {
   created() {
     this.getCode();
     this.getCookie();
+    this.getBgImg()
   },
   methods: {
+    getBgImg(){
+      getSYSTEM(1).then(res=>{
+        this.url = res.data.systemPicture
+      })
+    },
     getCode() {
       getCodeImg().then(res => {
         this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;
@@ -138,7 +145,7 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url('../assets/images/bg.png');
+  // background-image: url('../assets/images/bg.png');
   background-size: cover;
 }
 .title {

src/views/news/index.vue

@@ -265,7 +265,7 @@ export default {
       let formData = new FormData();
       formData.append('file', file);
       upload(formData).then(res => {
-        this.form.picture = res.fileName;
+        this.form.picture = res.url;
       });
     },
     handleRemove(file) {
@@ -357,10 +357,11 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = '修改网站新闻';
-        downloadpic(this.form.picture).then(res => {
-          let src = window.URL.createObjectURL(res);
-          this.fileList.push({ name: 'xxx', url: src });
-        });
+        this.fileList.push({ name: 'xxx', url: this.form.picture });
+        // downloadpic(this.form.picture).then(res => {
+        //   let src = window.URL.createObjectURL(res);
+        //   this.fileList.push({ name: 'xxx', url: src });
+        // });
       });
     },
     handleCommit(row) {

src/views/news/task/index.vue

@@ -35,24 +35,15 @@
           style="margin-top: 20px"
         >
           <el-form-item label="标题" prop="title">
-            <el-input
-              v-model="taskList.formobj.title"
-              disabled
-            ></el-input>
+            <el-input v-model="taskList.formobj.title" disabled></el-input>
           </el-form-item>
 
           <el-form-item label="来源">
-            <el-input
-              v-model="taskList.formobj.source"
-              disabled
-            ></el-input>
+            <el-input v-model="taskList.formobj.source" disabled></el-input>
           </el-form-item>
 
           <el-form-item label="类型" prop="type">
-            <el-select
-              v-model="taskList.formobj.type"
-              disabled
-            >
+            <el-select v-model="taskList.formobj.type" disabled>
               <el-option
                 v-for="item in typeList"
                 :key="item.value + 'typeList'"
@@ -127,9 +118,7 @@
 </template>
 
 <script>
-import {
-  downloadpic,
-} from "@/api/portal/task/task";
+import { downloadpic } from "@/api/portal/task/task";
 export default {
   data() {
     return {
@@ -140,34 +129,37 @@ export default {
         { label: "通知公告", value: "3" },
         { label: "政策解读", value: "4" },
       ],
-      fileList: [
-      ],
+      fileList: [],
       BigImgVisible: false,
     };
   },
   props: ["taskList"],
   created() {
     if (this.taskList.formobj.picture) {
-      downloadpic(this.taskList.formobj.picture).then((res) => {
-        this.fileList.push({
-          url:window.URL.createObjectURL(res),
-            name:'xxx'
-        })
-        console.log('下载转换后:',this.fileList[0])
+      this.fileList.push({
+        url: this.taskList.formobj.picture,
+        name: "xxx",
       });
+      // downloadpic(this.taskList.formobj.picture).then((res) => {
+
+      //   console.log('下载转换后:',this.fileList[0])
+      // });
     }
   },
   watch: {
     taskList(curVal, oldVal) {
       if (curVal) {
-        this.fileList.pop()
-        downloadpic(curVal.formobj.picture).then((res) => {
+        this.fileList.pop();
           this.fileList.push({
-            url:window.URL.createObjectURL(res),
-            name:'xxx'
-          })
-        });
-
+            url: curVal.formobj.picture,
+            name: "xxx",
+          });
+        // downloadpic(curVal.formobj.picture).then((res) => {
+        //   this.fileList.push({
+        //     url: window.URL.createObjectURL(res),
+        //     name: "xxx",
+        //   });
+        // });
       }
     },
   },

src/views/system/user/profile/userAvatar.vue

@@ -55,7 +55,7 @@
 <script>
 import store from "@/store";
 import { VueCropper } from "vue-cropper";
-import { uploadAvatar } from "@/api/system/user";
+import { uploadAvatar,upload } from "@/api/system/user";
 
 export default {
   components: { VueCropper },
@@ -122,6 +122,16 @@ export default {
     // 上传图片
     uploadImg() {
       this.$refs.cropper.getCropBlob(data => {
+        // let formData = new FormData();
+        // formData.append("file", data);
+        // upload(formData).then(response => {
+        //   this.open = false;
+        //   this.options.img = response.url;
+        //   store.commit('SET_AVATAR', this.options.img);
+        //   this.$modal.msgSuccess("修改成功");
+        //   this.visible = false;
+          
+        // });
         let formData = new FormData();
         formData.append("avatarfile", data);
         uploadAvatar(formData).then(response => {