4.2

linwenling

2023-04-02 d7f140b91b514c9ed36361552c2c627730f086d0

4.2

 ruoyi-ui/.env.development

@@ -1,5 +1,5 @@
# é¡µé¢æ ‡é¢˜
VUE_APP_TITLE = å¼ æ°APP
VUE_APP_TITLE = è‹¥ä¾ç®¡ç†ç³»ç»Ÿ

# å¼€å‘环境配置
ENV = 'development'
@@ -7,5 +7,7 @@
# è‹¥ä¾ç®¡ç†ç³»ç»Ÿ/开发环境
VUE_APP_BASE_API = '/dev-api'


VUE_APP_BASE_TRUE_API = 'http://47.93.189.255:8080/'
# è·¯ç”±æ‡’加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true

 ruoyi-ui/.env.production

@@ -1,5 +1,5 @@
# é¡µé¢æ ‡é¢˜
VUE_APP_TITLE = å¼ æ°APP
VUE_APP_TITLE = è‹¥ä¾ç®¡ç†ç³»ç»Ÿ

# ç”Ÿäº§çŽ¯å¢ƒé…ç½®
ENV = 'production'

 ruoyi-ui/.env.staging

@@ -1,5 +1,5 @@
# é¡µé¢æ ‡é¢˜
VUE_APP_TITLE = å¼ æ°APP
VUE_APP_TITLE = è‹¥ä¾ç®¡ç†ç³»ç»Ÿ

NODE_ENV = production


 ruoyi-ui/bin/н¨Îı¾Îĵµ.txt

 ruoyi-ui/package.json

