PC公司

src/api/wjnft/company.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询公司列表
+export function listCompany(query) {
+  return request({
+    url: '/wjnft/company/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询公司详细
+export function getCompany(id) {
+  return request({
+    url: '/wjnft/company/' + id,
+    method: 'get'
+  })
+}
+
+// 新增公司
+export function addCompany(data) {
+  return request({
+    url: '/wjnft/company',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改公司
+export function updateCompany(data) {
+  return request({
+    url: '/wjnft/company',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除公司
+export function delCompany(id) {
+  return request({
+    url: '/wjnft/company/' + id,
+    method: 'delete'
+  })
+}

src/global/global.js

@@ -1,7 +1,10 @@
 
-// 接口地址
+// 图片路径
 const apiUrl = null;
+// 回显图片路径地址
+const echoUrl = null;
 
 export default {
-    apiUrl
+    apiUrl,
+    echoUrl
 };

src/main.js

@@ -37,6 +37,8 @@ import DictTag from '@/components/DictTag'
 import VueMeta from 'vue-meta'
 // 字典数据组件
 import DictData from '@/components/DictData'
+//
+import Upload from '@/views/wjnft/uploading/upload'
 
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
@@ -62,6 +64,7 @@ Vue.component('Editor', Editor)
 Vue.component('FileUpload', FileUpload)
 Vue.component('ImageUpload', ImageUpload)
 Vue.component('ImagePreview', ImagePreview)
+Vue.component('Upload', Upload)
 
 Vue.use(directive)
 Vue.use(plugins)

src/views/wjnft/company/index.vue

@@ -0,0 +1,329 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="标题" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入标题"
+          clearable
+          size="small"
+          @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-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="['wjnft:company: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="['wjnft:company: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="['wjnft:company: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="['wjnft:company:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="companyList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号"  type="index" width="50" />
+      <el-table-column label="标题" align="center" prop="title" />
+      <el-table-column label="内容" align="center" prop="content" width="500">
+        <template slot-scope="scope">
+          <!--          <div v-html="scope.row.content" style="height:200px;width:100%;overflow:auto"></div>-->
+          <div class="ql-container ql-snow">
+            <div class="ql-editor" v-html="scope.row.content" style="height:100px;width:100%;overflow:auto" />
+          </div>
+        </template>
+
+      </el-table-column>
+      <el-table-column label="图片路径" align="center" prop="picture" >
+        <template slot-scope="scope">
+          <div class="demo-image">
+            <div class="block">
+              <el-image
+                  style="
+            width: 50px;
+            height: 51px;
+            border-radius: 6px;
+            z-index: 2;
+          "
+                  :src="scope.row.picture"
+                  :preview-src-list="srcList"
+              >
+              </el-image>
+            </div>
+          </div>
+        </template>
+
+      </el-table-column>
+      <el-table-column label="点赞数量" align="center" prop="thumbsUp" />
+      <el-table-column label="发布时间" align="center" prop="createdTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="修改时间" align="center" prop="updatedTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>
+        </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="['wjnft:company:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['wjnft:company: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="80px">
+        <el-form-item label="标题" prop="title">
+          <el-input v-model="form.title" placeholder="请输入标题" />
+        </el-form-item>
+        <el-form-item label="内容">
+          <editor v-model="form.content" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="图片路径">
+          <Upload ref="uploadFile"  :urlPath="urlPath" v-if="echo" ></Upload>
+          <span> 上传文件只能是<b style="color: #C03639">png，jpeg，jpg</b >格式,大小不能超过<b style="color: #C03639">3M</b> </span>
+          <el-dialog :visible.sync="dialogVisible">
+            <img width="100%" :src="dialogImageUrl" alt="">
+          </el-dialog>
+        </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 { listCompany, getCompany, delCompany, addCompany, updateCompany } from "@/api/wjnft/company";
+
+
+export default {
+  name: "Company",
+  data() {
+    return {
+      //文件上传
+      dialogImageUrl: '',
+      dialogVisible: false,
+      echo:false,
+      //图片路径
+      urlPath:null,
+      srcList: [],
+
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 公司表格数据
+      companyList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        title: null,
+        content: null,
+        picture: null,
+        thumbsUp: null,
+        createdTime: null,
+        updatedTime: null,
+        deletedTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询公司列表 */
+    getList() {
+      this.loading = true;
+      listCompany(this.queryParams).then(response => {
+        this.companyList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+        response.rows.forEach(item =>{
+          this.srcList.push(item.picture);
+        });
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        title: null,
+        content: null,
+        picture: null,
+        thumbsUp: null,
+        createdTime: null,
+        updatedTime: null,
+        deletedTime: 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.echo = true;
+      this.title = "添加科普";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getCompany(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.echo = true;
+        this.title = "修改科普";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateCompany(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+           // console.log(this.global.apiUrl);
+            this.form.picture = this.global.apiUrl;
+           // console.log(this.form);
+            addCompany(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除公司编号为"' + ids + '"的数据项？').then(function() {
+        return delCompany(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('wjnft/company/export', {
+        ...this.queryParams
+      }, `company_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/wjnft/rotation/index.vue

@@ -196,7 +196,7 @@
         </el-form-item>
         <el-form-item label="图片" prop="rotationId">
 <!--          <el-input v-model="form.rotationId" placeholder="请输入pc端图片表id" />-->
-          <Upload ref="uploadFile"  :urlPath="urlPath" ></Upload>
+          <Upload ref="uploadFile"  :urlPath="urlPath" v-if="echo" ></Upload>
           <span> 上传文件只能是<b style="color: #C03639">png，jpeg，jpg</b >格式,大小不能超过<b style="color: #C03639">3M</b> </span>
           <el-dialog :visible.sync="dialogVisible">
             <img width="100%" :src="dialogImageUrl" alt="">
@@ -269,6 +269,7 @@ export default {
   },
   data() {
     return {
+      echo:false,
       //图片路径
       urlPath:null,
       srcList: [],
@@ -349,6 +350,8 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.echo = false;
+      this.urlPath = null;
       this.reset();
       this.$refs.uploadFile.$refs.upload.clearFiles();
     },
@@ -385,19 +388,62 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
+      this.echo =true;
       this.title = "添加pc端轮播图";
 
     },
+    //修改赋值
+    valuation( len ){
+      if(len === 1){
+        this.form.identification = "首页"
+      }
+      if(len === 2){
+        this.form.identification = "创作者"
+      }
+      if(len === 3){
+        this.form.identification = "市场"
+      }
+      if(len === 4){
+        this.form.identification = "公司"
+      }
+      if(len === 5){
+        this.form.identification = "登录注册"
+      }
+    },
+    //提交修改赋值
+    updateValuation(len){
+      //验证是否是中文
+      let pattern = new RegExp("[\u4E00-\u9FA5]+");
+      if(pattern.test(len)){
+        if(len === "首页"){
+          this.form.identification = 1
+        }
+        if(len === "创作者"){
+          this.form.identification = 2
+        }
+        if(len === "市场"){
+          this.form.identification = 3
+        }
+        if(len === "公司"){
+          this.form.identification = 4
+        }
+        if(len === "登录注册"){
+          this.form.identification = 5
+        }
+      }
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids
       getRotation(id).then(response => {
         this.form = response.data;
+        this.valuation( this.form.identification );
         this.urlPath = response.data.rotationId;
         this.open = true;
         this.title = "修改pc端轮播图";
-        //console.log(this.urlPath);
+        this.echo =true;
+       // console.log(this.global.echoUrl);
       });
     },
     /** 提交按钮 */
@@ -405,9 +451,14 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
+            this.form.rotationId = this.global.apiUrl;
+            //console.log(this.form);
+            this.updateValuation(this.form.identification);
             updateRotation(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
+              this.echo = false;
+              this.global.apiUrl = null;
               this.getList();
             });
           } else {
@@ -417,6 +468,8 @@ export default {
             addRotation(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
+              this.echo = false;
+              this.global.apiUrl = null;
               this.$refs.uploadFile.$refs.upload.clearFiles();
               this.getList();
             });

src/views/wjnft/uploading/upload.vue

@@ -76,6 +76,7 @@ name: "upload",
 data(){
   return{
     imgList: [],
+    echo:false,
     disabled: false,
   }
 },
@@ -93,15 +94,39 @@ data(){
       return process.env.VUE_APP_BASE_API + "/wjnft/oss/upload/" + client
     }
   },
+  watch:{
+    // urlPath:{
+    //   deep:true,
+    //   immediate: true,
+    //   handler(newVal){
+    //     // TODO
+    //     console.log("子组件接收到了参数..."+newVal)
+    //     if(newVal !== null){
+    //       let obj = {}
+    //       obj.url = newVal
+    //       this.imgList.push(obj)
+    //     }
+    //   }
+    // }
+
+  },
+
   created() {
-    console.log(this.urlPath);
+
-    this.imgList.push(this.urlPath);
+  //  console.log(this.urlPath);
+    if(this.urlPath !== null){
+      let obj = {}
+      obj.url = this.urlPath
+      this.imgList.push(obj)
+    }
+
+    //this.imgList.push(this.urlPath);
   },
   methods:{
     //  上传文件时触发
     beforeUpload(file) {
       //console.log(file)
-      var testmsg = file.name.substring(file.name.lastIndexOf(".") + 1);
+      let testmsg = file.name.substring(file.name.lastIndexOf(".") + 1);
       const extension = testmsg === "png";
       const extension1 = testmsg === "jpg";
       const extension2 = testmsg === "jpeg";
@@ -126,6 +151,7 @@ data(){
       console.log(res);
       this.picture_url = res.url;
       this.global.apiUrl=  this.picture_url;
+      //console.log(this.global.apiUrl);
       return this.imgList;
     },
     handleRemove(file) {