Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-operate-ui/src/utils/index.js

@@ -907,6 +907,10 @@ export const detailSideBar = new Map([
   ["dishonestExecutee", "ifThePerson"],
   // 风险信息 失信被执行人
   ["dishonestExecutor", "dishonesty"],
+  // 风险信息 限制高消费
+  ["limitHighConsum", "limitHighConsumption"],
+  // 风险信息 股权冻结
+  ["judicialFreezesCount", "equityFreezing"],
   // 风险信息 裁判文书
   ["adjudicativeDoc", "judgment"],
   // 风险信息 法院公告

dsk-operate-ui/src/views/component/CustomTimeSelect.vue

@@ -173,6 +173,10 @@ export default {
         let startTime = ''
         let endTime = new Date()
         switch (value) {
+          case '今日':
+            startTime = new Date(endTime.getTime())
+            timeStr = [this.formatDate(startTime), this.formatDate(endTime)]
+            break;
           case '近三天':
             startTime = new Date(endTime.getTime() - 3600 * 1000 * 24 * 3)
             timeStr = [this.formatDate(startTime), this.formatDate(endTime)]
@@ -245,7 +249,7 @@ export default {
 
 <style lang="scss">
   .custom-time-select1 {
-    width: 90px !important;
+    width: 90px;
     height: 34px;
 
     .rote {

dsk-operate-ui/src/views/detail/party-a/consultingTransaction/cooperativeConstructionUnit.vue

@@ -42,7 +42,8 @@
               <div v-else v-html="scope.row.projectName || '--'"></div>
             </template>
             <template v-else>
-              <span @click="linkTo1(scope.row.sourceId)" v-if="scope.row.projectName" style="color: #0081FF;cursor: pointer;" v-html="scope.row.projectName">{{scope.row.projectName}}</span>
+              <span @click="linkTo1(scope.row.sourceId)" v-if="scope.row.projectName && scope.row.sourceId" style="color: #0081FF;cursor: pointer;" v-html="scope.row.projectName">{{scope.row.projectName}}</span>
+              <span v-else-if="scope.row.projectName" v-html="scope.row.projectName">{{scope.row.projectName}}</span>
               <span v-else>-</span>
             </template>
           </template>
@@ -367,6 +368,7 @@ export default {
     },
     linkTo1(id){
       let url = ""
+      if(id){
         skyProjectDetail({sourceId:id}).then(res=>{
           if(res.data&&res.data.sourceUrl){
             url = res.data.sourceUrl
@@ -374,6 +376,7 @@ export default {
           }
         })
       }
+    }
   },
 }
 </script>

dsk-operate-ui/src/views/detail/party-a/consultingTransaction/cooperativeOwnerUnits.vue

@@ -42,7 +42,8 @@
               <div v-else v-html="scope.row.projectName || '--'"></div>
             </template>
             <template v-else>
-              <span @click="linkTo1(scope.row.sourceId)" v-if="scope.row.projectName" style="color: #0081FF;cursor: pointer;" v-html="scope.row.projectName">{{scope.row.projectName}}</span>
+              <span @click="linkTo1(scope.row.sourceId)" v-if="scope.row.projectName && scope.row.sourceId" style="color: #0081FF;cursor: pointer;" v-html="scope.row.projectName">{{scope.row.projectName}}</span>
+              <span v-else-if="scope.row.projectName" v-html="scope.row.projectName">{{scope.row.projectName}}</span>
               <span v-else>-</span>
             </template>
           </template>