修改

src/views/center/achievement.vue

@@ -205,7 +205,7 @@ const formFields = ref([
   { label: '标签', model: 'tags', custom: true, mark: 'tags' },
   { label: '行业', model: 'industry', type: 'select' },
   { label: '专利号', model: 'patent' },
-  { label: '行业领域', model: 'field' },
+  { label: '行业领域', model: 'field', type: 'select' },
   { label: '属性', model: 'attribute', type: 'select', mark: 'dict', code: 'attribute' },
   { label: '成熟度', model: 'mature', type: 'select', mark: 'dict', code: 'mature' },
   { label: '出让方式', model: 'sell', type: 'select', mark: 'dict', code: 'sell' },

src/views/detail/company.vue

@@ -464,13 +464,12 @@ const toDel = async (data, type) => {
   .thr {
     display: flex;
     align-items: center;
-    justify-content: space-between;
     flex-wrap: wrap;
     .list {
       float: left;
       width: 420px;
       padding: 15px;
-      margin: 0 0 25px 0;
+      margin: 0 20px 25px 0;
       background: #f0f8ff;
       color: #000;
       cursor: default;
@@ -513,6 +512,9 @@ const toDel = async (data, type) => {
         }
       }
     }
+    .list:nth-child(3n) {
+      margin: 0 0 25px 0;
+    }
   }
   .four {
     display: flex;

src/views/one/parts/echarts1.vue

@@ -87,7 +87,6 @@ function echarts1View() {
   })
 }
 function echarts2View() {
-  const endPercent = (6 / info.value.two.list.length) * 100
   var myChart2 = echarts.init(echarts2.value)
   var option2 = {
     tooltip: {
@@ -110,54 +109,24 @@ function echarts2View() {
       color: ['#ffcc00', '#28f2e6']
     },
     dataZoom: [
-      //给x轴设置滚动条
       {
-        start: 0, //默认为0
-        end: endPercent,
-        type: 'slider',
         show: true,
-        xAxisIndex: [0],
-        handleSize: 0, //滑动条的 左右2个滑动条的大小
-        height: 12, //组件高度
-        left: 50, //左边的距离
-        right: 40, //右边的距离
-        bottom: 30, //右边的距离
-        handleColor: '#ddd', //h滑动图标的颜色
+        height: 12,
+        xAxisIndex: [0, 6],
+        bottom: 30,
+        start: 0,
+        end: 80,
+        handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
+        handleSize: '110%',
         handleStyle: {
-          borderColor: '#cacaca',
-          borderWidth: '1',
-          shadowBlur: 2,
-          background: '#ddd',
-          shadowColor: '#ddd'
+          color: '#d3dee5'
         },
-        fillerColor: new echarts.graphic.LinearGradient(1, 0, 0, 0, [
-          {
-            //给颜色设置渐变色 前面4个参数，给第一个设置1，第四个设置0 ，就是水平渐变
-            //给第一个设置0，第四个设置1，就是垂直渐变
-            offset: 0,
-            color: '#1eb5e5'
-          },
-          {
-            offset: 1,
-            color: '#5ccbb1'
-          }
-        ]),
-        backgroundColor: '#ddd', //两边未选中的滑动条区域的颜色
-        showDataShadow: false, //是否显示数据阴影 默认auto
-        showDetail: false, //即拖拽时候是否显示详细数值信息 默认true
-        handleIcon: 'M-292,322.2c-3.2,0-6.4-0.6-9.3-1.9c-2.9-1.2-5.4-2.9-7.6-5.1s-3.9-4.8-5.1-7.6c-1.3-3-1.9-6.1-1.9-9.3c0-3.2,0.6-6.4,1.9-9.3c1.2-2.9,2.9-5.4,5.1-7.6s4.8-3.9,7.6-5.1c3-1.3,6.1-1.9,9.3-1.9c3.2,0,6.4,0.6,9.3,1.9c2.9,1.2,5.4,2.9,7.6,5.1s3.9,4.8,5.1,7.6c1.3,3,1.9,6.1,1.9,9.3c0,3.2-0.6,6.4-1.9,9.3c-1.2,2.9-2.9,5.4-5.1,7.6s-4.8,3.9-7.6,5.1C-285.6,321.5-288.8,322.2-292,322.2z',
-        filterMode: 'filter'
-      },
-      //下面这个属性是里面拖到
-      {
-        type: 'inside',
-        show: true,
-        xAxisIndex: [0],
-        start: 0, //默认为1
-        end: 50
+        textStyle: {
+          color: '#fff'
+        },
+        borderColor: 'rgba(255,255,255,.3)'
       }
     ],
-    calculable: true,
     xAxis: [
       {
         type: 'category',

src/views/one/parts/echarts2.vue

@@ -87,7 +87,6 @@ function echarts1View() {
   })
 }
 function echarts2View() {
-  const endPercent = (6 / info.value.two.list.length) * 100
   var myChart2 = echarts.init(echarts2.value)
   var option2 = {
     tooltip: {
@@ -110,54 +109,24 @@ function echarts2View() {
       color: ['#ffcc00', '#28f2e6']
     },
     dataZoom: [
-      //给x轴设置滚动条
       {
-        start: 0, //默认为0
-        end: endPercent,
-        type: 'slider',
         show: true,
-        xAxisIndex: [0],
-        handleSize: 0, //滑动条的 左右2个滑动条的大小
-        height: 12, //组件高度
-        left: 50, //左边的距离
-        right: 40, //右边的距离
-        bottom: 30, //右边的距离
-        handleColor: '#ddd', //h滑动图标的颜色
+        height: 12,
+        xAxisIndex: [0, 6],
+        bottom: 30,
+        start: 0,
+        end: 80,
+        handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
+        handleSize: '110%',
         handleStyle: {
-          borderColor: '#cacaca',
-          borderWidth: '1',
-          shadowBlur: 2,
-          background: '#ddd',
-          shadowColor: '#ddd'
+          color: '#d3dee5'
         },
-        fillerColor: new echarts.graphic.LinearGradient(1, 0, 0, 0, [
-          {
-            //给颜色设置渐变色 前面4个参数，给第一个设置1，第四个设置0 ，就是水平渐变
-            //给第一个设置0，第四个设置1，就是垂直渐变
-            offset: 0,
-            color: '#1eb5e5'
-          },
-          {
-            offset: 1,
-            color: '#5ccbb1'
-          }
-        ]),
-        backgroundColor: '#ddd', //两边未选中的滑动条区域的颜色
-        showDataShadow: false, //是否显示数据阴影 默认auto
-        showDetail: false, //即拖拽时候是否显示详细数值信息 默认true
-        handleIcon: 'M-292,322.2c-3.2,0-6.4-0.6-9.3-1.9c-2.9-1.2-5.4-2.9-7.6-5.1s-3.9-4.8-5.1-7.6c-1.3-3-1.9-6.1-1.9-9.3c0-3.2,0.6-6.4,1.9-9.3c1.2-2.9,2.9-5.4,5.1-7.6s4.8-3.9,7.6-5.1c3-1.3,6.1-1.9,9.3-1.9c3.2,0,6.4,0.6,9.3,1.9c2.9,1.2,5.4,2.9,7.6,5.1s3.9,4.8,5.1,7.6c1.3,3,1.9,6.1,1.9,9.3c0,3.2-0.6,6.4-1.9,9.3c-1.2,2.9-2.9,5.4-5.1,7.6s-4.8,3.9-7.6,5.1C-285.6,321.5-288.8,322.2-292,322.2z',
-        filterMode: 'filter'
-      },
-      //下面这个属性是里面拖到
-      {
-        type: 'inside',
-        show: true,
-        xAxisIndex: [0],
-        start: 0, //默认为1
-        end: 50
+        textStyle: {
+          color: '#fff'
+        },
+        borderColor: 'rgba(255,255,255,.3)'
       }
     ],
-    calculable: true,
     xAxis: [
       {
         type: 'category',

src/views/one/parts/echarts3.vue

@@ -87,7 +87,6 @@ function echarts1View() {
   })
 }
 function echarts2View() {
-  const endPercent = (6 / info.value.two.list.length) * 100
   var myChart2 = echarts.init(echarts2.value)
   var option2 = {
     tooltip: {
@@ -110,54 +109,24 @@ function echarts2View() {
       color: ['#ffcc00', '#28f2e6']
     },
     dataZoom: [
-      //给x轴设置滚动条
       {
-        start: 0, //默认为0
-        end: endPercent,
-        type: 'slider',
         show: true,
-        xAxisIndex: [0],
-        handleSize: 0, //滑动条的 左右2个滑动条的大小
-        height: 12, //组件高度
-        left: 50, //左边的距离
-        right: 40, //右边的距离
-        bottom: 30, //右边的距离
-        handleColor: '#ddd', //h滑动图标的颜色
+        height: 12,
+        xAxisIndex: [0, 6],
+        bottom: 30,
+        start: 0,
+        end: 80,
+        handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
+        handleSize: '110%',
         handleStyle: {
-          borderColor: '#cacaca',
-          borderWidth: '1',
-          shadowBlur: 2,
-          background: '#ddd',
-          shadowColor: '#ddd'
+          color: '#d3dee5'
         },
-        fillerColor: new echarts.graphic.LinearGradient(1, 0, 0, 0, [
-          {
-            //给颜色设置渐变色 前面4个参数，给第一个设置1，第四个设置0 ，就是水平渐变
-            //给第一个设置0，第四个设置1，就是垂直渐变
-            offset: 0,
-            color: '#1eb5e5'
-          },
-          {
-            offset: 1,
-            color: '#5ccbb1'
-          }
-        ]),
-        backgroundColor: '#ddd', //两边未选中的滑动条区域的颜色
-        showDataShadow: false, //是否显示数据阴影 默认auto
-        showDetail: false, //即拖拽时候是否显示详细数值信息 默认true
-        handleIcon: 'M-292,322.2c-3.2,0-6.4-0.6-9.3-1.9c-2.9-1.2-5.4-2.9-7.6-5.1s-3.9-4.8-5.1-7.6c-1.3-3-1.9-6.1-1.9-9.3c0-3.2,0.6-6.4,1.9-9.3c1.2-2.9,2.9-5.4,5.1-7.6s4.8-3.9,7.6-5.1c3-1.3,6.1-1.9,9.3-1.9c3.2,0,6.4,0.6,9.3,1.9c2.9,1.2,5.4,2.9,7.6,5.1s3.9,4.8,5.1,7.6c1.3,3,1.9,6.1,1.9,9.3c0,3.2-0.6,6.4-1.9,9.3c-1.2,2.9-2.9,5.4-5.1,7.6s-4.8,3.9-7.6,5.1C-285.6,321.5-288.8,322.2-292,322.2z',
-        filterMode: 'filter'
-      },
-      //下面这个属性是里面拖到
-      {
-        type: 'inside',
-        show: true,
-        xAxisIndex: [0],
-        start: 0, //默认为1
-        end: 50
+        textStyle: {
+          color: '#fff'
+        },
+        borderColor: 'rgba(255,255,255,.3)'
       }
     ],
-    calculable: true,
     xAxis: [
       {
         type: 'category',

src/views/one/parts/echarts4.vue

@@ -87,7 +87,6 @@ function echarts1View() {
   })
 }
 function echarts2View() {
-  const endPercent = (6 / info.value.two.list.length) * 100
   var myChart2 = echarts.init(echarts2.value)
   var option2 = {
     tooltip: {
@@ -110,54 +109,24 @@ function echarts2View() {
       color: ['#ffcc00', '#28f2e6']
     },
     dataZoom: [
-      //给x轴设置滚动条
       {
-        start: 0, //默认为0
-        end: endPercent,
-        type: 'slider',
         show: true,
-        xAxisIndex: [0],
-        handleSize: 0, //滑动条的 左右2个滑动条的大小
-        height: 12, //组件高度
-        left: 50, //左边的距离
-        right: 40, //右边的距离
-        bottom: 30, //右边的距离
-        handleColor: '#ddd', //h滑动图标的颜色
+        height: 12,
+        xAxisIndex: [0, 6],
+        bottom: 30,
+        start: 0,
+        end: 80,
+        handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
+        handleSize: '110%',
         handleStyle: {
-          borderColor: '#cacaca',
-          borderWidth: '1',
-          shadowBlur: 2,
-          background: '#ddd',
-          shadowColor: '#ddd'
+          color: '#d3dee5'
         },
-        fillerColor: new echarts.graphic.LinearGradient(1, 0, 0, 0, [
-          {
-            //给颜色设置渐变色 前面4个参数，给第一个设置1，第四个设置0 ，就是水平渐变
-            //给第一个设置0，第四个设置1，就是垂直渐变
-            offset: 0,
-            color: '#1eb5e5'
-          },
-          {
-            offset: 1,
-            color: '#5ccbb1'
-          }
-        ]),
-        backgroundColor: '#ddd', //两边未选中的滑动条区域的颜色
-        showDataShadow: false, //是否显示数据阴影 默认auto
-        showDetail: false, //即拖拽时候是否显示详细数值信息 默认true
-        handleIcon: 'M-292,322.2c-3.2,0-6.4-0.6-9.3-1.9c-2.9-1.2-5.4-2.9-7.6-5.1s-3.9-4.8-5.1-7.6c-1.3-3-1.9-6.1-1.9-9.3c0-3.2,0.6-6.4,1.9-9.3c1.2-2.9,2.9-5.4,5.1-7.6s4.8-3.9,7.6-5.1c3-1.3,6.1-1.9,9.3-1.9c3.2,0,6.4,0.6,9.3,1.9c2.9,1.2,5.4,2.9,7.6,5.1s3.9,4.8,5.1,7.6c1.3,3,1.9,6.1,1.9,9.3c0,3.2-0.6,6.4-1.9,9.3c-1.2,2.9-2.9,5.4-5.1,7.6s-4.8,3.9-7.6,5.1C-285.6,321.5-288.8,322.2-292,322.2z',
-        filterMode: 'filter'
-      },
-      //下面这个属性是里面拖到
-      {
-        type: 'inside',
-        show: true,
-        xAxisIndex: [0],
-        start: 0, //默认为1
-        end: 50
+        textStyle: {
+          color: '#fff'
+        },
+        borderColor: 'rgba(255,255,255,.3)'
       }
     ],
-    calculable: true,
     xAxis: [
       {
         type: 'category',

src/views/one/parts/echarts5.vue

@@ -100,7 +100,6 @@ function echarts1View() {
   })
 }
 function echarts2View() {
-  const endPercent = (6 / info.value.two.list.length) * 100
   var myChart2 = echarts.init(echarts2.value)
   var option2 = {
     tooltip: {
@@ -124,54 +123,24 @@ function echarts2View() {
       color: ['#ffcc00', '#28f2e6']
     },
     dataZoom: [
-      //给x轴设置滚动条
       {
-        start: 0, //默认为0
-        end: endPercent,
-        type: 'slider',
         show: true,
-        xAxisIndex: [0],
-        handleSize: 0, //滑动条的 左右2个滑动条的大小
-        height: 12, //组件高度
-        left: 50, //左边的距离
-        right: 40, //右边的距离
-        bottom: 30, //右边的距离
-        handleColor: '#ddd', //h滑动图标的颜色
+        height: 12,
+        xAxisIndex: [0, 6],
+        bottom: 30,
+        start: 0,
+        end: 80,
+        handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
+        handleSize: '110%',
         handleStyle: {
-          borderColor: '#cacaca',
-          borderWidth: '1',
-          shadowBlur: 2,
-          background: '#ddd',
-          shadowColor: '#ddd'
+          color: '#d3dee5'
         },
-        fillerColor: new echarts.graphic.LinearGradient(1, 0, 0, 0, [
-          {
-            //给颜色设置渐变色 前面4个参数，给第一个设置1，第四个设置0 ，就是水平渐变
-            //给第一个设置0，第四个设置1，就是垂直渐变
-            offset: 0,
-            color: '#1eb5e5'
-          },
-          {
-            offset: 1,
-            color: '#5ccbb1'
-          }
-        ]),
-        backgroundColor: '#ddd', //两边未选中的滑动条区域的颜色
-        showDataShadow: false, //是否显示数据阴影 默认auto
-        showDetail: false, //即拖拽时候是否显示详细数值信息 默认true
-        handleIcon: 'M-292,322.2c-3.2,0-6.4-0.6-9.3-1.9c-2.9-1.2-5.4-2.9-7.6-5.1s-3.9-4.8-5.1-7.6c-1.3-3-1.9-6.1-1.9-9.3c0-3.2,0.6-6.4,1.9-9.3c1.2-2.9,2.9-5.4,5.1-7.6s4.8-3.9,7.6-5.1c3-1.3,6.1-1.9,9.3-1.9c3.2,0,6.4,0.6,9.3,1.9c2.9,1.2,5.4,2.9,7.6,5.1s3.9,4.8,5.1,7.6c1.3,3,1.9,6.1,1.9,9.3c0,3.2-0.6,6.4-1.9,9.3c-1.2,2.9-2.9,5.4-5.1,7.6s-4.8,3.9-7.6,5.1C-285.6,321.5-288.8,322.2-292,322.2z',
-        filterMode: 'filter'
-      },
-      //下面这个属性是里面拖到
-      {
-        type: 'inside',
-        show: true,
-        xAxisIndex: [0],
-        start: 0, //默认为1
-        end: 50
+        textStyle: {
+          color: '#fff'
+        },
+        borderColor: 'rgba(255,255,255,.3)'
       }
     ],
-    calculable: true,
     xAxis: [
       {
         type: 'category',

src/views/search/parts/company.vue

@@ -443,13 +443,12 @@ defineExpose({
   .thr {
     display: flex;
     align-items: center;
-    justify-content: space-between;
     flex-wrap: wrap;
     .list {
       float: left;
       width: 420px;
       padding: 15px;
-      margin: 0 0 25px 0;
+      margin: 0 20px 25px 0;
       background: #f0f8ff;
       color: #000;
       .name {
@@ -491,6 +490,9 @@ defineExpose({
         }
       }
     }
+    .list:nth-child(3n) {
+      margin: 0 0 25px 0;
+    }
   }
   .four {
     display: flex;

src/views/two/add/achievement.vue

@@ -117,7 +117,7 @@ const formFields = ref([
   { label: '标签', model: 'tags', custom: true, mark: 'tags' },
   { label: '行业', model: 'industry', type: 'select' },
   { label: '专利号', model: 'patent' },
-  { label: '行业领域', model: 'field' },
+  { label: '行业领域', model: 'field', type: 'select' },
   { label: '属性', model: 'attribute', type: 'select', mark: 'dict', code: 'attribute' },
   { label: '成熟度', model: 'mature', type: 'select', mark: 'dict', code: 'mature' },
   { label: '出让方式', model: 'sell', type: 'select', mark: 'dict', code: 'sell' },