新增组件及页面

dgtis-ui/src/views/dashboard/BarChart2.vue

@@ -53,7 +53,7 @@
           let series = {
             name: '',
             type: 'bar',
-            // barWidth: '50%',
+            barWidth: '40%',
             data:[]
           }
           item.stack ? series.stack = item.stack : '';

dgtis-ui/src/views/dashboard/BarChart3.vue

@@ -100,6 +100,7 @@
               },
               axisLabel:{
                 color:'#333',
+                rotate:40
               },
             }
           ],

dgtis-ui/src/views/dashboard/LineBarChart.vue

@@ -82,9 +82,7 @@
             {
               type: 'value',
               name: '',
-              min: 0,
-              max: 250,
-              interval: 50,
+              // interval: 50,
               // nameTextStyle:{
               //   color:'#333',
               // },

dgtis-ui/src/views/index.vue

@@ -149,15 +149,15 @@
         barChartData:{
           yAxisName:'单位：万',
           color:['#028FF3','#F29700'],
-          xAxisData:['A意外险', 'H健康险', 'L寿险'],
+          xAxisData:['人寿保险', '年金保险', '健康险','意外伤害保险','重疾保险','万能保险'],
           seriesData:[
             {
               name:'客户数量',
-              data: [ 390, 330, 220]
+              data: [ 390, 330, 220,390, 330, 220]
             },
             {
               name:'保单总金额',
-              data: [80, 52, 200]
+              data: [80, 52, 200,80, 52, 200]
             },
           ]
         },
@@ -186,7 +186,7 @@
               data: [80, 52, 200, 334, 390, 330, 220]
             },
             {
-              name:'铂金',
+              name:'白金',
               stack: 'vistors',
               data: [30, 52, 200, 334, 390, 330, 220]
             },

dgtis-ui/src/views/system/user/index.vue

@@ -139,7 +139,7 @@
             </el-row>
 
             <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
-              <el-table-column type="selection" width="40" align="center" />
+              <el-table-column type="selection" width="46" align="center" />
               <el-table-column label="用户ID" width="80" align="center" prop="userId" />
               <el-table-column label="用户名称" align="center" prop="nickName" :show-overflow-tooltip="true" />
               <el-table-column label="登录名称" align="center" prop="userName" :show-overflow-tooltip="true" />

dgtis-ui/src/views/system/userInfo/components/relationship.vue

@@ -7,8 +7,8 @@
       <el-table-column label="参与方甲角色" align="center" prop="role1" />
       <el-table-column label="参与方乙姓名" align="center" prop="name2" :show-overflow-tooltip="true" />
       <el-table-column label="参与方乙角色" align="center" prop="role2" />
-      <el-table-column label="开始时间" align="center" prop="startTime"></el-table-column>
-      <el-table-column label="结束时间" align="center" prop="endTime" />
+<!--      <el-table-column label="开始时间" align="center" prop="startTime"></el-table-column>-->
+<!--      <el-table-column label="结束时间" align="center" prop="endTime" />-->
       <el-table-column label="关系描述" align="center" prop="des" :show-overflow-tooltip="true"  />
     </el-table>
   </div>

dgtis-ui/src/views/system/userInfo/index.vue

@@ -2,16 +2,15 @@
   <div class="app-container">
     <div class="conPanel">
       <div class="userInfoPanel">
-        <div class="title">张大川<span class="num">（cp0185210402）</span><span class="tag">2孩儿</span><span class="tag">关注官微</span><span class="tag">内部人员</span></div>
+        <div class="title">张大川<span class="num">（cp0185210402）</span><span class="tag">2孩儿</span><span class="tag">关注官微</span></div>
         <el-row class="userInfo">
           <el-col :span="12">
             <span class="name">性别</span>
             <span class="value">男</span>
           </el-col>
           <el-col :span="12">
-            <span class="name">年龄</span>
-            <span class="value">55</span>
-            <el-tag type="warning" effect="dark" size="mini">大龄</el-tag>
+            <span class="name">民族</span>
+            <span class="value">汉</span>
           </el-col>
           <el-col :span="12">
             <span class="name">出生日期</span>
@@ -19,37 +18,61 @@
             <el-tag type="warning" effect="dark" size="mini">60后</el-tag>
           </el-col>
           <el-col :span="12">
-            <span class="name">证件类型</span>
-            <span class="value">身份证</span>
+            <span class="name">国籍</span>
+            <span class="value">中国</span>
           </el-col>
           <el-col :span="12">
-            <span class="name">证件号码</span>
-            <span class="value">410328196510081234</span>
+            <span class="name">户籍所在地</span>
+            <span class="value">江苏省南京市江宁区天元东路***号a区*栋****</span>
           </el-col>
           <el-col :span="12">
