新增组件及页面

dgtis-ui/src/assets/styles/lunbo.css

@@ -82,14 +82,15 @@ body {
   height: 82%;
   background: url("../image/lunboBg.png") 53% 50% no-repeat;
   background-size: 80% 90%;
-  margin-left: 50%;
+  /*margin-left: 50%;*/
   position: relative;
 }
 .lineImg{
   width: 150px;
   position: absolute;
   top: 20px;
-  left: 8%;
+  right: 8%;
+  transform:rotateY(180deg);
 }
 .lunboSearchBtn{
   position: absolute;
@@ -106,7 +107,7 @@ body {
   width: 50%;
   position: absolute;
   top: 50px;
-  left: 7px;
+  right: 27px;
 }
 .labelM label{
   width: 124px !important;
@@ -177,6 +178,7 @@ body {
 .horizontal .container {
     width: 80px;
     height: 70%;
+    min-height: 149px;
 }
 
 .vertical .container {
@@ -210,6 +212,9 @@ body {
     /*height: 40px;*/
   text-align: center;
 }
+.el-form-item__label{
+  font-size: 12px;
+}
 
 
 

dgtis-ui/src/layout/components/Navbar.vue

@@ -6,7 +6,7 @@
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
-        <search id="header-search" class="right-menu-item" />
+<!--        <search id="header-search" class="right-menu-item" />-->
 
 <!--        <el-tooltip content="源码地址" effect="dark" placement="bottom">-->
 <!--          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />-->

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

@@ -70,15 +70,15 @@
           },
           legend: {
             left: '17%',
-            top: 10,
+            top: 3,
             data: that.data.legendData
           },
           grid: [{
             left: '17%',
             show: true,
             containLabel: false,
-            bottom:'45%',
-            top:'20%',
+            bottom:'42.5%',
+            top:'25%',
             backgroundColor:'#FCF0D3',
             borderColor:'#F5EEF1',
           }, {
@@ -86,7 +86,7 @@
             show: true,
             containLabel: false,
             bottom:"10%",
-            top:'55%',
+            top:'57.5%',
             backgroundColor:'#DDF7FE',
             borderColor:'#F5EEF1',
           }, {
@@ -141,6 +141,11 @@
           }
           ],
           yAxis: [{
+            name: that.data.yAxisName,
+            nameTextStyle:{
+              color:'#333',
+              fontSize: 10,
+            },
             // position: 'right',
             axisLabel: {
               color: '#333333',

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

@@ -83,9 +83,10 @@
               name: '拥有保单件数分布',
               type: 'pie',
               // roseType: 'radius',
-              radius: ['20%', '45%'],
+              radius: ['30%', '75%'],
               center: ['40%', '55%'],
               label: {
+                show:false,
                 formatter: '{b}：\n{d}%'
               },
               data: this.data.seriesData,

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

@@ -88,21 +88,20 @@
               sizeRange: [12, 18],
               // Text rotation range and step in degree. Text will be rotated randomly in range [-90,                                                                             90] by rotationStep 45
               //用来调整词的旋转方向，，[0,0]--代表着没有角度，也就是词为水平方向，需要设置角度参考注释内容
-              // rotationRange: [-45, 0, 45, 90],
-              // rotationRange: [ 0,90],
-              rotationRange: [-90, 90],
+              rotationRange: [0, 90],
+              rotationStep: 90,
               //随机生成字体颜色
               // maskImage: maskImage,
               textStyle: {
                 normal: {
                   color: function() {
-                    // var colors = ['#00BBFE', '#3F96EA', '#0B5AAD', "#4198ED",'#F29901'];
-                    // return colors[parseInt(Math.random() * 10)];
-                    return 'rgb(' + [
-                      Math.round(Math.random() * 256),
-                      Math.round(Math.random() * 256),
-                      Math.round(Math.random() * 256)
-                    ].join(',') + ')';
+                    var colors = ['#f39800', '#007de7', '#63d5f8', "#b7e2fe"];
+                    return colors[parseInt(Math.random() * 4)];
+                    // return 'rgb(' + [
+                    //   Math.round(Math.random() * 256),
+                    //   Math.round(Math.random() * 256),
+                    //   Math.round(Math.random() * 256)
+                    // ].join(',') + ')';
                   }
                 }
               },

dgtis-ui/src/views/index.vue

@@ -221,13 +221,14 @@
       return {
         // 客户年龄段性别分布
         barTwoWayChartData:{
+          yAxisName:'单位：万',
           legendData:[],
           xAxisData:[],
           seriesData:[]
         },
         // 险种类别
         barChartData:{
-          yAxisName:'单位：个',
+          yAxisName:'单位：万',
           color:['#028FF3','#F29700'],
           xAxisData:[],
           seriesData:[]

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

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+    <el-form class="queryParams bgWhite" :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
       <el-form-item label="菜单名称" prop="menuName">
         <el-input
           v-model="queryParams.menuName"
@@ -25,66 +25,66 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:menu:add']"
-        >新增</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table
-      v-loading="loading"
-      :data="menuList"
-      row-key="menuId"
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-    >
-      <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
-      <el-table-column prop="icon" label="图标" align="center" width="100">
-        <template slot-scope="scope">
-          <svg-icon :icon-class="scope.row.icon" />
-        </template>
-      </el-table-column>
-      <el-table-column prop="orderNum" label="排序" width="60"></el-table-column>
-      <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column>
-      <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
-      <el-table-column prop="status" label="状态" :formatter="statusFormat" width="80"></el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button size="mini" 
-            type="text" 
-            icon="el-icon-edit" 
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:menu:edit']"
-          >修改</el-button>
-          <el-button 
-            size="mini" 
-            type="text" 
-            icon="el-icon-plus" 
-            @click="handleAdd(scope.row)"
-            v-hasPermi="['system:menu:add']"
-          >新增</el-button>
+    <div class="bgWhite">
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
           <el-button
+            type="cyan"
+            icon="el-icon-plus"
             size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:menu:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+            @click="handleAdd"
+            v-hasPermi="['system:menu:add']"
+          >新增</el-button>
+        </el-col>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
+
+      <el-table
+        v-loading="loading"
+        :data="menuList"
+        row-key="menuId"
+        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      >
+        <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
+        <el-table-column prop="icon" label="图标" align="center" width="100">
+          <template slot-scope="scope">
+            <svg-icon :icon-class="scope.row.icon" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="orderNum" label="排序" width="60"></el-table-column>
+        <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column prop="status" label="状态" :formatter="statusFormat" width="80"></el-table-column>
+        <el-table-column label="创建时间" align="center" prop="createTime">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button size="mini"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['system:menu:edit']"
+            >修改</el-button>
+            <el-button
+              size="mini"
+              type="cyan"
+              icon="el-icon-plus"
+              @click="handleAdd(scope.row)"
+              v-hasPermi="['system:menu:add']"
+            >新增</el-button>
+            <el-button
+              size="mini"
+              type="danger"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['system:menu:remove']"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
 
     <!-- 添加或修改菜单对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
@@ -396,4 +396,4 @@ export default {
     }
   }
 };
-</script>
+</script>

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

@@ -25,10 +25,6 @@
             <span class="name">国籍</span>
             <span class="value">中国</span>
           </el-col>
-          <el-col :span="12">
-            <span class="name">户籍所在地</span>
-            <span class="value">江苏省南京市江宁区天元东路***号a区*栋****</span>
-          </el-col>
           <el-col :span="12">
             <span class="name">婚姻状况</span>
             <span class="value">已婚</span>
@@ -70,14 +66,18 @@
             <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">20w-30w</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">江苏省南京市江宁区天元东路***号a区*栋****</span>
+          </el-col>
         </el-row>
       </div>
       <div>

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

@@ -23,11 +23,11 @@
             <div class="cardDiv">
               <div class="cardTitle">客户保单信息</div>
               <div class="chart">
-<!--                <div class="topNumDiv">-->
-<!--                  <div class="numTitle">项目数量</div>-->
-<!--                  <div class="num">1张</div>-->
-<!--                </div>-->
-                <div class="dashedLine"></div>
+                <div class="topNumDiv">
+                  <div class="numTitle">保单总数</div>
+                  <div class="num">1张</div>
+                </div>
+<!--                <div class="dashedLine"></div>-->
                 <div class="bottomNumDiv">
                   <div class="leftNumDiv">
                     <div class="numTitle">有效保单</div>