修改内容

feige

2025-05-06 c4d4c5d25cd78fa302fe07a824c8d7b3412bd9f1

修改内容

 ruoyi-ui/src/api/fscan/index.js

New file
@@ -0,0 +1,87 @@
import request from '@/utils/request'

// Familyevent

// 查询所有家庭大事，分页查询
export function listFScan(query) {
  return request({
    url: '/qrCode/all',
    method: 'get',
    params: query
  })
}
// 根据id查询所有家庭资产详细信息
export function getFSInfo(id) {
  return request({
    url: '/qrCode/getInf?id=' + id,
    method: 'get',

  })
  }
// 根据id查询所有家庭资产详细信息
export function getFScanInfo(id) {
  return request({
    url: '/qrCode/getInfo?id=' + id,
    method: 'get',

  })
}

//增加资产信息
export function addFScan(data)
{
  return request({
    url: '/qrCode',
    method: 'post',
    data: data
  })
}

// 删除资产信息
export function delFScan(Ids) {
  return request({
    url: '/qrCode/' + Ids,
    method: 'delete'
  })
}
//修改家大事记
export function updateFScan(data) {
  return request({
    url: '/qrCode',
    method: 'put',
    data: data
  })
}
//上传文件
export function uploadPic(data) {
  return request({
    url: '/common/upload',
    method: 'post',
    data: data
  })
}
export function uploadPic1(data) {
  return request({
    url: '/common/uploads',
    method: 'post',
    data: data
  })
}
//下载文件
export function download(data) {
  return request({
    url: '/common/downLoadFile',
    method: 'get',
    params: data,
    responseType: 'blob'
  })
}
//生成二维码
export function generateCode(id, uri){
 // alert(222)
  return request({
    url: '/qrCode/generateCode?id='+id+'&uri='+uri,
    method: 'get',

  })
}

 ruoyi-ui/src/router/index.js

