Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd

yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysUser.java

@@ -203,7 +203,6 @@ public class SysUser extends BaseEntity
     }
 
     @Xss(message = "用户账号不能包含脚本字符")
-    @NotBlank(message = "用户账号不能为空")
     @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
     public String getUserName()
     {

yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java

@@ -359,24 +359,11 @@ public class SysUserController extends BaseController {
     public AjaxResult edit(@Validated @RequestBody SysUser user) {
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());
-        if (StringUtils.isNotEmpty(user.getUserName()) && !userService.checkUserNameUnique(user)) {
-            return error("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
-        } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+        if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
             return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
         } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
             return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
-        SysUser where=new SysUser();
-        where.setUserName(user.getUserName());
-        List<SysUser> list=userService.selectUserList(where);
-        if(list.size()>1){
-            return error("此用户名己存在，修改失败！");
-        }
-        if(list.size()==1){
-            if(user.getUserId().intValue()!=list.get(0).getUserId().intValue()){
-                return error("此用户名己存在，修改失败！");
-            }
-        }
         user.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(userService.updateUser(user));
     }

yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java

@@ -374,10 +374,8 @@ public class SysUserServiceImpl implements ISysUserService
             comWhere.setComId(dept.getComId());
             List<SysUserCom> userComs= userComMapper.selectUserComs(comWhere);
             if(userComs.size()==0){
-                if(isPrjUser) {
                 userMapper.insertUserCom(user);
             }
-            }
             sysUser.setUserName(user.getUserName());
             sysUser.setComId(user.getComId());
             sysUser.setDeptId(user.getDeptId());
@@ -387,9 +385,7 @@ public class SysUserServiceImpl implements ISysUserService
             sysUser.setUpdateTime(user.getUpdateTime());
             sysUser.setPassword(user.getPassword());
             rows=userMapper.updateUser(sysUser);
-            if(isPrjUser) {
             userExtService.updateBySysUser(sysUser);
-            }
         }else{//此电话号码未注册
             user.setCreateBy(user.getUpdateBy());
             user.setCreateTime(user.getUpdateTime());
@@ -398,11 +394,9 @@ public class SysUserServiceImpl implements ISysUserService
             }
             rows=userMapper.insertUser(user);
             user.setIsActive(1l);
-            if(isPrjUser) {
             userMapper.insertUserCom(user);
             userExtService.updateBySysUser(user);
         }
-        }
         //int rows = userMapper.insertUser(user);
         // 新增用户岗位关联
         insertUserPost(user);

yanzhu-ui-vue3/src/api/system/user.js

