修改成果显示

src/views/achievement/index.vue

@@ -42,19 +42,22 @@
                 </el-tooltip>
               </el-col>
               <el-row class="other">
-                <el-col :span="8" class="other_1"
-                  ><span>技术领域：</span>{{ item.area || '暂无技术领域' }}</el-col
-                >
-                <el-col :span="8" class="other_1"
-                  ><span>成果地区：</span>{{ item.city || '暂无成果地区' }}</el-col
-                >
-                <el-col :span="8" class="other_1"
-                  ><span>单位：</span>{{ item.unit || '暂无单位' }}</el-col
-                >
+                <el-col :span="8" class="other_1">
+                  <span>技术领域：</span>
+                  {{ getDict(item.field || '暂无技术领域', 'field') }}
+                </el-col>
+                <el-col :span="8" class="other_1">
+                  <span>成果地区：</span>
+                  {{ getArea(item.area || '暂无成果地区') }}
+                </el-col>
+                <el-col :span="8" class="other_1">
+                  <span>单位：</span>
+                  {{ item.user || '暂无单位' }}
+                </el-col>
               </el-row>
-              <el-col :span="24" class="brief textOver">{{
-                item.brief || '没有更多成果简介'
-              }}</el-col>
+              <el-col :span="24" class="brief textOver">
+                {{ item.brief || '没有更多成果简介' }}
+              </el-col>
             </el-col>
           </el-col>
           <el-col :span="24" class="thr">
@@ -78,6 +81,13 @@
 
 <script setup>
 import { SearchOutlined } from '@ant-design/icons-vue'
+import { get } from 'lodash-es'
+const $checkRes = inject('$checkRes')
+// 接口
+import { AchievementStore } from '@/store/api/platform/achievement'
+import { DictDataStore } from '@/store/api/system/dictData'
+const store = AchievementStore()
+const dictDataStore = DictDataStore()
 // 路由
 const router = useRouter()
 // 图片引入
@@ -85,98 +95,12 @@ import achievement from '@/assets/achievement.png'
 // 加载中
 const loading = ref(false)
 const searchValue = ref('')
+const searchForm = ref({})
 // 列表
-const list = ref([
-  {
-    name: '拉力均衡强稳定性无焊口锚链',
-    area: '先进制造',
-    city: '舟山市',
-    unit: '浙江易丰安全科技有限公司',
-    brief:
-      '技术特点：专为电子商务行业设计，以自动化和流程化地管理订单、财务、仓库、物流和发货等业务为主。它的目标是提高商家的订单速度和出货速度，有效管理企业内部员工的工作能力和监管财务系统，以及改善企业业务流程、提高企业核心竞争力'
-  },
-  {
-    name: '拉力均衡强稳定性无焊口锚链',
-    area: '先进制造',
-    city: '舟山市',
-    unit: '浙江易丰安全科技有限公司'
-  },
-  {
-    name: '拉力均衡强稳定性无焊口锚链',
-    area: '先进制造',
-    city: '舟山市',
-    unit: '浙江易丰安全科技有限公司'
-  },
-  {
-    name: '拉力均衡强稳定性无焊口锚链',
-    area: '先进制造',
-    city: '舟山市',
-    unit: '浙江易丰安全科技有限公司'
-  },
-  {
-    name: '拉力均衡强稳定性无焊口锚链',
-    area: '先进制造',
-    city: '舟山市',
-    unit: '浙江易丰安全科技有限公司'
-  },
-  {
-    name: '拉力均衡强稳定性无焊口锚链',
-    area: '先进制造',
-    city: '舟山市',
-    unit: '浙江易丰安全科技有限公司'
-  },
-  {
-    name: '拉力均衡强稳定性无焊口锚链',
-    area: '先进制造',
-    city: '舟山市',
-    unit: '浙江易丰安全科技有限公司'
-  },
-  {
-    name: '拉力均衡强稳定性无焊口锚链',
-    area: '先进制造',
-    city: '舟山市',
-    unit: '浙江易丰安全科技有限公司'
-  },
-  {
-    name: '拉力均衡强稳定性无焊口锚链',
-    area: '先进制造',
-    city: '舟山市',
-    unit: '浙江易丰安全科技有限公司'
-  },
-  {
-    name: '拉力均衡强稳定性无焊口锚链',
-    area: '先进制造',
-    city: '舟山市',
-    unit: '浙江易丰安全科技有限公司'
-  },
-  {
-    name: '拉力均衡强稳定性无焊口锚链',
-    area: '先进制造',
-    city: '舟山市',
-    unit: '浙江易丰安全科技有限公司'
-  },
-  {
-    name: '拉力均衡强稳定性无焊口锚链',
-    area: '先进制造',
-    city: '舟山市',
-    unit: '浙江易丰安全科技有限公司'
-  },
-  {
-    name: '拉力均衡强稳定性无焊口锚链',
-    area: '先进制造',
-    city: '舟山市',
-    unit: '浙江易丰安全科技有限公司'
-  },
-  {
-    name: '拉力均衡强稳定性无焊口锚链',
-    area: '先进制造',
-    city: '舟山市',
-    unit: '浙江易丰安全科技有限公司'
-  }
-])
-let total = ref(12)
+const list = ref([])
 let skip = 0
 let limit = inject('limit')
