修改三期优化点

jero-web/src/components/SelectedBy/index.vue

@@ -44,10 +44,6 @@
   export default {
     name: 'index',
     props: {
-      url: {
-        type: Object,
-        default: {}
-      },
       title: {
         type: String,
         default: ''

jero-web/src/permission.js

@@ -32,6 +32,7 @@ router.beforeEach((to, from, next) => {
         Vue.ls.set(USER_INFO, res.result.userInfo, 7 * 24 * 60 * 60 * 1000)
         Vue.ls.set(UI_CACHE_DB_DICT_DATA, res.result.sysAllDictItems, 7 * 24 * 60 * 60 * 1000)
         Vue.ls.set('domianWebSocketURL', res.result.domianWebSocketURL)
+        Vue.ls.set('domianWebImgURL', res.result.domianWebImgURL)
         Vue.ls.set('onlinePreviewDomainURL', res.result.onlinePreviewDomainURL)
         Vue.ls.set('httpsOnlinePreviewDomainURL', res.result.httpsOnlinePreviewDomainURL)
         Vue.ls.set('domianPreviewURL', res.result.domianPreviewURL)

jero-web/src/store/modules/user.js

@@ -85,6 +85,7 @@ const user = {
             Vue.ls.set(USER_NAME, userInfo.username, 7 * 24 * 60 * 60 * 1000)
             Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000)
             Vue.ls.set('domianWebSocketURL', result.domianWebSocketURL)
+            Vue.ls.set('domianWebImgURL', result.domianWebImgURL)
             Vue.ls.set('onlinePreviewDomainURL', result.onlinePreviewDomainURL)
             Vue.ls.set('httpsOnlinePreviewDomainURL', result.httpsOnlinePreviewDomainURL)
             Vue.ls.set('domianPreviewURL', result.domianPreviewURL)
@@ -136,6 +137,7 @@ const user = {
           window._CONFIG['domianPreviewURL'] = Vue.ls.get('domianPreviewURL') + '/jero-boot'
           window._CONFIG['domianWebSocketURL'] = Vue.ls.get('domianWebSocketURL') + '/jero-boot'
           window._CONFIG['onlinePreviewDomainURL'] = Vue.ls.get('onlinePreviewDomainURL') + '/onlinePreview'
+          window._CONFIG['domianWebImgURL'] = Vue.ls.get('domianWebImgURL') + '/jero-boot'
           window._CONFIG['httpsOnlinePreviewDomainURL'] = Vue.ls.get('httpsOnlinePreviewDomainURL') + '/onlinePreview'
           //Vue.ls.set(USER_AUTH,authData);
           sessionStorage.setItem(USER_AUTH, JSON.stringify(authData))

jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue

@@ -379,7 +379,7 @@
                     let index1 = fileName.lastIndexOf('.')
                     let index2 = fileName.length
                     let fileSuffix = fileName.substring(index1, index2)
-                    quill.insertEmbed(length, 'image', window._CONFIG['domianPreviewURL'] + '/sys/common/download/' + res.data.result.id + fileSuffix)
+                    quill.insertEmbed(length, 'image', window._CONFIG['domianWebImgURL'] + '/sys/common/download/' + res.data.result.id + fileSuffix)
                     quill.setSelection(length + 1)
                   }
                 })
@@ -511,7 +511,7 @@
           let index1 = fileName.lastIndexOf('.')
           let index2 = fileName.length
           let fileSuffix = fileName.substring(index1, index2)
-          quill.insertEmbed(length, 'image', window._CONFIG['domianPreviewURL'] + '/sys/common/download/' + file.response.result.id + fileSuffix)
+          quill.insertEmbed(length, 'image', window._CONFIG['domianWebImgURL'] + '/sys/common/download/' + file.response.result.id + fileSuffix)
           quill.setSelection(length + 1)
           this.quillUpdateImg = false
         } else if (status === 'uploading') {

jero-web/src/views/regulationsKanban/components/addModel.vue

@@ -73,28 +73,54 @@
       :scroll="{x: '100%',y:370}"
       @change='handleTableChange'>
       <span slot="status" slot-scope="text,record" :title="text">
-        <a v-if="record.designFlowTaskStatus == 'Compliance'" style='color: #26BD4B'>{{ text }}</a>
+        <a v-if="record.designFlowTaskStatus == 'Compliance'"
-        <a v-if="record.designFlowTaskStatus == 'Non-Compliance'" style='color: #E83030'>{{ text }}</a>
+           @click="verifyTaskClick(record,1,false)"
-        <a v-if="record.designFlowTaskStatus == 'To be tracked'" style='color: #FDA71C'>{{ text }}</a>
+           style='color: #26BD4B'>{{ text }}</a>
-        <a v-if="record.designFlowTaskStatus == 'NA'" style='color: #707486'>{{ text }}</a>
+        <a v-if="record.designFlowTaskStatus == 'Non-Compliance'"
-        <a v-if="record.designFlowTaskStatus == 'No rating'" style='color: #00B3BE'>{{ $t('toBeConfirmed') }}</a>
+           @click="verifyTaskClick(record,1,false)"
-        <a v-if="record.designFlowTaskStatus == 'Termination of task'" style='color: #E83030'>{{ $t('taskTermination') }}</a>
+           style='color: #E83030'>{{ text }}</a>
+        <a v-if="record.designFlowTaskStatus == 'To be tracked'"
+           @click="verifyTaskClick(record,1,false)"
+           style='color: #FDA71C'>{{ text }}</a>
+        <a v-if="record.designFlowTaskStatus == 'NA'"
+           @click="verifyTaskClick(record,1,false)"
+           style='color: #707486'>{{ text }}</a>
+        <a v-if="record.designFlowTaskStatus == 'No rating'" style='color: #00B3BE'
+           @click="verifyTaskClick(record,1,true)">{{ $t('toBeConfirmed') }}</a>
+        <a v-if="record.designFlowTaskStatus == 'Termination of task'"
+           @click="verifyTaskClick(record,1,false)"
+           style='color: #E83030'>{{ $t('taskTermination') }}</a>
       </span>
       <span slot="statusprehomo" slot-scope="text,record" :title="text">
-        <a v-if="record.prehomoFlowTaskStatus == 'Compliance'" style='color: #26BD4B'>{{ text }}</a>
+        <a v-if="record.prehomoFlowTaskStatus == 'Compliance'"
-        <a v-if="record.prehomoFlowTaskStatus == 'Non-Compliance'" style='color: #E83030'>{{ text }}</a>
+           @click="verifyTaskClick(record,2,false)"
-        <a v-if="record.prehomoFlowTaskStatus == 'To be tracked'" style='color: #FDA71C'>{{ text }}</a>
+           style='color: #26BD4B'>{{ text }}</a>
-        <a v-if="record.prehomoFlowTaskStatus == 'NA'" style='color: #707486'>{{ text }}</a>
+        <a v-if="record.prehomoFlowTaskStatus == 'Non-Compliance'"
-        <a v-if="record.prehomoFlowTaskStatus == 'No rating'" style='color: #00B3BE'>{{ $t('toBeConfirmed') }}</a>
+           @click="verifyTaskClick(record,2,false)" style='color: #E83030'>{{ text }}</a>
-        <a v-if="record.prehomoFlowTaskStatus == 'Termination of task'" style='color: #E83030'>{{ $t('taskTermination') }}</a>
+        <a v-if="record.prehomoFlowTaskStatus == 'To be tracked'"
+           @click="verifyTaskClick(record,2,false)" style='color: #FDA71C'>{{ text }}</a>
+        <a v-if="record.prehomoFlowTaskStatus == 'NA'"
+           @click="verifyTaskClick(record,2,false)" style='color: #707486'>{{ text }}</a>
+        <a v-if="record.prehomoFlowTaskStatus == 'No rating'"
+           @click="verifyTaskClick(record,2,true)" style='color: #00B3BE'>{{ $t('toBeConfirmed') }}</a>
+        <a v-if="record.prehomoFlowTaskStatus == 'Termination of task'"
+           @click="verifyTaskClick(record,2,false)"
+           style='color: #E83030'>{{ $t('taskTermination') }}</a>
       </span>
       <span slot="filstatuse" slot-scope="text,record" :title="text">
-        <a v-if="record.verifyFlowTaskStatus == 'Compliance'" style='color: #26BD4B'>{{ text }}</a>
+        <a v-if="record.verifyFlowTaskStatus == 'Compliance'"
-        <a v-if="record.verifyFlowTaskStatus == 'Non-Compliance'" style='color: #E83030'>{{ text }}</a>
+           @click="verifyTaskClick(record,3,false)"
-        <a v-if="record.verifyFlowTaskStatus == 'To be tracked'" style='color: #FDA71C'>{{ text }}</a>
+           style='color: #26BD4B'>{{ text }}</a>
-        <a v-if="record.verifyFlowTaskStatus == 'NA'" style='color: #707486'>{{ text }}</a>
+        <a v-if="record.verifyFlowTaskStatus == 'Non-Compliance'"
-        <a v-if="record.verifyFlowTaskStatus == 'No rating'" style='color: #00B3BE'>{{ $t('toBeConfirmed') }}</a>
+           @click="verifyTaskClick(record,3,false)" style='color: #E83030'>{{ text }}</a>
-        <a v-if="record.verifyFlowTaskStatus == 'Termination of task'" style='color: #E83030'>{{ $t('taskTermination') }}</a>
+        <a v-if="record.verifyFlowTaskStatus == 'To be tracked'"
+           @click="verifyTaskClick(record,3,false)" style='color: #FDA71C'>{{ text }}</a>
+        <a v-if="record.verifyFlowTaskStatus == 'NA'"
+           @click="verifyTaskClick(record,3,false)" style='color: #707486'>{{ text }}</a>
+        <a v-if="record.verifyFlowTaskStatus == 'No rating'"
+           @click="verifyTaskClick(record,3,true)" style='color: #00B3BE'>{{ $t('toBeConfirmed') }}</a>
+        <a v-if="record.verifyFlowTaskStatus == 'Termination of task'"
+           @click="verifyTaskClick(record,3,false)" style='color: #E83030'>{{ $t('taskTermination') }}</a>
       </span>
 
       <!--      <template slot="file" slot-scope="text, record">-->
@@ -114,8 +140,12 @@
     <!--      />-->
     <!--    </div>-->
     <div class="table-operator">
-      <a-button type="primary" v-if='this.opinionGather > 0'  @click="handlecomments()">{{ $t('CommentsCollectionResultsForReference') }}</a-button>
+      <a-button type="primary" v-if='this.opinionGather > 0' @click="handlecomments()">{{
-      <a-button type="primary" v-if='this.technologyEvaluation > 0'  @click="handletechnical()">{{ $t('TechnicalEvaluationResultsForReference') }}</a-button>
+        $t('CommentsCollectionResultsForReference') }}
+      </a-button>
+      <a-button type="primary" v-if='this.technologyEvaluation > 0' @click="handletechnical()">{{
+        $t('TechnicalEvaluationResultsForReference') }}
+      </a-button>
     </div>
     <!--    <div class='drawer-bootom-button'>-->
     <!--      <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>-->
@@ -196,7 +226,7 @@ export default {
         },
         form: {},
         formData: {
-        projectName:'',
+          projectName: ''
         },
         rules: {
           title: [
@@ -210,7 +240,7 @@ export default {
         selectedRowKeys: [],
         pageNo: 1,
         pageSize: 10,
-      listVisible: false,
+        listVisible: false
       }
     },
     props: {
@@ -223,7 +253,7 @@ export default {
         type: String,
         default: '',
         require: true
-    },
+      }
     },
     mounted() {
       this.loadData()
@@ -264,6 +294,91 @@ export default {
           }
         })
       },
+      verifyTaskClick(val, num, isTrue) {
+        let query = {}
+        switch (num) {
+          case 1:
+            query = {
+              taskIds: val.designTaskId,
+              actiProcInstId: val.designPId,
+              projectTaskInventoryId: val.projectLawsInventoryId,
+              projectLibraryId: val.projectLibraryId,
+              id: val.projectLibraryId,
+              studioEngineer: val.studioEngineer,
+              serialNumber: val.serialNumber,
+              TaskKey: val.designTaskDefinitionKey,
+              isDisplay: isTrue,
+              flowType: 2,
+              Sponsor: 'designInitiatorName',
+              personLiable: 'designDutyName',
+              typeOfDeliverables: 'designDeliverableTypeName',
+              deliverableTemplate: 'designDeliverableTemplate',
+              DueDate: 'designDueDate',
+              remarks: 'designRemark',
+              projectName: val.projectName,
+              targetMarket: val.targetMarket,
+              projectNameId: val.projectNameId,
+              primaryKeyId: val.designTaskDetailId,
+              PersonChargeFeedback: val.designPersonChargeFeedback
+            }
+            break
+          case 2:
+            query = {
+              taskIds: val.prehomoTaskId,
+              actiProcInstId: val.prehomoPId,
+              projectTaskInventoryId: val.projectLawsInventoryId,
+              studioEngineer: val.studioEngineer,
+              projectLibraryId: val.projectLibraryId,
+              serialNumber: val.serialNumber,
+              TaskKey: val.prehomoTaskDefinitionKey,
+              flowType: 3,
+              isDisplay: isTrue,
+              id: val.projectLibraryId,
+              Sponsor: 'prehomoInitiatorName',
+              personLiable: 'prehomoDutyName',
+              typeOfDeliverables: 'prehomoDeliverableTypeName',
+              deliverableTemplate: 'prehomoDeliverableTemplate',
+              DueDate: 'prehomoDueDate',
+              remarks: 'prehomoRemark',
+              projectName: val.projectName,
+              targetMarket: val.targetMarket,
+              projectNameId: val.projectNameId,
+              primaryKeyId: val.prehomoTaskDetailId,
+              PersonChargeFeedback: val.prehomoPersonChargeFeedback
+            }
+            break
+          case 3:
+            query = {
+              taskIds: val.verifyTaskId,
+              actiProcInstId: val.verifyPId,
+              id: val.projectLibraryId,
+              projectLibraryId: val.projectLibraryId,
+              studioEngineer: val.studioEngineer,
+              serialNumber: val.serialNumber,
+              projectTaskInventoryId: val.projectLawsInventoryId,
+              TaskKey: val.verifyTaskDefinitionKey,
+              flowType: 4,
+              isDisplay: isTrue,
+              Sponsor: 'verifyInitiatorName',
+              personLiable: 'verifyDutyName',
+              typeOfDeliverables: 'verifyDeliverableTypeName',
+              deliverableTemplate: 'verifyDeliverableTemplate',
+              DueDate: 'verifyDueDate',
+              remarks: 'verifyRemark',
+              projectName: val.projectName,
+              targetMarket: val.targetMarket,
+              projectNameId: val.projectNameId,
+              primaryKeyId: val.verifyTaskDetailId,
+              PersonChargeFeedback: val.verifyPersonChargeFeedback
+            }
+            break
+        }
+        let newUrl = this.$router.resolve({
+          path: '/taskListProcess',
+          query: query
+        })
+        window.open(newUrl.href, '_blank')
+      },
       // 法规技术评估列表
       handletechnical() {
 
@@ -280,7 +395,7 @@ export default {
           id: this.paramsManifestId,
           dutyTerritory: this.formData.dutyTerritory ? this.formData.dutyTerritory : '',
           projectName: this.formData.projectName ? this.formData.projectName : '',
-        projectNameId:this.formData.projectNameId?this.formData.projectNameId:'',
+          projectNameId: this.formData.projectNameId ? this.formData.projectNameId : ''
           // pageNo: this.pageNo,
           // pageSize: this.pageSize,
         }
@@ -328,7 +443,7 @@ export default {
         this.title = this.$t('add')
         this.newVisible = true
         this.form = {}
-    },
+      }
     },
     watch: {
       selectedRowKeyS(val) {
@@ -341,6 +456,7 @@ export default {
 
 <style lang='less' scoped>
   @import '~@assets/less/common.less';
+
   .box-title-text {
     line-height: 1.4;
     display: flex;
@@ -382,10 +498,12 @@ export default {
       color: red;
     }
   }
+
   .drawer-bootom-button {
     display: flex;
     justify-content: center;
   }
+
   .Required {
     color: red;
     margin-right: 4px;