feige
2023-12-11 9ac4f1edc86c9af627fcff2b3263e029ec4c95ff
修改bug
12个文件已修改
112 ■■■■ 已修改文件
ruoyi-ui/src/views/bignote/index.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/clean/index.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/collection/index.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/contacts/index.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/device/index.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/doctor/index.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/economy/index.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/note/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/pet/index.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/pet/petInfo.vue 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/secret/secretInfo.vue 56 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/vue.config.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/bignote/index.vue
@@ -192,6 +192,7 @@
            size="mini"
            type="text"
            icon="el-icon-edit"
            :disabled="!scope.row.ownData"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['familymodel:bignote:list']"
          >修改</el-button>
@@ -199,6 +200,7 @@
            size="mini"
            type="text"
            icon="el-icon-delete"
            :disabled="!scope.row.ownData"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:role:remove']"
          >删除</el-button>
ruoyi-ui/src/views/clean/index.vue
@@ -177,6 +177,7 @@
                size="mini"
                type="text"
                icon="el-icon-edit"
                      :disabled="!scope.row.ownData"
                @click="handleUpdate(scope.row)"
                v-hasPermi="['familymodel:clean:info']"
              >修改</el-button>
@@ -184,6 +185,7 @@
                size="mini"
                type="text"
                icon="el-icon-delete"
                      :disabled="!scope.row.ownData"
                @click="handleDelete(scope.row)"
                v-hasPermi="['system:role:remove']"
              >删除</el-button>
ruoyi-ui/src/views/collection/index.vue
@@ -249,6 +249,7 @@
              size="mini"
              type="text"
              icon="el-icon-edit"
                        :disabled="!scope.row.ownData"
              @click="handleUpdate(scope.row)"
              v-hasPermi="['system:role:edit']"
            >
@@ -258,6 +259,7 @@
              size="mini"
              type="text"
              icon="el-icon-delete"
                        :disabled="!scope.row.ownData"
              @click="handleDelete(scope.row)"
              v-hasPermi="['system:role:remove']"
            ><span style="font-size: 14px;">删除</span></el-button>
ruoyi-ui/src/views/contacts/index.vue
@@ -82,6 +82,7 @@
          plain
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['system:role:add']"
        >新增</el-button>
@@ -94,6 +95,7 @@
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
          v-hasPermi="['system:role:remove']"
        >删除</el-button>
      </el-col>
@@ -217,6 +219,7 @@
              size="mini"
              type="text"
              icon="el-icon-edit"
                     :disabled="!scope.row.ownData"
              @click="handleUpdate(scope.row)"
              v-hasPermi="['system:role:edit']"
            >
@@ -226,6 +229,7 @@
              size="mini"
              type="text"
              icon="el-icon-delete"
                     :disabled="!scope.row.ownData"
              @click="handleDelete(scope.row)"
              v-hasPermi="['system:role:remove']"
            ><span style="font-size: 14px;">删除</span></el-button>
@@ -418,7 +422,7 @@
      // 数据范围选项
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
      fileList:[
      ],
      fileListOther:[
ruoyi-ui/src/views/device/index.vue
@@ -194,6 +194,7 @@
            size="mini"
            type="text"
            icon="el-icon-edit"
                :disabled="!scope.row.ownData"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['system:role:edit']"
          >修改</el-button>
@@ -201,6 +202,7 @@
            size="mini"
            type="text"
            icon="el-icon-delete"
                :disabled="!scope.row.ownData"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:role:remove']"
          >删除</el-button>
ruoyi-ui/src/views/doctor/index.vue
@@ -198,6 +198,7 @@
            size="mini"
            type="text"
            icon="el-icon-edit"
                :disabled="!scope.row.ownData"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['system:role:edit']"
          >
@@ -208,6 +209,7 @@
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
                :disabled="!scope.row.ownData"
            v-hasPermi="['system:role:remove']"
          ><span style="font-size: 14px;">删除</span></el-button>
          <el-button
ruoyi-ui/src/views/economy/index.vue
@@ -161,6 +161,7 @@
            size="mini"
            type="text"
            icon="el-icon-edit"
                :disabled="!scope.row.ownData"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['familymodel:economy:info']"
          >修改</el-button>
@@ -168,6 +169,7 @@
            size="mini"
            type="text"
            icon="el-icon-delete"
                :disabled="!scope.row.ownData"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:role:remove']"
          >删除</el-button>
ruoyi-ui/src/views/note/index.vue
@@ -673,6 +673,7 @@
    },
    /** 删除按钮操作 */
    handleDelete(row) {
        alert(23)
      const Ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除所选数据项?').then(function() {
        return delProperty(Ids);
ruoyi-ui/src/views/pet/index.vue
@@ -122,6 +122,7 @@
            size="mini"
            type="text"
            icon="el-icon-edit"
                :disabled="!scope.row.ownData"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['familymodel:property:info']"
          >修改</el-button>
@@ -129,6 +130,7 @@
            size="mini"
            type="text"
            icon="el-icon-delete"
                :disabled="!scope.row.ownData"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:role:remove']"
          >删除</el-button>
ruoyi-ui/src/views/pet/petInfo.vue
@@ -166,8 +166,10 @@
                    </el-upload>
            </el-col>
          </div>
<!--          <el-button  v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">修改魅宠信息</el-button> -->
        </el-col>
      </div>
    </el-container>
@@ -259,11 +261,15 @@
        </div>
      </el-col>
    </div>
    <div class="form-header mt">
</div>
    <div>
        <el-button  v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">修改魅宠信息</el-button>
    </div>
    <el-dialog  :visible.sync="dialogVisible">
      <img w-full :src="dialogImageUrl" alt="Preview Image" />
@@ -397,7 +403,7 @@
      // 数据范围选项
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
      fileList:[
      ],
      fileListOther:[
@@ -557,6 +563,8 @@
      jd =  this.$route.query.detail
      this.btn= jd
      this.dsb = !jd
      this.isShow = true
     // document.title = "修改魅宠详细信息";
      this.$route.meta.title = "修改魅宠详细信息";//列表的名称
    }
@@ -564,6 +572,7 @@
     // document.title = "查看魅宠详细信息";
      this.$route.meta.title = "查看魅宠详细信息";//列表的名称
      this.btn = false;
      this.isShow = false;
    }
    let _this = this
