修改了router/index.js中的魅宠详情
另外跳转是跳转到魅宠详情,pet/index.vue中已经修改
petInfo中route.params拿到的是pid,而不是id,之后可以拿到数据了
5个文件已修改
77 ■■■■ 已修改文件
ruoyi-ui/.env.development 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/api/pet/index.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/router/index.js 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/pet/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/pet/petInfo.vue 59 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/.env.development
@@ -1,5 +1,5 @@
# 页面标题
VUE_APP_TITLE = 若依管理系统
VUE_APP_TITLE =  张氏APP管理系统
# 开发环境配置
ENV = 'development'
ruoyi-ui/src/api/pet/index.js
@@ -47,9 +47,9 @@
  //魅宠主人信息
  //根据宠物id查询主人信息
  export function getPetowner(id,pid) {
  export function getPetowner(id) {
    return request({
      url: '/zfMaster/' + id + '/pid='+pid,
      url: '/zfMaster/' + id,
      method: 'get',
    })
  }
ruoyi-ui/src/router/index.js
@@ -230,19 +230,19 @@
      }
    ]
  },
  //魅宠备忘录
  //魅宠详情
  {
    path: '/familymodel/pet',
    component: Layout,
    // permissions: [],
    hidden: true,
    permissions: ['familymodel:pet:list'],
    permissions: ['familymodel:pet:info'],
    children: [
      {
        path: 'petnote/:pid(\\d+)',
        component: () => import('@/views/pet/petnote'),
        name: 'petnote',
        path: 'petInfo/:pid(\\d+)',
        component: () => import('@/views/pet/petInfo'),
        name: 'petInfo',
        meta: { title: '备忘录',activeMenu: '/familymodel/zfPetNote'}
      }
    ]
ruoyi-ui/src/views/pet/index.vue
@@ -145,7 +145,7 @@
           </template>
          </el-table-column>
      <el-table-column label="颜色" prop="color" sortable width="100" />
      <!-- <el-table-column label="主人姓名" prop="holder" sortable width="100" /> -->
      <el-table-column label="居住地址" prop="address" sortable width="100" />
      <el-table-column label="证件号码" prop="idNum" sortable width="100" />
ruoyi-ui/src/views/pet/petInfo.vue
@@ -205,7 +205,7 @@
    </el-container>
    <el-dialog  :visible.sync="dialogVisible">
      <img w-full :src="dialogImageUrl" alt="Preview Image" />
    </el-dialog>
@@ -300,7 +300,7 @@
  computed: {},
  watch: {},
  created() {
    const id = this.$route.params && this.$route.params.id;
    const id = this.$route.params && this.$route.params.pid;
    let jd;
    if(this.$route.query.detail!=undefined)
    {
@@ -320,58 +320,25 @@
      this.loading = true;
      getPetList(id).then((response) => {
        this.petList = response.data;
        let paths = response.data.url.split(",");
        for(let i = 0; i < paths.length; i++)
        {
          if(paths[i]!="") {
        console.log(response.data)
            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()
    };
    if (id,pid) {
    if (id) {
      this.loading = true;
      getPetownerList(id,pid).then((response) => {
      getPetownerList(id).then((response) => {
        this.petownerList = response.data;
        let paths = response.data.url.split(",");
        for(let i = 0; i < paths.length; i++)
        {
          if(paths[i]!="") {
        console.log(response.data)
            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()
    };
    this.getList();
  },
@@ -419,7 +386,7 @@
        saveAs(blob, filename)
      })
    },
   /** 备忘录 */
        Petnote(pid){
@@ -430,11 +397,11 @@
      const Base64 = require('js-base64').Base64
      this.desurl = process.env.VUE_APP_BASE_OTHER_API+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
      myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
      },
//删除图片
    handleRemoveFile(file,) {
      for(let i = 0; i < this.fileListOther.length; i++)
      {
        if(this.fileListOther[i].url==file.url)