修改到293

yz3456

2024-05-27 fd08342ac7b11db592ed04b2cbc51eac748d7535

修改到293

 ruoyi-ui/package.json

@@ -36,13 +36,11 @@
    "url": "https://gitee.com/y_project/RuoYi-Vue.git"
  },
  "dependencies": {
    "core-js": "3.25.3",
    "aegis-web-sdk": "^1.35.26",
    "trtc-js-sdk": "latest",
    "vue-i18n": "^8.26.3",
    "@riophae/vue-treeselect": "0.4.0",
    "aegis-web-sdk": "^1.39.1",
    "axios": "0.24.0",
    "clipboard": "2.0.8",
    "core-js": "3.25.3",
    "d3": "^7.8.5",
    "echarts": "^5.5.0",
    "element-ui": "2.15.12",
@@ -58,9 +56,11 @@
    "quill": "1.3.7",
    "screenfull": "5.0.2",
    "sortablejs": "1.10.2",
    "trtc-js-sdk": "^4.15.21",
    "vue": "2.6.12",
    "vue-count-to": "1.0.13",
    "vue-cropper": "0.5.5",
    "vue-i18n": "^8.28.2",
    "vue-meta": "2.4.0",
    "vue-print-nb": "^1.7.5",
    "vue-router": "3.4.9",

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

@@ -546,7 +546,7 @@
          trigger: 'blur'
        }],
        isAlways: [{
          // required: true,
          required: true,
          message: '是否常联系',
          trigger: 'blur'
        }],

 ruoyi-ui/src/views/meeting/meetingInfo.vue

@@ -59,20 +59,20 @@
              </el-form-item>
            </el-cow> -->
            <el-cow>
              <el-form-item label="可容纳人数" prop="conPeople" label-width="90px"
              <el-form-item label="可容纳人数" prop="conPeople" label-width="100px"
                style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-input v-if="!dsb" v-model="formData.conPeople" placeholder="请输入可容纳人数" clearable :style="{width: '100%'}" :disabled="dsb">
                <el-input v-if="!dsb" type="number" v-model="formData.conPeople" placeholder="请输入可容纳人数" clearable :style="{width: '100%'}" :disabled="dsb">
                </el-input>
                <el-input v-if="dsb" v-model="formData.conPeople" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                <el-input v-if="dsb" type="number" v-model="formData.conPeople" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                </el-input>
              </el-form-item>
            </el-cow>
            <el-cow>
              <el-form-item label="参与人数" prop="partPeople" label-width="90px"
                style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-input v-if="!dsb" v-model="formData.partPeople" placeholder="请输入参与人数" clearable :style="{width: '100%'}" :disabled="dsb">
                <el-input v-if="!dsb" type="number" v-model="formData.partPeople" placeholder="请输入参与人数" clearable :style="{width: '100%'}" :disabled="dsb">
                </el-input>
                <el-input v-if="dsb" v-model="formData.partPeople" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                <el-input v-if="dsb" type="number" v-model="formData.partPeople" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                </el-input>
              </el-form-item>
            </el-cow>
@@ -86,7 +86,7 @@
              </el-form-item>
            </el-cow>
            <el-cow>
              <el-form-item label="家庭或部门" prop="applyApart" label-width="90px"
              <el-form-item label="家庭或部门" prop="applyApart" label-width="100px"
                style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-input v-if="!dsb" v-model="formData.applyApart" placeholder="请输入申请家庭或部门" clearable :style="{width: '100%'}" :disabled="dsb">
                </el-input>