@@ -573,7 +582,7 @@
      getPetList(id).then((response) => {
        this.petList = response.data;
        console.log(this.petList)
        alert(this.petList.headPicture)
     //   alert(this.petList.headPicture)
        this.loading = false;
      });
      // getPetowner(id).then((response) => {
@@ -619,14 +628,14 @@
    },
    submitForm() {
      let ul = this.fileList1.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
      let uls = this.fileList2.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
      this.petList.headPicture = ul,
        this.petList.fullPicture = uls,
      // let ul = this.fileList1.map(function (elem){
      //   return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      // }).join(",")
      // let uls = this.fileList2.map(function (elem){
      //   return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      // }).join(",")
      // this.petList.headPicture = ul,
      //   this.petList.fullPicture = uls,
        this.$refs['elForm'].validate(valid => {
ruoyi-ui/src/views/secret/secretInfo.vue
@@ -38,15 +38,27 @@
          </el-input>
        </el-form-item>
        <el-form-item label="是否开启指纹" prop="isFinger">
          <el-input v-model="formData.isFinger" placeholder="请输入持有人" clearable :style="{width: '100%'}" :disabled="dsb">
    <el-select v-model="formData.isFinger" placeholder="请选择是/否" clearable :style="{width: '100%'}" :disabled="dsb" >
              <el-option v-for="(item, index) in typeOptions2" :key="index" :label="item.label" :value="item.value"
              ></el-option>
            </el-select>
          <!-- <el-input v-model="formData.isFinger" :active-value="是" :inactive-value="否" placeholder="请输入持有人" clearable :style="{width: '100%'}" :disabled="dsb"> -->
          </el-input>
        </el-form-item>
        <el-form-item label="是否开启人脸" prop="isFace">
          <el-input v-model="formData.isFace" placeholder="请选择现金/自动划扣" clearable :style="{width: '100%'}" :disabled="dsb">
            </el-input>
            <el-select v-model="formData.isFace" placeholder="请选择是/否" clearable :style="{width: '100%'}" :disabled="dsb" >
                      <el-option v-for="(item, index) in typeOptions2" :key="index" :label="item.label" :value="item.value"
                      ></el-option>
                    </el-select>
        </el-form-item>
        <el-form-item label="私有/公有" prop="isPrivate">
          <el-input v-model="formData.isPrivate" placeholder="请输入余额" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
          <el-select v-model="formData.isPrivate" placeholder="请选择是/否" clearable :style="{width: '100%'}" :disabled="dsb" >
                    <el-option v-for="(item, index) in typeOptions3" :key="index" :label="item.label" :value="item.value"
                    ></el-option>
                  </el-select>
        </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input v-model="formData.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
@@ -191,7 +203,7 @@
       // 数据范围选项
       fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
         '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
        fileList:[
        ],
        fileListOther:[
@@ -260,6 +272,26 @@
          }],
        },
        typeOptions2: [
          {
            value: '0',
            label: '否',
          },
          {
            value: '1',
            label: '是',
          }
        ],
        typeOptions3: [
          {
            value: '0',
            label: '私有',
          },
          {
            value: '1',
            label: '公有',
          }
        ],
        typeOptions: [{
    value: '0',
    label: '基金',
@@ -296,6 +328,18 @@
        this.loading = true;
        getSecretInfo({id}).then((response) => {
          this.formData = response.data;
          if(this.formData.isFinger==1)
            this.formData.isFinger = '是'
          else
          this.formData.isFinger = '否'
     if(this.formData.isFace==1)
            this.formData.isFace = '是'
          else
          this.formData.isFace = '否'
          if(this.formData.isPrivate==1)
                 this.formData.isPrivate = '共有'
               else
               this.formData.isPrivate = '私有'
          let paths = response.data.url.split(",");
          for(let i = 0; i < paths.length; i++)
          {
@@ -463,7 +507,7 @@
            updateSecret(_this.formData).then(response => {
              this.$modal.msgSuccess("图片上传成功");
              // this.open = false;
            });
        })
ruoyi-ui/vue.config.js
@@ -35,7 +35,7 @@
    proxy: {
      // 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://10.39.18.174:8080/`,
        target: 'https://www.bendudu.com:8080/',
        changeOrigin: true,
        pathRewrite: {