commit

src/components/SelectButton/NewTypeSelect.jsx

@@ -30,7 +30,7 @@ const NewsTypeSelect = (props) => {
   }
 
   return (
-      <Select value={props.value} style={{ width: '180px' }} placeholder="请选择讯类型" onChange={props.onChange}>
+      <Select value={props.value} style={{ width: '180px' }} placeholder="请选择资讯类型" onChange={props.onChange}>
           {data.map(type => (
             <Option key={type.newsTypeId}>{type.newsTypeName}</Option>
           ))}

src/pages/indexEcharts/components/UserConversion.jsx

@@ -18,18 +18,18 @@ const UserSource = props => {
     UserConversionRate({ conversion: 'authorization_phone' })
   }, [])
 
-  function UserConversionRate (params) {
+  function UserConversionRate(params) {
 
     request({
       ...apis.indexEcharts.userConversion,
       params,
-    }).then(data => {  
-      console.log(data.data_count.registeredCount/data.data_count.pvNum,'1241234')
+    }).then(data => {
+      console.log(data.data_count.registeredCount / data.data_count.pvNum, '1241234')
       setDataset(data, params.conversion)
     })
   }
 
-  function setDataset (data, theStatis) {
+  function setDataset(data, theStatis) {
     const { pvNum, ...other } = data.data_count
 
     // 获取第一个值
@@ -43,7 +43,7 @@ const UserSource = props => {
       setTheCurrent([])
     } else {
 
-      setConversionRate(num/pvNum)
+      setConversionRate(num / pvNum)
       setTheCurrent([
         { name: getStatisName(theStatis), value: num },
         { name: '其余', value: pvNum - num },
@@ -51,7 +51,7 @@ const UserSource = props => {
     }
   }
 
-  function getStatisName (theStatis) {
+  function getStatisName(theStatis) {
     const statisTypes = [
       { label: '授权手机', value: 'authorization_phone' },
       { label: '项目收藏', value: 'building_save' },
@@ -75,14 +75,21 @@ const UserSource = props => {
       name: '转化率',
       radius: ['34%', '52%'],
       avoidLabelOverlap: false,
-      label: { 
-        normal: { 
-          show: true,
+      label: {
+        normal: {
+          show: false,
           position: 'center',
           color: '#666666',
-          fontSize: 24,
-          fontWeight: 'bold',
-          formatter: `${(conversionRate*100).toFixed(2) === 'NaN' ? 0 : (conversionRate*100).toFixed(2) }%`, // {b}:数据名； {c}：数据值； {d}：百分比，可以自定义显示内容，
+          fontSize: 22,
+          formatter: '{d}%'
+        },
+        emphasis: {
+          show: true,
+          formatter: '{d}%',
+          textStyle: {
+            fontSize: '22',
+            fontWeight: 'bold'
+          }
         }
       },
       labelLine: {
@@ -95,7 +102,7 @@ const UserSource = props => {
     },
   }
 
-  function onChange (e) {
+  function onChange(e) {
     UserConversionRate({ conversion: e })
   }
   const piestyles = {

src/pages/indexEcharts/components/UserSourcepie.jsx

@@ -56,7 +56,25 @@ const UserSource = (props) => {
         type: 'pie',
         center: ['40%', '65%'],
         radius: ['34%', '52%'],
+        label: {
+          normal: {
+            show: false,
+            position: 'center',
+            color: '#666666',
+            fontSize: 22,
+            formatter: '{d}%'
+          },
+          emphasis: {
+            show: true,
+            formatter: '{d}%',
+            textStyle: {
+              fontSize: '22',
+              fontWeight: 'bold'
+            }
+          }
+        },
       },
+
     ],
 
     dataset: {

src/pages/news/list/NewsList.jsx

@@ -195,22 +195,22 @@ function body(props) {
             whiteSpace: 'nowrap',
             width: '300px',
           }}>{data.newsName}</p>
-          <p style={{ fontSize: ' 0.11rem', color: '#555', marginBottom: '10px' }}>
-            <span style={{ display: 'inline-block', width: '190px' }}>咨询类型：{data.newsType.newsTypeName}</span>
+          <p style={{ fontSize: ' 0.11rem', color: '#555', marginBottom: '8px',display:'flex' }}>
+            <span style={{ display: 'inline-block', width: '180px',overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap' }}>资讯类型：{data.newsType.newsTypeName}</span>
             <span>状态：{data.newsStatus == 0 ? "已发布" : "未发布"}</span>
           </p>
 
-          <p style={{ fontSize: ' 0.11rem', color: '#555', marginBottom: '10px' }}>
-            <span style={{ display: 'inline-block', width: '190px' }}>阅读数量：{data.pvNum}</span>
+          <p style={{ fontSize: ' 0.11rem', color: '#555', marginBottom: '8px' }}>
+            <span style={{ display: 'inline-block', width: '180px',overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap' }}>阅读数量：{data.pvNum}</span>
             <span>转发数量：{data.shareNum}</span>
           </p>
 
-          <p style={{ fontSize: ' 0.11rem', color: '#555', marginBottom: '10px' }}>
-            <span style={{ display: 'inline-block', width: '190px' }}>点赞数量：{data.favorNum}</span>
+          <p style={{ fontSize: ' 0.11rem', color: '#555', marginBottom: '8px' }}>
+            <span style={{ display: 'inline-block', width: '180px',overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap' }}>点赞数量：{data.favorNum}</span>
             <span>收藏数量：{data.saveNum}</span>
           </p>
 
-          <p style={{ fontSize: ' 0.11rem', color: '#999', marginBottom: '10px' }}>发布时间：{data.createDate}</p>
+          <p style={{ fontSize: ' 0.11rem', color: '#999', marginBottom: '8px' }}>发布时间：{data.createDate}</p>
         </div>
       </Card>
     )

src/pages/news/type/editNews.jsx

@@ -55,7 +55,7 @@ const header = props => {
       type: FieldTypes.Text,
       value: newsData.newsTypeName,
       rules: [
-        {required: true, message: '请输入咨询名称'},
+        {required: true, message: '请输入资讯名称'},
       ]
     },
   ]