1. 完成场景报告模块 2. 日报管理模块添加时间范围选择以及word报告生成

riku

2024-11-07 f5052fa7d4e73c0df5a02a6ad8987f35df42b8f8

 src/views/fysp/check/components/CompProblemAddOrUpd.vue

@@ -22,7 +22,7 @@
            v-for="item in descriptionOptions"
            :key="item.guid"
            :label="item.description"
            :value="item.guid"
            :value="item.description"
          />
        </el-select>
      </el-form-item>
@@ -232,7 +232,6 @@
  watch: {
    fileList: {
      handler(newFileList, oldFileList) {
        console.log('newFileList', newFileList);
        // 图片校验
        this.pictureValidate();
      },
@@ -262,10 +261,7 @@
    },
    adviseOptions() {
      var problemGuid = this.currProTypeGuid || this.problem.guid;
      console.log("problemGuid", problemGuid);
      
      var array = this.suggestions.filter((item) => item.adProblemtypeguid == problemGuid);
      console.log("array", array);
      return array;
    }
  },
@@ -286,8 +282,7 @@
      // 将一个js对象中所有di，wi，pi开头的属性全部改成去掉这些前缀并且重新变为驼峰式命名
      const newObj = {};
      for (const key in obj) {
        if (obj.hasOwnProperty(key)) {
          let newKey = key;
        let newKey = key;
          if (key.startsWith('di')) {
            newKey = key.substring(2);
          } else if (key.startsWith('wi')) {
@@ -297,7 +292,6 @@
          }
          newKey = newKey.charAt(0).toLowerCase() + newKey.slice(1);
          newObj[newKey] = obj[key];
        }
      }
      return newObj;
    },
@@ -350,8 +344,6 @@
                    this.saveStatus(newDevice, statusItem);
                    newDevice.dlLocation = statusItem.dlLocation;
                    newDevice.topTypeId = topTypeId;
                    console.log('newDevice.topTypeId', newDevice.topTypeId);
                    console.log('newDevice', newDevice);

                    this.deviceImgObjList.push(newDevice);
                  }
@@ -364,7 +356,6 @@
    },
    initOptions() {
      if (this.problem == undefined || this.problem == null) {
        this.problem = {};
        this.deepCopyProblem = {};
      } else {
        this.deepCopyProblem = useCloned(this.problem).cloned.value;
@@ -472,7 +463,7 @@
      return result;
    },
    changeProblemname() {
      if (this.proRemark == null || this.proRemark == '') {
      if (!this.proRemark || this.proRemark == null || this.proRemark == '') {
        this.deepCopyProblem.problemname = this.deepCopyProblem.description;
      } else {
        this.deepCopyProblem.problemname =
@@ -486,10 +477,19 @@
      this.deepCopyProblem.description = '';
      this.deepCopyProblem.advise = '';
    },
    findProByProDesName(name) {
      let result
      this.problemTypeList.forEach(item=>{
        if (item.description == name) {
          result = item;
        }
      })
      return result
    },
    onProDesChange(value) {
      let currPro = this.findProTypeByGuid(value);
      let currPro = this.findProByProDesName(value)
      this.deepCopyProblem.advise = '';
      this.currProTypeGuid = value;
      this.currProTypeGuid = currPro.guid;
      // this.deepCopyProblem.description = currPro.description;
      this.changeProblemname();
      this.deepCopyProblem.advise = '';
@@ -549,7 +549,6 @@
          }
          exclude = false;
          // picUrls.push(item)
        } else {
        }
      });
      if (this.type == 1) {
@@ -568,7 +567,6 @@
        const deepCopySubTask = useCloned(this.subtask).cloned.value;
        const that = this;
        fileUtil.getImageFiles(picUrls, function (files) {
          console.log('deepCopySubTask', deepCopySubTask);
          deepCopyPro.insGuid = deepCopySubTask.insGuid;
          delete deepCopyPro['advise'];
          delete deepCopyPro['description'];