@@ -43,7 +43,7 @@ export function updateUser(data) {
     method: 'put',
     data: {
       userId:data.userId,
-      userName:data.userName,
+      nickName:data.nickName,
       userType:data.userType,
       workType:data.workType,
       sex:data.sex,

yanzhu-ui-vue3/src/components/ImageUpload/index.vue

@@ -1,23 +1,12 @@
 <template>
   <div class="component-upload-image">
-    <el-upload
-      multiple
-      :action="uploadImgUrl"
-      list-type="picture-card"
-      :on-success="handleUploadSuccess"
-      :before-upload="handleBeforeUpload"
-      :limit="limit"
-      :on-error="handleUploadError"
-      :on-exceed="handleExceed"
-      ref="imageUpload"
-      :before-remove="handleDelete"
-      :show-file-list="true"
-      :headers="headers"
-      :file-list="fileList"
-      :on-preview="handlePictureCardPreview"
-      :class="{ hide: fileList.length >= limit }"
-    >
-      <el-icon class="avatar-uploader-icon"><plus /></el-icon>
+    <el-upload multiple :action="uploadImgUrl" list-type="picture-card" :on-success="handleUploadSuccess"
+      :before-upload="handleBeforeUpload" :limit="limit" :on-error="handleUploadError" :on-exceed="handleExceed"
+      ref="imageUpload" :before-remove="handleDelete" :show-file-list="true" :headers="headers" :file-list="fileList"
+      :on-preview="handlePictureCardPreview" :class="{ hide: fileList.length >= limit }">
+      <el-icon class="avatar-uploader-icon">
+        <plus />
+      </el-icon>
     </el-upload>
     <!-- 上传提示 -->
     <div class="el-upload__tip" v-if="showTip">
@@ -31,16 +20,22 @@
       的文件
     </div>
 
-    <el-dialog
-      v-model="dialogVisible"
-      title="预览"
-      width="800px"
-      append-to-body
-    >
-      <img
-        :src="dialogImageUrl"
-        style="display: block; max-width: 100%; margin: 0 auto"
-      />
+    <el-dialog v-model="dialogVisible" title="预览" width="800px" append-to-body modal-class="img-preview-dlg">
+      <template v-if="previewAll">
+        <el-button type="primary" class="btn-remove" @click="doDelete"  size="large">
+        删除
+        </el-button>
+        <el-icon class="el-icon-left el-preview" v-if="showIndex > 0" @click="doLeft">
+          <ArrowLeft />
+        </el-icon>
+        <el-icon class="el-icon-right el-preview" v-if="showIndex < fileList.length - 1" @click="doRight">
+          <ArrowRight />
+        </el-icon>
+        <template v-if="fileList.length>0">
+        <el-image  :src="fileList[showIndex].name" fit="cover" :preview-src-list="[fileList[showIndex].name]"></el-image>
+        </template>
+      </template>
+      <img v-else :src="dialogImageUrl" style="display: block; max-width: 100%; margin: 0 auto" />
     </el-dialog>
   </div>
 </template>
@@ -68,7 +63,11 @@ const props = defineProps({
   // 是否显示提示
   isShowTip: {
     type: Boolean,
-    default: true
+    default: true,
+  },
+  previewAll: {
+    type: Boolean,
+    default: false,
   },
 });
 
@@ -85,13 +84,16 @@ const fileList = ref([]);
 const showTip = computed(
   () => props.isShowTip && (props.fileType || props.fileSize)
 );
+const showIndex = ref(0);
 
-watch(() => props.modelValue, val => {
+watch(
+  () => props.modelValue,
+  (val) => {
     if (val) {
       // 首先将值转为数组
       const list = Array.isArray(val) ? val : props.modelValue.split(",");
       // 然后将数组转为对象数组
-    fileList.value = list.map(item => {
+      fileList.value = list.map((item) => {
         if (typeof item === "string") {
           item = { name: item, url: item };
         }
@@ -101,8 +103,38 @@ watch(() => props.modelValue, val => {
       fileList.value = [];
       return [];
     }
-},{ deep: true, immediate: true });
+  },
+  { deep: true, immediate: true }
+);
 
+function doDelete() { 
+  proxy.$confirm("确认删除此图片？", "提示", {
+    confirmButtonText: "确 认",
+    cancelButtonText: "取 消"
+  }).then(() => {
+    handleDelete(fileList.value[showIndex.value])
+    if(fileList.value.length<1){
+      dialogVisible.value=false
+    }
+      showIndex.value--;
+      if(showIndex<0){
+        showIndex=0;
+      }
+    
+  });
+}
+
+function doLeft() {
+  if (showIndex.value > 1) {
+    showIndex.value--;
+  }
+}
+
+function doRight() {
+  if (showIndex.value < fileList.value.length - 1) {
+    showIndex.value++;
+  }
+}
 // 上传前loading加载
 function handleBeforeUpload(file) {
   let isImg = false;
@@ -111,7 +143,7 @@ function handleBeforeUpload(file) {
     if (file.name.lastIndexOf(".") > -1) {
       fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
     }
-    isImg = props.fileType.some(type => {
+    isImg = props.fileType.some((type) => {
       if (file.type.indexOf(type) > -1) return true;
       if (fileExtension && fileExtension.indexOf(type) > -1) return true;
       return false;
@@ -157,7 +189,7 @@ function handleUploadSuccess(res, file) {
 
 // 删除图片
 function handleDelete(file) {
-  const findex = fileList.value.map(f => f.name).indexOf(file.name);
+  const findex = fileList.value.map((f) => f.name).indexOf(file.name);
   if (findex > -1 && uploadList.value.length === number.value) {
     fileList.value.splice(findex, 1);
     emit("update:modelValue", listToString(fileList.value));
@@ -168,7 +200,9 @@ function handleDelete(file) {
 // 上传结束处理
 function uploadedSuccessfully() {
   if (number.value > 0 && uploadList.value.length === number.value) {
-    fileList.value = fileList.value.filter(f => f.url !== undefined).concat(uploadList.value);
+    fileList.value = fileList.value
+      .filter((f) => f.url !== undefined)
+      .concat(uploadList.value);
     uploadList.value = [];
     number.value = 0;
     emit("update:modelValue", listToString(fileList.value));
@@ -185,6 +219,7 @@ function handleUploadError() {
 function handlePictureCardPreview(file) {
   dialogImageUrl.value = file.url;
   dialogVisible.value = true;
+  showIndex.value = 0;
 }
 
 // 对象转成指定字符串分隔
@@ -206,3 +241,39 @@ function listToString(list, separator) {
   display: none;
 }
 </style>
+<style lang="scss">
+.img-preview-dlg {
+  .el-dialog__body {
+    max-height: 80vh;
+    overflow: hidden;
+    position: relative;
+    text-align: center;
+  }
+
+  .el-preview {
+    font-size: 80px;
+    position: absolute;
+    z-index: 99;
+    top: 40%;
+
+    &.el-icon-right {
+      right: 5%;
+    }
+
+    &.el-icon-left {
+      left: 5%;
+    }
+  }
+
+  .btn-remove {
+    position: absolute;
+    bottom: 10%;
+    left: calc(50% - 40px);
+    width: auto;
+    height: auto;
+    z-index: 99;
+    font-size: 40px;;
+    
+  }
+}
+</style>

yanzhu-ui-vue3/src/views/system/user/index.vue

@@ -130,7 +130,7 @@
                   <el-form-item label="所属部门" prop="deptId">
                      <el-tree-select ref="selTreeDept" v-if="data.mode == 'add'" v-model="form.deptId" :data="deptOptions"
                         :props="{ value: 'id', label: 'label', children: 'children' }" value-key="id"
-                        placeholder="请选择所属部门" check-strictly style="width:100%" @change="handleChangeDept" />
+                        placeholder="请选择所属部门" check-strictly style="width:100%" @change="v=>handleChangeDept(v)" />
                      <el-tag type="primary" v-else>{{ form.dept?.deptName }}</el-tag>
                   </el-form-item>
 
@@ -668,10 +668,14 @@ function handleUpdate(row) {
       }
       open.value = true;
       title.value = "修改用户";
-      form.password = "";
+      form.value.password = "";
       data.mode = 'edit'
+      let oldRoleIds=form.value.roleIds
+      handleChangeDept(form.value.deptId,()=>{
+         form.value.roleIds=oldRoleIds;
       });
-   handleChangeDept(row.deptId);
+   });
+  
 };
 
 function getWorkType(wt) {
@@ -685,10 +689,11 @@ function getWorkType(wt) {
 }
 
 /** 根据单位选择角色 */
-function handleChangeDept(value) {
+function handleChangeDept(value,cb) {
    form.value.roleIds = [];
    getDeptRole(value).then(response => {
       roleOptions.value = response.data;
+      cb && cb();
    });
 }
 
@@ -716,7 +721,6 @@ function submitForm() {
    data.loading = true;
    proxy.$refs["userRef"].validate(valid => {
       if (valid) {
-         form.value.userName = form.value.nickName;
          if (form.value.userId != undefined) {
             updateUser(form.value).then(response => {
                proxy.$modal.msgSuccess("修改成功");

yanzhu-ui-vue3/src/views/trouble/problemmodifyDraft/index.vue

@@ -1,214 +1,16 @@
 <template>
-  <div class="app-container">
+  <div class="app-container problemmodify-draft">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="租户ID" prop="comId">
-        <el-input
-          v-model="queryParams.comId"
-          placeholder="请输入租户ID"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+      <el-form-item label="检查类型" prop="problemType">
+          <el-select v-model="form.problemType" placeholder="请选择检查类型" clearable>
+            <el-option v-for="dict in ssp_proble_type" :key="dict.value" :label="dict.label" :value="dict.value">
+            </el-option>
+          </el-select>
         </el-form-item>
-      <el-form-item label="项目id" prop="projectId">
-        <el-input
-          v-model="queryParams.projectId"
-          placeholder="请输入项目id"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="留痕图片" prop="marksPicture">
-        <el-input
-          v-model="queryParams.marksPicture"
-          placeholder="请输入留痕图片"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="留痕视频" prop="marksVideo">
-        <el-input
-          v-model="queryParams.marksVideo"
-          placeholder="请输入留痕视频"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="拍摄位置" prop="problemArea">
-        <el-input
-          v-model="queryParams.problemArea"
-          placeholder="请输入拍摄位置"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="施工部位" prop="workParts">
-        <el-input
-          v-model="queryParams.workParts"
-          placeholder="请输入施工部位"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="整改要求" prop="changeInfo">
-        <el-input
-          v-model="queryParams.changeInfo"
-          placeholder="请输入整改要求"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="主送人姓名" prop="lordSent">
-        <el-input
-          v-model="queryParams.lordSent"
-          placeholder="请输入主送人姓名"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="主送人手机号" prop="lordSentUser">
-        <el-input
-          v-model="queryParams.lordSentUser"
-          placeholder="请输入主送人手机号"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="抄送人姓名" prop="copySend">
-        <el-input
-          v-model="queryParams.copySend"
-          placeholder="请输入抄送人姓名"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="抄送人手机号" prop="copySendUser">
-        <el-input
-          v-model="queryParams.copySendUser"
-          placeholder="请输入抄送人手机号"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="流程状态" prop="checkState">
-        <el-input
-          v-model="queryParams.checkState"
-          placeholder="请输入流程状态"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="整改定位" prop="nickedArea">
-        <el-input
-          v-model="queryParams.nickedArea"
-          placeholder="请输入整改定位"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="整改截至时间" prop="nickedTime">
-        <el-date-picker clearable
-          v-model="queryParams.nickedTime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择整改截至时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="工序名称" prop="processName">
-        <el-input
-          v-model="queryParams.processName"
-          placeholder="请输入工序名称"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="工程名称" prop="projectName">
-        <el-input
-          v-model="queryParams.projectName"
-          placeholder="请输入工程名称"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="留痕说明" prop="nickedInfo">
-        <el-input
-          v-model="queryParams.nickedInfo"
-          placeholder="请输入留痕说明"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="审核人" prop="checkUser">
-        <el-input
-          v-model="queryParams.checkUser"
-          placeholder="请输入审核人"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="审核人手机号" prop="checkUserPhone">
-        <el-input
-          v-model="queryParams.checkUserPhone"
-          placeholder="请输入审核人手机号"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="删除状态" prop="isDel">
-        <el-input
-          v-model="queryParams.isDel"
-          placeholder="请输入删除状态"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建人" prop="createUser">
-        <el-input
-          v-model="queryParams.createUser"
-          placeholder="请输入创建人"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker clearable
-          v-model="queryParams.createTime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择创建时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="修改人" prop="updateUser">
-        <el-input
-          v-model="queryParams.updateUser"
-          placeholder="请输入修改人"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="修改时间" prop="updateTime">
-        <el-date-picker clearable
-          v-model="queryParams.updateTime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择修改时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="复检人" prop="recheckSend">
-        <el-input
-          v-model="queryParams.recheckSend"
-          placeholder="请输入复检人"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="复检人手机号" prop="recheckSendUser">
-        <el-input
-          v-model="queryParams.recheckSendUser"
-          placeholder="请输入复检人手机号"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+      <el-form-item label="整改人" prop="lordSent">
+        <el-input v-model="queryParams.lordSent" style="width: 200px;" placeholder="请输入人员姓名/联系方式" clearable @keyup.enter="handleQuery" />
       </el-form-item>
+     
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -217,49 +19,63 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['trouble:problemmodifyDraft:add']"
-        >新增</el-button>
+        <el-button type="primary" plain  size="mini" @click="handleAdd"
+          v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']">
+          <el-icon><Plus /></el-icon>新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['trouble:problemmodifyDraft:edit']"
-        >修改</el-button>
+        <el-button type="warning" plain size="mini" @click="dataSynchronization" :disabled="single"
+          v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']">
+          <el-icon><CopyDocument /></el-icon>
+          数据同步</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['trouble:problemmodifyDraft:remove']"
-        >删除</el-button>
+        <el-tooltip content="批量提交选择的数据！" placement="bottom">
+          <el-button type="success" plain size="mini" @click="batchSubmitForm"
+            :disabled="multiple" v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']">
+            <el-icon><Check /></el-icon>批量提交</el-button>
+        </el-tooltip>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['trouble:problemmodifyDraft:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
       
-    <el-table v-loading="loading" :data="problemmodifyDraftList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="${comment}" align="center" prop="id" />
+    </el-row>
+    <el-alert title="操作说明" class="tips" effect="dark" type="warning" :closable="false">
+      <template #title>
+        <div><strong>数据同步:</strong>将选中行的数据同步到（当前项目或项目为空）的其它行！</div>
+        <div><strong>批量提交:</strong>将选中行的数据，数据验证通过后一次全部提交！</div>
+      </template>
+    </el-alert>
+
+    <el-table :data="problemmodifyDraftList">
+      <el-table-column type="index" width="50" align="center" label="序号">
+      </el-table-column>
+    
+      <el-table-column  align="center" width="240" class-name="td-up-img" label="问题图片">
+        <template #default="scope">
+            <image-upload v-model="scope.row.smarkUrl" previewAll :limit="5" :isShowTip="false" />
+          </template>
+      </el-table-column>
+      <el-table-column  align="center" width="240" class-name="td-proble-type" label="隐患类型">
+        <template #default="scope">
+          <el-select v-model="scope.row.problemType" placeholder="请选择检查类型" clearable>
+            <el-option v-for="dict in ssp_proble_type" :key="dict.value" :label="dict.label" :value="dict.value">
+            </el-option>
+          </el-select>
+          <el-select v-model="scope.row.dangerType" placeholder="请选择隐患类型" clearable style="margin-top:80px;">
+            <el-option v-for="dict in ssp_proble_sub_type" :key="dict.value" :label="dict.label" :value="dict.value">
+            </el-option>
+          </el-select>
+          </template>
+      </el-table-column>
+      <el-table-column label="施工部位" align="center" prop="workParts" width="180">
+          <template #default="scope">
+            <el-input v-model="scope.row.workParts" placeholder="请输入施工部位" type="textarea" :rows="3" />
+          </template>
+        </el-table-column>
+        <el-table-column label="整改要求" align="center" prop="changeInfo" width="180">
+          <template #default="scope">
+            <el-input v-model="scope.row.changeInfo" placeholder="请输入整改要求" type="textarea" :rows="3" />
+          </template>
+        </el-table-column>
       <el-table-column label="租户ID" align="center" prop="comId" />
       <el-table-column label="项目id" align="center" prop="projectId" />
       <el-table-column label="信息类型" align="center" prop="infoType" />
@@ -276,7 +92,7 @@
       <el-table-column label="整改定位" align="center" prop="nickedArea" />
       <el-table-column label="整改截至时间" align="center" prop="nickedTime" width="180">
         <template #default="scope">
-          <span>{{ parseTime(scope.row.nickedTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.nickedTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="工程类型" align="center" prop="projectType" />
@@ -285,18 +101,18 @@
       <el-table-column label="留痕说明" align="center" prop="nickedInfo" />
       <el-table-column label="审核人" align="center" prop="checkUser" />
       <el-table-column label="审核人手机号" align="center" prop="checkUserPhone" />
-      <el-table-column label="智能公司展示的图片url" align="center" prop="smarkUrl" />
+     
       <el-table-column label="删除状态" align="center" prop="isDel" />
       <el-table-column label="创建人" align="center" prop="createUser" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="修改人" align="center" prop="updateUser" />
       <el-table-column label="修改时间" align="center" prop="updateTime" width="180">
         <template #default="scope">
-          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.updateTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="隐患类型" align="center" prop="dangerType" />
@@ -306,119 +122,27 @@
       <el-table-column label="问题类型" align="center" prop="problemType" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['trouble:problemmodifyDraft:edit']">修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['trouble:problemmodifyDraft:remove']">删除</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['trouble:problemmodifyDraft:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['trouble:problemmodifyDraft:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改安全问题草稿对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="problemmodifyDraftRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="租户ID" prop="comId">
-          <el-input v-model="form.comId" placeholder="请输入租户ID" />
-        </el-form-item>
-        <el-form-item label="项目id" prop="projectId">
-          <el-input v-model="form.projectId" placeholder="请输入项目id" />
-        </el-form-item>
-        <el-form-item label="留痕图片" prop="marksPicture">
-          <el-input v-model="form.marksPicture" placeholder="请输入留痕图片" />
-        </el-form-item>
-        <el-form-item label="留痕视频" prop="marksVideo">
-          <el-input v-model="form.marksVideo" placeholder="请输入留痕视频" />
-        </el-form-item>
-        <el-form-item label="拍摄位置" prop="problemArea">
-          <el-input v-model="form.problemArea" placeholder="请输入拍摄位置" />
-        </el-form-item>
-        <el-form-item label="施工部位" prop="workParts">
-          <el-input v-model="form.workParts" placeholder="请输入施工部位" />
-        </el-form-item>
-        <el-form-item label="整改要求" prop="changeInfo">
-          <el-input v-model="form.changeInfo" placeholder="请输入整改要求" />
-        </el-form-item>
-        <el-form-item label="主送人姓名" prop="lordSent">
-          <el-input v-model="form.lordSent" placeholder="请输入主送人姓名" />
-        </el-form-item>
-        <el-form-item label="主送人手机号" prop="lordSentUser">
-          <el-input v-model="form.lordSentUser" placeholder="请输入主送人手机号" />
-        </el-form-item>
-        <el-form-item label="抄送人姓名" prop="copySend">
-          <el-input v-model="form.copySend" placeholder="请输入抄送人姓名" />
-        </el-form-item>
-        <el-form-item label="抄送人手机号" prop="copySendUser">
-          <el-input v-model="form.copySendUser" placeholder="请输入抄送人手机号" />
-        </el-form-item>
-        <el-form-item label="流程状态" prop="checkState">
-          <el-input v-model="form.checkState" placeholder="请输入流程状态" />
-        </el-form-item>
-        <el-form-item label="整改定位" prop="nickedArea">
-          <el-input v-model="form.nickedArea" placeholder="请输入整改定位" />
-        </el-form-item>
-        <el-form-item label="整改截至时间" prop="nickedTime">
-          <el-date-picker clearable
-            v-model="form.nickedTime"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择整改截至时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="工序名称" prop="processName">
-          <el-input v-model="form.processName" placeholder="请输入工序名称" />
-        </el-form-item>
-        <el-form-item label="工程名称" prop="projectName">
-          <el-input v-model="form.projectName" placeholder="请输入工程名称" />
-        </el-form-item>
-        <el-form-item label="留痕说明" prop="nickedInfo">
-          <el-input v-model="form.nickedInfo" placeholder="请输入留痕说明" />
-        </el-form-item>
-        <el-form-item label="审核人" prop="checkUser">
-          <el-input v-model="form.checkUser" placeholder="请输入审核人" />
-        </el-form-item>
-        <el-form-item label="审核人手机号" prop="checkUserPhone">
-          <el-input v-model="form.checkUserPhone" placeholder="请输入审核人手机号" />
-        </el-form-item>
-        <el-form-item label="智能公司展示的图片url" prop="smarkUrl">
-          <el-input v-model="form.smarkUrl" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="删除状态" prop="isDel">
-          <el-input v-model="form.isDel" placeholder="请输入删除状态" />
-        </el-form-item>
-        <el-form-item label="创建人" prop="createUser">
-          <el-input v-model="form.createUser" placeholder="请输入创建人" />
-        </el-form-item>
-        <el-form-item label="修改人" prop="updateUser">
-          <el-input v-model="form.updateUser" placeholder="请输入修改人" />
-        </el-form-item>
-        <el-form-item label="复检人" prop="recheckSend">
-          <el-input v-model="form.recheckSend" placeholder="请输入复检人" />
-        </el-form-item>
-        <el-form-item label="复检人手机号" prop="recheckSendUser">
-          <el-input v-model="form.recheckSendUser" placeholder="请输入复检人手机号" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
   </div>
 </template>
 
 <script setup name="ProblemmodifyDraft">
-import { listProblemmodifyDraft, getProblemmodifyDraft, delProblemmodifyDraft, addProblemmodifyDraft, updateProblemmodifyDraft } from "@/api/trouble/problemmodifyDraft";
+import {
+  listProblemmodifyDraft,
+  getProblemmodifyDraft,
+  delProblemmodifyDraft,
+  addProblemmodifyDraft,
+  updateProblemmodifyDraft,
+} from "@/api/trouble/problemmodifyDraft";
 
 const { proxy } = getCurrentInstance();
-
+const { ssp_proble_type,ssp_proble_sub_type } = proxy.useDict('ssp_proble_type','ssp_proble_sub_type');
 const problemmodifyDraftList = ref([]);
 const open = ref(false);
 const loading = ref(true);
@@ -428,6 +152,7 @@ const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
 const title = ref("");
+const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + "/file/upload"); // 上传文件服务器地址
 
 const data = reactive({
   form: {},
@@ -465,13 +190,11 @@ const data = reactive({
     recheckSend: null,
     recheckSendUser: null,
     roleType: null,
-    problemType: null
+    problemType: null,
   },
   rules: {
-    comId: [
-      { required: true, message: "租户ID不能为空", trigger: "blur" }
-    ],
-  }
+    comId: [{ required: true, message: "租户ID不能为空", trigger: "blur" }],
+  },
 });
 
 const { queryParams, form, rules } = toRefs(data);
@@ -479,7 +202,7 @@ const { queryParams, form, rules } = toRefs(data);
 /** 查询安全问题草稿列表 */
 function getList() {
   loading.value = true;
-  listProblemmodifyDraft(queryParams.value).then(response => {
+  listProblemmodifyDraft(queryParams.value).then((response) => {
     problemmodifyDraftList.value = response.rows;
     total.value = response.total;
     loading.value = false;
@@ -527,7 +250,7 @@ function reset() {
     recheckSend: null,
     recheckSendUser: null,
     roleType: null,
-    problemType: null
+    problemType: null,
   };
   proxy.resetForm("problemmodifyDraftRef");
 }
@@ -546,7 +269,7 @@ function resetQuery() {
 
 // 多选框选中数据
 function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.id);
+  ids.value = selection.map((item) => item.id);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 }
@@ -561,8 +284,8 @@ function handleAdd() {
 /** 修改按钮操作 */
 function handleUpdate(row) {
   reset();
-  const _id = row.id || ids.value
-  getProblemmodifyDraft(_id).then(response => {
+  const _id = row.id || ids.value;
+  getProblemmodifyDraft(_id).then((response) => {
     form.value = response.data;
     open.value = true;
     title.value = "修改安全问题草稿";
@@ -571,16 +294,16 @@ function handleUpdate(row) {
 
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs["problemmodifyDraftRef"].validate(valid => {
+  proxy.$refs["problemmodifyDraftRef"].validate((valid) => {
     if (valid) {
       if (form.value.id != null) {
-        updateProblemmodifyDraft(form.value).then(response => {
+        updateProblemmodifyDraft(form.value).then((response) => {
           proxy.$modal.msgSuccess("修改成功");
           open.value = false;
           getList();
         });
       } else {
-        addProblemmodifyDraft(form.value).then(response => {
+        addProblemmodifyDraft(form.value).then((response) => {
           proxy.$modal.msgSuccess("新增成功");
           open.value = false;
           getList();
@@ -593,20 +316,42 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value;
-  proxy.$modal.confirm('是否确认删除安全问题草稿编号为"' + _ids + '"的数据项？').then(function() {
+  proxy.$modal
+    .confirm('是否确认删除安全问题草稿编号为"' + _ids + '"的数据项？')
+    .then(function () {
       return delProblemmodifyDraft(_ids);
-  }).then(() => {
+    })
+    .then(() => {
       getList();
       proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => {});
+    })
+    .catch(() => { });
 }
 
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.download('trouble/problemmodifyDraft/export', {
-    ...queryParams.value
-  }, `problemmodifyDraft_${new Date().getTime()}.xlsx`)
+  proxy.download(
+    "trouble/problemmodifyDraft/export",
+    {
+      ...queryParams.value,
+    },
+    `problemmodifyDraft_${new Date().getTime()}.xlsx`
+  );
 }
 
-getList();
+//getList();
+problemmodifyDraftList.value.push({});
 </script>
+<style lang="scss">
+.problemmodify-draft{
+  .td-up-img{
+    .component-upload-image{
+      height: 150px;
+      overflow: hidden;
+      .el-upload-list__item{
+        position: absolute;
+      }
+    }
+  }
+}
+</style>