修改

dsk-operate-ui/src/router/index.js

@@ -70,7 +70,7 @@ export const constantRoutes = [
         path: 'index',
         component: () => import('@/views/index'),
         name: 'Index',
-        meta: { title: '首页', icon: 'index'}
+        meta: { title: '首页', icon: 'index', noCache: true}
       }
     ]
   },
@@ -174,6 +174,84 @@ export const constantRoutes = [
       }
     ]
   },
+  //企业详情-业绩
+  {
+    path: '',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
+    children: [
+      {
+        path: '/company/:id/performance',
+        component: () => import('@/views/detail'),
+      }
+    ]
+  },
+  //企业详情-人员
+  {
+    path: '',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
+    children: [
+      {
+        path: '/company/:id/personnel',
+        component: () => import('@/views/detail'),
+      }
+    ]
+  },
+  //企业详情-经营信息
+  {
+    path: '',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
+    children: [
+      {
+        path: '/company/:id/business',
+        component: () => import('@/views/detail'),
+      }
+    ]
+  },
+  //企业详情-良好行为
+  {
+    path: '',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
+    children: [
+      {
+        path: '/company/:id/behavior',
+        component: () => import('@/views/detail'),
+      }
+    ]
+  },
+  //企业详情-信用评价
+  {
+    path: '',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
+    children: [
+      {
+        path: '/company/:id/evaluation',
+        component: () => import('@/views/detail'),
+      }
+    ]
+  },
+  //企业详情-信用行为
+  {
+    path: '',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
+    children: [
+      {
+        path: '/company/:id/credit',
+        component: () => import('@/views/detail'),
+      }
+    ]
+  },
   //企业详情-股权
   {
     path: '',
@@ -182,7 +260,7 @@ export const constantRoutes = [
     redirect: 'noredirect',
     children: [
       {
-        path: '/enterprise/:id/lt',
+        path: '/company/:id/lt',
         component: () => import('@/views/detail'),
       }
     ]

dsk-operate-ui/src/views/detail/groupAccount/component/zbxmfx.vue

@@ -576,11 +576,11 @@
             legend: {
               data: [
                 {
-                  name: '招标数量',
+                  name: '招标数量（个）',
                   // icon: 'rect',
                 },
                 {
-                  name: '招标金额(万元）',
+                  name: '招标金额（万元）',
                   // icon: 'circle',
                 }
               ],
@@ -643,7 +643,7 @@
             },
             series: [
               {
-                name:'招标金额(万元）',
+                name:'招标金额（万元）',
                 smooth: false, //平滑
                 type:"line",
                 symbolSize: 6,
@@ -664,12 +664,12 @@
                 data:data.map(item => item.sum),
               },
               {
-                name:'招标数量',
+                name:'招标数量（个）',
                 type: 'bar',
                 barWidth: 20,
                 tooltip: {
                   valueFormatter: function (value) {
-                    return value + '个';
+                    return value;
                   }
                 },
                 itemStyle: {
@@ -754,23 +754,23 @@
               axisPointer: {
                 type: 'cross'
               },
-              formatter: function (params) {
-                var relVal = params[0].name;
-                // relVal+='<br/>' +"<span style=\"display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:#f17f0a;\"></span>" + '次数' +": "+ array[0][relVal.replace(/"/g, '')]
-                for (var i = 0, l = params.length; i < l; i++) {
-                  relVal += '<br/>' + params[i].marker + params[i].seriesName +": "+ params[i].value
-                }
-                return relVal
-              }
+              // formatter: function (params) {
+              //   var relVal = params[0].name;
+              //   // relVal+='<br/>' +"<span style=\"display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:#f17f0a;\"></span>" + '次数' +": "+ array[0][relVal.replace(/"/g, '')]
+              //   for (var i = 0, l = params.length; i < l; i++) {
+              //     relVal += '<br/>' + params[i].marker + params[i].seriesName +": "+ params[i].value
+              //   }
+              //   return relVal
+              // }
             },
             legend: {
               data: [
                 {
-                  name: '招标数量',
+                  name: '招标数量（个）',
                   // icon: 'rect',
                 },
                 {
-                  name: '招标金额(万元）',
+                  name: '招标金额（万元）',
                   // icon: 'circle',
                 }
               ],
@@ -833,7 +833,7 @@
             },
             series: [
               {
-                name:'招标金额(万元）',
+                name:'招标金额（万元）',
                 smooth: false, //平滑
                 type:"line",
                 symbolSize: 6,
@@ -854,12 +854,12 @@
                 data:data.map(item => item.sum),
               },
               {
-                name:'招标数量',
+                name:'招标数量（个）',
                 type: 'bar',
                 barWidth: 20,
                 tooltip: {
                   valueFormatter: function (value) {
-                    return value + '个';
+                    return value;
                   }
                 },
                 itemStyle: {

dsk-operate-ui/src/views/enterpriseManagement/index.vue

@@ -97,6 +97,12 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-refresh"
+            @click="handleSync(scope.row)"
+          >同步</el-button>
           <el-button
             size="mini"
             type="text"
@@ -205,6 +211,19 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog
+      title="权限同步"
+      :visible.sync="dialogVisible1"
+      custom-class="sync"
+      width="400px">
+      <p><i class="el-icon-warning-outline" style="margin-right: 8px;"></i>是否确认同步？</p>
+      <p>温馨提示：此操作可能会影响正在使用的用户，建议合理安排同步时间</p>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible1 = false">取消</el-button>
+        <el-button type="primary" @click="confirm()" >同步</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -242,6 +261,7 @@
         title: "",
         // 是否显示弹出层
         open: false,
+        dialogVisible1: false,
         // 查询参数
         queryParams: {
           pageNum: 1,
@@ -360,6 +380,10 @@
         this.title = "添加企业";
         this.getpack()
       },
+      /** 同步按钮操作 */
+      handleSync() {
+        this.dialogVisible1=true
+      },
       /** 修改按钮操作 */
       handleUpdate(row) {
         this.disabled = false
@@ -447,4 +471,14 @@
     }
   };
 </script>
+<style lang="scss" scoped>
+  ::v-deep .sync{
+    .el-dialog__header{
+      border-bottom: 1px solid #eee;
+    }
+    .el-dialog__body{
+      padding: 15px 20px
+    }
+  }
+</style>
 

dsk-operate-ui/src/views/macro/nationalEconomies/component/zhongbiao.vue

@@ -977,6 +977,11 @@
                 smooth: false, //平滑
                 type:"line",
                 symbolSize: 6, //折线拐点大小
+                tooltip: {
+                  valueFormatter: function (value) {
+                    return value + '%';
+                  }
+                },
                 itemStyle: {
                   normal: {
                     borderWidth: 4,
@@ -990,6 +995,11 @@
                 smooth: false, //平滑
                 type:"line",
                 symbolSize: 6, //折线拐点大小
+                tooltip: {
+                  valueFormatter: function (value) {
+                    return value + '%';
+                  }
+                },
                 itemStyle: {
                   normal: {
                     borderWidth: 4,
@@ -1003,6 +1013,11 @@
                 smooth: false, //平滑
                 type:"line",
                 symbolSize: 6, //折线拐点大小
+                tooltip: {
+                  valueFormatter: function (value) {
+                    return value + '%';
+                  }
+                },
                 itemStyle: {
                   normal: {
                     borderWidth: 4,