+const total = ref(0)
 const searchList = ref([
   {
     title: '行业分市场',
@@ -274,6 +198,8 @@ const searchList = ref([
     ]
   }
 ])
+// 字典表
+const fieldList = ref([])
 // 查看
 const toView = (item) => {
   router.push({ path: '/achievement/detail', query: { id: item.id || item._id } })
@@ -285,21 +211,29 @@ onMounted(async () => {
   await search({ skip, limit })
   loading.value = false
 })
-const search = async (e) => {
-  const info = { skip: e.skip, limit: e.limit }
-  console.log(info)
-  //   const res: IQueryResult = await userCheckAxios.query(info);
-  //   if (res.errcode == '0') {
-  //     list.value = res.data;
-  //     total.value = res.total;
-  //   }
-}
-// 查询其他信息
 const searchOther = async () => {
-  //   let res: IQueryResult;
-  //   // 性别
-  //   res = await dictAxios.query({ type: 'common_gender' });
-  //   if (res.errcode == '0') genderList.value = res.data;
+  let result
+  // 技术领域
+  result = await dictDataStore.query({ code: 'field', is_use: '0' })
+  if ($checkRes(result)) fieldList.value = result.data
+}
+const search = async (query = { skip: 0, limit }) => {
+  const info = { skip: query.skip, limit: query.limit, ...searchForm.value }
+  const res = await store.query(info)
+  if (res.errcode == '0') {
+    list.value = res.data
+    total.value = res.total
+  }
+}
+// 字典数据转换
+const getDict = (data, model) => {
+  let res
+  if (model == 'field') res = fieldList.value.find((f) => f.value == data)
+  return get(res, 'label')
+}
+// 地区显示
+const getArea = (data) => {
+  if (data) return data.join(',')
 }
 </script>
 <style lang="scss" scoped>

src/views/demand/index.vue

@@ -94,12 +94,7 @@ let skip = 0
 let limit = inject('limit')
 const total = ref(20)
 // 字典表
-const isUseList = ref([])
-const statusList = ref([])
-const methodList = ref([])
-const urgentList = ref([])
 const fieldList = ref([])
-const demandList = ref([])
 const searchList = ref([
   {
     title: '技术领域',
@@ -183,24 +178,9 @@ onMounted(async () => {
 })
 const searchOther = async () => {
   let result
-  // 是否使用
-  result = await dictDataStore.query({ code: 'isUse', is_use: '0' })
-  if ($checkRes(result)) isUseList.value = result.data
-  // 状态
-  result = await dictDataStore.query({ code: 'examStatus', is_use: '0' })
-  if ($checkRes(result)) statusList.value = result.data
-  // 合作方式
-  result = await dictDataStore.query({ code: 'method', is_use: '0' })
-  if ($checkRes(result)) methodList.value = result.data
-  // 需求紧急度
-  result = await dictDataStore.query({ code: 'urgent', is_use: '0' })
-  if ($checkRes(result)) urgentList.value = result.data
   // 技术领域
   result = await dictDataStore.query({ code: 'field', is_use: '0' })
   if ($checkRes(result)) fieldList.value = result.data
-  // 需求状态
-  result = await dictDataStore.query({ code: 'demandStatus', is_use: '0' })
-  if ($checkRes(result)) demandList.value = result.data
 }
 const search = async (query = { skip: 0, limit }) => {
   const info = { skip: query.skip, limit: query.limit, ...searchForm.value }
@@ -213,15 +193,10 @@ const search = async (query = { skip: 0, limit }) => {
 // 字典数据转换
 const getDict = (data, model) => {
   let res
-  if (model == 'is_use') res = isUseList.value.find((f) => f.value == data)
-  else if (model == 'status') res = statusList.value.find((f) => f.value == data)
-  else if (model == 'method') res = methodList.value.find((f) => f.value == data)
-  else if (model == 'urgent') res = urgentList.value.find((f) => f.value == data)
-  else if (model == 'field') res = fieldList.value.find((f) => f.value == data)
-  else if (model == 'demand') res = demandList.value.find((f) => f.value == data)
+  if (model == 'field') res = fieldList.value.find((f) => f.value == data)
   return get(res, 'label')
 }
-// 字典数据转换
+// 地区显示
 const getArea = (data) => {
   if (data) return data.join(',')
 }