@@ -124,6 +124,38 @@
    ]
  },
  {
    path: '/pscan/pscil',
    component: Layout,
    // permissions: [],
    hidden: true,
  
  
    children: [
      {
        path: 'pdscanInfo/:id(\\d+)',
        component: () => import('@/views/qrcode/pdscanInfo'),
        name: 'pdscanInfo',
        meta: { title: '二维码详细信息',activeMenu: '/pscan/psci'}
      }
    ]
  },
  
  
  // {
  //   path: '/pscan',
  //   component: Layout,
  //   hidden: true,
  //   redirect: 'noredirect',
  //   children: [
  //     {
  //       path: 'ancestor',
  //       component: () => import('@/views/qrcode/index'),
  //       name: 'ancestor',
  //       meta: { title: '下载视频管理', icon: 'user' }
  //     }
  //   ]
  // },
  {
    path: '/clan',
    component: Layout,
    hidden: true,

 ruoyi-ui/src/views/clanManager/ancestor/index.vue

@@ -75,7 +75,7 @@
          <el-table-column label="家族号" align="center" key="clanName" prop="clanName"  :show-overflow-tooltip="true" />

          <el-table-column label="用户角色" align="center" key="roleName" prop="roleName" width="120" />
      <el-table-column label="性别" align="center" key="sex" prop="sex"  width="120" >
      <el-table-column label="" align="center" key="sex" prop="sex"  width="120" >
            <template slot-scope="scope">{{scope.row.sex==1? '女': '男'}}</template>
            
          </el-table-column>
@@ -161,8 +161,8 @@
            </el-form-item>
          </el-col>
    <el-col :span="12">
      <el-form-item label="祖先性别">
        <el-select v-model="form.sex" placeholder="请选择祖先性别">
      <el-form-item label="祖先">
        <el-select v-model="form.sex" placeholder="请选择祖先">
          <el-option
            v-for="dict in dict.type.sys_user_sex"
            :key="dict.value"
@@ -181,8 +181,8 @@
            </el-form-item>
          </el-col>
    <el-col :span="12">
      <el-form-item label="祖先性别">
        <el-select v-model="form.sex" placeholder="请选择性别">
      <el-form-item label="祖先">
        <el-select v-model="form.sex" placeholder="请选择">
          <el-option
            v-for="dict in dict.type.sys_user_sex"
            :key="dict.value"
@@ -203,8 +203,8 @@
          </el-form-item>
        </el-col>
  <el-col :span="12">
    <el-form-item label="祖先性别">
      <el-select v-model="form.fsex" placeholder="请选择性别">
    <el-form-item label="祖先">
      <el-select v-model="form.fsex" placeholder="请选择">
        <el-option
          v-for="dict in dict.type.sys_user_sex"
          :key="dict.value"

 ruoyi-ui/src/views/qrcode/index.vue

New file
@@ -0,0 +1,738 @@
<template>
  <div class="app-container" style="opacity: 1;">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >

      <el-form-item label="姓名" prop="name">
        <el-input

          v-model="queryParams.name"
          placeholder="请姓名"
          clearable
          style="
              width: 197px;
              height: 30px;
              background: #FFFFFF;
              border-radius: 14px 14px 14px 14px;
              opacity: 0.5;
              border: 1px solid rgba(0,0,0,0.25);"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>


      <el-form-item label="订单时间" prop="happenTime">
        <el-date-picker
          v-model="dateRange"
          style="width:  240px;
height: 30px;
background: #FFFFFF;
border-radius: 14px 14px 14px 14px;
opacity: 0.5;
border: 1px solid rgba(0,0,0,0.25);"
          value-format="yyyy-MM-dd"
          type="daterange"
          range-separator="-"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
        ></el-date-picker>
      </el-form-item><el-form-item>
      <el-button size="mini" @click="handleQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
          border-radius: 6px 6px 6px 6px;opacity:1; " >搜索</el-button>
      <el-button  size="mini" @click="resetQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
          border-radius: 6px 6px 6px 6px;opacity:1; " >重置</el-button>
    </el-form-item>

    </el-form>

<!--    <div style="width: 72px;-->
<!--height: 24px;-->
<!--font-size: 18px;-->
<!--font-family: Microsoft YaHei-Regular, Microsoft YaHei;-->
<!--font-weight: 400;-->
<!--color: #000000;-->
<!--line-height: 21px;-->
<!--">家大事记</div>-->
    <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="['system:role:add']"
        >新增</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="['system:role: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="['system:role:remove']"
       >导出</el-button>
      </el-col>




      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
    <!-- 序号、时间、人物、地点、大事标题、电子文件、备注 -->
    <!-- 这里有个familyList数组 是在data()中定义的 -->
    <el-table v-loading="loading"  :data="familyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName">
      <el-table-column type="selection"  :reserve-selection="true" width="50"  align="center" />

      <el-table-column fixed label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80px"/>
      <el-table-column label="姓名" prop="name" sortable width="180px" align="center">
      </el-table-column>
      <el-table-column label="标题" prop="title" sortable width="180px" align="center">
      </el-table-column>

      <el-table-column label="订单时间" prop="createTime" sortable width="100px" >
        <template slot-scope="scope">{{scope.row.createTime}}</template>

</el-table-column>

   
      <!-- <el-table-column label="家庭号" prop="familyId" sortable width="100" /> -->
      <el-table-column label="操作" align="center" width="350" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <div class="button-container">
            <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"

            @click="handleUpdate(scope.row)"

          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"

            @click="handleDelete(scope.row)"
            v-hasPermi="['system:role:remove']"
          >删除</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"

            @click="generateCode(scope.row)"
            v-hasPermi="['system:role:remove']"
          >生成二维码</el-button>
    
          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" >
            <el-button size="mini" type="text" icon="el-icon-d-arrow-right"  @click="handleCheck(scope.row)">查看详情</el-button>

          </el-dropdown>
          </div>
        </template>
      </el-table-column>




    </el-table>

    <pagination
      v-show="total>0"
      :total="total"
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
      style="background: #FEF7FC;"
    />

    <!-- 添加或修改资产信息配置对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
      <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">


        <el-form-item label="姓名" prop="name">
          <el-input v-model="formDat.name" placeholder="请输入姓名" clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>


   <el-form-item label="标题" prop="title">
        <el-input v-model="formDat.title" placeholder="请输入产品标题" clearable :style="{width: '100%'}"></el-input>
      </el-form-item>
 




          <el-form-item label="上传文件" prop="cover">

        <el-upload
        action="#"
        list-type="picture-card"
        :http-request="requestUpload"
        :file-list="fileList1"





          class="upload-demo"
          multiple
            ref="upload1"
        :on-change="handleChange1"
        :auto-upload="false"
          :show-file-list="true"
        >
      <i slot="default" class="el-icon-plus"></i>
        <div slot="file" slot-scope="{file}">



          <span class="el-upload-list__item-actions">
               <span class="el-upload-list__item-name">{{ file.name }}</span>
                    <span
                      class="el-upload-list__item-preview"
                      @click="handleFileCardPreview(file)"
                    >
                      <i class="el-icon-zoom-in"></i>
                    </span>

                    <span

                      class="el-upload-list__item-delete"
                      @click="handleRemoveFile(file)"
                    >
                      <i class="el-icon-delete"></i>
                    </span>
              </span>

        </div>


      </el-upload>
        </el-form-item>
      </el-form>
      <el-button
                        style="margin-left: 10px"
                        size="small"
                        type="success"
                        @click="fileUpload"
                      >上传到服务器</el-button>
       </el-form>
      <h4 class="form-header"> </h4>

      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitDataScope">保 存</el-button>
        <el-button @click="cancelData">取 消</el-button>
      </div>
    </el-dialog>

    <!-- 分配角色数据权限对话框 -->
    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
 <img :src="codeUrl" />
    </el-dialog>

  </div>
</template>



<script>
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";


import { Notification, MessageBox, Message, Loading } from 'element-ui'
import store from '@/store'

//在system/note/index.js中导入接口函数  --接好了
import {listFScan,getFScanInfo,generateCode,addFScan,delFScan,updateFScan, uploadPic1} from "@/api/fscan/index";
import {getInfo} from "@/api/login";
export default {
  name: "Role",
  dicts: ['sys_normal_disable'],
  data() {
     const validateLogo = (rule, value, callback) => {
          if (!this.form.cover && this.fileListOther.length ===0) {
          //  console.log(!this.form.cover)
            callback(new Error('请上传图片'))
          } else {
            callback()
          }
        }

    return {
        userid: store.getters.id,
      // 遮罩层
      disabled: false,

      loading: true,
      formData:[],
      // 选中数组
      ids: [],
      // 非单个禁用
      single: true,
      // 非多个禁用
      multiple: true,
      // 显示搜索条件
      showSearch: true,
      // 总条数
      total: 0,
      // 家大事记表格数据
      familyList: [],

auditShow:false,
      // 弹出层标题
      title: "",
      // 是否显示弹出层
      open: false,
      // 是否显示弹出层（数据权限）
      openDataScope: false,
      menuExpand: false,
      menuNodeAll: false,
      deptExpand: true,
      deptNodeAll: false,
      // 日期范围
      dateRange: [],
      // 数据范围选项

      fileList:[],
      fileList1:[],
            uploadFileList: [],
        uploadFileList1: [],
      fileListOther:[],
      dsb:true,
      codeUrl: undefined,
      btn:false,
      uploading: false,
      formDat: {
        // type: undefined,
        comName: undefined,
        deadTime: undefined,
        filePath: ""
      },
      // 菜单列表
      menuOptions: [],
      // 部门列表
      deptOptions: [],
      // 查询参数
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        comName: undefined,
        happenStartDeadTime:undefined,
        happenEndDeadTime:undefined
      },
      // 表单参数
      form: {  cover: null},
      defaultProps: {
        children: "children",
        label: "label"
      },
      // 表单校验
      rules: {
        name: [{
          required: true,
          message: '请输入大事标题',
          trigger: 'blur'
        }],


        createTime: [{
          required: true,
          message: '请选择日期',
          trigger: 'blur'
        }],
   cover: [{ required: true, validator: validateLogo, trigger: 'change' }],
      },
      typeOptions: [],
    };
  },
  created() {
  console.log(this.$store.state.user.roles)
    if(this.$store.state.user.roles=="admin")
    {
      this.auditShow = true
    }
    console.log("000000000000")
    this.getList();
    //   this.getCateInfor()
    this.getInfo()

  },
  methods: {
    handleChange1(file, fileOtherList1) {
       //定义一个全局数组uploadFileList来做存储
    this.uploadFileList1.push(file.raw);
     this.fileListOther.push({name:file.name,url:file.url})
     // this.uploadFileList.push(file.raw);
      console.log("=========5555=========")
      //console.log(file)
    //  console.log(this.uploadFileList)
    //  this.fileList = fileList
    },
    fileUpload(){
    //    var file = params.file;

        var formData = new FormData();
        this.$refs.upload1.submit();
        // formData.append('uploadFile', file);
        if(this.uploadFileList1.length==0){
              this.$modal.msgSuccess("文档上传列表不能为空!");
              return
        }
        this.uploadFileList1.forEach((elem)=>{
            formData.append("files", elem)

        })

        let _this = this

        this.uploading = true;
        uploadPic1(formData).then(response => {
        _this.uploadFileList1 = []
        _this.formDat.filePath = _this.formDat.filePath+","+response.fileNames
        _this.$modal.msgSuccess("文件上传成功!");
          })

    },
    picUpload()
    {
        var formData = new FormData();
        //alert(976)
        //this.$refs.upload.submit();
        //alert(8)
        //alert(this.uploadFileList.length)
    if(this.uploadFileList.length==0){
          this.$modal.msgSuccess("图片上传列表不能为空！");
          return}
    //console.log(this.uploadFileList)
        this.uploadFileList.forEach((elem)=>{
            formData.append("files", elem)

        })
                // console.log(formData,'465456456')
        //alert(90)
        let _this = this
        //alert(9)
        uploadPic1(formData).then(response => {
        //    alert("dds")
            // console.log(response,'123123123')
    //     console.log(_this.formDat.url,'666')
          _this.formDat.filePath = _this.formDat.filePath+","+response.fileNames
               // alert(_this.formDat.url)
          _this.uploadFileList = []
          _this.$modal.msgSuccess("图片上传成功");

      });
    },




handleFileChange(file, fileList){  //图片上传后

   },
            handleRemoveFile(file)
            {
              this.fileListOther = []
            },
    getInfo(){
     // console.log('-----------------')
      getInfo().then(response=>{
        console.log(response)
      })
    },

    isImage(fileType) {
      return fileType.startsWith('image/');
    },
    isInFot(fileName) {
      return this.fot.includes(fileName);
    },
    // 取消按钮
    cancelData() {
      this.open = false;
      this.reset();
    },
    getRowId(row)
    {
      return row.id
    },
    //隔行变色
    tableRowClassName({ row, rowIndex }) {
      if (rowIndex % 2 == 0) {
        return "statistics-warning-row1";
      } else {
        return "statistics-warning-row";
      }
    },


    /** 查询角色列表 */
    //列表显示家大事记

    getList() {
      this.loading = true;
      console.log(this.queryParams)
      // this.queryParams.happenStartDeadTime = this.dateRange.length > 0 && this.dateRange[0]
      // this.queryParams.happenEndDeadTime = this.dateRange.length > 0 && this.dateRange[1]

      // this.queryParams.uid = this.userid
     // alert(this.userid)
      let _this = this

      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      listFScan(this.queryParams).then(response => {
          //  alert(123)
          // alert(response.data.data[1].url)
          console.log(response.data)
          _this.familyList = response.data.data;

          _this.total = response.data.total;
          _this.loading = false;

        }
      );
    },

    // 取消按钮
    cancel() {
      this.open = false;
      this.reset();
    },
    // 取消按钮（数据权限）
    cancelDataScope() {
      this.openDataScope = false;
      this.reset();
    },
    // 表单重置
    reset() {
      if (this.$refs.menu != undefined) {
        this.$refs.menu.setCheckedKeys([]);
      }
      this.menuExpand = false,
        this.menuNodeAll = false,
        this.deptExpand = true,
        this.deptNodeAll = false,
        this.form = {
          roleId: undefined,
          roleName: undefined,
          roleKey: undefined,
          roleSort: 0,
          status: "0",
          menuIds: [],
          deptIds: [],
          menuCheckStrictly: true,
          deptCheckStrictly: true,
          remark: undefined
        };
      this.resetForm("elForm");
    },
    /** 搜索按钮操作 */
    handleQuery() {
      this.queryParams.pageNum = 1;
      this.getList();
    },
    /** 重置按钮操作 */
    resetQuery() {
      this.dateRange = [];
      this.resetForm("queryForm");
      this.handleQuery();
    },
    // 多选框选中数据
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.id)
    //  alert(this.ids)
      this.single = selection.length!=1
      this.multiple = !selection.length
    },

    /** 新增按钮操作 */
    handleAdd() {
      this.reset();
      this.open = true;
      this.title = "添加下载视频记录";
    },
    audit(row)
    {
     const id = row.id;
     //alert(row.codeS)
     if(row.codeS==null)
     {
       //alert(23)
          this.$modal.msgSuccess("请先生成文件二维码!")
     }
     else{
        this.$router.push({
          path:"/pdscan/pscil/pdscanInfo/" + id,
          query:{
            sh:true
          }
        });
     }
    },
    generateCode(row)
    {
     alert(row.id)

      const url =  process.env.VUE_APP_BASE_FRONT+row.id;
      const id = row.id;
    //  alert(id)
   // alert(url)
      generateCode(id, url).then(response => {
      //  alert(23)
      this.openDataScope = true;
      console.log(response)
       this.codeUrl = "data:image/gif;base64," + response.img;
        this.$modal.msgSuccess("生成二维码成功")
        this.getList()
        })
    },
  /** 导出按钮操作 */
    handleExport() {

      this.download('/coscan/export', {
        ...this.queryParams
      }, `zfScode_${new Date().getTime()}.xlsx`)


      },
    /** 查看详细信息 */
    handleCheck(row){
      const id = row.id;
      // if(row.codeS==null)
      // {
      //   //alert(23)
      //      this.$modal.msgSuccess("请先生成文件二维码!")
      // }
      // else{
      this.$router.push("/pscan/pscil/pdscanInfo/" + id);
      // }
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
      const id = row.id;
      let jd = true;

      if(row.codeS=="")
      {
        this.$modal.msgSuccess("请先生成文件二维码!")
      }
      else{
      this.$router.push({
        path:"/pdscan/pscil/pdscanInfo/" + id,
        query:{
          detail:jd
        }
      });
      }
    },





    handlePictureCardPreview(file) {
      this.dialogImageUrl = file.url;
      this.dialogVisible = true;
    },
    /** 提交按钮（数据权限） */
    submitDataScope: function() {

      // let ul = this.fileList.map(function (elem){
      //   return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      // }).join(",")
      // let uls = this.fileListOther.map(function (elem){
      //   return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      // }).join(",")
      // this.formDat.url = ul+","+uls
      console.log(this.fileList1)
   //   alert(19)
     // this.formDat.filePath = this.fileList1[0]['name']
      this.formDat.uid = this.userid
    //  alert(this.formDat.filePath)
    //  alert(this.formDat.url)
      this.$refs["elForm"].validate(valid => {
        if (valid) {
          this.formDat.approveStatus = 1
          addFScan(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.open = false;
            // 清空formDat对象的数据
            Object.keys(this.formDat).forEach(key => {
              this.formDat[key] = '';
            });
          this.fileList1 = []
            this.getList();
          });
        }
      });

    },

    requestUpload(params)
    {
      // var file = params.file;
      // var formData = new FormData();

      // formData.append('file', file);
      // let _this = this

      // uploadPic(formData).then(response => {
      //   console.log(response)
      //   let pth = response.originalFilename.substr(response.originalFilename.length-4, response.originalFilename.length)
      //   _this.fileList1.push({name:response.fileName, url:response.url})
      //   // _this.fileList2.push({name:response.data.fileName, url:response.data.url})
      //   this.$modal.msgSuccess("pdf上传成功！")
      //   console("ok")
      // })
        //     this.uploadFileList1.push(params.file);
    },
    /** 删除按钮操作 */
    handleDelete(row) {
      const Ids = row.id || this.ids;

      this.$modal.confirm('是否确认删除所选中数据项？').then(function() {
        return delFScan(Ids);
      }).then(() => {
        this.getList();
        this.ids = []
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    /** 导出按钮操作 */


  }
};
</script>
<style scoped="">
.el-table__row.statistics-warning-row {
  background: #E0EEFE;

}
.el-table__row.statistics-warning-row1 {
  background: #FFEFF2;

}
.el-table__cell {
  font-size: 14px; /* 设置字体大小 */
}
.button-container {
  display: inline-flex; /* 设置按钮容器为行内元素 */
}
</style>

 ruoyi-ui/src/views/system/family/index.vue

@@ -57,7 +57,7 @@
    </el-row>

    <el-table v-loading="loading" :data="roleList" :row-key="getRowId" @selection-change="handleSelectionChange">
    <el-table-column type="selection" width="55"  align="center" />
<!--    <el-table-column type="selection" width="55"  align="center" /> -->

    <el-table-column fixed label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="100"/>
    <el-table-column label="家庭名称" prop="name" sortable :show-overflow-tooltip="true" width="150" />

 ruoyi-ui/vue.config.js

@@ -37,7 +37,7 @@
      // detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
   //   target: `https://10.39.18.174:8080/`,
    //  target: `https://192.168.1.4:8080/`,
     // target: `https://192.168.1.7:8080/`,
      target: 'https://www.bendudu.com:8080/',
        changeOrigin: true,
        pathRewrite: {