[BUG修复](hyx_2024-9-11)

优化重点工程操作后不跳转到首页
Merge remote-tracking branch 'origin/pet' into pet
2024-09-24 17:05:46 +08:00 · 2024-09-23 10:37:43 +08:00 · 2024-09-23 10:37:29 +08:00 · 2024-09-20 17:23:14 +08:00 · 2024-09-20 16:15:03 +08:00 · 2024-09-20 16:14:31 +08:00
9 changed files with 214 additions and 37 deletions
--- a/src/views/corpInfo/user/components/edit.vue
+++ b/src/views/corpInfo/user/components/edit.vue
@ -139,11 +139,11 @@
                    <i class="el-icon-plus"/>
                  </el-upload>
                  <div style="margin-left:20px;line-height:1.6">
-                    <!-- <div style="color: red;font-size: 12px">（若新上传人脸图片将覆盖旧人脸信息，不上传则不做修改）</div>
+                    <div style="color: red;font-size: 12px">（若新上传人脸图片将覆盖旧人脸信息，不上传则不做修改）</div>
                    <div style="color: red;font-size: 12px">* 图像格式：JPEG、JPG、PNG、BMP</div>
                    <div style="color: red;font-size: 12px">* 图像大小：不超过1M。</div>
-                    <div style="color: red;font-size: 12px">* 图像分辨率：大于32×32像素，小于4096×4096像素，<br>人脸占比不低于64×64像素。</div> -->
-                    <!-- <div style="color: red;font-size: 12px">（如无合适照片请该人员登陆曹港APP中进行人脸照片采集）</div> -->
+                    <div style="color: red;font-size: 12px">* 图像分辨率：大于32×32像素，小于4096×4096像素，<br>人脸占比不低于64×64像素。</div>
+                    <div style="color: red;font-size: 12px">（如无合适照片请该人员登陆曹港APP中进行人脸照片采集）</div>
                  </div>
                </div>
              </el-form-item>
