搜索调整

src/components/cus/cus-form-link/upload.vue

@@ -26,15 +26,25 @@
         <template v-if="layout === 'card'">
           <div class="upload-layout-card __hover" :class="{'limit-disabled': isLimitCpt || (isViewCpt && paramVal.length === 0)}">
             <SvgIcon name="add" color="#0062E9" size="24"/>
-            <div>选择{{acceptTypeFormatCpt}}</div>
-            <div v-if="limit > 0">(最多{{ limit }}个)</div>
+            <template v-if="title">
+              <div>{{title}}</div>
+            </template>
+            <template v-else>
+              <div>选择{{acceptTypeFormatCpt}}</div>
+              <div v-if="limit > 0">(最多{{ limit }}个)</div>
+            </template>
           </div>
         </template>
         <template v-else>
           <div class="upload-layout-list_button" :class="{'limit-disabled': isLimitCpt|| (isViewCpt && paramVal.length === 0)}">
             <SvgIcon name="add" color="#ffffff" size="14"/>
-            选择{{acceptTypeFormatCpt}}
-            <template v-if="limit > 0">(最多{{ limit }}个)</template>
+            <template v-if="title">
+              {{title}}
+            </template>
+            <template v-else>
+              选择{{acceptTypeFormatCpt}}
+              <template v-if="limit > 0">(最多{{ limit }}个)</template>
+            </template>
           </div>
         </template>
       </el-tooltip>
@@ -59,7 +69,7 @@
           <div class="upload-layout-list_item __hover" :class="{'item-view': isViewCpt || !delRule(file)}" @click="validImgByUrl(file[urlKey]) ? viewImg(file[urlKey]) : downloadFileByUrl(file[urlKey], file[nameKey])">
             <img class="file-type-img" :src="getFileImgByUrl(file[urlKey])"/>
             <CusEllipsis v-if="file[nameKey] ?? file[urlKey]" class="label" :value="file[nameKey] ?? file[urlKey]"/>
-            <SvgIcon v-if="!isViewCpt && delRule(file)" class="close" name="close_2" size="12" @click.stop="ref_upload.handleRemove(file)"/>
+            <SvgIcon v-if="!isViewCpt && delRule(file)" class="close" name="close_3" size="12" @click.stop="ref_upload.handleRemove(file)"/>
           </div>
         </template>
       </template>
