Merge pull request 'dj' (#141) from dj into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/141

src/api/project-demand/index.js

@@ -41,9 +41,9 @@ export const addRequirement = (data) => {
     data: data
   });
 };
-export const deleteFile = (path) => {
+export const deleteFile = (fileId) => {
   return request({
-    url: '/process/file/delete/'+ path,
+    url: `/workflow/process/file/delete/${fileId}`,
     method: "delete"
   });
 };

src/components/FileUpload.vue

@@ -11,9 +11,6 @@
              :before-upload="beforeUpload"
              :on-success="handleUploadSuccess"
   >
-<!--    :before-remove="beforeRemove"-->
-<!--    :on-remove="handleRemoveAttachment"-->
-<!--    @handleRemove="handleRemove1"-->
     <el-button color="#DED0B2">上传文件</el-button>
   </el-upload>
   <div v-if="showTable||fileList.length!==0">
@@ -25,7 +22,6 @@
           {{parseInt(scope.row.size/1024)}}{{parseInt(scope.row.size/1024)>1024?'MB':'KB'}}
         </template>
       </el-table-column>
-<!--      <el-table-column fixed prop="url" label="url"  />-->
       <el-table-column fixed="right" label="操作" >
         <template #default="scope">
           <a :href="scope.row.url">
@@ -91,6 +87,8 @@ const beforeUpload = (file) => {
 const handleUploadSuccess = (res, file) => {
   if (res.code !== 1000) {
     ElMessage.error("上传失败")
+  }else {
+    ElMessage.success("上传成功")
   }
   showTable.value=true
   let data = res.data
@@ -98,8 +96,6 @@ const handleUploadSuccess = (res, file) => {
   emit("getFile", fileList.value)
 }
 const beforeRemove = (row) => {
-  console.log('row',row)
-  // console.log('file.response.data.originalFilename', file.response)
   ElMessageBox.confirm(`确认删除名称为${row.originalFilename}的表格吗?`, '系统提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
@@ -108,26 +104,18 @@ const beforeRemove = (row) => {
     handleRemove(row)
   }).catch(()=>{
     ElMessage.warning("用户取消删除! ");
-    // return false;
   })
 }
-const handleRemoveAttachment = (file) => {
-  handleRemove(file.response.data)
-}
-const handleRemove = (row) => {
-  console.log('fil对对对e',row,fileList.value)
-  // "http://43.138.199.198:8888//group1/M00/00/00/CgAICGY_pZKAFiruAAAAAAAAAAA88.docx"
 
-  // deleteFile(file.id).then(res => {
+const handleRemove = (row) => {
-  //   if (res.code === 1000) {
+  deleteFile(row.id).then(res => {
-  //     ElMessage.success("删除成功");
+    if (res.code === 1000) {
-  //     fileList.value.splice(fileList.value.findIndex((item) => item.id === file.id), 1);
+      ElMessage.success("删除成功");
-  //   }
+      fileList.value.splice(fileList.value.findIndex((item) => item.id === row.id), 1);
-  // });
+    }
+  });
 };
-const handleRemove1=()=>{
+
-  console.log('handleRemove1vdvd')
-}
 </script>
 
 <style lang="scss" scoped>

src/views/home/index.vue

@@ -46,7 +46,6 @@
               <span>常用网站</span>
             </div>
             <el-divider/>
-
           </div>
         </div>
       </el-col>

src/views/projectdemand/demandcollection/index.vue

@@ -4,28 +4,30 @@
 </template>
 
 <script setup lang="jsx">
-import fvSelect from '@/fvcomponents/fvSelect/index.vue'
 import Tag from '@/components/Tag.vue'
-import {getDemandInfo} from "@/api/project-demand";
 
 const router = useRouter()
 const searchConfig = reactive([
-  {
-    label: '征集类型',
-    prop: 'collectType',
-    component: 'el-input',
-    props: {
-      placeholder: '请输入名称查询',
-      clearable: true
-    }
-  },
   {
     label: '需求名称',
     prop: 'requirementName',
     component: 'el-input',
     props: {
       placeholder: '请输入名称查询',
-      clearable: true
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
+  {
+    label: '征集类型',
+    prop: 'collectType',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入名称查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
     }
   }
 ])

src/views/workflow/process/common/AvatarEllipsis.vue

@@ -5,8 +5,11 @@
     <slot name="pre"></slot>
     <div style="display: flex;flex-wrap: wrap;">
       <div v-for="(user,index) in userInfo" :key="index" class="avatar_name">
-        <el-avatar size="large"
+        <div class="circle-user">
-                   :src="user.avatar"></el-avatar>
+          <el-tooltip class="item" effect="dark" :content="user.name" placement="bottom-start">
+            <span class="item_name">{{ user.name }}</span>
+          </el-tooltip>
+        </div>
         <div v-if="user.icon"
              class="el-timeline-item__node" :style="{
                       backgroundColor: user.color
@@ -15,17 +18,15 @@
             <component :is="user.icon"/>
           </el-icon>
         </div>
-        <el-tooltip class="item" effect="dark" :content="user.name" placement="bottom-start">
-          <span class="item_name">{{ user.name }}</span>
-        </el-tooltip>
       </div>
     </div>
   </div>
 </template>
 
 <script setup>
-import {Loading,Close,CircleCheckFilled,MoreFilled} from '@element-plus/icons-vue'
+import {Loading, Close, CircleCheckFilled, MoreFilled} from '@element-plus/icons-vue'
 import {defineProps} from "vue";
+
 const props = defineProps({
   row: {
     type: Number,
@@ -74,7 +75,7 @@ const initUser = (user) => {
     user["icon"] = Close
     user["color"] = "#f56c6c"
   }
-  if (state === 'PASS'){
+  if (state === 'PASS') {
     user["icon"] = MoreFilled
     user["color"] = "#c0c4cc"
   }
@@ -84,7 +85,27 @@ const initUser = (user) => {
 init()
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+.circle-user {
+  width: 50px;
+  height: 50px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 50%;
+  border: 1px solid #ACACAC;
+  position: relative;
+
+  .circle-icon {
+    width: 10px;
+    height: 10px;
+    position: absolute;
+    top: auto !important;
+    bottom: -9px;
+    right: 15px !important;
+  }
+}
+
 .avatar_name {
   display: flex;
   flex-direction: column;
@@ -96,7 +117,7 @@ init()
 
 .el-timeline-item__node {
   position: absolute;
-  bottom: 20px;
+  bottom: 0;
   right: 1px;
 }
 

src/views/workflow/process/nodes/Node.vue

@@ -23,22 +23,11 @@
         </template>
         <template v-else-if="showAvatar">
           <span class="placeholder" v-if="userInfo.length === 0">{{ placeholder }}</span>
-
           <avatar-ellipsis :row="3" v-if="userInfo.length > 0" :user-info="userInfo"/>
-
-
-<!--          <div v-else v-for="item in userInfo" class="circle-user">-->
-<!--            <span>{{ item.name }}</span>-->
-<!--            <el-button v-if="item.state==='RUNNING'" type="warning" loading circle class="circle-icon"></el-button>-->
-<!--            <el-button v-else-if="item.state==='UNACTIVATED'" type="info" :icon="More" circle-->
-<!--                       class="circle-icon"></el-button>-->
-<!--            <el-button v-else type="success" :icon="Check" circle class="circle-icon"></el-button>-->
-<!--          </div>-->
-          <!--          <avatar-ellipsis :row="3" :user-info="userInfo"/>-->
         </template>
         <template v-else>
           <span class="placeholder" v-if="(content || '').trim() === ''">{{ placeholder }}</span>
-          <ellipsis :row="3" :content="content"  :mode="mode" v-else/>
+          <ellipsis :row="3" :content="content" :mode="mode" v-else/>
         </template>
       </div>
       <div class="node-error" v-if="showError">
@@ -194,26 +183,6 @@ const init = () => {
 </script>
 
 <style lang="scss" scoped>
-.circle-user {
-  width: 50px;
-  height: 50px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  border-radius: 50%;
-  border: 1px solid #ACACAC;
-  position: relative;
-
-  .circle-icon {
-    width: 10px;
-    height: 10px;
-    position: absolute;
-    top: auto !important;
-    bottom: -9px;
-    right: 15px !important;
-  }
-}
-
 .root {
   &:before {
     display: none !important;