Merge remote-tracking branch 'origin/master'

src/views/OverviewMallResources/publicResources/index.vue

@@ -38,10 +38,7 @@
             </template>
           </Dropdown>
           <Dropdown :trigger="['click']">
-            <span
-              @click.prevent
-              style="margin-right: 20px; color: rgb(146, 153, 167); font-size: 13px"
-            >
+            <span @click.prevent style="margin-right: 20px; color: rgb(0, 0, 0); font-size: 13px">
               所有编目<Icon
                 icon="ant-design:caret-down-filled"
                 style="font-size: 12px; margin-left: 2px"
@@ -65,10 +62,7 @@
             </template>
           </Dropdown>
           <Dropdown :trigger="['click']">
-            <span
-              @click.prevent
-              style="margin-right: 20px; color: rgb(146, 153, 167); font-size: 13px"
-            >
+            <span @click.prevent style="margin-right: 20px; color: rgb(0, 0, 0); font-size: 13px">
               所有机构<Icon
                 icon="ant-design:caret-down-filled"
                 style="font-size: 12px; margin-left: 2px"
@@ -92,10 +86,7 @@
             </template>
           </Dropdown>
           <Dropdown :trigger="['click']">
-            <span
-              @click.prevent
-              style="margin-right: 20px; color: rgb(146, 153, 167); font-size: 13px"
-            >
+            <span @click.prevent style="margin-right: 20px; color: rgb(0, 0, 0); font-size: 13px">
               所有标签<Icon
                 icon="ant-design:caret-down-filled"
                 style="font-size: 12px; margin-left: 2px"
@@ -119,7 +110,7 @@
             </template>
           </Dropdown>
           <Dropdown :trigger="['click']">
-            <span @click.prevent style="color: rgb(146, 153, 167); font-size: 13px">
+            <span @click.prevent style="color: rgb(0, 0, 0); font-size: 13px">
               所有发布时间<Icon
                 icon="ant-design:caret-down-filled"
                 style="font-size: 12px; margin-left: 2px"
@@ -143,7 +134,8 @@
             </template>
           </Dropdown>
         </div>
-        <div class="headerContent">
+        <div class="headerContent" style="background-color: #e4e6ee">
+          <span style="color: #0d88e5; font-size: 15px; margin-left: 30px">搜索结果5个</span>
           <div class="buttonGroup">
             <Segmented v-model:value="value" :options="data">
               <template #label="{ payload, value: segmentValue }">
@@ -172,7 +164,7 @@
             </div>
           </div>
         </div>
-      </template>
+        <div style="background-color: #e4e6ee">
           <List v-if="value === 'cardList'">
             <Row :gutter="16">
               <template v-for="item in cardListData" :key="item.title">
@@ -186,7 +178,12 @@
                       <div style="display: flex; justify-content: space-between">
                         <div style="display: flex; align-items: center; gap: 5px">
                           <div style="display: flex">
-                        <Icon size="23" v-if="item.icon" :icon="item.icon" :color="item.color" />
+                            <Icon
+                              size="23"
+                              v-if="item.icon"
+                              :icon="item.icon"
+                              :color="item.color"
+                            />
                           </div>
                           <div>
                             <span class="card-title">{{ item.title }}</span>
@@ -199,7 +196,10 @@
                       <div class="card-description">
                         {{ item.description }}
                       </div>
-                  <div class="cardFooter" style="position: absolute; bottom: 0; left: 0; right: 0">
+                      <div
+                        class="cardFooter"
+                        style="position: absolute; bottom: 0; left: 0; right: 0"
+                      >
                         <div style="padding-left: 5px; padding-bottom: 5px">
                           <Tag style="padding: 2px 10px">
                             {{ item.label }}
@@ -214,11 +214,17 @@
                           <span v-if="item.isShare">有条件共享</span>
                           <span v-else>无条件共享</span>
                           <div>
-                        <a-button style="padding: 0; border: none; box-shadow: none">
+                            <a-button
+                              style="padding: 0; border: none; box-shadow: none"
+                              @click="information(item)"
+                            >
                               <Icon icon="icon-park-outline:eyes" />{{ item.view }}</a-button
                             >
                             <Divider type="vertical" />
-                        <a-button style="padding: 0; border: none; box-shadow: none">
+                            <a-button
+                              style="padding: 0; border: none; box-shadow: none"
+                              @click="pushNotifications"
+                            >
                               <Icon icon="icon-park-outline:hand-up" />{{ item.edit }}</a-button
                             >
                           </div>
@@ -243,6 +249,8 @@
             show-size-changer
             show-quick-jumper
           />
+        </div>
+      </template>
     </PageWrapper>
   </div>
 </template>
@@ -357,6 +365,46 @@
     reload();
   }
 
+  function information(item) {
+    const title = item.title;
+    if (title === '党建工作总结') {
+      router.push({
+        path: '/mallResourceDevelopment/dataSet/commonDataSet/columnInformation',
+        query: {},
+      });
+    }
+    if (title === '党史知识竞赛') {
+      router.push({
+        path: '/mallResourceDevelopment/dataSet/commonDataSet/partyHistoryKnowledgeCompetition',
+        query: {},
+      });
+    }
+    if (title === '主题教育活动') {
+      router.push({
+        path: '/mallResourceDevelopment/dataSet/commonDataSet/themeEducationActivities',
+        query: {},
+      });
+    }
+    if (title === '党员发展计划') {
+      router.push({
+        path: '/mallResourceDevelopment/dataSet/commonDataSet/partyMemberDevelopmentPlan',
+        query: {},
+      });
+    }
+    if (title === '基本信息') {
+      router.push({
+        path: '/mallResourceDevelopment/dataSet/commonDataSet/essentialInformation',
+        query: {},
+      });
+    }
+  }
+
+  function pushNotifications() {
+    router.push({
+      path: '/mallResourceDevelopment/dataSet/commonDataSet/applyForPushNotificationsModal',
+      query: {},
+    });
+  }
   onMounted(() => {
     onSearch();
   });
@@ -463,7 +511,7 @@
     margin-bottom: 20px;
     .centent2-1 {
       margin-right: 20px;
-      color: rgb(146, 153, 167);
+      color: rgb(0, 0, 0);
       font-size: 13px;
     }
   }

src/views/scriptDevelopment/sqlDevelopment/index.vue

@@ -87,18 +87,12 @@
   const showTable = ref('false');
   const selectedTasks = ref([]);
   const fieldData = [
-    { value: 'script', label: '脚本' },
-    { value: 'java', label: 'Java' },
-    { value: 'python', label: 'Python' },
-    { value: 'rTask', label: 'R任务' },
-    { value: 'scala', label: 'Scala' },
-    { value: 'sql', label: 'SQL' },
-    { value: 'dataLoad', label: '数据加载' },
-    { value: 'dataSync', label: '数据同步' },
-    { value: 'dataQuality', label: '数据质量' },
-    { value: 'dataMetrics', label: '数据指标' },
-    { value: 'nestedWorkflow', label: '嵌套任务流' },
-    { value: 'delay', label: '延时器' },
+    { value: 'id', label: 'id' },
+    { value: 'em_name', label: 'em_name' },
+    { value: 'em_age', label: 'em_age' },
+    { value: 'em_idcard', label: 'em_idcard' },
+    { value: 'em_tel', label: 'em_tel' },
+    { value: 'em_typework', label: 'em_typework' },
   ];
 
   const form = reactive({