@@ -127,7 +137,8 @@ export default defineComponent({
     cardHeight: {default: '128px'},
     urlKey: {default: 'url'},
     nameKey: {default: 'name'},
-    limitNoUpload: {default: false}
+    limitNoUpload: {default: false},
+    title: {}
   },
   setup(props, { emit }) {
     const router = useRouter();

src/views/manage/service/detail.vue

@@ -942,7 +942,7 @@ const onClickFormatRuleDictJson = (row, index) => {
   state.formatRuleDictJson.show = true
 }
 const getDictJson = (dict) => {
-  state.params.responseBody.json.data[state.formatRuleDictJson.transfer.index].formatRule = [...dict]
+  state.params.responseBody.json.data[state.formatRuleDictJson.transfer.index].formatRule = JSON.stringify(dict)
 }
 const onClickFormatRuleDictText = (row, index) => {
   state.formatRuleDictText.transfer = {
@@ -952,7 +952,7 @@ const onClickFormatRuleDictText = (row, index) => {
   state.formatRuleDictText.show = true
 }
 const getDictText = (dict) => {
-  state.params.responseBody.text.data[state.formatRuleDictText.transfer.index].formatRule = [...dict]
+  state.params.responseBody.text.data[state.formatRuleDictText.transfer.index].formatRule = JSON.stringify(dict)
 }
 watch(() => props.show, (n) => {
   if (n) {

src/views/manage/service/format-rule-dict.vue

@@ -85,6 +85,7 @@ const onSubmit = () => {
     } as any).then(() => {
       emit('update:show', false)
       emit('dict', state.data)
+      console.log(state.data)
     }).catch(() => {})
   }).catch((e) => {
     ElMessage({
@@ -96,7 +97,11 @@ const onSubmit = () => {
 }
 watch(() => props.show, (n) => {
   if (n) {
-    state.data = typeof props.transfer.formatRule === 'object' ? [...props.transfer.formatRule] : []
+    try {
+      state.data = typeof props.transfer.formatRule === 'object' ? [...props.transfer.formatRule] : (typeof props.transfer.formatRule === 'string' ? JSON.parse(props.transfer.formatRule) : [])
+    } catch (e) {
+      state.data = []
+    }
     nextTick(() => {
       ref_form.value.reset()
     })

src/views/manage/theme/relation-detail.vue

@@ -143,6 +143,32 @@
                 :options="DictionaryStore.conditionTypeList"
               />
             </template>
+            <template #paramType-column-value="{scope}">
+              <el-row>
+                <CusFormColumn
+                  class="__cus-table-form-column"
+                  required
+                  :span="24"
+                  v-model:param="scope.row.paramType"
+                  link="select"
+                  :options="[
+                  {dictLabel: '性别', dictValue: 'sex'}
+                ]"
+                  @change="onChangeParamType(scope.row)"
+                />
+                <CusFormColumn
+                  v-if="scope.row.paramType == 'sex'"
+                  :span="24"
+                  v-model:param="scope.row.sexImgs"
+                  link="upload"
+                  type="img"
+                  :limit="2"
+                  limitNoUpload
+                  :delRule="(file) => true"
+                  title="依次选择男、女图标"
+                />
+              </el-row>
+            </template>
             <template #do-header-value="{scope}">
               <CusFormColumn
                 class="__cus-table-form-column"
@@ -236,6 +262,7 @@ const state: any = reactive({
       {value: "indexParam", label: "查询字段"},
       {value: "condition", label: "条件类型"},
       {value: "themeParam", label: "主题参数"},
+      {value: "paramType", label: "参数条件", width: 200, popover: true},
       {value: "do", label: "操作", width: 200, fixed: 'right'},
     ]
   },
@@ -398,13 +425,17 @@ const handleChangeCondition = (val) => {
     state.conditionTable.data.push({
       indexParam: '',
       condition: '',
-      themeParam: val
+      themeParam: val,
+      paramType: ''
     })
     setTimeout(() => {
       state.conditionTable.selectValue = ''
     }, 100)
   }
 }
+const onChangeParamType = (row) => {
+  row.sexImgs = []
+}
 watch(() => props.show, (n) => {
   if (n) {
     state.loading = false

src/views/web/archive/index-worker.vue

@@ -218,6 +218,13 @@ const themeConfigCpt = computed(() => {
     })
     return arr
   }
+  const getSex = (idCard: string) => {
+    if (idCard.length !== 18) {
+      throw new Error("身份证号码长度不正确");
+    }
+    const genderDigit = parseInt(idCard.charAt(16), 10);
+    return genderDigit % 2 === 1 ? "男" : "女";
+  }
   const res = {
     main: <any>{
       indexStyle: {}
@@ -239,7 +246,7 @@ const themeConfigCpt = computed(() => {
         searchParam: getSearchParam(v),
         tableHead: getTableHead(v),
       }
-      res.chart.nodes.unshift({
+      const node = {
         id: String(v.id),
         iconSrc: v.url,
         weight: v.weight || 100,
@@ -250,9 +257,24 @@ const themeConfigCpt = computed(() => {
         indexId: v.indexId,
         searchParam: getSearchParam(v),
         tableHead: getTableHead(v),
-      })
+      }
+      try {
+        JSON.parse(v.indexCondition).forEach(c => {
+          if (c.paramType == 'sex') {
+            const sex = getSex(route.query[c.themeParam])
+            if (sex == '男') {
+              node.iconSrc = c.sexImgs[0].url
+            } else if (sex == '女') {
+              node.iconSrc = c.sexImgs[1].url
+            }
+          }
+        })
+      } catch (e) {
+        console.error(e)
+      }
+      res.chart.nodes.unshift(node)
     } else if (v.relateIndexId) {
-      res.chart.nodes.push({
+      const node = {
         id: String(v.id),
         iconSrc: v.url,
         weight: v.weight,
@@ -263,7 +285,22 @@ const themeConfigCpt = computed(() => {
         indexId: v.indexId,
         searchParam: getSearchParam(v),
         tableHead: getTableHead(v),
-      })
+      }
+      try {
+        JSON.parse(v.indexCondition).forEach(c => {
+          if (c.paramType == 'sex') {
+            const sex = getSex(route.query[c.themeParam])
+            if (sex == '男') {
+              node.iconSrc = c.sexImgs[0].url
+            } else if (sex == '女') {
+              node.iconSrc = c.sexImgs[1].url
+            }
+          }
+        })
+      } catch (e) {
+        console.error(e)
+      }
+      res.chart.nodes.push(node)
       res.chart.edges.push({source: String(v.relateIndexId), target: String(v.id), labelText: v.description || '关系描述'})
     } else {
       res.tabs.set(v.id, {

src/views/web/list/index-worker.vue

@@ -1112,11 +1112,15 @@ onMounted(() => {
                 font-size: 14px;
                 color: var(--cus-text-color-2);
                 padding: 12px 16px;
-                &:hover {
-                  background-color: rgba(46,129,255,0.05);
+                border: 2px solid transparent;
+                &:nth-child(odd) {
+                  background-color: rgba(var(--cus-main-color-rgb), 0.2);
                 }
                 &:not(:last-child) {
-                  border-bottom: 1px solid #EAEBEF;
+                  border-bottom-color: #EAEBEF;
+                }
+                &:hover {
+                  border: 2px solid var(--cus-main-color);
                 }
                 .index {
                   margin-right: 16px;
@@ -1166,14 +1170,21 @@ onMounted(() => {
               .card-block {
                 overflow: hidden;
                 height: max-content;
-                box-shadow: 0px 2px 4px 0px rgba(var(--cus-main-color-rgb),0.2);
+                box-shadow: 0px 2px 3px 0px rgba(var(--cus-main-color-rgb),0.2);
+                border-radius: 4px;
+
                 .card-item {
                   padding: 16px;
-                  background: linear-gradient( 180deg, rgba(var(--cus-main-color-rgb), 0.1) 0%, rgba(var(--cus-main-color-rgb),0) 100%), #FFFFFF;
+                  background: linear-gradient( 180deg, rgba(var(--cus-main-color-rgb), 0.3) 0%, rgba(var(--cus-main-color-rgb),0) 100%), #FFFFFF;
                   border-radius: 4px;
+                  border: 4px solid transparent;
+                  &:hover {
+                    border-color: var(--cus-main-color);
+                  }
                   .main-row {
                     display: flex;
                     align-items: center;
+                    margin-bottom: 20px;
                     .main-row-img {
                       width: 40px;
                       height: 40px;
@@ -1213,7 +1224,7 @@ onMounted(() => {
                   }
                   .cols {
                     display: grid;
-                    row-gap: 4px;
+                    row-gap: 8px;
                     font-size: 14px;
                     .cols-item {
                       display: flex;