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

@@ -392,8 +392,8 @@ export function toHump(lineStr) {
 
 /**
  * 驼峰转下划线
- * @param {string} humpStr 
- * @returns 
+ * @param {string} humpStr
+ * @returns
  */
 export function toLine(humpStr) {
   return humpStr.replace(/([A-Z])/g, "_$1").toLowerCase();
@@ -404,7 +404,7 @@ export function isNumberStr(str) {
 }
 
 /**
- * 
+ *
  * @param {string} originUrl 需要获取参数的url 默认当前url
  * @param {RegExp} reg key需要剔除的特殊字符 默认过滤问号
  * @returns {{[key : string] : any}} 查询对象 键值对
@@ -421,7 +421,7 @@ export const getUrlSearchQuery = (originUrl = location.href, reg = new RegExp("\
 
 /**
  * 对象转换为查询字符串
- * @param {{[key:string] : any}} query 
+ * @param {{[key:string] : any}} query
  */
 export const paramsToQuery = (query, decode = true) => {
   try {
@@ -441,7 +441,7 @@ export const paramsToQuery = (query, decode = true) => {
 
 /**
  * 查询字符串转对象
- * @param {string} text 
+ * @param {string} text
  */
 export const searchTextToQuery = (text) => {
   try {
@@ -460,8 +460,8 @@ export const searchTextToQuery = (text) => {
 
 /**
  * 验证链接是否是url
- * @param {string} url 
- * @returns 
+ * @param {string} url
+ * @returns
  */
 export function isUrl(url) {
   return /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*[\u4e00-\u9fa5\w]*)$/.test(url);
@@ -496,8 +496,8 @@ export function encodeSearchKey(key) {
 
 /**
  * 去除json 换行空格符号
- * @param {string} str 
- * @returns 
+ * @param {string} str
+ * @returns
  */
 export function jsonEscape(str) {
   return str.replace(/(\r\n|\n|\r)/gm, "");
@@ -505,7 +505,7 @@ export function jsonEscape(str) {
 
 /**
  * json递归特殊参数处理
- * @param {object} target 
+ * @param {object} target
  */
 export function jsonTraversal(target, decode = false) {
   try {
@@ -530,8 +530,8 @@ export function jsonTraversal(target, decode = false) {
 
 /**
  * url查询参数中需要编码的特殊字符
- * @param {string} componentStr 
- * @returns 
+ * @param {string} componentStr
+ * @returns
  */
 export function needEncodeComponent(componentStr) {
   const reg = /[^a-zA-Z0-9\-_.!~*'()]/gim;
@@ -540,8 +540,8 @@ export function needEncodeComponent(componentStr) {
 
 /**
  * 字符串是否被编码过
- * @param {string} checkStr 
- * @returns 
+ * @param {string} checkStr
+ * @returns
  */
 export function isencodingStr(checkStr) {
   const reg = /%[0-9A-Fa-f]{2}/gim;
@@ -551,8 +551,8 @@ export function isencodingStr(checkStr) {
 let messageSingleton = null;
 /**
  * element message 弹窗单例模式
- * @param {string} type 
- * @param {string} messgage 
+ * @param {string} type
+ * @param {string} messgage
  */
 export async function elementMessageSingleton(type = "success", messgage = "") {
   try {
@@ -568,8 +568,8 @@ export async function elementMessageSingleton(type = "success", messgage = "") {
 
 /**
  * 检测数组对象中是否有重复数据
- * @param {Array} arr 
- * @param {string | null} mapKey 
+ * @param {Array} arr
+ * @param {string | null} mapKey
  * @returns
  */
 export function hasDuplicates(arr, mapKey = null) {
@@ -590,7 +590,7 @@ export function hasDuplicates(arr, mapKey = null) {
 
 /**
  * 表单查询条件过滤
- * @param {Object} params 
+ * @param {Object} params
  */
 export function queryConditionFiltering(params) {
   try {
@@ -627,8 +627,8 @@ export function queryConditionFiltering(params) {
 
 /**
  * 三级联动选择 过滤省市区 兼容父子互不关联情况
- * @param {Array<object>} selectList 
- * @returns 
+ * @param {Array<object>} selectList
+ * @returns
  */
 export function getTreeSelectAreaList(nodeList = [], tree, idkey = "id") {
 
@@ -657,7 +657,7 @@ export function getTreeSelectAreaList(nodeList = [], tree, idkey = "id") {
 }
 
 /**
- * 
+ *
  */
 export function createAreaSelect(node, tree, idkey) {
   // console.log(node, tree, idkey);
@@ -725,10 +725,10 @@ export function createAreaSelect(node, tree, idkey) {
 
 /**
  * 根据节点 id 获取父节点
- * @param {*} tree 
- * @param {*} targetId 
- * @param {*} parentNode 
- * @returns 
+ * @param {*} tree
+ * @param {*} targetId
+ * @param {*} parentNode
+ * @returns
  */
 export function findParentNode(tree, targetId, idKey = "id", parentNode = null) {
   if (tree[idKey] === targetId) {
@@ -752,9 +752,9 @@ export function findParentNode(tree, targetId, idKey = "id", parentNode = null)
 
 /**
  * 根据节点信息 找到当前节点到祖先辈组成的树形结构
- * @param {*} tree 
- * @param {*} targetId 
- * @returns 
+ * @param {*} tree
+ * @param {*} targetId
+ * @returns
  */
 export function findNodeAndAncestors(tree, targetId, idKey = "id", directAncestorsOnly = true) {
   if (tree[idKey] === targetId) {
@@ -788,9 +788,9 @@ export function findNodeAndAncestors(tree, targetId, idKey = "id", directAncesto
 
 /**
  * 根据节点唯一标识查找节点信息
- * @param {*} tree 
- * @param {*} targetId 
- * @param {*} idKey 
+ * @param {*} tree
+ * @param {*} targetId
+ * @param {*} idKey
  */
 export function findNodeFromTree(tree, targetId, ancestors = [], idKey = "id") {
   if (tree[idKey] == targetId) {
@@ -813,7 +813,7 @@ export function findNodeFromTree(tree, targetId, ancestors = [], idKey = "id") {
 
 /**
  * 删除某个属性节点
- * @param node 
+ * @param node
  */
 export function removeAncestors(node, removeKey = "ancestors") {
   delete node[removeKey];
@@ -824,9 +824,9 @@ export function removeAncestors(node, removeKey = "ancestors") {
 
 /**
  * 根据id 数组 生成直系关系树形结构 并排除不需要的属性
- * @param tree 
+ * @param tree
  * @param targetIds []
- * @returns 
+ * @returns
  */
 export function generateDirectSubtreeAndRemove(targetIds, tree, idKey = "id") {
 
@@ -852,7 +852,7 @@ export function generateDirectSubtreeAndRemove(targetIds, tree, idKey = "id") {
         }
       }
 
-      // 往目标节点追加值  
+      // 往目标节点追加值
       currentNode.children.push({ ...targetNode, children: [] });
     }
   }
@@ -907,6 +907,10 @@ export const detailSideBar = new Map([
   ["dishonestExecutee", "ifThePerson"],
   // 风险信息 失信被执行人
   ["dishonestExecutor", "dishonesty"],
+  // 风险信息 限制高消费
+  ["limitHighConsum", "limitHighConsumption"],
+  // 风险信息 股权冻结
+  ["judicialFreezesCount", "equityFreezing"],
   // 风险信息 裁判文书
   ["adjudicativeDoc", "judgment"],
   // 风险信息 法院公告
@@ -934,8 +938,8 @@ export const tableContainerFixed = (scrollBarContainer = "",) => {
 
 /**
  * 序列化 function
- * @param {Function} fn 
- * @returns 
+ * @param {Function} fn
+ * @returns
  */
 export const serializationFn = (fn) => {
   const type = Object.prototype.toString.call(fn);
@@ -945,7 +949,7 @@ export const serializationFn = (fn) => {
 
 /**
  * 反序列化 function
- * @param {string} fnStr 
+ * @param {string} fnStr
  */
 export const deserializeFn = (fnStr) => {
   try {
@@ -956,9 +960,9 @@ export const deserializeFn = (fnStr) => {
 };
 
 /**
- * json字符串转换为json 
- * @param {*} jsonStr 
- * @returns 
+ * json字符串转换为json
+ * @param {*} jsonStr
+ * @returns
  */
 export const jsonStrToObject = (jsonStr) => {
   if (typeof jsonStr !== "string") return null;
@@ -967,9 +971,9 @@ export const jsonStrToObject = (jsonStr) => {
 
 /**
  * 数组元素分组
- * @param {Array<any>} arr 分组元素 
+ * @param {Array<any>} arr 分组元素
  * @param {*} max 最大值
- * @returns 
+ * @returns
  */
 export function groupArray(arr, max = 100, target = "") {
   let result = [];
@@ -1014,7 +1018,7 @@ export function groupArray(arr, max = 100, target = "") {
 
 /**
  * 去掉dom元素两边的标签
- * @param {string} str 
+ * @param {string} str
  */
 export function replaceDomTags(str) {
   const reg = /<[^>]*>/gmi;
@@ -1023,7 +1027,7 @@ export function replaceDomTags(str) {
 
 /**
  * 生成随机字母
- * @returns 
+ * @returns
  */
 export function generateRandomLowerCaseLetter() {
   const alphabet = 'abcdefghijklmnopqrstuvwxyz';
@@ -1033,11 +1037,11 @@ export function generateRandomLowerCaseLetter() {
 
 /**
  * 获取直系祖先到本身组成的数组
- * @param {object} data 
- * @param {string | number} targetId 
- * @param {string} idKey 
- * @param {Array<any>} ancestors 
- * @returns 
+ * @param {object} data
+ * @param {string | number} targetId
+ * @param {string} idKey
+ * @param {Array<any>} ancestors
+ * @returns
  */
 export function findAncestors(data, targetId, idKey = "id", childrenKey = "children", ancestors = []) {
   if (data[idKey] === targetId) {
@@ -1058,8 +1062,8 @@ export function findAncestors(data, targetId, idKey = "id", childrenKey = "child
 
 /**
  * 给树形添加层级
- * @param {Array<any> | object} tree 
- * @param {number} startLevel 
+ * @param {Array<any> | object} tree
+ * @param {number} startLevel
  */
 export function addTreeLevel(tree, startLevel = 1, removeEmptyChildren = true) {
   if (tree instanceof Array && tree?.length) {
@@ -1076,8 +1080,8 @@ export function addTreeLevel(tree, startLevel = 1, removeEmptyChildren = true) {
 
 /**
  * 给树形节点添加父节点关联
- * @param {Array<any> | object} tree 
- * @param {object} parent 
+ * @param {Array<any> | object} tree
+ * @param {object} parent
  */
 export function addNodeParent(tree, parent = null) {
   if (tree instanceof Array && tree?.length) {
@@ -1089,4 +1093,4 @@ export function addNodeParent(tree, parent = null) {
     });
   }
   return tree;
-}
\ No newline at end of file
+}

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,12 +368,14 @@ export default {
     },
     linkTo1(id){
       let url = ""
-      skyProjectDetail({sourceId:id}).then(res=>{
-        if(res.data&&res.data.sourceUrl){
-          url = res.data.sourceUrl
-          window.open(url, "_blank")
-        }
-      })
+      if(id){
+        skyProjectDetail({sourceId:id}).then(res=>{
+          if(res.data&&res.data.sourceUrl){
+            url = res.data.sourceUrl
+            window.open(url, "_blank")
+          }
+        })
+      }
     }
   },
 }

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>