修改显示字段

src/components/custom/custom-layout.vue

@@ -327,11 +327,11 @@ const toOut = () => {
         }
       }
       .info {
-        // display: none;
+        display: none;
         .info_1 {
           z-index: 100;
           position: absolute;
-          left: 450px;
+          left: 449px;
           top: 143px;
           cursor: default;
           width: 170px;

src/views/center/achievement.vue

@@ -203,7 +203,7 @@ const dialog = ref({ type: '1', show: false, title: '发布成果' })
 const formFields = ref([
   { label: '成果名称', model: 'name' },
   { label: '标签', model: 'tags', custom: true, mark: 'tags' },
-  { label: '所属产业', model: 'industry', type: 'select' },
+  { label: '行业', model: 'industry', type: 'select' },
   { label: '专利号', model: 'patent' },
   { label: '行业领域', model: 'field' },
   { label: '属性', model: 'attribute', type: 'select', mark: 'dict', code: 'attribute' },

src/views/center/demand.vue

@@ -212,7 +212,7 @@ const dialog = ref({ type: '1', show: false, title: '发布需求' })
 const formFields = ref([
   { label: '需求名称', model: 'name' },
   { label: '标签', model: 'tags', custom: true, mark: 'tags' },
-  { label: '所属产业', model: 'industry', type: 'select' },
+  { label: '行业', model: 'industry', type: 'select' },
   { label: '行业领域', model: 'field', type: 'select' },
   { label: '需求紧急度', model: 'urgent', type: 'select', mark: 'dict', code: 'urgent' },
   { label: '合作方式', model: 'method', type: 'select', mark: 'dict', code: 'method' },

src/views/center/footplate.vue

@@ -104,7 +104,7 @@ const formFields = ref([
   { label: '封面', model: 'file', custom: true },
   { label: '名称', model: 'name' },
   { label: '标签', model: 'tags', custom: true },
-  { label: '所属产业', model: 'industry', type: 'select' },
+  { label: '行业', model: 'industry', type: 'select' },
   { label: '建设主体', model: 'build' },
   { label: '运营主体', model: 'operate' },
   { label: '服务产业领域', model: 'field' },

src/views/center/match.vue

@@ -59,7 +59,7 @@
               <el-radio v-for="i in isUseList" :key="i.id" :label="i.value">{{ i.label }}</el-radio>
             </template>
             <template #industry>
-              <el-option v-for="i in sectorList" :key="i.id" :label="i.title" :value="i.title"></el-option>
+              <el-option v-for="i in industryList" :key="i.id" :label="i.label" :value="i.value"></el-option>
             </template>
             <template #scale>
               <el-radio v-for="i in scaleList" :key="i.id" :label="i.value">{{ i.label }}</el-radio>
@@ -193,11 +193,9 @@ import { MatchStore } from '@/store/api/platform/match'
 import { ProcessStore } from '@/store/api/platform/process'
 import { DictDataStore } from '@/store/api/system/dictData'
 import { TagsStore } from '@/store/api/system/tags'
-import { SectorStore } from '@/store/api/platform/sector'
 const store = MatchStore()
 const dictDataStore = DictDataStore()
 const tagsStore = TagsStore()
-const sectorStore = SectorStore()
 const processStore = ProcessStore()
 // 加载中
 const loading = ref(false)
@@ -216,7 +214,7 @@ const typeList = ref([])
 const matchList = ref([])
 const formList = ref([])
 const tagsList = ref([])
-const sectorList = ref([])
+const industryList = ref([])
 const matchTypeList = ref([])
 const scaleList = ref([])
 // 流程列表
@@ -233,7 +231,7 @@ const formFields = ref([
   { label: '赛事类型', model: 'match_type', type: 'radio' },
   { label: '路由', model: 'href', display: () => form.value.match_type == '1' },
   { label: '组织单位', model: 'work' },
-  { label: '所属产业', model: 'industry', type: 'select' },
+  { label: '行业', model: 'industry', type: 'select' },
   { label: '类别', model: 'form', type: 'select' },
   { label: '奖金(万元)', model: 'money' },
   { label: '有效期', model: 'time', type: 'daterange' },
@@ -316,8 +314,8 @@ const searchOther = async () => {
   result = await tagsStore.query({ is_use: '0' })
   if ($checkRes(result)) tagsList.value = result.data
   // 行业
-  result = await sectorStore.query({ is_use: '0' })
-  if ($checkRes(result)) sectorList.value = result.data
+  result = await dictDataStore.query({ code: 'matchIndustry', is_use: '0' })
+  if ($checkRes(result)) industryList.value = result.data
 }
 const searchProcess = async () => {
   const info = { match: form.value.id }

src/views/center/project.vue

@@ -220,7 +220,7 @@ const dialog = ref({ type: '1', show: false, title: '发布项目' })
 const formFields = ref([
   { label: '项目名称', model: 'name' },
   { label: '标签', model: 'tags', custom: true, mark: 'tags' },
-  { label: '所属产业', model: 'industry', type: 'select' },
+  { label: '行业', model: 'industry', type: 'select' },
   { label: '行业分类', model: 'type', type: 'select', code: 'industry' },
   { label: '成熟度', model: 'maturity', type: 'select', mark: 'dict', code: 'projectMaturity' },
   { label: '技术类型', model: 'skill', type: 'select', mark: 'dict', code: 'technology' },

src/views/center/service.vue

@@ -103,7 +103,7 @@ const formFields = ref([
   { label: '封面', model: 'file', custom: true },
   { label: '名称', model: 'name' },
   { label: '标签', model: 'tags', custom: true },
-  { label: '所属产业', model: 'industry', type: 'select' },
+  { label: '行业', model: 'industry', type: 'select' },
   { label: '服务领域', model: 'field' },
   { label: '登记时间', model: 'time', type: 'date' },
   { label: '所在地区', model: 'area', custom: true },

src/views/center/supply.vue

@@ -198,7 +198,7 @@ const dialog = ref({ type: '1', show: false, title: '发布供给' })
 const formFields = ref([
   { label: '供给名称', model: 'name' },
   { label: '标签', model: 'tags', custom: true, mark: 'tags' },
-  { label: '所属产业', model: 'industry', type: 'select' },
+  { label: '行业', model: 'industry', type: 'select' },
   { label: '行业领域', model: 'field', type: 'select' },
   { label: '供给紧急度', model: 'urgent', type: 'select', mark: 'dict', code: 'urgent' },
   { label: '合作方式', model: 'method', type: 'select', mark: 'dict', code: 'method' },

src/views/one/parts/echarts1.vue

@@ -121,6 +121,7 @@ function echarts2View() {
           textStyle: {
             color: '#7FC5F5'
           },
+          fontSize: 18,
           interval: 0
         },
         axisLine: {
@@ -143,6 +144,7 @@ function echarts2View() {
       axisLabel: {
         show: true,
         formatter: '{value}',
+        fontSize: 18,
         color: '#7FC5F5'
       },
       splitLine: {

src/views/one/parts/echarts2.vue

@@ -117,11 +117,12 @@ function echarts2View() {
           textStyle: {
             color: '#7FC5F5'
           },
+          fontSize: 18,
           interval: 0
         },
         axisLine: {
           lineStyle: {
-            color: 'rgba(127,197,245,0.1)',
+            color: 'rgba(127,197,245,0.5)',
             width: 1 //这里是为了突出显示加上的
           }
         },
@@ -136,13 +137,14 @@ function echarts2View() {
       axisLabel: {
         show: true,
         formatter: '{value}',
+        fontSize: 18,
         color: '#7FC5F5'
       },
       splitLine: {
         // 网格线
         show: true,
         lineStyle: {
-          color: 'rgba(127,197,245,0.1)',
+          color: 'rgba(127,197,245,0.5)',
           width: 1
         }
       }

src/views/one/parts/echarts3.vue

@@ -117,11 +117,12 @@ function echarts2View() {
           textStyle: {
             color: '#7FC5F5'
           },
+          fontSize: 18,
           interval: 0
         },
         axisLine: {
           lineStyle: {
-            color: 'rgba(127,197,245,0.1)',
+            color: 'rgba(127,197,245,0.5)',
             width: 1 //这里是为了突出显示加上的
           }
         },
@@ -136,13 +137,14 @@ function echarts2View() {
       axisLabel: {
         show: true,
         formatter: '{value}',
+        fontSize: 18,
         color: '#7FC5F5'
       },
       splitLine: {
         // 网格线
         show: true,
         lineStyle: {
-          color: 'rgba(127,197,245,0.1)',
+          color: 'rgba(127,197,245,0.5)',
           width: 1
         }
       }

src/views/one/parts/echarts4.vue

@@ -117,11 +117,12 @@ function echarts2View() {
           textStyle: {
             color: '#7FC5F5'
           },
+          fontSize: 18,
           interval: 0
         },
         axisLine: {
           lineStyle: {
-            color: 'rgba(127,197,245,0.1)',
+            color: 'rgba(127,197,245,0.5)',
             width: 1 //这里是为了突出显示加上的
           }
         },
@@ -136,13 +137,14 @@ function echarts2View() {
       axisLabel: {
         show: true,
         formatter: '{value}',
+        fontSize: 18,
         color: '#7FC5F5'
       },
       splitLine: {
         // 网格线
         show: true,
         lineStyle: {
-          color: 'rgba(127,197,245,0.1)',
+          color: 'rgba(127,197,245,0.5)',
           width: 1
         }
       }

src/views/one/parts/echarts5.vue

@@ -119,6 +119,7 @@ function echarts2View() {
       textStyle: {
         color: '#FFFFFF'
       },
+
       color: ['#ffcc00', '#28f2e6']
     },
     xAxis: [
@@ -130,11 +131,12 @@ function echarts2View() {
           textStyle: {
             color: '#7FC5F5'
           },
+          fontSize: 18,
           interval: 0
         },
         axisLine: {
           lineStyle: {
-            color: 'rgba(127,197,245,0.1)',
+            color: 'rgba(127,197,245,0.5)',
             width: 1 //这里是为了突出显示加上的
           }
         },
@@ -149,13 +151,14 @@ function echarts2View() {
       axisLabel: {
         show: true,
         formatter: '{value}',
+        fontSize: 18,
         color: '#7FC5F5'
       },
       splitLine: {
         // 网格线
         show: true,
         lineStyle: {
-          color: 'rgba(127,197,245,0.1)',
+          color: 'rgba(127,197,245,0.5)',
           width: 1
         }
       }

src/views/search/parts/project.vue

@@ -193,16 +193,11 @@ const sizeChange = (limits) => {
 }
 // 选择
 const oneChange = async () => {
-  if (checked1.value && checked1.value.length > 0) {
-    searchForm.value.industry = checked1.value
-  } else if (checked2.value && checked2.value.length > 0) {
-    searchForm.value.field = checked2.value
-  } else if (checked3.value && checked3.value.length > 0) {
-    searchForm.value.area = checked3.value
-  } else if (checked4.value && checked4.value.length > 0) {
-    searchForm.value.maturity = checked4.value
-  } else searchForm.value = {}
-
+  if (checked1.value && checked1.value.length > 0) searchForm.value.industry = checked1.value
+  if (checked2.value && checked2.value.length > 0) searchForm.value.field = checked2.value
+  if (checked3.value && checked3.value.length > 0) searchForm.value.area = checked3.value
+  if (checked4.value && checked4.value.length > 0) searchForm.value.maturity = checked4.value
+  if (checked1.value.length == 0 && checked2.value.length == 0 && checked3.value.length == 0 && checked4.value.length == 0) searchForm.value = {}
   await search({ skip, limit })
 }
 defineExpose({

src/views/two/add/achievement.vue

@@ -115,7 +115,7 @@ const urgentList = ref([])
 const formFields = ref([
   { label: '成果名称', model: 'name' },
   { label: '标签', model: 'tags', custom: true, mark: 'tags' },
-  { label: '所属产业', model: 'industry', type: 'select' },
+  { label: '行业', model: 'industry', type: 'select' },
   { label: '专利号', model: 'patent' },
   { label: '行业领域', model: 'field' },
   { label: '属性', model: 'attribute', type: 'select', mark: 'dict', code: 'attribute' },

src/views/two/add/demand.vue

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

src/views/two/add/footplate.vue

@@ -58,7 +58,7 @@ const formFields = ref([
   { label: '封面', model: 'file', custom: true },
   { label: '名称', model: 'name' },
   { label: '标签', model: 'tags', custom: true },
-  { label: '所属产业', model: 'industry', type: 'select' },
+  { label: '行业', model: 'industry', type: 'select' },
   { label: '建设主体', model: 'build' },
   { label: '运营主体', model: 'operate' },
   { label: '服务产业领域', model: 'field' },

src/views/two/add/match.vue

@@ -13,7 +13,7 @@
             <el-radio v-for="i in isUseList" :key="i.id" :label="i.value">{{ i.label }}</el-radio>
           </template>
           <template #industry>
-            <el-option v-for="i in sectorList" :key="i.id" :label="i.title" :value="i.title"></el-option>
+            <el-option v-for="i in industryList" :key="i.id" :label="i.label" :value="i.value"></el-option>
           </template>
           <template #scale>
             <el-radio v-for="i in scaleList" :key="i.id" :label="i.value">{{ i.label }}</el-radio>
@@ -130,11 +130,9 @@ import { MatchStore } from '@/store/api/platform/match'
 import { ProcessStore } from '@/store/api/platform/process'
 import { DictDataStore } from '@/store/api/system/dictData'
 import { TagsStore } from '@/store/api/system/tags'
-import { SectorStore } from '@/store/api/platform/sector'
 const store = MatchStore()
 const dictDataStore = DictDataStore()
 const tagsStore = TagsStore()
-const sectorStore = SectorStore()
 const processStore = ProcessStore()
 // 加载中
 const loading = ref(false)
@@ -146,7 +144,7 @@ const typeList = ref([])
 const matchList = ref([])
 const formList = ref([])
 const tagsList = ref([])
-const sectorList = ref([])
+const industryList = ref([])
 const matchTypeList = ref([])
 const scaleList = ref([])
 // 流程列表
@@ -162,7 +160,7 @@ const formFields = ref([
   { label: '赛事类型', model: 'match_type', type: 'radio' },
   { label: '路由', model: 'href', display: () => form.value.match_type == '1' },
   { label: '组织单位', model: 'work' },
-  { label: '所属产业', model: 'industry', type: 'select' },
+  { label: '行业', model: 'industry', type: 'select' },
   { label: '类别', model: 'form', type: 'select' },
   { label: '奖金(万元)', model: 'money' },
   { label: '有效期', model: 'time', type: 'datetimerange' },
@@ -227,8 +225,8 @@ const searchOther = async () => {
   result = await tagsStore.query({ is_use: '0' })
   if ($checkRes(result)) tagsList.value = result.data
   // 行业
-  result = await sectorStore.query({ is_use: '0' })
-  if ($checkRes(result)) sectorList.value = result.data
+  result = await dictDataStore.query({ code: 'matchIndustry', is_use: '0' })
+  if ($checkRes(result)) industryList.value = result.data
 }
 const toSave = async () => {
   const data = cloneDeep(form.value)

src/views/two/add/project.vue

@@ -76,7 +76,7 @@ const form = ref({ file: [] })
 const formFields = ref([
   { label: '项目名称', model: 'name' },
   { label: '标签', model: 'tags', custom: true, mark: 'tags' },
-  { label: '所属产业', model: 'industry', type: 'select' },
+  { label: '行业', model: 'industry', type: 'select' },
   { label: '行业分类', model: 'type', type: 'select', code: 'industry' },
   { label: '成熟度', model: 'maturity', type: 'select', mark: 'dict', code: 'projectMaturity' },
   { label: '技术类型', model: 'skill', type: 'select', mark: 'dict', code: 'technology' },

src/views/two/add/supply.vue

@@ -105,7 +105,7 @@ const form = ref({ time: [] })
 const formFields = ref([
   { label: '供给名称', model: 'name' },
   { label: '标签', model: 'tags', custom: true, mark: 'tags' },
-  { label: '所属产业', model: 'industry', type: 'select' },
+  { label: '行业', model: 'industry', type: 'select' },
   { label: '行业领域', model: 'field', type: 'select' },
   { label: '供给紧急度', model: 'urgent', type: 'select', mark: 'dict', code: 'urgent' },
   { label: '合作方式', model: 'method', type: 'select', mark: 'dict', code: 'method' },