@@ -197,22 +197,69 @@
        dialogImageUrl: '',
        dialogVisible: false,
        disabled: false,
        // 表单校验
        rules: {
          // title: [{
          //   required: true,
          //   message: '请输入会议标题',
          //   trigger: 'blur'
          // }],
          // startTime: [{
          //   required: true,
          //   message: '请选择开始时间',
          //   trigger: 'blur'
          // }],
          // endTime: [{
          //   required: true,
          //   message: '请选择结束时间',
          //   trigger: 'blur'
          // }]
          startTime: [{
            required: true,
            message: '请输入开始时间',
            trigger: 'blur'
          }],
          endTime: [{
            required: true,
            message: '请输入结束时间',
            trigger: 'blur'
          }],
          title: [{
            required: true,
            message: '请输入标题',
            trigger: 'blur'
          }],
          place: [{
            required: true,
            message: '请输入地点',
            trigger: 'blur'
          }],
          conPeople: [{
            required: true,
            message: '请输入可容纳人数',
            trigger: 'blur'
          }],
          partPeople: [{
            required: true,
            message: '请输入参与人数',
            trigger: 'blur'
          }],
          applyPerson: [{
            required: true,
            message: '请输入申请人',
            trigger: 'blur'
          }],
          applyApart: [{
            required: true,
            message: '请输入申请家庭或部门',
            trigger: 'blur'
          }],
          isPlacebrand: [{
            required: true,
            message: '请选择是否拜访水牌',
            trigger: 'blur'
          }],
          connPerson: [{
            required: true,
            message: '请输入联系人',
            trigger: 'blur'
          }],
          connPhone: [{
            required: true,
            message: '请输入联系电话',
            trigger: 'blur'
          }],
          statu: [{
            required: true,
            message: '请选择状态',
            trigger: 'blur'
          }],

        },
        typeOptions: [
          {

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

@@ -452,22 +452,22 @@
        animal: [{
          required: true,
          message: '请输入种类',
          trigger: 'blue'
          trigger: 'blur'
        }],
        idNum: [{
          required: true,
          message: '请输入证件号码',
          trigger: 'blue'
          trigger: 'blur'
        }],
        securityCode: [{
          // required: true,
          message: '请输入防伪码',
          trigger: 'blue'
          trigger: 'blur'
        }],
        name: [{
          required: true,
          message: '请输入名字',
          trigger: 'blue'
          trigger: 'blur'
        }],
        birth: [{
          required: true,
@@ -477,12 +477,12 @@
        color: [{
          required: true,
          message: '请输入颜色',
          trigger: 'blue'
          trigger: 'blur'
        }],
        properties: [{
          // required: true,
          message: '请输入性质',
          trigger: 'blue'
          trigger: 'blur'
        }],
        sex: [{
          required: true,

 ruoyi-ui/src/views/pet/petInfo.vue

@@ -615,21 +615,23 @@
      );
    },

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

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

      uploadPic1(formData).then(response => {
        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
        _this.fileList2.push({name:response.data.fileName, url:response.data.url})
        console("ok")
      })

    },
    //   uploadPic1(formData).then(response => {
    //     let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
    //     _this.fileList2.push({name:response.data.fileName, url:response.data.url})
    //     console("ok")
    //   })


    // },
    submitForm() {

      // let ul = this.fileList1.map(function (elem){
@@ -645,13 +647,25 @@

          if (valid) {
            if (this.petList.id != undefined) {
              if(this.petList.sex=='雄性')
                  this.petList.sex = 1
              else
                  this.petList.sex = 0
              updatePet(this.petList).then(response => {
                this.$modal.msgSuccess("修改成功");
                // this.open = false;
                if(this.petList.sex==1)
                    this.petList.sex = '雄性'
                else
                    this.petList.sex = '雌性'
                this.btn=false
              });
            } else {
              this.$modal.msgSuccess("修改失败");
              if(this.petList.sex==1)
                  this.petList.sex = '雄性'
              else
                  this.petList.sex = '雌性'

            }
          }
@@ -764,18 +778,28 @@
   //   console("ok")
    //  alert(90)
    //  alert(response.data.url)
    if(this.petList.sex=='雄性')
        this.petList.sex = 1
    else
        this.petList.sex = 0
      _this.petList.fullPicture =  response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      updatePet(_this.petList).then(response => {
        _this.$modal.msgSuccess("图像修改成功");
        if(this.petList.sex==1)
            this.petList.sex = '雄性'
        else
            this.petList.sex = '雌性'
        // this.open = false;
        _this.btn=false
      });
     // alert(100)
    })

      //alert(90)
     },
requestUpload1(params)
    {

      var file = params.file;
      var formData = new FormData();
      formData.append('uploadFile', file);
@@ -791,14 +815,23 @@
   //   console("ok")
    //  alert(90)
    //  alert(response.data.url)
    if(this.petList.sex=='雄性')
        this.petList.sex = 1
    else
        this.petList.sex = 0
      _this.petList.headPicture =  response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      updatePet(_this.petList).then(response => {
        _this.$modal.msgSuccess("修改成功");
        // this.open = false;
        if(this.petList.sex==1)
            this.petList.sex = '雄性'
        else
            this.petList.sex = '雌性'
        _this.btn=false
      });
     // alert(100)
    })

      //alert(90)
     },