Browse Source

修改选择

zs 6 months ago
parent
commit
ca00a1e103

+ 0 - 1
src/views/center/achievement.vue

@@ -101,7 +101,6 @@
                 <div class="other_2 textOne">
                   <el-icon color="#0085f5"><Location /></el-icon>
                   {{ getArea(item.area) }}
-                  <span class="state">{{ getDict(item.status, 'status') || '未解决' }}</span>
                 </div>
               </div>
             </div>

+ 1 - 1
src/views/center/demand.vue

@@ -213,7 +213,7 @@ const formFields = ref([
   { label: '需求名称', model: 'name' },
   { label: '标签', model: 'tags', custom: true, mark: 'tags' },
   { label: '所属产业', model: 'industry', type: 'select' },
-  { label: '行业领域', model: 'field' },
+  { label: '行业领域', model: 'field', type: 'select' },
   { label: '需求紧急度', model: 'urgent', type: 'select', mark: 'dict', code: 'urgent' },
   { label: '合作方式', model: 'method', type: 'select', mark: 'dict', code: 'method' },
   { label: '价格(万元)', model: 'money' },

+ 0 - 1
src/views/center/project.vue

@@ -101,7 +101,6 @@
                 <div class="other_2 textOne">
                   <el-icon color="#0085f5"><Location /></el-icon>
                   {{ getArea(item.area) }}
-                  <span class="state">{{ getDict(item.status, 'status') || '未解决' }}</span>
                 </div>
               </div>
             </div>

+ 1 - 2
src/views/center/supply.vue

@@ -93,7 +93,6 @@
                 <div class="other_2 textOne">
                   <el-icon color="#0085f5"><Location /></el-icon>
                   {{ getArea(item.area) }}
-                  <span class="state">{{ getDict(item.status, 'status') || '未解决' }}</span>
                 </div>
               </div>
             </div>
@@ -200,7 +199,7 @@ const formFields = ref([
   { label: '供给名称', model: 'name' },
   { label: '标签', model: 'tags', custom: true, mark: 'tags' },
   { label: '所属产业', model: 'industry', type: 'select' },
-  { label: '行业领域', model: 'field' },
+  { label: '行业领域', model: 'field', type: 'select' },
   { label: '供给紧急度', model: 'urgent', type: 'select', mark: 'dict', code: 'urgent' },
   { label: '合作方式', model: 'method', type: 'select', mark: 'dict', code: 'method' },
   { label: '价格(万元)', model: 'money' },

+ 11 - 29
src/views/twelve/index.vue

@@ -1,9 +1,9 @@
 <template>
   <custom-layout class="main">
-    <div class="loading" v-if="loading">
+    <!-- <div class="loading" v-if="loading">
       <el-image class="image" :src="load" fit="fill" />
-    </div>
-    <div class="w_1700 one" v-else>
+    </div> -->
+    <div class="w_1700 one">
       <div class="left">
         <div class="left_1">
           <div class="titleOne">
@@ -35,15 +35,7 @@
               </div>
             </div>
             <el-col :span="24" class="page">
-              <el-pagination
-                background
-                layout="prev, pager, next"
-                :total="supplytotal"
-                :page-size="supplylimit"
-                v-model:current-page="currentPageone"
-                @current-change="changePageone"
-                @size-change="sizeChangeone"
-              />
+              <el-pagination background layout="prev, pager, next" :total="supplytotal" :page-size="supplylimit" v-model:current-page="currentPageone" @current-change="changePageone" @size-change="sizeChangeone" />
             </el-col>
           </div>
         </div>
@@ -81,15 +73,7 @@
               </div>
             </div>
             <el-col :span="24" class="page">
-              <el-pagination
-                background
-                layout="prev, pager, next"
-                :total="demandtotal"
-                :page-size="demandlimit"
-                v-model:current-page="currentPagetwo"
-                @current-change="changePagetwo"
-                @size-change="sizeChangetwo"
-              />
+              <el-pagination background layout="prev, pager, next" :total="demandtotal" :page-size="demandlimit" v-model:current-page="currentPagetwo" @current-change="changePagetwo" @size-change="sizeChangetwo" />
             </el-col>
           </div>
         </div>
@@ -192,7 +176,7 @@
 // 图片引入
 import left from '/images/top-left.png'
 import right from '/images/top-right.png'
-import load from '/images/load.gif'
+// import load from '/images/load.gif'
 // 接口
 import { DemandStore } from '@/store/api/platform/demand'
 import { SupplyStore } from '@/store/api/platform/supply'
@@ -230,13 +214,11 @@ const total = ref(0)
 
 // 请求
 onMounted(async () => {
-  setTimeout(async () => {
-    loading.value = true
-    await searchOther()
-    await searchsupply({ supplyskip, supplylimit })
-    await searchdemand({ demandskip, demandlimit })
-    loading.value = false
-  }, 6000)
+  loading.value = true
+  await searchOther()
+  await searchsupply({ supplyskip, supplylimit })
+  await searchdemand({ demandskip, demandlimit })
+  loading.value = false
 })
 const searchOther = async () => {}
 // 供给信息

+ 0 - 1
src/views/two/add/achievement.vue

@@ -64,7 +64,6 @@
                 <div class="other_2 textOne">
                   <el-icon color="#0085f5"><Location /></el-icon>
                   {{ getArea(item.area) }}
-                  <span class="state">{{ getDict(item.status, 'status') || '未解决' }}</span>
                 </div>
               </div>
             </div>

+ 1 - 1
src/views/two/add/demand.vue

@@ -106,7 +106,7 @@ const formFields = ref([
   { label: '需求名称', model: 'name' },
   { label: '标签', model: 'tags', custom: true, mark: 'tags' },
   { label: '所属产业', model: 'industry', type: 'select' },
-  { label: '行业领域', model: 'field' },
+  { label: '行业领域', model: 'field', type: 'select' },
   { label: '需求紧急度', model: 'urgent', type: 'select', mark: 'dict', code: 'urgent' },
   { label: '合作方式', model: 'method', type: 'select', mark: 'dict', code: 'method' },
   { label: '价格(万元)', model: 'money' },

+ 1 - 2
src/views/two/add/supply.vue

@@ -55,7 +55,6 @@
                 <div class="other_2 textOne">
                   <el-icon color="#0085f5"><Location /></el-icon>
                   {{ getArea(item.area) }}
-                  <span class="state">{{ getDict(item.status, 'status') || '未解决' }}</span>
                 </div>
               </div>
             </div>
@@ -107,7 +106,7 @@ const formFields = ref([
   { label: '供给名称', model: 'name' },
   { label: '标签', model: 'tags', custom: true, mark: 'tags' },
   { label: '所属产业', model: 'industry', type: 'select' },
-  { label: '行业领域', model: 'field' },
+  { label: '行业领域', model: 'field', type: 'select' },
   { label: '供给紧急度', model: 'urgent', type: 'select', mark: 'dict', code: 'urgent' },
   { label: '合作方式', model: 'method', type: 'select', mark: 'dict', code: 'method' },
   { label: '价格(万元)', model: 'money' },