@ -812,7 +812,7 @@ export default {
        DUTIES_ID: [{ required: true, message: '请选择岗位', trigger: 'change' }],
        SORT: [{ required: true, message: '请输入排序', trigger: 'blur' }],
        NATION: [{ required: false, trigger: 'blur' }],
-        SEX: [{ required: false, trigger: 'blur' }],
+        SEX: [{ required: false, trigger: 'blur' }], // / dsfsdfsd
        POLITICAL_OUTLOOK: [{ required: true, message: '政治面貌不能为空', trigger: 'blur' }],
        DATE_OF_BIRTH: [{ required: true, message: '请选择出生年月', trigger: 'blur' }],
        DEGREE_OF_EDUCATION: [{ required: true, message: '文化程度不能为空', trigger: 'blur' }],
--- a/src/views/hidden/rectify/components/change.vue
+++ b/src/views/hidden/rectify/components/change.vue
@ -33,25 +33,46 @@
            <el-form-item :rules="form.IS_NORMAL =='1' ?formRule.RECTIFICATIONTIME:[{required: false}]" label="整改时间" prop="RECTIFICATIONTIME">
              <el-date-picker v-model="form.RECTIFICATIONTIME" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期" />
            </el-form-item>
+            <!--            <el-form-item :rules="[{required: true}]" label="整改后图片" label-width="100px">-->
+            <!--              <el-upload-->
+            <!--                ref="zhenggaiupload"-->
+            <!--                :class="{hide:hideUpload}"-->
+            <!--                :file-list="rectify_files"-->
+            <!--                :on-remove="handleRemove"-->
+            <!--                :on-change="handleChangeIMG"-->
+            <!--                :limit="4"-->
+            <!--                :on-preview="handlePictureCardPreview"-->
+            <!--                :before-upload="beforeFileUpload"-->
+            <!--                :auto-upload="false"-->
+            <!--                class="avatar-uploader"-->
+            <!--                action="#"-->
+            <!--                accept=".jpg,.jpeg,.png"-->
+            <!--                list-type="picture-card">-->
+            <!--                <i class="el-icon-plus" />-->
+            <!--              </el-upload>-->
+            <!--              <el-dialog :visible.sync="dialogImageVisible">-->
+            <!--                <img :src="dialogImageUrl" width="100%" alt="">-->
+            <!--              </el-dialog>-->
+            <!--            </el-form-item>-->
            <el-form-item :rules="[{required: true}]" label="整改后图片" label-width="100px">
-              <el-upload
-                ref="zhenggaiupload"
-                :class="{hide:hideUpload}"
-                :on-remove="handleRemove"
-                :on-change="handleChangeIMG"
-                :limit="4"
-                :on-preview="handlePictureCardPreview"
-                :before-upload="beforeFileUpload"
-                :auto-upload="false"
-                class="avatar-uploader"
-                action="#"
-                accept=".jpg,.jpeg,.png"
-                list-type="picture-card">
-                <i class="el-icon-plus" />
-              </el-upload>
-              <el-dialog :visible.sync="dialogImageVisible">
-                <img :src="dialogImageUrl" width="100%" alt="">
-              </el-dialog>
+              <div class="parentBox">
+                <el-upload
+                  :class="{hideShow: hideUpload}"
+                  :multiple="true"
+                  :on-exceed="onExceed"
+                  :on-remove="handleRemove"
+                  :limit="limit"
+                  :before-upload="beforeUpload"
+                  :http-request="uploadFiles"
+                  :on-preview="handlePictureCardPreview"
+                  action=""
+                  list-type="picture-card">
+                  <i class="el-icon-plus"/>
+                </el-upload>
+                <el-dialog :visible.sync="dialogVisible">
+                  <img :src="imgUrl" width="100%">
+                </el-dialog>
+              </div>
            </el-form-item>
            <div v-if="pd.ISCONFIRM=='0'">
              <div class="form-flex">
@ -194,11 +215,13 @@ export default {
        INVESTMENT_FUNDS: '', // 投入资金
        RECTIFICATIONTIME: ''// 整改时间
      },
+      imgUrl: '',
      rectify_files: [],
      hideUpload: false, // 整改照片
      dialogImageVisible: false, // 放大照片的显示和隐藏
      dialogImageUrl: '', // 照片的地址
      scheme_files: [], // 整改方案图片
+      temporaryFilePath: [],
      formRule: {
        RECTIFICATIONDEPT: [{ required: true, message: '请选择整改部门', trigger: 'blur' }],
        RECTIFICATIONOR: [{ required: true, message: '请选择整改人', trigger: 'blur' }],
@ -252,6 +275,53 @@ export default {
    this.getEditMyInfo()
  },
  methods: {
+    uploadFiles(file) {
+      // 调用文件大小校验方法
+      if (this.beforeUpload(file.file)) {
+        this.formData = new FormData()
+        this.formData.append('FFILE', file.file)
+        // 请求接口
+        upload(
+          '/mfolder/upLoadTemporary',
+          this.formData
+        ).then((data) => {
+          if (data.result == 'success') {
+            this.$message({
+              message: '保存成功',
+              type: 'success'
+            })
+            this.loading = false
+            this.temporaryFilePath.push(data.temporaryFilePath)
+            console.info('this.temporaryFilePath========' + this.temporaryFilePath)
+          } else {
+            this.$message({
+              message: data.exception,
+              type: 'error'
+            })
+            this.loading = false
+          }
+        }).catch((e) => {
+          this.listLoading = false
+          this.loading = false
+        })
+      }
+    },
+    // 文件大小校验
+    beforeUpload(file) {
+      if (file.size > 10 * 1024 * 1024) {
+        this.$message('文件过大，请上传小于10MB的文件〜')
+        return false
+      }
+      return true
+    },
+    // 删除图片
+    imageRemove() {
+      this.imgUrl = ''
+      this.$message({
+        message: '删除图片成功',
+        type: 'success'
+      })
+    },
    getEditMyInfo: function() {
      requestFN(
        '/user/goEditMyInfo',
@ -414,7 +484,8 @@ export default {
    },
    saveRectify() { // 正常整改
      this.loading = true
-      if (this.$refs.zhenggaiupload.uploadFiles.length < 1) {
+      // if (this.$refs.zhenggaiupload.uploadFiles.length < 1) {
+      if (this.temporaryFilePath.length < 1) {
        this.$message({
          message: '请上传整改后照片',
          type: 'error'
@ -541,16 +612,24 @@ export default {
        text: '加载中......',
        background: 'rgba(0,0,0,0.5)'
      })
-      this.$refs.zhenggaiupload.submit()
+      // this.$refs.zhenggaiupload.submit()
      var todata = new FormData()
-      for (var i = 0; i < _this.rectify_files.length; i++) {
-        if (_this.rectify_files[i]) {
-          todata.append('FFILE', _this.rectify_files[i])
+      for (var i = 0; i < _this.temporaryFilePath.length; i++) {
+        if (_this.temporaryFilePath[i]) {
+          todata.append('temporaryFilePath', _this.temporaryFilePath[i])
        }
      }
-      if (!todata.get('FFILE')) {
+      if (!todata.get('temporaryFilePath')) {
        return
      }
+      // for (var i = 0; i < _this.rectify_files.length; i++) {
+      //   if (_this.rectify_files[i]) {
+      //     todata.append('FFILE', _this.rectify_files[i])
+      //   }
+      // }
+      // if (!todata.get('FFILE')) {f
+      //   return
+      // }
      todata.append('FOREIGN_KEY', this.HIDDEN_ID)
      todata.append('TYPE', 4)
      upload(
@ -603,6 +682,7 @@ export default {
      }
      todata.append('FOREIGN_KEY', this.HIDDEN_ID)
      todata.append('TYPE', 8)
+      todata.append('temporaryFilePath', this.temporaryFilePath)
      upload(
        '/imgfiles/add',
        todata
@ -684,6 +764,39 @@ export default {
        this.scheme_files.push(file)
      }
    },
+    submitUpload() {
+      var _this = this
+      this.$refs.zhenggaiupload.submit()
+      var todata = new FormData()
+      for (var i = 0; i < _this.rectify_files.length; i++) {
+        if (_this.rectify_files[i]) {
+          todata.append('FFILE', _this.rectify_files[i])
+        }
+      }
+      console.log(todata)
+      upload(
+        '/mfolder/upLoadTemporary',
+        todata
+      ).then((data) => {
+        if (data.result == 'success') {
+          this.$message({
+            message: '保存成功',
+            type: 'success'
+          })
+          this.loading = false
+          this.temporaryFilePath = data.temporaryFilePath
+        } else {
+          this.$message({
+            message: data.exception,
+            type: 'error'
+          })
+          this.loading = false
+        }
+      }).catch((e) => {
+        this.listLoading = false
+        this.loading = false
+      })
+    },
    back() {
      this.$parent.activeName = 'List'
    }
--- a/src/views/hotwork/hotwork/components/list.vue
+++ b/src/views/hotwork/hotwork/components/list.vue
@ -350,7 +350,7 @@ export default {
          })
          this.listLoading = false
          this.varList = []
-          this.listQuery.page = 1
+          // this.listQuery.page = 1
          this.getList()
        }).catch((e) => {
          this.listLoading = false
@ -379,7 +379,7 @@ export default {
          })
          this.listLoading = false
          this.varList = []
-          this.listQuery.page = 1
+          // this.listQuery.page = 1
          this.getList()
        }).catch((e) => {
          this.listLoading = false
--- a/src/views/keyprojects/aiwarning/index.vue
+++ b/src/views/keyprojects/aiwarning/index.vue
@ -1,6 +1,8 @@
 <template>
  <div>
-    <component :is="activeName"/>
+    <List v-show="activeName == 'List'"/>
+    <Info v-if="activeName == 'Info'"/>
+    <recordList v-if="activeName == 'recordList'"/>
  </div>
 </template>

--- a/src/views/keyprojects/hidden/index.vue
+++ b/src/views/keyprojects/hidden/index.vue
@ -1,6 +1,8 @@
 <template>
  <div>
-    <component :is="activeName"/>
+    <List v-show="activeName == 'List'"/>
+    <Info v-if="activeName == 'Info'"/>
+    <recordList v-if="activeName == 'recordList'"/>
  </div>
 </template>

--- a/src/views/keyprojects/inspection/index.vue
+++ b/src/views/keyprojects/inspection/index.vue
@ -1,6 +1,9 @@
 <template>
  <div>
-    <component :is="activeName"/>
+    <!--    <component :is="activeName"/>-->
+    <List v-show="activeName == 'List'"/>
+    <Info v-if="activeName == 'Info'"/>
+    <recordList v-if="activeName == 'recordList'"/>
  </div>
 </template>

--- a/src/views/keyprojects/outsourced/components/edit.vue
+++ b/src/views/keyprojects/outsourced/components/edit.vue
@ -27,20 +27,23 @@
            <el-col :span="8">
              <el-form-item label="企业监督部门" class="is-required" prop="DEPARTMENT_ID">
                <Treeselect
+                  v-if="updateSuperviseValue"
                  :multiple="true"
                  :flat="true"
                  :default-expand-level="1"
                  :options="treeDataDept"
-                  :normalizer="normalizer2"
+                  :normalizer="normalizer"
                  v-model="form.DEPARTMENT_ID"
                  placeholder="请选择部门"
                  no-options-text="暂无数据"
                  no-children-text="暂无数据"
                  style="width: 100%;"
+                  @select="handleSuperviseSelect"
+                  @deselect="handleSuperviseRemove"
+
                />
              </el-form-item>
            </el-col>
-
            <el-col :span="8">
              <el-form-item prop="COMPETENT_DEPT_ID" label="企业主管部门:">
                <SelectTree
@ -261,6 +264,7 @@ export default {
  data() {
    return {
      updateValue: true,
+      updateSuperviseValue: true,
      selectUsers: [], // 防止报错，参数无用
      chooseUserList: [],
      punishThePerson: [],
@ -1205,8 +1209,51 @@ export default {
      }).catch((e) => {
      })
    },
+    pullSelectedSuperviseNodes(selectedItems) {
+      if (selectedItems.nodes && selectedItems.nodes.length > 0) {
+        for (let i = 0; i < selectedItems.nodes.length; i++) {
+          if (!this.form.DEPARTMENT_ID.includes(selectedItems.nodes[i].id)) {
+            this.form.DEPARTMENT_ID.push(selectedItems.nodes[i].id)
+          }
+          this.pullSelectedSuperviseNodes(selectedItems.nodes[i])
+        }
+      }
+      console.log('this.form.DEPARTMENT_ID====' + this.form.DEPARTMENT_ID)
+    },
+    handleSuperviseSelect(selectedItems) {
+      // 选择父节点时同时勾选全部子节点
+      if (!this.form.DEPARTMENT_ID.includes(selectedItems.id)) {
+        this.form.DEPARTMENT_ID.push(selectedItems.id)
+      }
+      this.pullSelectedSuperviseNodes(selectedItems)
+      this.onClickSupervise()
+      console.log('this.form.DEPARTMENT_ID==2==' + this.form.DEPARTMENT_ID)
+    },
+
+    // 将选中项的子节点全部移除
+    removeSuperviseSelectedNodes(selectedItems) {
+      if (selectedItems.nodes && selectedItems.nodes.length > 0) {
+        for (let i = 0; i < selectedItems.nodes.length; i++) {
+          if (this.form.DEPARTMENT_ID.includes(selectedItems.nodes[i].id)) {
+            this.form.DEPARTMENT_ID.splice(this.form.DEPARTMENT_ID.indexOf(selectedItems.nodes[i].id), 1)
+          }
+          this.removeSuperviseSelectedNodes(selectedItems.nodes[i])
+        }
+      }
+    },
+    // 移除选中项时触发的事件
+    handleSuperviseRemove(selectedItems) {
+      // 移除选中项时同时移除全部子节点
+      if (this.form.DEPARTMENT_ID.includes(selectedItems.id)) {
+        this.form.DEPARTMENT_ID.splice(this.form.DEPARTMENT_ID.indexOf(selectedItems.id), 1)
+      }
+      this.removeSuperviseSelectedNodes(selectedItems)
+      this.onClickSupervise()
+    },
+
    // 将树节点的子节点全部添加到数组中
    pullSelectedNodes(selectedItems) {
+      console.log(selectedItems)
      if (selectedItems.nodes && selectedItems.nodes.length > 0) {
        for (let i = 0; i < selectedItems.nodes.length; i++) {
          if (!this.form.INVOLVING_CORPS_DEPART_ID.includes(selectedItems.nodes[i].id)) {
@ -1215,6 +1262,7 @@ export default {
          this.pullSelectedNodes(selectedItems.nodes[i])
        }
      }
+      console.info('this.form.INVOLVING_CORPS_DEPART_ID========' + this.form.INVOLVING_CORPS_DEPART_ID)
    },
    // 选择项时触发的事件
    handleSelect(selectedItems) {
@ -1250,6 +1298,12 @@ export default {
      this.$nextTick(() => {
        this.updateValue = true
      })
+    },
+    onClickSupervise() {
+      this.updateSuperviseValue = false
+      this.$nextTick(() => {
+        this.updateSuperviseValue = true
+      })
    }
  }
 }
--- a/src/views/keyprojects/punish/index.vue
+++ b/src/views/keyprojects/punish/index.vue
@ -1,6 +1,8 @@
 <template>
  <div>
-    <component :is="activeName"/>
+    <List v-show="activeName == 'List'"/>
+    <Info v-if="activeName == 'Info'"/>
+    <recordList v-if="activeName == 'recordList'"/>
  </div>
 </template>

--- a/src/views/keyprojects/videomanager/index.vue
+++ b/src/views/keyprojects/videomanager/index.vue
@ -1,6 +1,7 @@
 <template>
  <div>
-    <component :is="activeName"/>
+    <List v-show="activeName == 'List'"/>
+    <videoList v-if="activeName == 'videoList'"/>
  </div>
 </template>
Author	SHA1	Message	Date
huangyuxuan	7ab1922a52	[BUG修复](hyx_2024-9-11) 优化重点工程操作后不跳转到首页	2024-09-24 17:05:46 +08:00
guoyuepeng	980aa64706	Merge remote-tracking branch 'origin/pet' into pet	2024-09-23 10:37:43 +08:00
guoyuepeng	315e75323a	1.二维码地址错误	2024-09-23 10:37:29 +08:00
huangyuxuan	ce96201c0d	[BUG修复](hyx_2024-9-11) 代码版本回退	2024-09-20 17:23:14 +08:00
huangyuxuan	8749c308ad	Merge remote-tracking branch 'origin/pet' into pet	2024-09-20 16:15:03 +08:00
huangyuxuan	0249ce3782	Merge branch 'hyx_2024-9-11_changeUpload' into pet # Conflicts: # src/views/safetyenvironmental/archive/components/accept.vue # src/views/safetyenvironmental/inspected/components/list.vue # src/views/safetyenvironmental/inspection/components/add.vue	2024-09-20 16:14:31 +08:00
huangyuxuan	f89c653d8d	[BUG修复](hyx_2024-9-11) 代码版本回退	2024-09-20 16:09:00 +08:00
guoyuepeng	300c387e83	1.修改消防检查二维码	2024-09-20 15:51:11 +08:00
guoyuepeng	1ac1777da3	Merge branch 'dev' into pet	2024-09-20 15:48:11 +08:00
guoyuepeng	5163d5ca32	Merge remote-tracking branch 'origin/pet' into pet # Conflicts: # src/views/corpInfo/user/components/edit.vue	2024-09-20 14:59:13 +08:00
huangyuxuan	1f1d39949f	[BUG修复](hyx_2024-9-11) 修复新增消防点位检查时检查器材添加多个问题	2024-09-20 09:09:16 +08:00
huangyuxuan	1e2f9ae668	[新增流程](hyx_2024-9-11) 动火作业操作后保留在本页	2024-09-18 11:00:03 +08:00
huangyuxuan	248ae576a1	[新增流程](hyx_2024-9-11) - 新增企业端安全环保检查新增后三端同步 - 隐患整改上传图片到服务器改为新上传流程	2024-09-18 10:59:19 +08:00
huangyuxuan	6304bcfceb	[BUG修复](hyx_2024-9-11) 重点工程管理新增工程信息时，企业监督部门选择部门将子类部门连同勾选	2024-09-14 09:31:54 +08:00
guoyuepeng	e764e8a945	1.修改代码格式	2024-09-06 14:25:05 +08:00