@@ -1,7 +1,7 @@
{
  "name": "ruoyi",
  "version": "3.8.5",
  "description": "张氏APP",
  "description": "若依管理系统",
  "author": "若依",
  "license": "MIT",
  "scripts": {
@@ -49,7 +49,6 @@
    "js-cookie": "3.0.1",
    "jsencrypt": "3.0.0-rc.1",
    "nprogress": "0.2.0",
    "postcss-px2rem": "^0.3.0",
    "quill": "1.3.7",
    "screenfull": "5.0.2",
    "sortablejs": "1.10.2",

 ruoyi-ui/src/App.vue

@@ -1,6 +1,9 @@
<template>
  <div id="app">
    <router-view />



    <theme-picker />
  </div>
</template>

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

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

// Familyevent 

// æŸ¥è¯¢æ‰€æœ‰å®¶åº­å¤§äº‹ï¼Œåˆ†é¡µæŸ¥è¯¢
export function listFamilyevent(query) {
  return request({
    url: '/family/zfEvent/all',
    method: 'get',
    params: query
  })
}

// æ ¹æ®id查询所有家庭资产详细信息
export function getFamilyeventInfo(id) {
  return request({
    url: '/family/zfEvent/{id}' + id,
    method: 'get',

  })
}

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

// åˆ é™¤èµ„产信息
export function delFamilyevent(Ids) {
  return request({
    url: '/family/zfEvent/' + Ids,
    method: 'delete'
  })
}
//修改家大事记
export function updateFamilyevent(data) {
  return request({
    url: '/family/zfEvent',
    method: 'put',
    data: data
  })
}
//上传文件
export function uploadPic(data) {
  return request({
    url: '/common/upload',
    method: 'post',
    data: data
  })
}
//下载文件
export function download(data) {
  return request({
    url: '/common/downLoadFile',
    method: 'get',
    params: data,
    responseType: 'blob'
  })
}

// //拿到类别
// export function getCategory()
// {
//   return request({
//     url: '/zDict/byId',
//     method: 'get',
//     params: {'id':22}
//   })
// }



 ruoyi-ui/src/api/login.js

@@ -8,6 +8,8 @@
    code,
    uuid
  }


  return request({
    url: '/login',
    headers: {
@@ -48,6 +50,19 @@

// èŽ·å–验证码
export function getCodeImg() {
  console.log("-----")
  return request({
    url: '/captchaImage',
    headers: {
      isToken: false
    },
    method: 'get',
    timeout: 20000
  })
}

// èŽ·å–验证码
export function getCodeImg() {
  return request({
    url: '/captchaImage',
    headers: {

 ruoyi-ui/src/router/index.js

@@ -57,6 +57,11 @@
    hidden: true
  },
  {
    path: '/tmps',
    component: () => import('@/views/tmp'),
    hidden: true
  },
  {
    path: '/401',
    component: () => import('@/views/error/401'),
    hidden: true
@@ -72,9 +77,9 @@
        name: 'Index',
        meta: { title: '首页', icon: 'dashboard', affix: true }
      }

    ]
  },

  {
    path: '/user',
    component: Layout,
@@ -107,6 +112,36 @@
      }
    ]
  },
    {
    path: '/family/note1',
    component: Layout,
    permissions: ['family:note:list'],

    hidden: true,
    children: [
      {
        path: 'propertyInfo/:id(\\d+)',
        component: () => import('@/views/note/propertyInfo'),
        name: 'propertyInfo',
        meta: { title: '查询详情'}
      }
    ]
  },
//家大事记的详情
  {
    path: '/family1/bignote',
    component: Layout,
    // permissions: [],
    hidden: true,
    children: [
      {
        path: 'familyeventInfo/:id(\\d+)',
        component: () => import('@/views/bignote/familyeventInfo'),
        name: 'familyeventInfo',
        meta: { title: '查询详情'}
      }
    ]
  },
  {
    path: '/system/role-auth',
    component: Layout,

 ruoyi-ui/src/store/modules/permission.js

@@ -123,6 +123,7 @@

export const loadView = (view) => {
  if (process.env.NODE_ENV === 'development') {

    return (resolve) => require([`@/views/${view}`], resolve)
  } else {
    // ä½¿ç”¨ import å®žçŽ°ç”Ÿäº§çŽ¯å¢ƒçš„路由懒加载

 ruoyi-ui/src/store/modules/settings.js

@@ -4,7 +4,7 @@

const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
const state = {
  title: '张氏APP',
  title: '',
  theme: storageSetting.theme || '#409EFF',
  sideTheme: storageSetting.sideTheme || sideTheme,
  showSettings: showSettings,

 ruoyi-ui/src/utils/request.js

@@ -17,7 +17,7 @@
  // axios中请求配置有baseURL选项，表示请求URL公共部分
  baseURL: process.env.VUE_APP_BASE_API,
  // è¶…æ—¶
  timeout: 10000
  timeout: 1000000
})

// request拦截器
@@ -32,9 +32,16 @@
  // get请求映射params参数
  if (config.method === 'get' && config.params) {
    let url = config.url + '?' + tansParams(config.params);


    url = url.slice(0, -1);
    config.params = {};
    config.url = url;
    if(config.responseType!=undefined)
    {
      config.responseType='blob'
    }
    config.headers['Content-Type']= 'application/json'
  }
  if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
    const requestObj = {
@@ -62,6 +69,7 @@
  return config
}, error => {
    console.log(error)

    Promise.reject(error)
})

@@ -69,6 +77,8 @@
service.interceptors.response.use(res => {
    // æœªè®¾ç½®çŠ¶æ€ç åˆ™é»˜è®¤æˆåŠŸçŠ¶æ€
    const code = res.data.code || 200;


    // èŽ·å–错误信息
    const msg = errorCode[code] || res.data.msg || errorCode['default']
    // äºŒè¿›åˆ¶æ•°æ®åˆ™ç›´æŽ¥è¿”回

 ruoyi-ui/src/utils/ruoyi.js

@@ -232,6 +232,7 @@
  try {
    const text = await data.text();
    JSON.parse(text);
    alert(text)
    return false;
  } catch (error) {
    return true;

 ruoyi-ui/src/views/bignote/familyeventInfo.vue

New file
@@ -0,0 +1,363 @@
<template>
    <div class="app-container">
      <div class="form-header mt">
        <h4 class="dt h4">家庭大事记详情 </h4>
        <el-button type="primary" class="pt"  icon="el-icon-edit" @click="handleEdit()" :disabled="btn">编辑</el-button>
      </div>
  
      <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
        <el-form-item label="id" prop="id">
          <el-input v-model="formData.id" placeholder="请输入id" :maxlength="11" show-word-limit :disabled="true"
                    clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>
        </el-form-item>
        <!-- <el-form-item label="类别" prop="type">
          <el-select v-model="formData.type" placeholder="请选择类别" clearable :style="{width: '100%'}" :disabled="dsb" >
            <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
                       :disabled="item.disabled"></el-option>
          </el-select>
        </el-form-item> -->
        <el-form-item label="标题" prop="title">
          <el-input v-model="formData.title" placeholder="请输入标题" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
        </el-form-item>
        <!-- <el-form-item label="存储地址" prop="location">
          <el-input v-model="formData.location" placeholder="请输入存储地址" clearable :style="{width: '100%'}" :disabled="dsb">
          </el-input>
        </el-form-item> -->
        <el-form-item label="人物" prop="people">
          <el-input v-model="formData.holder" placeholder="请输入人物" clearable :style="{width: '100%'}" :disabled="dsb">
          </el-input>
        </el-form-item>
        <el-form-item label="地点" prop="address">
          <el-input v-model="formData.address" placeholder="请输入地点" clearable :style="{width: '100%'}" :disabled="dsb">
          </el-input>
        </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input v-model="formData.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
        </el-form-item>
  
        <h4 class="form-header">相关图片 </h4>
        <el-upload
          action="#"
          list-type="picture-card"
          multiple
          :http-request="requestUpload"
          :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"
              alt=""
              style="width: 147px; height: 147px"
              fit="cover"
              :preview-src-list="[file.url]"
            >
            <span class="el-upload-list__item-actions">
          <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.url)"
          >
            <i class="el-icon-download"></i>
          </span>
          <span
            v-if="!disabled"
            class="el-upload-list__item-delete"
            @click="handleRemove(file)"
          >
            <i class="el-icon-delete"></i>
          </span>
        </span>
  
  
          </div>
        </el-upload>
  
        <h4 class="form-header">其他附件 </h4>
        <el-upload
          action=""
          :file-list="fileListOther"
          class="upload-demo"
          multiple
          :on-preview="handlePreview"
  
          :on-remove="handleRemove"
          :http-request="requestUpload"
          :show-file-list="true"
        >
          <el-button type="primary">Click to upload</el-button>
          <template #tip>
            <div class="el-upload__tip">
            </div>
          </template>
  
  
        </el-upload>
  
        <el-form-item size="large">
          <el-button type="primary" @click="submitForm" :disabled="dsb">修改</el-button>
        </el-form-item>
      </el-form>
  
      <el-dialog  :visible.sync="dialogVisible">
        <img w-full :src="dialogImageUrl" alt="Preview Image" />
      </el-dialog>
    </div>
  </template>
  <script>
  import {getFamilyeventInfo, updateFamilyevent, uploadPic, download} from "@/api/bignote/index";
  import {addRole, updateRole} from "@/api/system/role";
  import {blobValidate} from "@/utils/ruoyi";
  import errorCode from "@/utils/errorCode";
  import {Message} from "element-ui";
  
  export default {
    components: {},
    props: [],
    data() {
      return {
        cdi:"家庭大事记信息",
        udi:"家庭大事记修改",
        fot:[".jpg",".jif"],
        fileList:[
        ],
        fileListOther:[
  
        ],
        dsb:true,
        btn:false,
        formData: {
          id: undefined,
          // type: undefined,
          title: undefined,
          // location: undefined,
          people: undefined,
          address: undefined,
          remark: undefined,
          url: undefined,
        },
        dialogImageUrl: '',
        dialogVisible: false,
        disabled: false,
        rules: {
          id: [{
            required: true,
            message: '请输入id',
            trigger: 'blur'
          }],
          // type: [{
          //   required: true,
          //   message: '请选择类别',
          //   trigger: 'change'
          // }],
          title: [{
            required: true,
            message: '请输入大事标题',
            trigger: 'blur'
          }],
          // location: [{
          //   required: true,
          //   message: '请输入存储地址',
          //   trigger: 'blur'
          // }],
          people: [{
            required: true,
            message: '请输入人物',
            trigger: 'blur'
          }],
          address: [{
            required: true,
            message: '请输入地点',
            trigger: 'blur'
          }],
          remark: [{
            required: true,
            message: '请输入备注',
            trigger: 'blur'
          }],
  
        },
        typeOptions: [],
      }
    },
    computed: {},
    watch: {},
    created() {
      const id = this.$route.params && this.$route.params.id;
      let jd;
      if(this.$route.query.detail!=undefined)
      {
        jd =  this.$route.query.detail
        this.btn= jd
        this.dsb = !jd
        document.title = "修改家大事记详细信息";
        this.$route.meta.title = "修改家大事记详细信息";//列表的名称
      }
      else{
        document.title = "查看家大事记详细信息";
        this.$route.meta.title = "查看家大事记详细信息";//列表的名称
      }
  
      let _this = this
      if (id) {
        this.loading = true;
        getFamilyeventInfo(id).then((response) => {
          this.formData = response.data;
          let paths = response.data.url.split(",");
          for(let i = 0; i < paths.length; i++)
          {
            if(paths[i]!="") {
  
              let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
  
              if (_this.fot.includes(pth) === true)
                _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
              else {
                // alert(paths[i])
                let nms = paths[i].split("\/")
                let nm = nms[nms.length - 1]
                _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
              }
            }
          }
          this.loading = false;
        });
        // this.getCateInfor()
  
      }
    },
    mounted() {},
    methods: {
      /** æŸ¥è¯¢ç±»åˆ«ä¿¡æ¯ */
      // getCateInfor()
      // {
      //   let _this = this
      //   getCategory().then(response=>{
  
      //     response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
      //       _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
      //     })
      //   })
      // },
      submitForm() {
        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.formData.url = ul+","+uls
  
        this.$refs['elForm'].validate(valid => {
  
  
          if (valid) {
            if (this.formData.id != undefined) {
              updateFamilyevent(this.formData).then(response => {
                this.$modal.msgSuccess("修改成功");
                // this.open = false;
                this.btn=false
              });
            } else {
              this.$modal.msgSuccess("修改失败");
  
            }
          }
        })
      },
      resetForm() {
        this.$refs['elForm'].resetFields()
      },
      handlePreview(file)
      {
        let formData = {'path':"/"+file.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
        let lens = formData.path.split(".")
        let suffix = lens[lens.length-1]
        download(formData).then(async (response) => {
          const isLogin = await blobValidate(response);
          let nt = new Date().getTime()
          let filename = 'familyevent_'+nt+'.'+suffix
          const blob = new Blob([response])
          saveAs(blob, filename)
        })
      },
      handleRemoveFile(file) {
        alert(23)
      },
      handleRemove(file) {
        alert(323)
      },
      handlePictureCardPreview(file) {
        this.dialogImageUrl = file.url;
        this.dialogVisible = true;
      },
      handleDownload(url) {
        var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
  
        let lens = formData.path.split(".")
        let suffix = lens[lens.length-1]
        download(formData).then(async (response) => {
          const isLogin = await blobValidate(response);
          let nt = new Date().getTime()
          let filename = 'property_'+nt+'.'+suffix
          const blob = new Blob([response])
          saveAs(blob, filename)
        })
      },
      handleEdit()
      {
        this.dsb = false
        this.btn = true
      },
      requestUpload(params)
      {
        var file = params.file;
        var formData = new FormData();
        formData.append('uploadFile', file);
        let _this = this
  
        uploadPic(formData).then(response => {
          let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
  
          if(_this.fot.includes(pth) === true)
          {
            _this.fileList.push({name:response.data.fileName, "url":response.data.url})
  
          }
  
          else{
            _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
  
          }
        })
  
      }
  
    }
  }
  
  </script>
  <style>
  .mt
  {
    position: relative;
  }
  .dt{
    display: block;
  
  }
  .pt{
    right: 10px;
    top:-3px;
    display: block;
    position: absolute;
  }
  </style>
  

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

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

          <el-form-item label="大事标题" prop="title">
            <el-input
              v-model="queryParams.title"
              placeholder="请输入标题"
              clearable
              style="width: 240px"
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
        
          <el-form-item label="人物" prop="people">
            <el-input
              v-model="queryParams.people"
              placeholder="请输入人物"
              clearable
              style="width: 240px"
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="地点" prop="address">
            <el-input
              v-model="queryParams.address"
              placeholder="请输入地点"
              clearable
              style="width: 240px"
              @keyup.enter.native="handleQuery"
            />
     
        </el-form-item>
        <el-form-item label="时间">
          <el-date-picker
            v-model="dateRange"
            style="width: 240px"
            value-format="yyyy-MM-dd HH-MM"
            type="daterange"
            range-separator="-"
            start-placeholder="开始日期"
            end-placeholder="结束日期"
          ></el-date-picker>
        </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="['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="['family:note:export']"
          >导出</el-button>
        </el-col>
        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
      </el-row>
      <!-- åºå·ã€æ—¶é—´ã€äººç‰©ã€åœ°ç‚¹ã€å¤§äº‹æ ‡é¢˜ã€ç”µå­æ–‡ä»¶ã€å¤‡æ³¨ -->
      <!-- è¿™é‡Œæœ‰ä¸ªfamilyList数组 æ˜¯åœ¨data()中定义的 -->
      <el-table v-loading="loading" :data="familyList" @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55"  align="center" />
        <el-table-column label="序号" prop="id" sortable width="120" />

        <el-table-column label="时间" align="center" sortable prop="createTime" width="180">
          <template slot-scope="scope">
            <span>{{ parseTime(scope.row.createTime) }}</span>
          </template>
        </el-table-column>
        <el-table-column label="人物" prop="people" sortable width="100" />
        <el-table-column label="地点" prop="address" sortable width="100" />
        <el-table-column label="大事标题" prop="title" sortable :show-overflow-tooltip="true" width="150" />
       
        <el-table-column label="备注" prop="remark" sortable width="100" />
        <el-table-colum label="电子文件" prop="fujian" sortable width="100"/>
        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
          <template slot-scope="scope" v-if="scope.row.roleId !== 1">
            <el-button
              size="mini"
              type="text"
              icon="el-icon-edit"
              @click="handleUpdate(scope.row)"
              v-hasPermi="['system:role:edit']"
            >修改</el-button>
            <el-button
              size="mini"
              type="text"
              icon="el-icon-delete"
              @click="handleDelete(scope.row)"
              v-hasPermi="['system:role:remove']"
            >删除</el-button>
            <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
              <el-button size="mini" type="text" icon="el-icon-d-arrow-right"  @click="handleCheck(scope.row)">查看详情</el-button>
  
            </el-dropdown>
          </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="800px" append-to-body>
        <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
  
         
          <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="people">
            <el-input v-model="formDat.holder" placeholder="请输入人物" clearable :style="{width: '100%'}" >
            </el-input>
          </el-form-item>
          <el-form-item label="地点" prop="address">
            <el-input v-model="formDat.address" placeholder="请输入地点" clearable :style="{width: '100%'}" >
            </el-input>
          </el-form-item>
          <el-form-item label="备注" prop="remark">
            <el-input v-model="formDat.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" ></el-input>
          </el-form-item>
  
          <h4 class="form-header">相关图片 </h4>
          <el-upload
            action="#"
            list-type="picture-card"
            multiple
            :http-request="requestUpload"
            :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"
                alt=""
                style="width: 126px; height: 126px"
                fit="cover"
                :preview-src-list="[file.url]"
              >
              <span class="el-upload-list__item-actions">
          <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="handleRemove(file)"
          >
            <i class="el-icon-delete"></i>
          </span>
        </span>
  
  
            </div>
          </el-upload>
          <h4 class="form-header">其他附件 </h4>
          <el-upload
            action=""
            :file-list="fileListOther"
            class="upload-demo"
            multiple
  
            :on-remove="handleRemove"
            :http-request="requestUpload"
            :show-file-list="true"
          >
            <el-button type="primary">Click to upload</el-button>
            <template #tip>
              <div class="el-upload__tip">
              </div>
            </template>
          </el-upload>
  
        </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>
  
      </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";
  
  
  
  //在system/note/index.js中导入接口函数  --接好了
  import {listFamilyevent , getFamilyeventInfo , delFamilyevent  , addFamilyevent , uploadPic} from "@/api/bignote/index";
  export default {
    name: "Role",
    dicts: ['sys_normal_disable'],
    data() {
      return {
        // é®ç½©å±‚
        disabled: false,
  
        loading: true,
        formData:[],
        // é€‰ä¸­æ•°ç»„
        ids: [],
        // éžå•ä¸ªç¦ç”¨
        single: true,
        // éžå¤šä¸ªç¦ç”¨
        multiple: true,
        // æ˜¾ç¤ºæœç´¢æ¡ä»¶
        showSearch: true,
        // æ€»æ¡æ•°
        total: 0,
        // å®¶å¤§äº‹è®°è¡¨æ ¼æ•°æ®
        familyList: [],
        // å¼¹å‡ºå±‚标题
        title: "",
        // æ˜¯å¦æ˜¾ç¤ºå¼¹å‡ºå±‚
        open: false,
        // æ˜¯å¦æ˜¾ç¤ºå¼¹å‡ºå±‚（数据权限）
        openDataScope: false,
        menuExpand: false,
        menuNodeAll: false,
        deptExpand: true,
        deptNodeAll: false,
        // æ—¥æœŸèŒƒå›´
        dateRange: [],
        // æ•°æ®èŒƒå›´é€‰é¡¹
        fot:[".jpg",".jif"],
        fileList:[
        ],
        fileListOther:[
  
        ],
        dsb:true,
        btn:false,
        formDat: {
          type: undefined,
          title: undefined,
          location: undefined,
          holder: undefined,
          address: undefined,
          remark: undefined,
          url: undefined,
        },
        // èœå•åˆ—表
        menuOptions: [],
        // éƒ¨é—¨åˆ—表
        deptOptions: [],
        // æŸ¥è¯¢å‚æ•°
        queryParams: {
          pageNum: 1,
          pageSize: 10,
          title:undefined,
          people:undefined,
          address:undefined,
          createTime:undefined
        },
        // è¡¨å•å‚æ•°
        form: {},
        defaultProps: {
          children: "children",
          label: "label"
        },
        // è¡¨å•æ ¡éªŒ
        rules: {
          title: [{
            required: true,
            message: '请输入大事标题',
            trigger: 'blur'
          }],
          
          people: [{
            required: true,
            message: '请输入人物',
            trigger: 'blur'
          }],
          address: [{
            required: true,
            message: '请输入地点',
            trigger: 'blur'
          }],
          remark: [{
            required: true,
            message: '请输入备注',
            trigger: 'blur'
          }],
          createTime: [{
            required: true,
            message: '请选择日期选择',
            trigger: 'change'
          }],
        },
        typeOptions: [],
      };
    },
    created() {
      this.getList();
    //   this.getCateInfor()
  
    },
    methods: {
      // å–消按钮
      cancelData() {
        this.open = false;
        this.reset();
      },

      /** æŸ¥è¯¢è§’色列表 */  
      //列表显示家大事记

      getList() {
        this.loading = true;
        // console.log(this.queryParams)
        //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
        listFamilyevent(this.queryParams).then(response => {
            //  alert(123)
            //   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("form");
      },
      /** æœç´¢æŒ‰é’®æ“ä½œ */
      handleQuery() {
        this.queryParams.pageNum = 1;
        this.getList();
      },
      /** é‡ç½®æŒ‰é’®æ“ä½œ */
      resetQuery() {
        this.dateRange = [];
        this.resetForm("queryForm");
        this.handleQuery();
      },
      // å¤šé€‰æ¡†é€‰ä¸­æ•°æ®
      handleSelectionChange(selection) {
        this.ids = selection.map(item => item.id)
        console.log(this.ids)
        this.single = selection.length!=1
        this.multiple = !selection.length
      },
  
      /** æ–°å¢žæŒ‰é’®æ“ä½œ */
      handleAdd() {
        this.reset();
        this.open = true;
        this.title = "添加家庭大事记信息";
      },


      /** æŸ¥çœ‹è¯¦ç»†ä¿¡æ¯ */
      handleCheck(row){
        const id = row.id;
        this.$router.push("/family1/bignote1/familyeventInfo/" + id);
      },
      /** ä¿®æ”¹æŒ‰é’®æ“ä½œ */
      handleUpdate(row) {
        const id = row.id;
        let jd = true
  
        this.$router.push({
          path:"/family1/bignote1/familyeventInfo/" + 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
        this.$refs["elForm"].validate(valid => {
          if (valid) {
  
            addFamilyevent(this.formDat).then(response => {
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.getList1();
            });
          }
        });
      },
      requestUpload(params)
      {
        var file = params.file;
        var formData = new FormData();
        formData.append('uploadFile', file);
        let _this = this
  
        uploadPic(formData).then(response => {
          let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
  
          if(_this.fot.includes(pth) === true)
          {
            _this.fileList.push({name:response.data.fileName, "url":response.data.url})
  
          }
  
          else{
            _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
  
          }
        })
  
      },
      /** åˆ é™¤æŒ‰é’®æ“ä½œ */
      handleDelete(row) {
        const Ids = row.id || this.ids;
        this.$modal.confirm('是否确认删除序号为"' + Ids + '"的数据项？').then(function() {
          return delFamilyevent(Ids);
        }).then(() => {
          this.getList1();
          this.$modal.msgSuccess("删除成功");
        }).catch(() => {});
      },
      /** å¯¼å‡ºæŒ‰é’®æ“ä½œ */
      handleExport() {
        this.download('/family/zfEvent/export', {
          ...this.queryParams
        }, `zfEvent_${new Date().getTime()}.xlsx`)
      }
    }
  };
  </script>
  

 ruoyi-ui/src/views/note/propertyInfo.vue

New file
@@ -0,0 +1,362 @@
<template>
  <div class="app-container">
    <div class="form-header mt">
      <h4 class="dt h4">资产详细信息 </h4>
      <el-button type="primary" class="pt"  icon="el-icon-edit" @click="handleEdit()" :disabled="btn">编辑</el-button>
    </div>

    <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
      <el-form-item label="id" prop="id">
        <el-input v-model="formData.id" placeholder="请输入id" :maxlength="11" show-word-limit :disabled="true"
          clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>
      </el-form-item>
      <el-form-item label="类别" prop="type">
        <el-select v-model="formData.type" placeholder="请选择类别" clearable :style="{width: '100%'}" :disabled="dsb" >
          <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
            :disabled="item.disabled"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="标题" prop="title">
        <el-input v-model="formData.title" placeholder="请输入标题" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
      </el-form-item>
      <el-form-item label="存储地址" prop="location">
        <el-input v-model="formData.location" placeholder="请输入存储地址" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="持有人" prop="holder">
        <el-input v-model="formData.holder" placeholder="请输入持有人" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="具体位置" prop="address">
        <el-input v-model="formData.address" placeholder="请输入具体位置" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="备注" prop="remark">
        <el-input v-model="formData.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
      </el-form-item>

      <h4 class="form-header">相关图片 </h4>
      <el-upload
      action="#"
      list-type="picture-card"
      multiple
      :http-request="requestUpload"
      :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"
          alt=""
          style="width: 147px; height: 147px"
          fit="cover"
          :preview-src-list="[file.url]"
        >
       <span class="el-upload-list__item-actions">
        <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.url)"
        >
          <i class="el-icon-download"></i>
        </span>
        <span
          v-if="!disabled"
          class="el-upload-list__item-delete"
          @click="handleRemove(file)"
        >
          <i class="el-icon-delete"></i>
        </span>
      </span>


    </div>
    </el-upload>

      <h4 class="form-header">其他附件 </h4>
      <el-upload
        action=""
        :file-list="fileListOther"
        class="upload-demo"
        multiple
        :on-preview="handlePreview"

        :on-remove="handleRemove"
        :http-request="requestUpload"
        :show-file-list="true"
      >
        <el-button type="primary">Click to upload</el-button>
        <template #tip>
          <div class="el-upload__tip">
          </div>
        </template>


      </el-upload>

      <el-form-item size="large">
        <el-button type="primary" @click="submitForm" :disabled="dsb">修改</el-button>
      </el-form-item>
    </el-form>

    <el-dialog  :visible.sync="dialogVisible">
      <img w-full :src="dialogImageUrl" alt="Preview Image" />
    </el-dialog>
  </div>
</template>
<script>
import {getPropertyInfo, updateProperty, uploadPic, download, getCategory} from "@/api/note/index";
import {addRole, updateRole} from "@/api/system/role";
import {blobValidate} from "@/utils/ruoyi";
import errorCode from "@/utils/errorCode";
import {Message} from "element-ui";

export default {
  components: {},
  props: [],
  data() {
    return {
      cdi:"资产详细信息",
      udi:"资产信息修改",
      fot:[".jpg",".jif"],
      fileList:[
      ],
      fileListOther:[

      ],
      dsb:true,
      btn:false,
      formData: {
        id: undefined,
        type: undefined,
        title: undefined,
        location: undefined,
        holder: undefined,
        address: undefined,
        remark: undefined,
        url: undefined,
      },
        dialogImageUrl: '',
        dialogVisible: false,
        disabled: false,
      rules: {
        id: [{
          required: true,
          message: '请输入id',
          trigger: 'blur'
        }],
        type: [{
          required: true,
          message: '请选择类别',
          trigger: 'change'
        }],
        title: [{
          required: true,
          message: '请输入标题',
          trigger: 'blur'
        }],
        location: [{
          required: true,
          message: '请输入存储地址',
          trigger: 'blur'
        }],
        holder: [{
          required: true,
          message: '请输入持有人',
          trigger: 'blur'
        }],
        address: [{
          required: true,
          message: '请输入具体位置',
          trigger: 'blur'
        }],
        remark: [{
          required: true,
          message: '请输入备注',
          trigger: 'blur'
        }],

      },
      typeOptions: [],
    }
  },
  computed: {},
  watch: {},
  created() {
    const id = this.$route.params && this.$route.params.id;
    let jd;
    if(this.$route.query.detail!=undefined)
    {
      jd =  this.$route.query.detail
      this.btn= jd
      this.dsb = !jd
      document.title = "修改资产详细信息";
      this.$route.meta.title = "修改资产详细信息";//列表的名称
    }
    else{
      document.title = "查看资产详细信息";
      this.$route.meta.title = "查看资产详细信息";//列表的名称
    }

    let _this = this
    if (id) {
      this.loading = true;
      getPropertyInfo(id).then((response) => {
        this.formData = response.data;
        let paths = response.data.url.split(",");
        for(let i = 0; i < paths.length; i++)
        {
          if(paths[i]!="") {

            let pth = paths[i].substr(paths[i].length - 4, paths[i].length)

            if (_this.fot.includes(pth) === true)
              _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
            else {
              // alert(paths[i])
              let nms = paths[i].split("\/")
              let nm = nms[nms.length - 1]
              _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
            }
          }
        }
        this.loading = false;
      });
      this.getCateInfor()

    }
  },
  mounted() {},
  methods: {
    /** æŸ¥è¯¢ç±»åˆ«ä¿¡æ¯ */
    getCateInfor()
    {
      let _this = this
      getCategory().then(response=>{

        response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
          _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
        })
      })
    },
    submitForm() {
      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.formData.url = ul+","+uls

      this.$refs['elForm'].validate(valid => {


        if (valid) {
          if (this.formData.id != undefined) {
            updateProperty(this.formData).then(response => {
              this.$modal.msgSuccess("修改成功");
              // this.open = false;
              this.btn=false
            });
          } else {
            this.$modal.msgSuccess("修改失败");

          }
        }
      })
    },
    resetForm() {
      this.$refs['elForm'].resetFields()
    },
    handlePreview(file)
    {
      let formData = {'path':"/"+file.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
      let lens = formData.path.split(".")
      let suffix = lens[lens.length-1]
      download(formData).then(async (response) => {
        const isLogin = await blobValidate(response);
        let nt = new Date().getTime()
        let filename = 'property_'+nt+'.'+suffix
        const blob = new Blob([response])
        saveAs(blob, filename)
      })
    },
    handleRemoveFile(file) {
      alert(23)
    },
    handleRemove(file) {
      alert(323)
      },
      handlePictureCardPreview(file) {
        this.dialogImageUrl = file.url;
        this.dialogVisible = true;
      },
      handleDownload(url) {
        var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};

        let lens = formData.path.split(".")
        let suffix = lens[lens.length-1]
        download(formData).then(async (response) => {
          const isLogin = await blobValidate(response);
          let nt = new Date().getTime()
          let filename = 'property_'+nt+'.'+suffix
          const blob = new Blob([response])
          saveAs(blob, filename)
        })
      },
    handleEdit()
    {
      this.dsb = false
      this.btn = true
    },
    requestUpload(params)
    {
      var file = params.file;
      var formData = new FormData();
      formData.append('uploadFile', file);
      let _this = this

      uploadPic(formData).then(response => {
        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)

        if(_this.fot.includes(pth) === true)
        {
          _this.fileList.push({name:response.data.fileName, "url":response.data.url})

        }

        else{
          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})

        }
      })

    }

  }
}

</script>
<style>
.mt
{
  position: relative;
}
.dt{
  display: block;

}
.pt{
  right: 10px;
  top:-3px;
  display: block;
  position: absolute;
}
</style>

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

@@ -602,4 +602,353 @@
    }
  }
};
</script>

export default {
  name: "Role",
  dicts: ['sys_normal_disable'],
  data() {
    return {
      // é®ç½©å±‚
      loading: true,
      // é€‰ä¸­æ•°ç»„
      ids: [],
      // éžå•ä¸ªç¦ç”¨
      single: true,
      // éžå¤šä¸ªç¦ç”¨
      multiple: true,
      // æ˜¾ç¤ºæœç´¢æ¡ä»¶
      showSearch: true,
      // æ€»æ¡æ•°
      total: 0,
      // è§’色表格数据
      roleList: [],
      // å¼¹å‡ºå±‚标题
      title: "",
      // æ˜¯å¦æ˜¾ç¤ºå¼¹å‡ºå±‚
      open: false,
      // æ˜¯å¦æ˜¾ç¤ºå¼¹å‡ºå±‚（数据权限）
      openDataScope: false,
      menuExpand: false,
      menuNodeAll: false,
      deptExpand: true,
      deptNodeAll: false,
      // æ—¥æœŸèŒƒå›´
      dateRange: [],
      // æ•°æ®èŒƒå›´é€‰é¡¹
      dataScopeOptions: [
        {
          value: "1",
          label: "全部数据权限"
        },
        {
          value: "2",
          label: "自定数据权限"
        },
        {
          value: "3",
          label: "本部门数据权限"
        },
        {
          value: "4",
          label: "本部门及以下数据权限"
        },
        {
          value: "5",
          label: "仅本人数据权限"
        }
      ],
      // èœå•åˆ—表
      menuOptions: [],
      // éƒ¨é—¨åˆ—表
      deptOptions: [],
      // æŸ¥è¯¢å‚æ•°
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        roleName: undefined,
        roleKey: undefined,
        status: undefined
      },
      // è¡¨å•å‚æ•°
      form: {},
      defaultProps: {
        children: "children",
        label: "label"
      },
      // è¡¨å•æ ¡éªŒ
      rules: {
        roleName: [
          { required: true, message: "角色名称不能为空", trigger: "blur" }
        ],
        roleKey: [
          { required: true, message: "权限字符不能为空", trigger: "blur" }
        ],
        roleSort: [
          { required: true, message: "角色顺序不能为空", trigger: "blur" }
        ]
      }
    };
  },
  created() {
    this.getList();
  },
  methods: {
    /** æŸ¥è¯¢è§’色列表 */
    getList() {
      this.loading = true;
      listRole(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
          this.roleList = response.rows;
          this.total = response.total;
          this.loading = false;
        }
      );
    },
    /** æŸ¥è¯¢èœå•æ ‘结构 */
    getMenuTreeselect() {
      menuTreeselect().then(response => {
        this.menuOptions = response.data;
      });
    },
    // æ‰€æœ‰èœå•èŠ‚点数据
    getMenuAllCheckedKeys() {
      // ç›®å‰è¢«é€‰ä¸­çš„菜单节点
      let checkedKeys = this.$refs.menu.getCheckedKeys();
      // åŠé€‰ä¸­çš„菜单节点
      let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys();
      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
      return checkedKeys;
    },
    // æ‰€æœ‰éƒ¨é—¨èŠ‚点数据
    getDeptAllCheckedKeys() {
      // ç›®å‰è¢«é€‰ä¸­çš„部门节点
      let checkedKeys = this.$refs.dept.getCheckedKeys();
      // åŠé€‰ä¸­çš„部门节点
      let halfCheckedKeys = this.$refs.dept.getHalfCheckedKeys();
      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
      return checkedKeys;
    },
    /** æ ¹æ®è§’色ID查询菜单树结构 */
    getRoleMenuTreeselect(roleId) {
      return roleMenuTreeselect(roleId).then(response => {
        this.menuOptions = response.menus;
        return response;
      });
    },
    /** æ ¹æ®è§’色ID查询部门树结构 */
    getDeptTree(roleId) {
      return deptTreeSelect(roleId).then(response => {
        this.deptOptions = response.depts;
        return response;
      });
    },
    // è§’色状态修改
    handleStatusChange(row) {
      let text = row.status === "0" ? "启用" : "停用";
      this.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗？').then(function() {
        return changeRoleStatus(row.roleId, row.status);
      }).then(() => {
        this.$modal.msgSuccess(text + "成功");
      }).catch(function() {
        row.status = row.status === "0" ? "1" : "0";
      });
    },
    // å–消按钮
    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("form");
    },
    /** æœç´¢æŒ‰é’®æ“ä½œ */
    handleQuery() {
      this.queryParams.pageNum = 1;
      this.getList();
    },
    /** é‡ç½®æŒ‰é’®æ“ä½œ */
    resetQuery() {
      this.dateRange = [];
      this.resetForm("queryForm");
      this.handleQuery();
    },
    // å¤šé€‰æ¡†é€‰ä¸­æ•°æ®
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.roleId)
      this.single = selection.length!=1
      this.multiple = !selection.length
    },
    // æ›´å¤šæ“ä½œè§¦å‘
    handleCommand(command, row) {
      switch (command) {
        case "handleDataScope":
          this.handleDataScope(row);
          break;
        case "handleAuthUser":
          this.handleAuthUser(row);
          break;
        default:
          break;
      }
    },
    // æ ‘权限（展开/折叠）
    handleCheckedTreeExpand(value, type) {
      if (type == 'menu') {
        let treeList = this.menuOptions;
        for (let i = 0; i < treeList.length; i++) {
          this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
        }
      } else if (type == 'dept') {
        let treeList = this.deptOptions;
        for (let i = 0; i < treeList.length; i++) {
          this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value;
        }
      }
    },
    // æ ‘权限（全选/全不选）
    handleCheckedTreeNodeAll(value, type) {
      if (type == 'menu') {
        this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []);
      } else if (type == 'dept') {
        this.$refs.dept.setCheckedNodes(value ? this.deptOptions: []);
      }
    },
    // æ ‘权限（父子联动）
    handleCheckedTreeConnect(value, type) {
      if (type == 'menu') {
        this.form.menuCheckStrictly = value ? true: false;
      } else if (type == 'dept') {
        this.form.deptCheckStrictly = value ? true: false;
      }
    },
    /** æ–°å¢žæŒ‰é’®æ“ä½œ */
    handleAdd() {
      this.reset();
      this.getMenuTreeselect();
      this.open = true;
      this.title = "添加角色";
    },
    /** ä¿®æ”¹æŒ‰é’®æ“ä½œ */
    handleUpdate(row) {
      this.reset();
      const roleId = row.roleId || this.ids
      const roleMenu = this.getRoleMenuTreeselect(roleId);
      getRole(roleId).then(response => {
        this.form = response.data;
        this.open = true;
        this.$nextTick(() => {
          roleMenu.then(res => {
            let checkedKeys = res.checkedKeys
            checkedKeys.forEach((v) => {
                this.$nextTick(()=>{
                    this.$refs.menu.setChecked(v, true ,false);
                })
            })
          });
        });
        this.title = "修改角色";
      });
    },
    /** é€‰æ‹©è§’色权限范围触发 */
    dataScopeSelectChange(value) {
      if(value !== '2') {
        this.$refs.dept.setCheckedKeys([]);
      }
    },
    /** åˆ†é…æ•°æ®æƒé™æ“ä½œ */
    handleDataScope(row) {
      this.reset();
      const deptTreeSelect = this.getDeptTree(row.roleId);
      getRole(row.roleId).then(response => {
        this.form = response.data;
        this.openDataScope = true;
        this.$nextTick(() => {
          deptTreeSelect.then(res => {
            this.$refs.dept.setCheckedKeys(res.checkedKeys);
          });
        });
        this.title = "分配数据权限";
      });
    },
    /** åˆ†é…ç”¨æˆ·æ“ä½œ */
    handleAuthUser: function(row) {
      const roleId = row.roleId;
      this.$router.push("/system/role-auth/user/" + roleId);
    },
    /** æäº¤æŒ‰é’® */
    submitForm: function() {
      this.$refs["form"].validate(valid => {
        if (valid) {
          if (this.form.roleId != undefined) {
            this.form.menuIds = this.getMenuAllCheckedKeys();
            updateRole(this.form).then(response => {
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
            this.form.menuIds = this.getMenuAllCheckedKeys();
            addRole(this.form).then(response => {
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.getList();
            });
          }
        }
      });
    },
    /** æäº¤æŒ‰é’®ï¼ˆæ•°æ®æƒé™ï¼‰ */
    submitDataScope: function() {
      if (this.form.roleId != undefined) {
        this.form.deptIds = this.getDeptAllCheckedKeys();
        dataScope(this.form).then(response => {
          this.$modal.msgSuccess("修改成功");
          this.openDataScope = false;
          this.getList();
        });
      }
    },
    /** åˆ é™¤æŒ‰é’®æ“ä½œ */
    handleDelete(row) {
      const roleIds = row.roleId || this.ids;
      this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？').then(function() {
        return delRole(roleIds);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    /** å¯¼å‡ºæŒ‰é’®æ“ä½œ */
    handleExport() {
      this.download('system/role/export', {
        ...this.queryParams
      }, `role_${new Date().getTime()}.xlsx`)
    }
  }
};
</script>

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

@@ -606,6 +606,330 @@
    /** æäº¤æŒ‰é’® */
    submitForm: function() {
      this.$refs["form"].validate(valid => {
        alert(valid)
        if (valid) {
          if (this.form.userId != undefined) {
            updateUser(this.form).then(response => {
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
            addUser(this.form).then(response => {
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.getList();
            });
          }
        }
      });
    },
    /** åˆ é™¤æŒ‰é’®æ“ä½œ */
    handleDelete(row) {
      const userIds = row.userId || this.ids;
      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
        return delUser(userIds);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    /** å¯¼å‡ºæŒ‰é’®æ“ä½œ */
    handleExport() {
      this.download('system/user/export', {
        ...this.queryParams
      }, `user_${new Date().getTime()}.xlsx`)
    },
    /** å¯¼å…¥æŒ‰é’®æ“ä½œ */
    handleImport() {
      this.upload.title = "用户导入";
      this.upload.open = true;
    },
    /** ä¸‹è½½æ¨¡æ¿æ“ä½œ */
    importTemplate() {
      this.download('system/user/importTemplate', {
      }, `user_template_${new Date().getTime()}.xlsx`)
    },
    // æ–‡ä»¶ä¸Šä¼ ä¸­å¤„理
    handleFileUploadProgress(event, file, fileList) {
      this.upload.isUploading = true;
    },
    // æ–‡ä»¶ä¸Šä¼ æˆåŠŸå¤„理
    handleFileSuccess(response, file, fileList) {
      this.upload.open = false;
      this.upload.isUploading = false;
      this.$refs.upload.clearFiles();
      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
      this.getList();
    },
    // æäº¤ä¸Šä¼ æ–‡ä»¶
    submitFileForm() {
      this.$refs.upload.submit();
    }
  }
};
</script>

export default {
  name: "User",
  dicts: ['sys_normal_disable', 'sys_user_sex'],
  components: { Treeselect },
  data() {
    return {
      // é®ç½©å±‚
      loading: true,
      // é€‰ä¸­æ•°ç»„
      ids: [],
      // éžå•ä¸ªç¦ç”¨
      single: true,
      // éžå¤šä¸ªç¦ç”¨
      multiple: true,
      // æ˜¾ç¤ºæœç´¢æ¡ä»¶
      showSearch: true,
      // æ€»æ¡æ•°
      total: 0,
      // ç”¨æˆ·è¡¨æ ¼æ•°æ®
      userList: null,
      // å¼¹å‡ºå±‚标题
      title: "",
      // éƒ¨é—¨æ ‘选项
      deptOptions: undefined,
      // æ˜¯å¦æ˜¾ç¤ºå¼¹å‡ºå±‚
      open: false,
      // éƒ¨é—¨åç§°
      deptName: undefined,
      // é»˜è®¤å¯†ç 
      initPassword: undefined,
      // æ—¥æœŸèŒƒå›´
      dateRange: [],
      // å²—位选项
      postOptions: [],
      // è§’色选项
      roleOptions: [],
      // è¡¨å•å‚æ•°
      form: {},
      defaultProps: {
        children: "children",
        label: "label"
      },
      // ç”¨æˆ·å¯¼å…¥å‚æ•°
      upload: {
        // æ˜¯å¦æ˜¾ç¤ºå¼¹å‡ºå±‚（用户导入）
        open: false,
        // å¼¹å‡ºå±‚标题（用户导入）
        title: "",
        // æ˜¯å¦ç¦ç”¨ä¸Šä¼ 
        isUploading: false,
        // æ˜¯å¦æ›´æ–°å·²ç»å­˜åœ¨çš„用户数据
        updateSupport: 0,
        // è®¾ç½®ä¸Šä¼ çš„请求头部
        headers: { Authorization: "Bearer " + getToken() },
        // ä¸Šä¼ çš„地址
        url: process.env.VUE_APP_BASE_API + "/system/user/importData"
      },
      // æŸ¥è¯¢å‚æ•°
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        userName: undefined,
        phonenumber: undefined,
        status: undefined,
        deptId: undefined
      },
      // åˆ—信息
      columns: [
        { key: 0, label: `用户编号`, visible: true },
        { key: 1, label: `用户名称`, visible: true },
        { key: 2, label: `用户昵称`, visible: true },
        { key: 3, label: `部门`, visible: true },
        { key: 4, label: `手机号码`, visible: true },
        { key: 5, label: `状态`, visible: true },
        { key: 6, label: `创建时间`, visible: true }
      ],
      // è¡¨å•æ ¡éªŒ
      rules: {
        userName: [
          { required: true, message: "用户名称不能为空", trigger: "blur" },
          { min: 2, max: 20, message: '用户名称长度必须介于 2 å’Œ 20 ä¹‹é—´', trigger: 'blur' }
        ],
        nickName: [
          { required: true, message: "用户昵称不能为空", trigger: "blur" }
        ],
        password: [
          { required: true, message: "用户密码不能为空", trigger: "blur" },
          { min: 5, max: 20, message: '用户密码长度必须介于 5 å’Œ 20 ä¹‹é—´', trigger: 'blur' }
        ],
        email: [
          {
            type: "email",
            message: "请输入正确的邮箱地址",
            trigger: ["blur", "change"]
          }
        ],
        phonenumber: [
          {
            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
            message: "请输入正确的手机号码",
            trigger: "blur"
          }
        ]
      }
    };
  },
  watch: {
    // æ ¹æ®åç§°ç­›é€‰éƒ¨é—¨æ ‘
    deptName(val) {
      this.$refs.tree.filter(val);
    }
  },
  created() {
    this.getList();
    this.getDeptTree();
    this.getConfigKey("sys.user.initPassword").then(response => {
      this.initPassword = response.msg;
    });
  },
  methods: {
    /** æŸ¥è¯¢ç”¨æˆ·åˆ—表 */
    getList() {
      this.loading = true;
      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
          this.userList = response.rows;
          this.total = response.total;
          this.loading = false;
        }
      );
    },
    /** æŸ¥è¯¢éƒ¨é—¨ä¸‹æ‹‰æ ‘结构 */
    getDeptTree() {
      deptTreeSelect().then(response => {
        this.deptOptions = response.data;
      });
    },
    // ç­›é€‰èŠ‚点
    filterNode(value, data) {
      if (!value) return true;
      return data.label.indexOf(value) !== -1;
    },
    // èŠ‚点单击事件
    handleNodeClick(data) {
      this.queryParams.deptId = data.id;
      this.handleQuery();
    },
    // ç”¨æˆ·çŠ¶æ€ä¿®æ”¹
    handleStatusChange(row) {
      let text = row.status === "0" ? "启用" : "停用";
      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
        return changeUserStatus(row.userId, row.status);
      }).then(() => {
        this.$modal.msgSuccess(text + "成功");
      }).catch(function() {
        row.status = row.status === "0" ? "1" : "0";
      });
    },
    // å–消按钮
    cancel() {
      this.open = false;
      this.reset();
    },
    // è¡¨å•é‡ç½®
    reset() {
      this.form = {
        userId: undefined,
        deptId: undefined,
        userName: undefined,
        nickName: undefined,
        password: undefined,
        phonenumber: undefined,
        email: undefined,
        sex: undefined,
        status: "0",
        remark: undefined,
        postIds: [],
        roleIds: []
      };
      this.resetForm("form");
    },
    /** æœç´¢æŒ‰é’®æ“ä½œ */
    handleQuery() {
      this.queryParams.pageNum = 1;
      this.getList();
    },
    /** é‡ç½®æŒ‰é’®æ“ä½œ */
    resetQuery() {
      this.dateRange = [];
      this.resetForm("queryForm");
      this.queryParams.deptId = undefined;
      this.$refs.tree.setCurrentKey(null);
      this.handleQuery();
    },
    // å¤šé€‰æ¡†é€‰ä¸­æ•°æ®
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.userId);
      this.single = selection.length != 1;
      this.multiple = !selection.length;
    },
    // æ›´å¤šæ“ä½œè§¦å‘
    handleCommand(command, row) {
      switch (command) {
        case "handleResetPwd":
          this.handleResetPwd(row);
          break;
        case "handleAuthRole":
          this.handleAuthRole(row);
          break;
        default:
          break;
      }
    },
    /** æ–°å¢žæŒ‰é’®æ“ä½œ */
    handleAdd() {
      this.reset();
      getUser().then(response => {
        this.postOptions = response.posts;
        this.roleOptions = response.roles;
        this.open = true;
        this.title = "添加用户";
        this.form.password = this.initPassword;
      });
    },
    /** ä¿®æ”¹æŒ‰é’®æ“ä½œ */
    handleUpdate(row) {
      this.reset();
      const userId = row.userId || this.ids;
      getUser(userId).then(response => {
        this.form = response.data;
        this.postOptions = response.posts;
        this.roleOptions = response.roles;
        this.$set(this.form, "postIds", response.postIds);
        this.$set(this.form, "roleIds", response.roleIds);
        this.open = true;
        this.title = "修改用户";
        this.form.password = "";
      });
    },
    /** é‡ç½®å¯†ç æŒ‰é’®æ“ä½œ */
    handleResetPwd(row) {
      this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        closeOnClickModal: false,
        inputPattern: /^.{5,20}$/,
        inputErrorMessage: "用户密码长度必须介于 5 å’Œ 20 ä¹‹é—´"
      }).then(({ value }) => {
          resetUserPwd(row.userId, value).then(response => {
            this.$modal.msgSuccess("修改成功，新密码是：" + value);
          });
        }).catch(() => {});
    },
    /** åˆ†é…è§’色操作 */
    handleAuthRole: function(row) {
      const userId = row.userId;
      this.$router.push("/system/user-auth/role/" + userId);
    },
    /** æäº¤æŒ‰é’® */
    submitForm: function() {
      this.$refs["form"].validate(valid => {
        if (valid) {
          if (this.form.userId != undefined) {
            updateUser(this.form).then(response => {

 ruoyi-ui/src/views/tmp.vue

New file
@@ -0,0 +1,12 @@
<template>
  <div>

  dddddddddddddddddddddasfdasdfasdfasd
  </div>
</template>

<script>
</script>
<style scoped>

</style>

 ruoyi-ui/target/npmlist.json

New file
@@ -0,0 +1 @@
{"version":"3.8.5","name":"ruoyi","dependencies":{"@riophae/vue-treeselect":{"version":"0.4.0"},"axios":{"version":"0.24.0"},"clipboard":{"version":"2.0.8"},"core-js":{"version":"3.25.3"},"echarts":{"version":"5.4.0"},"element-ui":{"version":"2.15.12"},"file-saver":{"version":"2.0.5"},"fuse.js":{"version":"6.4.3"},"highlight.js":{"version":"9.18.5"},"js-beautify":{"version":"1.13.0"},"js-cookie":{"version":"3.0.1"},"jsencrypt":{"version":"3.0.0-rc.1"},"nprogress":{"version":"0.2.0"},"quill":{"version":"1.3.7"},"screenfull":{"version":"5.0.2"},"sortablejs":{"version":"1.10.2"},"vue-count-to":{"version":"1.0.13"},"vue-cropper":{"version":"0.5.5"},"vue-meta":{"version":"2.4.0"},"vue-router":{"version":"3.4.9"},"vue":{"version":"2.6.12"},"vuedraggable":{"version":"2.24.3"},"vuex":{"version":"3.6.0"}}}

 ruoyi-ui/vue.config.js

@@ -7,9 +7,9 @@

const CompressionPlugin = require('compression-webpack-plugin')

const name = process.env.VUE_APP_TITLE || '张氏APP' // ç½‘页标题
const name = process.env.VUE_APP_TITLE || '若依管理系统' // ç½‘页标题

const port = process.env.port || process.env.npm_config_port || 8088 // ç«¯å£
const port = process.env.port || process.env.npm_config_port || 80 // ç«¯å£

// vue.config.js é…ç½®è¯´æ˜Ž
//官方vue.config.js å‚考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
@@ -35,8 +35,7 @@
    proxy: {
      // detail: https://cli.vuejs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
        // target: `http://localhost:8080`,
        target: `http://47.93.189.255:8080`,
        target: `http://47.93.189.255:8080/`,
        changeOrigin: true,
        pathRewrite: {
          ['^' + process.env.VUE_APP_BASE_API]: ''
@@ -47,15 +46,8 @@
  },
  css: {
    loaderOptions: {
      // sass: {
      //   sassOptions: { outputStyle: "expanded" }
      // }
      postcss:{
        plugins:[
          require('postcss-px2rem')({
            remUnit:192
          })
        ]
      sass: {
        sassOptions: { outputStyle: "expanded" }
      }
    }
  },
@@ -97,17 +89,6 @@
        symbolId: 'icon-[name]'
      })
      .end()
    //
    // config.module
    //   .rule("css")
    //   .test(/\.css$/)
    //   .oneOf("vue")
    //   .resourceQuery(/\?vue/)
    //   .use("px2rem")
    //   .loader("px2rem-loader")
    //   .options({
    //     remUnit: 192 // è®¾è®¡ç¨¿å¤§å°æ¯”例 / 10
    //   });

    config
      .when(process.env.NODE_ENV !== 'development',
@@ -152,5 +133,4 @@
        }
      )
  }

}