-            <span class="name">联系电话</span>
-            <span class="value">13212312312</span>
+            <span class="name">婚姻状况</span>
+            <span class="value">已婚</span>
           </el-col>
           <el-col :span="12">
             <span class="name">职业</span>
             <span class="value">律师</span>
             <el-tag type="warning" effect="dark" size="mini">敏感职业</el-tag>
           </el-col>
+          <el-col :span="12">
+            <span class="name">工作单位</span>
+            <span class="value">神州通誉软件（上海）有限公司</span>
+          </el-col>
+          <el-col :span="12">
+            <span class="name">最高学历</span>
+            <span class="value">硕士</span>
+          </el-col>
+          <el-col :span="12">
+            <span class="name">客户类型</span>
+            <span class="value">投保人</span>
+          </el-col>
           <el-col :span="12">
             <span class="name">客户等级</span>
-            <span class="value">铂金</span>
+            <span class="value">白金</span>
           </el-col>
           <el-col :span="12">
-            <span class="name">身高</span>
-            <span class="value">178cm</span>
+            <span class="name">社保情况</span>
+            <span class="value">有社保</span>
           </el-col>
           <el-col :span="12">
-            <span class="name">体重</span>
-            <span class="value">74kg</span>
+            <span class="name">官微积分</span>
+            <span class="value">586</span>
           </el-col>
           <el-col :span="12">
-            <span class="name">户籍所在地</span>
-            <span class="value">江苏省南京市江宁区一二三是</span>
+            <span class="name">户籍类型</span>
+            <span class="value">城镇</span>
+          </el-col>
+          <el-col :span="12">
+            <span class="name">个人年收入</span>
+            <span class="value">6w-8w</span>
+          </el-col>
+          <el-col :span="12">
+            <span class="name">家庭年收入</span>
+            <span class="value">20w-30w</span>
+          </el-col>
+          <el-col :span="12">
+            <span class="name">收入来源</span>
+            <span class="value">工资</span>
           </el-col>
         </el-row>
       </div>
@@ -161,8 +184,6 @@ export default {
           role1:'儿子',
           name2:'张三',
           role2:'父亲',
-          startTime:'2016-10-28',
-          endTime:'2020-10-28',
           des:'父子关系，张三是张大川的父亲',
         },
         {
@@ -171,8 +192,6 @@ export default {
           role1:'父亲',
           name2:'张蕾',
           role2:'女儿',
-          startTime:'2016-10-28',
-          endTime:'2020-10-28',
           des:'父女关系，张蕾是张大川的女儿',
         },
         {
@@ -181,8 +200,6 @@ export default {
           role1:'丈夫',
           name2:'王美丽',
           role2:'妻子',
-          startTime:'2016-10-28',
-          endTime:'2020-10-28',
           des:'夫妻关系，王美丽是张大川的妻子',
         },
       ],

dgtis-ui/src/views/system/userInfoDetails/index.vue

@@ -62,7 +62,7 @@
 <!--                  <img style="width: 100%;" src="../../../assets/image/levelBg.png" alt=""/>-->
 <!--                </div>-->
                 <div class="levelImgDiv">
-                  <div class="level">铂金会员</div>
+                  <div class="level">白金会员</div>
                   <div class="isPay">已交保费</div>
                   <div class="payNum">234,897.234</div>
                 </div>
@@ -128,7 +128,7 @@
                     <div>姓名：张大春</div>
                   </el-col>
                   <el-col :span="12">
-                    <div>手机：12345678912</div>
+                    <div>手机：123****8912</div>
                   </el-col>
                 </el-row>
                 <el-row :gutter="10">
@@ -311,11 +311,11 @@ export default {
       lineBarChartData:{
         expectedData:{
           name:'',
-          data:[2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4, 3.3]
+          data:[200, 49, 700, 232, 256, 767, 1356, 1622, 326, 200, 64, 33]
         },
         actualData:{
           name:'',
-          data:[2.0, 2.2, 3.3, 4.5, 6.3, 10.2, 20.3, 23.4, 23.0, 16.5, 12.0, 6.2]
+          data:[240, 232, 303, 405, 603, 102, 203, 234, 230, 165, 120, 62]
         },
         xAxisData:['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12']
       },

dgtis-ui/src/views/system/userInfoList/index.vue

@@ -90,7 +90,7 @@ export default {
           sex:'男',
           birthday:'2020-01-01',
           age:30,
-          level:'铂金'
+          level:'白金'
         },
         {
           userId:'CP0185210401',
@@ -100,7 +100,7 @@ export default {
           sex:'男',
           birthday:'2020-01-01',
           age:30,
-          level:'铂金'
+          level:'白金'
         },
         {
           userId:'CP0185210401',
@@ -110,7 +110,7 @@ export default {
           sex:'男',
           birthday:'2020-01-01',
           age:30,
-          level:'铂金'
+          level:'白金'
         },
       ],
       // 查询参数