zhuliu 1 rok temu
rodzic
commit
c35e198e3f

+ 7 - 13
src/views/components/import/task/components/index.vue

@@ -186,15 +186,12 @@ export default {
         if(code === 900){
             if(data.doneType == -1){
                 const index = this.tableData.findIndex(item=>{return item.id == data.taskId})
-                if (index == -1) {
+                if (index === -1) {
 
                 } else {
-                    var arr = this.tableData[index]
-                    arr.doneNum = data.index
-                    arr.percentage = data.percentage
-                    // arr.successNum =  data.index
-                    arr.state =  data.taskStatus
-                    this.$set(this.tableData, index, arr)
+                    this.$set(this.tableData[index],'doneNum',data.index)
+                    this.$set(this.tableData[index],'percentage',data.percentage)
+                    this.$set(this.tableData[index],'state',data.taskStatus)
                 }
             }
         }
@@ -203,12 +200,9 @@ export default {
           if (index === -1) {
 
           } else {
-            var arr = this.tableData[index]
-            arr.doneNum = data.index
-            arr.percentage = data.percentage
-            // arr.successNum =  data.index
-            arr.state =  data.taskStatus
-            this.$set(this.tableData, index, arr)
+            this.$set(this.tableData[index],'doneNum',data.index)
+            this.$set(this.tableData[index],'percentage',data.percentage)
+            this.$set(this.tableData[index],'state',data.taskStatus)
           }
           if (data.complete) {
             // if(data.taskType!=2){

+ 25 - 6
src/views/home/components/echarts/components/task.vue

@@ -23,15 +23,37 @@
     computed: {},
     created() {},
     mounted() {
-      this.initChart();
+      this.init()
     },
     methods: {
+      async init(){
+        const [completed,incomplete] = await Promise.allSettled([this.getData('(3)'),this.getData('(1 OR 2 OR 4 OR 5 OR 6)')])
+        var completedNum = completed.status =='fulfilled'?completed.value.total:0
+        var incompleteNum = incomplete.status =='fulfilled'?incomplete.value.total:0
+        var data = [
+          {
+            value:completedNum,
+            name:'已完成'
+          },
+          {
+            value:incompleteNum,
+            name:'未完成'
+          }
+        ]
+        this.initChart(data)
+      },
+      getData(val){
+        let params = {
+          searchQuery: `status=${val}`,//检索条件
+        }
+        return this.$api.queryProjectTask(params).then(response=> response.data)
+      },
       handleSizeChange(){
         this.$nextTick(()=>{
           this.chart.resize()
         }) 
       },
-      initChart() {
+      initChart(data) {
         const chartDom = this.$refs.taskEcharts;
         this.chart = this.$echarts.init(chartDom)
         this.chart.setOption(
@@ -76,10 +98,7 @@
               radius: ["50%", "80%"],
               center: ["0", "50%"],
               left:'25%',
-              data: [
-                { value: 1048, name: "未完成" },
-                { value: 735, name: "已完成" },
-              ],
+              data: data,
             },
           ],
           emphasis: {

+ 2 - 2
src/views/layout/index.vue

@@ -18,9 +18,9 @@
       </el-header>
       <el-main class="main">
         <section class="wrapper" >
-          <keep-alive>
+          <!-- <keep-alive> -->
             <router-view id="view"></router-view>
-          </keep-alive>
+          <!-- </keep-alive> -->
           <!-- <router-view id="view" v-if="!$route.meta.keepAlive"></router-view> -->
           <contextMenu></contextMenu>
         </section>

+ 2 - 2
src/views/layout/mixins/index.js

@@ -4,8 +4,8 @@ import Store from '@/store'
 export const webSocket = {
   methods: {
     connectWebSocket(userId) {
-      let webSocket = new WebSocket(`ws://${this.$c.staticURL}:8877/api/xiaoshi/ws/` + userId)
-      // let webSocket = new WebSocket(`ws://192.168.1.18:8877/api/xiaoshi/ws/` + userId)
+      // let webSocket = new WebSocket(`ws://${this.$c.staticURL}:8877/api/xiaoshi/ws/` + userId)
+      let webSocket = new WebSocket(`ws://192.168.1.18:8877/api/xiaoshi/ws/` + userId)
       Store.commit('SET_WEB_SOCKET', webSocket)
       webSocket.onopen = () => {
         console.log('WebSocket连接成功')

+ 2 - 2
src/views/patentMining/components/dialog/createTask.vue

@@ -43,7 +43,7 @@ import { personnelLoading, optionsData } from '../mixins/index2'
 export default {
   mixins: [personnelLoading, optionsData],
   components: {},
-  props: ['id','processId'],
+  props: ['projectId','processId'],
   data() {
     return {
       dialogVisible: false,
@@ -83,7 +83,7 @@ export default {
         }
       } else {//创建分配任务
         this.title = '创建文件分配任务'
-        this.form.projectId = this.id//项目id
+        this.form.projectId = this.projectId//项目id
         this.form.processId=this.processId
         this.form.type = 6//分配任务
         this.form.handlerType = 0//0内部人员1外部人员

+ 16 - 8
src/views/report/InvalidResponse/components/draggable/index.vue

@@ -6,14 +6,22 @@
         width="200"
         ref="draggablePopover"
         trigger="click"
-    >
-    <el-radio-group v-model="radio" @input="change">
-    <draggable ref="el" v-model="tableData" @end="end">
-            <div v-for="item in tableData" :key="item.id" class="item">
-                <el-radio :label="item.id">{{ item.name }}</el-radio>
-            </div>
-    </draggable>
-</el-radio-group>
+    > 
+    <div style="max-height:400px;overflow-y:auto;">
+        <!-- <el-radio-group v-model="radio" @input="change"> -->
+        <draggable ref="el" v-model="tableData" @end="end">
+                <div v-for="item in tableData" :key="item.id" class="item" style="display:flex">
+                    <span>
+                        <el-radio v-model="radio" @input="change" :label="item.id">{{  }}</el-radio>
+                    </span>
+                    <my-tooltip :content="item.name" placement="right">
+                            <div class="noWrap" style="cursor:move;">{{ item.name }}</div>
+                    </my-tooltip>
+                </div>
+        </draggable>
+    <!-- </el-radio-group> -->
+    </div>
+    
     <span slot="reference">
         <i class="el-icon-arrow-right" v-if="show" @click="show = !show"></i>
         <i class="el-icon-arrow-down" v-else @click="show = !show"></i>

+ 10 - 2
src/views/report/InvalidResponse/components/reasonsAndEvidence/details.vue

@@ -447,7 +447,7 @@
                             <div class="right">
                                 <span v-for="(evidence,y) in literature.literatures" :key="'evidence'+y">
                                     <span v-if="evidence.id <= 0">{{ evidence.name }}</span>
-                                    <span v-else>D{{ evidence.sysOrder }}</span>
+                                    <span v-else class="cursor_pointer" @click="checkEvidenceDetails(item)">D{{ evidence.sysOrder }}</span>
                                     <span v-if="y < literature.literatures.length-1"> + </span>
                                 </span>
                             </div>
@@ -779,7 +779,7 @@
                                 <div class="right">
                                     <span v-for="(evidence,y) in literature.literatures" :key="'evidence'+y">
                                         <span v-if="evidence.id <= 0">{{ evidence.name }}</span>
-                                        <span v-else>D{{ evidence.sysOrder }}</span>
+                                        <span v-else class="cursor_pointer" @click="checkEvidenceDetails(item)">D{{ evidence.sysOrder }}</span>
                                         <span v-if="y < literature.literatures.length-1"> + </span>
                                     </span>
                                 </div>
@@ -1189,10 +1189,12 @@
 
 <script>
 import batchAddMessage from '../dialog/batchAddMessage.vue';
+import mixins from './mixins';
 export default {
   components: {
     batchAddMessage
   },
+  mixins:[mixins],
   props: {
     row:{
         default:()=>{
@@ -1201,6 +1203,12 @@ export default {
     },
     ifSecondInvalid:{
         default:false
+    },
+    reportType:{
+        default:0
+    },
+    projectId:{
+        default:0
     }
   },
   data() {

+ 17 - 0
src/views/report/InvalidResponse/components/reasonsAndEvidence/mixins.js

@@ -0,0 +1,17 @@
+export default {
+    methods: {
+        checkEvidenceDetails(item){
+            this.$router.push(
+                {
+                  path: '/patentDetails/' + item.literatureNo,
+                  query: {
+                    projectId: this.projectId,
+                    reportType: this.reportType,
+                    evidenceType:item.type,
+                    evidence:JSON.stringify(item)
+                  }
+                }
+              )
+        }
+    },
+}

+ 8 - 4
src/views/report/InvalidResponse/components/reasonsAndEvidence/reasonsAndEvidence.vue

@@ -83,7 +83,7 @@
                         <div v-if="['2','3','4','8'].indexOf(scope.row.statutesId) !=-1">
                             <span v-for="(item,index) in scope.row.literatures" :key="item.id">
                                     <span v-if="item.id <= 0">{{ item.name }}</span>
-                                    <span v-else>D{{ item.sysOrder }}</span>
+                                    <span v-else class="cursor_pointer" @click="checkEvidenceDetails(item)">D{{ item.sysOrder }}</span>
                                     <span v-if="index < scope.row.literatures.length-1"> + </span>
                             </span>
                         </div>
@@ -127,7 +127,7 @@
                                 <div  v-if="['2','3','4','8'].indexOf(scope.row.statutesId) !=-1">
                                     <span v-for="(item,index) in scope.row.secondLiteratures" :key="item.id">
                                             <span v-if="item.id <= 0">{{ item.name }}</span>
-                                            <span v-else>D{{ item.sysOrder }}</span>
+                                            <span v-else class="cursor_pointer" @click="checkEvidenceDetails(item)">D{{ item.sysOrder }}</span>
                                             <span v-if="index < scope.row.secondLiteratures.length-1"> + </span>
                                     </span>
                                 </div>
@@ -208,7 +208,7 @@
                 </el-table-column>
                 <el-table-column type="expand" width="1">
                     <template slot-scope="scope">
-                        <reasonsAndEvidenceDetails :row="scope.row" style="height:500px" :ifSecondInvalid="ifSecondInvalid" @update="updateData"></reasonsAndEvidenceDetails>
+                        <reasonsAndEvidenceDetails :row="scope.row" style="height:500px" :reportType="reportType" :projectId="projectId" :ifSecondInvalid="ifSecondInvalid" @update="updateData"></reasonsAndEvidenceDetails>
                     </template>
                 </el-table-column>
             </el-table>
@@ -232,6 +232,7 @@ import reasonsAndEvidenceDetails from './details.vue'
 import ReviewCommittee from '../dialog/ReviewCommittee.vue';
 import addFeature from '../dialog/addFeature.vue'
 import { getTableHeight } from '@/views/components/mixins'
+import mixins from './mixins';
 export default {
   components: {
     addInvalidResponse,
@@ -241,13 +242,16 @@ export default {
     ReviewCommittee,
     addFeature
   },
-  mixins:[getTableHeight],
+  mixins:[getTableHeight,mixins],
   props: {
     projectId:{
         default:0
     },
     ifSecondInvalid:{
         default:false
+    },
+    reportType:{
+        default:0
     }
   },
   data() {

+ 4 - 4
src/views/report/components/dialog/addAndEditReport.vue

@@ -1020,7 +1020,7 @@ export default {
       this.$refs.TaskForm.validate((valid) => {
         if (valid) {
           this.taskForm.handlerType = 0//内部人员0,外部人员1
-          this.taskForm.type = 5//任务类型,5为审核
+          this.taskForm.type = 1//任务类型,5为审核
           let params = {
             reportProjectDTO: this.form,
             projectTaskDTO:this.taskForm,
@@ -1035,7 +1035,7 @@ export default {
               this.handleClose()
             }
           }).catch(error => {
-            this.$message.error('报告创建失败')
+            // this.$message.error('报告创建失败')
             this.handleCloseTask()
           })
         }
@@ -1075,11 +1075,11 @@ export default {
         }
       )
     },
-    saveFlowPath(taskId){
+    saveFlowPath2(taskId){
       let params = {
         current:1,
         size:10,
-        searchQuery: `id=${taskId[0]}`,//检索条件
+        searchQuery: `id=${taskId}`,//检索条件
         orderDTOList:[],//排序信息
       }
       this.$api.queryProjectTask(params).then(response => {

+ 4 - 4
src/views/task/components/index.vue

@@ -71,7 +71,7 @@
 
 
     <auditRecords ref="auditRecords"></auditRecords>
-    <createTask ref="createTaskDialog" :id="id" :processId="processId" @isCreate="isCreate"></createTask>
+    <createTask ref="createTaskDialog" :projectId="projectId" :processId="processId" @isCreate="isCreate"></createTask>
     <handleTask1 ref="handleTask1Dialog" @isSuccess="isSuccess"></handleTask1>
     <handleTask2 ref="handleTask2Dialog" @isSuccess="isSuccess"></handleTask2>
     <lookReport ref="lookReport" @isSuccess="isSuccess"></lookReport>
@@ -354,7 +354,7 @@ export default {
           break;
         case 5://专利挖掘任务审核任务
         case 7://专利挖掘文件审核任务
-          this.fileExamine(row)
+          this.fileExamine(row,str)
           break;
         case 6://专利挖掘文件分配任务
           this.$refs.handleTask2Dialog.open(row, !str)
@@ -417,8 +417,8 @@ export default {
 
     },
     //文件及任务审核任务(专利挖掘)
-    fileExamine(row) {
-      row.disabled = str == '查看' ? true : false
+    fileExamine(row,str) {
+      row.disabled = str 
       let router = this.$router.resolve({
         path: '/handleExamine',
         query: {

+ 4 - 4
src/views/task/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Table :id="id" :show="true"></Table>
+    <Table :projectId="projectId" :show="true"></Table>
   </div>
 </template>
 
@@ -15,9 +15,9 @@ export default {
     }
   },
   computed: {
-    // id(){
-    //   return this.$route.query.projectId
-    // },
+    projectId(){
+      return this.$route.query.projectId
+    },
   },
   mounted() {