Ver Fonte

溧水app、机柜小程序修改

sunyadv há 5 anos atrás
pai
commit
bfe6e9c652

+ 1 - 1
.gitignore

@@ -24,7 +24,7 @@ target/
 /nbbuild/
 /dist/
 /nbdist/
-/.nb-gradle/
+/.nb-gradle
 
 ### VS Code ###
 .vscode/

+ 5 - 0
lss_vue/build/webpack.base.conf.js

@@ -13,6 +13,11 @@ module.exports = {
     //app: './src/main.js'
     app: ["babel-polyfill", "./src/main.js"]
   },
+  externals: {
+      'vue': 'Vue',
+      'vuex': 'Vuex',
+      'echarts': 'echarts'
+  },
   output: {
     path: config.build.assetsRoot,
     filename: '[name].js',

+ 1 - 1
lss_vue/config/index.js

@@ -15,7 +15,7 @@ module.exports = {
     assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
     assetsPublicPath: './',
-    productionSourceMap: true,
+    productionSourceMap: false,
     productionGzip: false,
     productionGzipExtensions: ['js', 'css'],
     bundleAnalyzerReport: process.env.npm_config_report

+ 8 - 1
lss_vue/index.html

@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
-        <title>溧水</title>
+        <title>数据中心</title>
         <link rel="shortcut icon" type="image/x-icon" href="./cloud.ico" />
         <style>
             .toolbar {
@@ -104,5 +104,12 @@
     </head>
     <body>
         <div id="app"></div>
+
+        <!-- 引入Vue.js -->
+        <script src="https://cdn.staticfile.org/vue/2.4.3/vue.min.js"></script>
+        <!-- 引入vuex.js -->
+        <script src="https://cdn.staticfile.org/vuex/3.0.0/vuex.min.js"></script>
+        <!-- 引入echarts -->
+        <script src="https://cdn.staticfile.org/echarts/4.1.0/echarts.min.js"></script>
     </body>
 </html>

+ 27 - 7
lss_vue/src/main.js

@@ -1,4 +1,4 @@
-import Vue from 'vue'
+// import Vue from 'vue'
 import App from './App'
 
 import VueRouter from 'vue-router'
@@ -9,7 +9,7 @@ import Mint from 'mint-ui';
 import 'mint-ui/lib/style.css';
 
 import store from './vuex/store'
-import Vuex from 'vuex'
+// import Vuex from 'vuex'
 import routes from './routes'
 
 import http from './http'
@@ -18,7 +18,7 @@ Vue.prototype.http = http
 import port from './port'
 Vue.prototype.port = port
 
-import echarts from 'echarts'
+// import echarts from 'echarts'
 Vue.prototype.echarts = echarts
 
 import VueClipboard from 'vue-clipboard2'
@@ -31,6 +31,9 @@ import picker from "./assets/js/custom-picker.js"
 import "./assets/css/custom-picker.css"
 Vue.use(picker)
 
+import NProgress from 'nprogress'
+import 'nprogress/nprogress.css'
+
 Vue.use(Mint);
 Vue.use(VueRouter)
 Vue.use(Vuex)
@@ -40,13 +43,25 @@ const router = new VueRouter({
 })
 
 router.beforeEach((to, from, next) => {
+    NProgress.configure({showSpinner: false}); 
+    NProgress.start();
+
+    if(to.meta.parentPath == "/tab_assets"){
+        document.title = '资产'
+    } else if(to.meta.parentPath == "/tab_data") {
+        document.title = '数据'
+    } else if(to.meta.parentPath == "/tab_my") {
+        document.title = '我的'
+    } else {
+        document.title = '数据中心'
+    }
+
     if (to.path == '/login') {
         sessionStorage.clear();
     }
 
     let user = JSON.parse(sessionStorage.getItem('user'));
     if (!user && to.path != '/login' && to.path != '/404') {
-        console.log(11123)
         next({ path: '/login' })
     } else {
         if(to.path == '/login'){
@@ -58,12 +73,12 @@ router.beforeEach((to, from, next) => {
                 for(var i = 0; i < strs.length; i ++) {
                     theRequest[strs[i].split("=")[0]] = unescape(strs[i].split("=")[1]);
                 }
-                Vue.prototype.$indicator.open();
+                // Vue.prototype.$indicator.open();
                 Vue.prototype.http.post(Vue.prototype.port.manage.login, {
                     "loginName": theRequest.sername,
                     "password": theRequest.password,
                 } , res => {
-                    Vue.prototype.$indicator.close();
+                    // Vue.prototype.$indicator.close();
                     if (res.code == "ok") {
                         sessionStorage.setItem('user', JSON.stringify(res.data));
                         var str = '';
@@ -81,7 +96,7 @@ router.beforeEach((to, from, next) => {
                         next({ path: '/404' });
                     }
                 }, error => {
-                    Vue.prototype.$indicator.close();
+                    // Vue.prototype.$indicator.close();
                     Vue.prototype.$toast({
                         message: error,
                         duration: 2000
@@ -99,10 +114,15 @@ router.beforeEach((to, from, next) => {
         } else {
             $(".tabber").hide();
         }
+
         next()
     }
 })
 
+router.afterEach(() => {
+    NProgress.done()
+})
+
 new Vue({
     router,
     store,

+ 37 - 19
lss_vue/src/routes.js

@@ -42,14 +42,21 @@ let routes = [
         name: '',
         leaf: true,//只有一个节点
         children: [
-            { path: '/assets', component: assets, name: '资产', meta: {keepAlive: true, parentPath:'/tab_assets'} },
-            { path: '/detail/:id', component: assetsDetail, name: '资产详情', meta: {keepAlive: true, parentPath:'/tab_assets'} },
-            { path: '/assetsRegister', component: assetsRegister, name: '登记资产', meta: {keepAlive: true, parentPath:'/tab_assets'} },
-            { path: '/assetsEdit/:id/', component: assetsEdit, name: '资产编辑', meta: {keepAlive: true, parentPath:'/tab_assets'} },
-            { path: '/assetsNumber/:id/:divisionCode/:suffixCode', component: assetsNumber, name: '资产编号', meta: {keepAlive: true, parentPath:'/tab_assets'} },
-            { path: '/assetsHandle/:id', component: assetsHandle, name: '处置资产', meta: {keepAlive: true, parentPath:'/tab_assets'} },
-            { path: '/assetsMaintain/:id', component: assetsMaintain, name: '维护资产', meta: {keepAlive: true, parentPath:'/tab_assets'} },
-            { path: '/assetsOperation/:id', component: assetsOperation, name: '操作记录', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            { path: '/assets', component:(resolve)=>require(['./views/assets/assets.vue'] , resolve), name: '资产', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            // { path: '/detail/:id', component: assetsDetail, name: '资产详情', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            // { path: '/assetsRegister', component: assetsRegister, name: '登记资产', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            // { path: '/assetsEdit/:id/', component: assetsEdit, name: '资产编辑', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            // { path: '/assetsNumber/:id/:divisionCode/:suffixCode', component: assetsNumber, name: '资产编号', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            // { path: '/assetsHandle/:id', component: assetsHandle, name: '处置资产', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            // { path: '/assetsMaintain/:id', component: assetsMaintain, name: '维护资产', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            // { path: '/assetsOperation/:id', component: assetsOperation, name: '操作记录', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            { path: '/detail/:id', component:(resolve)=>require(['./views/assets/assetsDetail.vue'] , resolve), name: '资产详情', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            { path: '/assetsRegister', component:(resolve)=>require(['./views/assets/assetsRegister.vue'] , resolve), name: '登记资产', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            { path: '/assetsEdit/:id/', component:(resolve)=>require(['./views/assets/assetsEdit.vue'] , resolve), name: '资产编辑', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            { path: '/assetsNumber/:id/:divisionCode/:suffixCode', component:(resolve)=>require(['./views/assets/assetsNumber.vue'] , resolve), name: '资产编号', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            { path: '/assetsHandle/:id', component:(resolve)=>require(['./views/assets/assetsHandle.vue'] , resolve), name: '处置资产', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            { path: '/assetsMaintain/:id', component:(resolve)=>require(['./views/assets/assetsMaintain.vue'] , resolve), name: '维护资产', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            { path: '/assetsOperation/:id', component:(resolve)=>require(['./views/assets/assetsOperation.vue'] , resolve), name: '操作记录', meta: {keepAlive: true, parentPath:'/tab_assets'} },
         ]
     },
     // 数据
@@ -59,7 +66,8 @@ let routes = [
         name: '',
         leaf: true,//只有一个节点
         children: [
-            { path: '/data', component: data, name: '数据', meta: {keepAlive: true, parentPath:'/tab_data'} }
+            // { path: '/data', component: data, name: '数据', meta: {keepAlive: true, parentPath:'/tab_data'} }
+            { path: '/data', component:(resolve)=>require(['./views/data/data.vue'] , resolve), name: '数据', meta: {keepAlive: true, parentPath:'/tab_data'} }
         ]
     },
     // 我的
@@ -69,16 +77,26 @@ let routes = [
         name: '',
         leaf: true,//只有一个节点
         children: [
-            { path: '/my', component: my, name: '我的', meta: {keepAlive: true, parentPath:'/tab_my'} },
-            { path: '/myMessage', component: myMessage, name: '我的消息', meta: {keepAlive: true, parentPath:'/tab_my'} },
-            { path: '/myAssets', component: myAssets, name: '我的资产', meta: {keepAlive: true, parentPath:'/tab_my'} },
-            { path: '/myScore', component: myScore, name: '我的评分', meta: {keepAlive: true, parentPath:'/tab_my'} },
-            { path: '/myScore/:uid/:time', component: myScoreDetail, name: '我的评分详情', meta: {keepAlive: true, parentPath:'/tab_my'} },
-            { path: '/mySuggest', component: mySuggest, name: '我的建议', meta: {keepAlive: true, parentPath:'/tab_my'} },
-            { path: '/myAddress', component: myAddress, name: '通讯录', meta: {keepAlive: true, parentPath:'/tab_my'} },
-            { path: '/myGrade/:id/:name', component: myGrade, name: '打分页面', meta: {keepAlive: true, parentPath:'/tab_my'} },
-            { path: '/myInstitution', component: myInstitution, name: '管理制度', meta: {keepAlive: true, parentPath:'/tab_my'} },
-            { path: '/myInstitution/:id', component: myInsDetail, name: '管理制度详情', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            // { path: '/my', component: my, name: '我的', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            // { path: '/myMessage', component: myMessage, name: '我的消息', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            // { path: '/myAssets', component: myAssets, name: '我的资产', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            // { path: '/myScore', component: myScore, name: '我的评分', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            // { path: '/myScore/:uid/:time', component: myScoreDetail, name: '我的评分详情', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            // { path: '/mySuggest', component: mySuggest, name: '我的建议', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            // { path: '/myAddress', component: myAddress, name: '通讯录', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            // { path: '/myGrade/:id/:name', component: myGrade, name: '打分页面', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            // { path: '/myInstitution', component: myInstitution, name: '管理制度', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            // { path: '/myInstitution/:id', component: myInsDetail, name: '管理制度详情', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            { path: '/my', component:(resolve)=>require(['./views/my/my.vue'] , resolve), name: '我的', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            { path: '/myMessage', component:(resolve)=>require(['./views/my/myMessage.vue'] , resolve), name: '我的消息', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            { path: '/myAssets', component:(resolve)=>require(['./views/my/myAssets.vue'] , resolve), name: '我的资产', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            { path: '/myScore', component:(resolve)=>require(['./views/my/myScore.vue'] , resolve), name: '我的评分', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            { path: '/myScore/:uid/:time', component:(resolve)=>require(['./views/my/myScoreDetail.vue'] , resolve), name: '我的评分详情', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            { path: '/mySuggest', component:(resolve)=>require(['./views/my/mySuggest.vue'] , resolve), name: '我的建议', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            { path: '/myAddress', component:(resolve)=>require(['./views/my/myAddress.vue'] , resolve), name: '通讯录', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            { path: '/myGrade/:id/:name', component:(resolve)=>require(['./views/my/myGrade.vue'] , resolve), name: '打分页面', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            { path: '/myInstitution', component:(resolve)=>require(['./views/my/myInstitution.vue'] , resolve), name: '管理制度', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            { path: '/myInstitution/:id', component:(resolve)=>require(['./views/my/myInsDetail.vue'] , resolve), name: '管理制度详情', meta: {keepAlive: true, parentPath:'/tab_my'} },
         ]
     },
     {

+ 1 - 0
lss_vue/src/views/my/myAssets.vue

@@ -160,6 +160,7 @@
     .detail_body {
         margin-top: 0.4rem;
         padding-bottom: 0.15rem;
+        background: #EFEFEF;
     }
 
     .tab_head {

+ 4 - 0
lss_vue/src/views/my/myInsDetail.vue

@@ -94,6 +94,10 @@
         background: #fff;
     }
 
+    .context_router {
+        height: 100%;
+    }
+
     .detail_head {
         background: #fff;
         color: #333;

+ 2 - 1
lss_vue/src/views/my/myMessage.vue

@@ -73,7 +73,7 @@
                 } else if(this.pageNum < this.pages) {
                     this.$indicator.open();
                     this.http.post(this.port.my.newList, {
-                        'id': this.id,
+                        'uid': this.user.id,
                         'pageNum': ++this.pageNum
                     } , 
                     res => {
@@ -147,6 +147,7 @@
     .detail_body {
         margin-top: 0.4rem;
         padding-bottom: 0.15rem;
+        background: #EFEFEF;
     }
 
     .tab_head {

+ 1 - 0
lss_vue/src/views/my/myScore.vue

@@ -140,6 +140,7 @@
     .detail_body {
         margin-top: 0.4rem;
         padding-bottom: 0.15rem;
+        background: #EFEFEF;
     }
 
     .detailBox {

+ 6 - 0
lss_vue_wx/build/webpack.base.conf.js

@@ -13,6 +13,12 @@ module.exports = {
     //app: './src/main.js'
     app: ["babel-polyfill", "./src/main.js"]
   },
+  externals: {
+    'vue': 'Vue',
+    'vuex': 'Vuex',
+    'echarts': 'echarts',
+    'element-ui': 'ELEMENT'
+  },
   output: {
     path: config.build.assetsRoot,
     filename: '[name].js',

+ 10 - 1
lss_vue_wx/index.html

@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
-        <title>机柜</title>
+        <title>机柜管理</title>
         <link rel="shortcut icon" type="image/x-icon" href="./cloud.ico" /> 
         <style>
             .toolbar {
@@ -128,5 +128,14 @@
     </head>
     <body>
         <div id="app"></div>
+
+        <!-- 引入Vue.js -->
+        <script src="https://cdn.staticfile.org/vue/2.4.3/vue.min.js"></script>
+        <!-- 引入vuex.js -->
+        <script src="https://cdn.staticfile.org/vuex/3.0.0/vuex.min.js"></script>
+        <!-- 引入echarts -->
+        <script src="https://cdn.staticfile.org/echarts/4.1.0/echarts.min.js"></script>
+        <!-- 引入组件库 -->
+        <script src="https://cdn.staticfile.org/element-ui/2.4.3/index.js"></script>
     </body>
 </html>

+ 14 - 4
lss_vue_wx/src/main.js

@@ -1,18 +1,18 @@
-import Vue from 'vue'
+// import Vue from 'vue'
 import App from './App'
 
 import VueRouter from 'vue-router'
 
 import './assets/js/rem.js'
 
-import ElementUI from 'element-ui'
+// import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 
 import Mint from 'mint-ui';
 import 'mint-ui/lib/style.css';
 
 import store from './vuex/store'
-import Vuex from 'vuex'
+// import Vuex from 'vuex'
 import routes from './routes'
 
 import http from './http'
@@ -21,7 +21,7 @@ Vue.prototype.http = http
 import port from './port'
 Vue.prototype.port = port
 
-import echarts from 'echarts'
+// import echarts from 'echarts'
 Vue.prototype.echarts = echarts
 
 import VueClipboard from 'vue-clipboard2'
@@ -34,6 +34,9 @@ import picker from "./assets/js/custom-picker.js"
 import "./assets/css/custom-picker.css"
 Vue.use(picker)
 
+import NProgress from 'nprogress'
+import 'nprogress/nprogress.css'
+
 Vue.use(ElementUI)
 Vue.use(Mint);
 Vue.use(VueRouter)
@@ -45,6 +48,9 @@ const router = new VueRouter({
 
 
 router.beforeEach((to, from, next) => {
+    NProgress.configure({showSpinner: false}); 
+    NProgress.start();
+
     if (to.path == '/login') {
         sessionStorage.clear();
     }
@@ -62,6 +68,10 @@ router.beforeEach((to, from, next) => {
     }
 })
 
+router.afterEach(() => {
+    NProgress.done()
+})
+
 new Vue({
     router,
     store,

+ 49 - 36
lss_vue_wx/src/routes.js

@@ -13,9 +13,6 @@ import assetsHandle from './views/assets/assetsHandle.vue'
 import assetsOperation from './views/assets/assetsOperation.vue'
 import assetsMaintain from './views/assets/assetsMaintain.vue'
 
-// 数据
-import data from './views/data/data.vue'
-
 // 任务
 import task from './views/task/task.vue'
 import taskDetail from './views/task/taskDetail.vue'
@@ -49,25 +46,25 @@ let routes = [
         name: '',
         leaf: true,//只有一个节点
         children: [
-            { path: '/assets', component: assets, name: '资产', meta: {keepAlive: true, parentPath:'/tab_assets'} },
-            { path: '/detail/:id', component: assetsDetail, name: '资产详情', meta: {keepAlive: true, parentPath:'/tab_assets'} },
-            { path: '/detailFrame/:id', component: assetsDetailFrame, name: '机柜详情', meta: {keepAlive: true, parentPath:'/tab_assets'} },
-            { path: '/assetsRegister', component: assetsRegister, name: '登记资产', meta: {keepAlive: true, parentPath:'/tab_assets'} },
-            { path: '/assetsEdit/:id/', component: assetsEdit, name: '资产编辑', meta: {keepAlive: true, parentPath:'/tab_assets'} },
-            { path: '/assetsNumber/:id/:divisionCode/:suffixCode', component: assetsNumber, name: '资产编号', meta: {keepAlive: true, parentPath:'/tab_assets'} },
-            { path: '/assetsHandle/:id', component: assetsHandle, name: '处置资产', meta: {keepAlive: true, parentPath:'/tab_assets'} },
-            { path: '/assetsMaintain/:id', component: assetsMaintain, name: '维护资产', meta: {keepAlive: true, parentPath:'/tab_assets'} },
-            { path: '/assetsOperation/:id', component: assetsOperation, name: '操作记录', meta: {keepAlive: true, parentPath:'/tab_assets'} },
-        ]
-    },
-    // 数据
-    {
-        path: '/',
-        component: Home,
-        name: '',
-        leaf: true,//只有一个节点
-        children: [
-            { path: '/data', component: data, name: '数据', meta: {keepAlive: true, parentPath:'/tab_data'} }
+            // { path: '/assets', component: assets, name: '资产', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            // { path: '/detail/:id', component: assetsDetail, name: '资产详情', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            // { path: '/detailFrame/:id', component: assetsDetailFrame, name: '机柜详情', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            // { path: '/assetsRegister', component: assetsRegister, name: '登记资产', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            // { path: '/assetsEdit/:id/', component: assetsEdit, name: '资产编辑', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            // { path: '/assetsNumber/:id/:divisionCode/:suffixCode', component: assetsNumber, name: '资产编号', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            // { path: '/assetsHandle/:id', component: assetsHandle, name: '处置资产', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            // { path: '/assetsMaintain/:id', component: assetsMaintain, name: '维护资产', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            // { path: '/assetsOperation/:id', component: assetsOperation, name: '操作记录', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+
+            { path: '/assets', component:(resolve)=>require(['./views/assets/assets.vue'] , resolve), name: '资产', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            { path: '/detail/:id', component:(resolve)=>require(['./views/assets/assetsDetail.vue'] , resolve), name: '资产详情', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            { path: '/detailFrame/:id', component:(resolve)=>require(['./views/assets/assetsDetailFrame.vue'] , resolve), name: '机柜详情', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            { path: '/assetsRegister', component:(resolve)=>require(['./views/assets/assetsRegister.vue'] , resolve), name: '登记资产', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            { path: '/assetsEdit/:id/', component:(resolve)=>require(['./views/assets/assetsEdit.vue'] , resolve), name: '资产编辑', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            { path: '/assetsNumber/:id/:divisionCode/:suffixCode', component:(resolve)=>require(['./views/assets/assetsNumber.vue'] , resolve), name: '资产编号', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            { path: '/assetsHandle/:id', component:(resolve)=>require(['./views/assets/assetsHandle.vue'] , resolve), name: '处置资产', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            { path: '/assetsMaintain/:id', component:(resolve)=>require(['./views/assets/assetsMaintain.vue'] , resolve), name: '维护资产', meta: {keepAlive: true, parentPath:'/tab_assets'} },
+            { path: '/assetsOperation/:id', component:(resolve)=>require(['./views/assets/assetsOperation.vue'] , resolve), name: '操作记录', meta: {keepAlive: true, parentPath:'/tab_assets'} },
         ]
     },
     // 任务
@@ -77,10 +74,15 @@ let routes = [
         name: '',
         leaf: true,//只有一个节点
         children: [
-            { path: '/task', component: task, name: '任务', meta: {keepAlive: true, parentPath:'/tab_task'} },
-            { path: '/task/:id', component: taskDetail, name: '任务详情', meta: {keepAlive: true, parentPath:'/tab_task'} },
-            { path: '/taskRegister', component: taskRegister, name: '新增任务', meta: {keepAlive: true, parentPath:'/tab_task'} },
-            { path: '/taskEdit/:id', component: taskEdit, name: '修改任务', meta: {keepAlive: true, parentPath:'/tab_task'} },
+            // { path: '/task', component: task, name: '任务', meta: {keepAlive: true, parentPath:'/tab_task'} },
+            // { path: '/task/:id', component: taskDetail, name: '任务详情', meta: {keepAlive: true, parentPath:'/tab_task'} },
+            // { path: '/taskRegister', component: taskRegister, name: '新增任务', meta: {keepAlive: true, parentPath:'/tab_task'} },
+            // { path: '/taskEdit/:id', component: taskEdit, name: '修改任务', meta: {keepAlive: true, parentPath:'/tab_task'} },
+
+            { path: '/task', component:(resolve)=>require(['./views/task/task.vue'] , resolve), name: '任务', meta: {keepAlive: true, parentPath:'/tab_task'} },
+            { path: '/task/:id', component:(resolve)=>require(['./views/task/taskDetail.vue'] , resolve), name: '任务详情', meta: {keepAlive: true, parentPath:'/tab_task'} },
+            { path: '/taskRegister', component:(resolve)=>require(['./views/task/taskRegister.vue'] , resolve), name: '新增任务', meta: {keepAlive: true, parentPath:'/tab_task'} },
+            { path: '/taskEdit/:id', component:(resolve)=>require(['./views/task/taskEdit.vue'] , resolve), name: '修改任务', meta: {keepAlive: true, parentPath:'/tab_task'} },
         ]
     },
     // 我的
@@ -90,16 +92,27 @@ let routes = [
         name: '',
         leaf: true,//只有一个节点
         children: [
-            { path: '/my', component: my, name: '我的', meta: {keepAlive: true, parentPath:'/tab_my'} },
-            { path: '/myMessage', component: myMessage, name: '我的消息', meta: {keepAlive: true, parentPath:'/tab_my'} },
-            { path: '/myAssets', component: myAssets, name: '我的资产', meta: {keepAlive: true, parentPath:'/tab_my'} },
-            { path: '/myScore', component: myScore, name: '我的评分', meta: {keepAlive: true, parentPath:'/tab_my'} },
-            { path: '/myScore/:uid/:time', component: myScoreDetail, name: '我的评分详情', meta: {keepAlive: true, parentPath:'/tab_my'} },
-            { path: '/mySuggest', component: mySuggest, name: '我的建议', meta: {keepAlive: true, parentPath:'/tab_my'} },
-            { path: '/myAddress', component: myAddress, name: '通讯录', meta: {keepAlive: true, parentPath:'/tab_my'} },
-            { path: '/myGrade/:id/:name', component: myGrade, name: '打分页面', meta: {keepAlive: true, parentPath:'/tab_my'} },
-            { path: '/myInstitution', component: myInstitution, name: '管理制度', meta: {keepAlive: true, parentPath:'/tab_my'} },
-            { path: '/myInstitution/:id', component: myInsDetail, name: '管理制度详情', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            // { path: '/my', component: my, name: '我的', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            // { path: '/myMessage', component: myMessage, name: '我的消息', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            // { path: '/myAssets', component: myAssets, name: '我的资产', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            // { path: '/myScore', component: myScore, name: '我的评分', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            // { path: '/myScore/:uid/:time', component: myScoreDetail, name: '我的评分详情', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            // { path: '/mySuggest', component: mySuggest, name: '我的建议', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            // { path: '/myAddress', component: myAddress, name: '通讯录', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            // { path: '/myGrade/:id/:name', component: myGrade, name: '打分页面', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            // { path: '/myInstitution', component: myInstitution, name: '管理制度', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            // { path: '/myInstitution/:id', component: myInsDetail, name: '管理制度详情', meta: {keepAlive: true, parentPath:'/tab_my'} },
+
+            { path: '/my', component:(resolve)=>require(['./views/my/my.vue'] , resolve), name: '我的', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            { path: '/myMessage', component:(resolve)=>require(['./views/my/myMessage.vue'] , resolve), name: '我的消息', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            { path: '/myAssets', component:(resolve)=>require(['./views/my/myAssets.vue'] , resolve), name: '我的资产', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            { path: '/myScore', component:(resolve)=>require(['./views/my/myScore.vue'] , resolve), name: '我的评分', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            { path: '/myScore/:uid/:time', component:(resolve)=>require(['./views/my/myScoreDetail.vue'] , resolve), name: '我的评分详情', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            { path: '/mySuggest', component:(resolve)=>require(['./views/my/mySuggest.vue'] , resolve), name: '我的建议', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            { path: '/myAddress', component:(resolve)=>require(['./views/my/myAddress.vue'] , resolve), name: '通讯录', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            { path: '/myGrade/:id/:name', component:(resolve)=>require(['./views/my/myGrade.vue'] , resolve), name: '打分页面', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            { path: '/myInstitution', component:(resolve)=>require(['./views/my/myInstitution.vue'] , resolve), name: '管理制度', meta: {keepAlive: true, parentPath:'/tab_my'} },
+            { path: '/myInstitution/:id', component:(resolve)=>require(['./views/my/myInsDetail.vue'] , resolve), name: '管理制度详情', meta: {keepAlive: true, parentPath:'/tab_my'} },
         ]
     },
     {

+ 0 - 738
lss_vue_wx/src/views/data/data.vue

@@ -1,738 +0,0 @@
-<template>
-	<div class="data">
-        <mt-navbar v-model="selected" class="tab_head" v-on:click.native="changeTab">
-            <mt-tab-item id="tab1">数据存储监控</mt-tab-item>
-            <mt-tab-item id="tab2">云平台监控</mt-tab-item>
-            <mt-tab-item id="tab3">数据交换</mt-tab-item>
-        </mt-navbar>
-        <mt-tab-container v-model="selected">
-            <mt-tab-container-item id="tab1">
-                <div class="headMsg">
-                    <div>中心数据库总量:{{tab1_head1}}</div>
-                    <div>五大数据库总量:{{tab1_head2}}</div>
-                </div>
-                <div id="tab1_chart1" class="echarts"></div>
-                <div class="echartsBox">
-                    <table class="tab1_table">
-                        <thead><tr><td>库名</td><td>数据量(GB)</td><td>占比(%)</td></tr></thead>
-                        <tbody>
-                            <tr><td>入口库</td><td>335</td><td>13.08%</td></tr>
-                            <tr><td>信用库</td><td>310</td><td>20.1%</td></tr>
-                            <tr><td>地理库</td><td>234</td><td>9.13%</td></tr>
-                            <tr><td>法人库</td><td>135</td><td>5.27%</td></tr>
-                            <tr><td>电子证据</td><td>1548</td><td>60.42%</td></tr>
-                        </tbody>
-                    </table>
-                </div>
-                <div id="tab1_chart2" class="echarts echartsBox"></div>
-                <div id="tab1_chart3" class="echarts echartsBox bottom"></div>
-            </mt-tab-container-item>
-            <mt-tab-container-item id="tab2">
-                <div class="headMsg">
-                    <div>总用户数:{{tab2_head1}}</div>
-                    <div>在线用户数:{{tab2_head1}}</div>
-                    <div>上云系统总数量:{{tab2_head1}}</div>
-                </div>
-                <div id="tab2_chart1" class="echarts echartsBox"></div>
-                <div id="tab2_chart2" class="echarts echartsBox"></div>
-                <div id="tab2_chart3" class="echarts echartsBox"></div>
-                <div class="echartsBox bottom">
-                    <table class="tab1_table">
-                        <thead><tr><td>各委办局</td><td>接入效率</td><td>交换效率</td></tr></thead>
-                        <tbody>
-                            <tr><td>交通</td><td>335</td><td>13.08%</td></tr>
-                            <tr><td>公安</td><td>310</td><td>20.1%</td></tr>
-                            <tr><td>卫计</td><td>234</td><td>9.13%</td></tr>
-                            <tr><td>国土</td><td>135</td><td>5.27%</td></tr>
-                            <tr><td>城管</td><td>1548</td><td>60.42%</td></tr>
-                            <tr><td>安监</td><td>1548</td><td>60.42%</td></tr>
-                            <tr><td>房产局</td><td>1548</td><td>60.42%</td></tr>
-                            <tr><td>旅游</td><td>1548</td><td>60.42%</td></tr>
-                            <tr><td>水务</td><td>1548</td><td>60.42%</td></tr>
-                            <tr><td>法院</td><td>1548</td><td>60.42%</td></tr>
-                            <tr><td>环保</td><td>1548</td><td>60.42%</td></tr>
-                            <tr><td>财政</td><td>1548</td><td>60.42%</td></tr>
-                        </tbody>
-                    </table>
-                </div>
-            </mt-tab-container-item>
-            <mt-tab-container-item id="tab3">
-                <div class="headMsg">
-                    <div>当日数据交换量:{{tab3_head1}}</div>
-                    <div>数据交换次数:{{tab3_head2}}</div>
-                </div>
-                <div id="tab3_chart1" class="echarts echartsBox"></div>
-            </mt-tab-container-item>
-        </mt-tab-container>
-    </div>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-                selected: "tab1",
-                tab1_head1: "423GB",
-                tab1_head2: "1168GB",
-                tab2_head1: "1523638",
-                tab2_head2: "35216",
-                tab2_head3: "102",
-                tab3_head1: "114388",
-                tab3_head2: "35216",
-                list: [],
-                labels: [],
-                pageNum: 1,
-                tagId: 0,
-                popupVisible: false,
-                department: ['交通', '公安', '卫计', '国土', '城管', '安监', '房产', '教育', '旅游', '水务', '法院', '环保', '财政'],
-			}
-		},
-		methods: {
-            // 数据存储监控
-            set_tab1_chart1(){
-                var myChart = this.echarts.init(document.getElementById('tab1_chart1'));
-                var option = {
-                    backgroundColor: '#fff',
-                    title : {
-                        text: '五大库数据储存量',
-                        x:'left'
-                    },
-                    tooltip: {
-                        trigger: 'item',
-                        formatter: "{a} <br/>{b}: {c} ({d}%)",
-                        color:'#000',
-                        textStyle:{
-                            color:"#fff",
-                        }
-                    },
-                    legend: {
-                        orient: 'vertical',
-                        x: 'right',
-                        data:['入口库','信用库','地理库','法人库','电子证据'],
-                        textStyle:{
-                            color:'#888',
-                            fontSize:12
-                        }
-                    },
-                    series: [
-                        {
-                            name:'数据储存量',
-                            type:'pie',
-                            radius: ['35%', '55%'],
-                            avoidLabelOverlap: false,
-                            color:['#F68077','#66B1FD','#0BC3FF','#FCF255','#90FB4C'],
-                            label: {
-                                normal: {  //正常的样式
-                                    show: true,
-                                    position: 'left'
-                                },
-                                emphasis: { //选中时候的样式
-                                    show: true,
-                                    textStyle: {
-                                        fontSize: '20',
-                                        fontWeight: 'bold'
-                                    }
-                                }
-                            },  //提示文字
-                            labelLine: {
-                                normal: {
-                                    show: false
-                                }
-                            },
-                            data:[
-                                {value:335, name:'入口库'},
-                                {value:310, name:'信用库'},
-                                {value:234, name:'地理库'},
-                                {value:135, name:'法人库'},
-                                {value:1548, name:'电子证据'}
-                            ]
-                        }
-                    ]
-                };
-                myChart.setOption(option);
-            },
-
-            set_tab1_chart2(){
-                var myChart = this.echarts.init(document.getElementById('tab1_chart2'));
-                var option = {
-                    backgroundColor: '#fff',
-                    title : {
-                        text: '五大库使用情况',
-                        x:'left',
-                    },
-                    tooltip: {
-                        trigger: 'axis',
-                        axisPointer: {
-                            type: 'cross',
-                            crossStyle: {
-                                color: '#999'
-                            }
-                        }
-                    },
-                    xAxis: {
-                        axisTick:{
-                            show:false
-                        },
-                        axisLine: {
-                            show: false,
-                        },
-                        axisLabel: {  
-                            interval:0,  
-                            rotate:40  
-                        },
-                        type: 'category',
-                        data: ['交通', '公安', '卫计', '国土', '城管', '安监', '房产局', '教育', '旅游', '水务', '法院', '环保', '财政']
-                    },
-                    yAxis: {
-                        axisTick:{
-                            show:false
-                        },
-                        axisLine: {
-                            show: false,
-                        },
-                        type: 'value',
-                        name: '单位:%',
-                    },
-                    series: [{
-                        data: [12, 20, 15, 80, 70, 11, 30, 80, 30, 80, 20, 50, 60],
-                        type: 'bar',
-                        barWidth : 10,
-                        itemStyle:{
-                            normal:{
-                                color: '#FF5B29',
-                            }
-                        },
-                    }]
-                };
-                myChart.setOption(option);
-            },
-
-            set_tab1_chart3(){
-                var myChart = this.echarts.init(document.getElementById('tab1_chart3'));
-                var option = {
-                    backgroundColor: '#fff',
-                    title : {
-                        text: '中心库数据存储情况',
-                        x:'left',
-                    },
-                    tooltip: {
-                        trigger: 'axis',
-                        axisPointer: {
-                            type: 'cross',
-                            crossStyle: {
-                                color: '#999'
-                            }
-                        }
-                    },
-                    xAxis: {
-                        axisTick:{
-                            show:false
-                        },
-                        axisLine: {
-                            show: false,
-                        },
-                        axisLabel: {  
-                            interval:0,  
-                            rotate:40  
-                        },
-                        type: 'category',
-                        data: ['交通', '公安', '卫计', '国土', '城管', '安监', '房产局', '教育', '旅游', '水务', '法院', '环保', '财政']
-                    },
-                    yAxis: {
-                        axisTick:{
-                            show:false
-                        },
-                        axisLine: {
-                            show: false,
-                        },
-                        type: 'value',
-                        name: '单位:%',
-                    },
-                    series: [{
-                        data: [12, 20, 15, 80, 70, 11, 30, 80, 30, 80, 20, 50, 60],
-                        type: 'bar',
-                        barWidth : 10,
-                        itemStyle:{
-                            normal:{
-                                color: '#FF5B29',
-                            }
-                        },
-                    }]
-                };
-                myChart.setOption(option);
-            },
-
-            // 云平台监控
-            set_tab2_chart1(){
-                var myChart = this.echarts.init(document.getElementById('tab2_chart1'));
-                var option = {
-                    backgroundColor: '#fff',
-                    title : {
-                        text: '上云系统数量分析',
-                        x:'left',
-                    },
-                    tooltip: {
-                        trigger: 'axis',
-                        axisPointer: {
-                            type: 'cross',
-                            crossStyle: {
-                                color: '#999'
-                            }
-                        }
-                    },
-                    xAxis: {
-                        axisTick:{
-                            show:false
-                        },
-                        axisLine: {
-                            show: false,
-                        },
-                        axisLabel: {  
-                            interval:0,  
-                            rotate:40  
-                        },
-                        type: 'category',
-                        data: ['交通', '公安', '卫计', '国土', '城管', '安监', '房产局', '教育', '旅游', '水务', '法院', '环保', '财政']
-                    },
-                    yAxis: {
-                        axisTick:{
-                            show:false
-                        },
-                        axisLine: {
-                            show: false,
-                        },
-                        type: 'value',
-                        name: '单位:%',
-                    },
-                    series: [{
-                        data: [12, 20, 15, 80, 70, 11, 30, 80, 30, 80, 20, 50, 60],
-                        type: 'bar',
-                        barWidth : 10,
-                        itemStyle:{
-                            normal:{
-                                color: '#FF5B29',
-                            }
-                        },
-                    }]
-                };
-                myChart.setOption(option);
-            },
-
-            set_tab2_chart2(){
-                var myChart = this.echarts.init(document.getElementById('tab2_chart2')) , 
-                    _this = this;
-                var option = {
-                    backgroundColor: '#fff',
-                    title : {
-                        text: '数据接入效率',
-                        x:'left',
-                    },
-                    tooltip: {
-                        trigger: 'axis',
-                        axisPointer: {
-                            type: 'cross',
-                            crossStyle: {
-                                color: '#999'
-                            }
-                        }
-                    },
-                    radar: [{
-                        indicator: (function (){
-                            var res = [];
-                            for(var i in _this.department) {
-                                res.push({text: _this.department[i] , max:100});
-                            }
-                            return res;
-                        })(),
-                        radius: 80
-                    }],
-                    series: [{
-                        type: 'radar',
-                        itemStyle: {normal: {areaStyle: {type: 'default'}}},
-                        data: [
-                            {
-                                name: '接入效率',
-                                value: [2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 75.6, 82.2, 48.7, 18.8, 6.0, 2.3],
-                                itemStyle: {
-                                    normal: {
-                                        color: 'rgba(84,196,168,0.7)',
-                                        lineStyle: {
-                                            color: '#fff',
-                                        },
-                                    },
-                                },
-                            }
-                        ]
-                    }]
-                };
-                myChart.setOption(option);
-            },
-
-            set_tab2_chart3(){
-                var myChart = this.echarts.init(document.getElementById('tab2_chart3')) , 
-                    _this = this;
-                var option = {
-                    backgroundColor: '#fff',
-                    title : {
-                        text: '数据交换效率',
-                        x:'left',
-                    },
-                    tooltip: {
-                        trigger: 'axis',
-                        axisPointer: {
-                            type: 'cross',
-                            crossStyle: {
-                                color: '#999'
-                            }
-                        }
-                    },
-                    radar: [{
-                        indicator: (function (){
-                            var res = [];
-                            for(var i in _this.department) {
-                                res.push({text: _this.department[i] , max:100});
-                            }
-                            return res;
-                        })(),
-                        radius: 80
-                    }],
-                    series: [{
-                        type: 'radar',
-                        itemStyle: {normal: {areaStyle: {type: 'default'}}},
-                        data: [
-                            {
-                                name:'交换效率',
-                                value:[2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 35.6, 62.2, 32.6, 20.0, 6.4, 3.3],
-                                itemStyle: {
-                                    normal: {
-                                        color: 'rgba(252,202,94,0.7)',
-                                        lineStyle: {
-                                            color: '#fff',
-                                        },
-                                    },
-                                },
-                            }
-                        ]
-                    }]
-                };
-                myChart.setOption(option);
-            },
-
-            // 数据交换
-            set_tab3_chart1(){
-                // var uploadedDataURL = "/asset/get/s/data-1559121268278-ozjd-lXoz.png";
-                // var uploadedDataURL = "/asset/get/s/data-1559121263841-UC5w7mTJ9.png";
-                // var uploadedDataURL = "/asset/get/s/data-1559121259198-sxyPSimU9.png";
-                // var uploadedDataURL = "/asset/get/s/data-1559121254241-xj5JAIBzC.png";
-                // var uploadedDataURL = "/asset/get/s/data-1559121249274-QxHDAdQGy.png";
-                var  colorList=['#afa3f5', '#00d488', '#3feed4', '#3bafff', '#f1bb4c','#afa3f5', '#00d488', '#3feed4', '#3bafff', '#f1bb4c','#afa3f5', '#00d488', '#3feed4', '#3bafff', '#f1bb4c', "rgba(250,250,250,0.5)"];
-                var sportsIcon = {
-                    'a':'../../assets/image/userHead.jpg',
-                    'b':'../../assets/image/userHead.jpg',
-                    'c':'../../assets/image/userHead.jpg',
-                    'd':'../../assets/image/userHead.jpg',
-                    'e':'../../assets/image/userHead.jpg',
-                };
-                var myChart = this.echarts.init(document.getElementById('tab3_chart1'));
-                var option = {
-                    backgroundColor: '#fff',
-                    title: {
-                        text: '80',
-                        subtext: '总量',
-                        x: 'center',
-                        y: 'center',
-                        textStyle: {
-                            fontSize:20,
-                            fontWeight:'normal',
-                            color: ['#333']
-                        },
-                        subtextStyle: {
-                            color: '#666',
-                            fontSize: 12
-                        },
-                    },
-                    grid: {
-                        bottom: 150,
-                        left: 0,
-                        right: '10%'
-                    },
-                    legend: {
-                        show:false,
-                        orient: 'vertical',
-                        top: "middle",
-                        right: "5%",
-                        textStyle: {
-                            color: '#f2f2f2',
-                            fontSize: 13,
-
-                        },
-                        icon: 'roundRect'
-                    },
-                    series: [
-                        // 主要展示层的
-                        {
-                            radius: ['25%', '33%'],
-                            center: ['50%', '50%'],
-                            type: 'pie',
-                            itemStyle: {
-                                normal: {
-                                    color: function(params) {
-                                        return colorList[params.dataIndex]
-                                    }
-                                }
-                            },
-                            labelLine: {
-                                normal: {
-                                    show: true,
-                                    length: 15,
-                                    length2: 120,
-                                    lineStyle: {
-                                        color: '#d3d3d3'
-                                    },
-                                    align: 'right'
-                                },
-                                color: "#000",
-                                emphasis: {
-                                    show: true
-                                }
-                            },
-                            label:{
-                                normal:{
-                                    formatter: function(params){
-                                        var str = '';
-                                        switch(params.name){
-                                            case '交通局':str = '{a|}\n{nameStyle|交通局 }'+'{rate|'+params.value+'%}\n' + '{rate|'+params.data.value1+'}';break;
-                                            case '公安局':str = '{b|}\n{nameStyle|公安局 }'+'{rate|'+params.value+'%}\n' + '{rate|'+params.data.value1+'}';break;
-                                            case '卫计局':str = '{c|}\n{nameStyle|卫计局 }'+'{rate|'+params.value+'%}\n' + '{rate|'+params.data.value1+'}';break;
-                                            case '国土局':str = '{d|}\n{nameStyle|国土局 }'+'{rate|'+params.value+'%}\n' + '{rate|'+params.data.value1+'}';break;
-                                            case '城管':str = '{a|}\n{nameStyle|城管 }'+'{rate|'+params.value+'%}\n' + '{rate|'+params.data.value1+'}';break;
-                                            case '安监局':str = '{e|}\n{nameStyle|安监局 }'+'{rate|'+params.value+'%}\n' + '{rate|'+params.data.value1+'}';break;
-                                            case '房产局':str = '{a|}\n{nameStyle|房产局 }'+'{rate|'+params.value+'%}\n' + '{rate|'+params.data.value1+'}';break;
-                                            case '教育局':str = '{e|}\n{nameStyle|教育局 }'+'{rate|'+params.value+'%}\n' + '{rate|'+params.data.value1+'}';break;
-                                            case '旅游局':str = '{a|}\n{nameStyle|旅游局 }'+'{rate|'+params.value+'%}\n' + '{rate|'+params.data.value1+'}';break;
-                                            case '水务局':str = '{e|}\n{nameStyle|水务局 }'+'{rate|'+params.value+'%}\n' + '{rate|'+params.data.value1+'}';break;
-                                            case '法院':str = '{a|}\n{nameStyle|法院 }'+'{rate|'+params.value+'%}\n' + '{rate|'+params.data.value1+'}';break;
-                                            case '环保局':str = '{e|}\n{nameStyle|环保局 }'+'{rate|'+params.value+'%}\n' + '{rate|'+params.data.value1+'}';break;
-                                            case '财政局':str = '{e|}\n{nameStyle|财政局 }'+'{rate|'+params.value+'%}\n' + '{rate|'+params.data.value1+'}';break;
-                                        }
-                                        return str
-                                    },
-                                    padding: [0, -110],
-                                    height: 165,
-                                    rich: {
-                                        a: {
-                                            width:24,
-                                            height:50,
-                                            lineHeight: 50,
-                                            backgroundColor: {
-                                                // image: sportsIcon.e
-                                            },
-                                            align: 'left'
-                                        },
-                                        b: {
-                                            width:24,
-                                            height:50,
-                                            lineHeight: 50,
-                                            backgroundColor: {
-                                                // image: sportsIcon.d
-                                            },
-                                            align: 'left'
-                                        },
-                                        c: {
-                                            width:24,
-                                            height:50,
-                                            lineHeight: 50,
-                                            backgroundColor: {
-                                                // image: sportsIcon.c
-                                            },
-                                            align: 'left'
-                                        },
-                                        d: {
-                                            width:24,
-                                            height:50,
-                                            lineHeight: 50,
-                                            backgroundColor: {
-                                                // image: sportsIcon.b
-                                            },
-                                            align: 'left'
-                                        },
-                                        e: {
-                                            width:24,
-                                            height:50,
-                                            lineHeight: 50,
-                                            backgroundColor: {
-                                                // image: sportsIcon.a
-                                            },
-                                            align: 'left'
-                                        },
-                                        nameStyle: {
-                                            fontSize: 14,
-                                            color: "#555",
-                                            align: 'left'
-                                        },
-                                        rate: {
-                                            fontSize: 12,
-                                            color: "#1ab4b8",
-                                            align: 'left'
-                                        }
-                                    }
-                                }
-                            },
-                            data: [
-                                {value:17, name:'交通局',value1:0,},
-                                {value:23, name:'公安局',value1:10,},
-                                {value:27, name:'卫计局',value1:20,},
-                                {value:33, name:'国土局',value1:30,},
-                                {value:20, name:'安监局',value1:50,},
-                                {value:39, name:'房产局',value1:60,},
-                                {value:29, name:'教育局',value1:70,},
-                                {value:19, name:'旅游局',value1:80,},
-                                {value:39, name:'水务局',value1:90,},
-                                {value:29, name:'法院',value1:100,},
-                                {value:80, name:'城管',value1:110,},
-                                {value:49, name:'环保局',value1:110,},
-                                {value:10, name:'财政局',value1:120,},
-                            ],
-                        },
-                        // 边框的设置
-                        {
-                            radius: ['40%', '47%'],
-                            center: ['50%', '50%'],
-                            type: 'pie',
-                            label: {
-                                normal: {
-                                    show: false
-                                },
-                                emphasis: {
-                                    show: false
-                                }
-                            },
-                            labelLine: {
-                                normal: {
-                                    show: false
-                                },
-                                emphasis: {
-                                    show: false
-                                }
-                            },
-                            animation: false,
-                            tooltip: {
-                                show: false
-                            },
-                            itemStyle: {
-                                normal: {
-                                    color:'rgba(250,250,250,0.5)'
-                                }
-                            },
-                            data: [{
-                                value: 1,
-                            }],
-                        }
-                    ]
-                };
-                myChart.setOption(option);
-            },
-
-            changeTab() {
-                if(this.selected == 'tab1') {
-                    this.set_tab1_chart1();
-                    this.set_tab1_chart2();
-                    this.set_tab1_chart3();
-                } else if(this.selected == 'tab2') {
-                    this.set_tab2_chart1();
-                    this.set_tab2_chart2();
-                    this.set_tab2_chart3();
-                } else if(this.selected == 'tab3') {
-                    this.set_tab3_chart1();
-                }
-            }
-        },
-        created() {
-        },
-		mounted() {
-            // 数据存储监控
-            this.set_tab1_chart1();
-            this.set_tab1_chart2();
-            this.set_tab1_chart3();
-		}
-	}
-
-</script>
-
-<style scoped>
-    .tab_head {
-        position: fixed;
-        z-index: 105;
-        width: 100%;
-        top: 0;
-        
-    }
-
-    .mint-tab-container {
-        /* height: calc(100% - 46px); */
-        margin-top: 46px!important;
-        margin-bottom: 0.45rem;
-        overflow-y: auto;
-        background: #efefef;
-    }
-
-    .data {
-        background: #EFEFEF;
-    }
-
-    .headMsg {
-        background: #fff;
-        margin: 0.02rem 0 0.05rem 0;
-        padding: 0.1rem 0.2rem;
-        font-size: 0.15rem;
-    }
-
-    .headMsg {
-        line-height: 0.25rem;
-    }
-
-    .echarts {
-        width: 100%;
-        height: 3rem;
-        background: #fff;
-        padding: 0.05rem;
-        box-sizing:border-box;
-    }
-
-    .echartsBox {
-        margin-bottom: 0.11rem;
-    }
-
-    .tab1_table {
-        width: 100%;
-        border-collapse:collapse;
-        border-spacing:1;
-        border-spacing:0;
-    }
-
-    .tab1_table thead {
-        background: #F8F8F8;
-    }
-
-    .tab1_table tbody {
-        background: #fff;
-    }
-
-    .tab1_table tr td {
-        line-height: 0.4rem;
-        padding: 0 0.15rem;
-    }
-
-    .tab1_table tr td:nth-child(1) {
-        width: 30%;
-    }
-
-    .bottom {
-        margin-bottom: 0.5rem;
-    }
-</style>
-<style>
-    .tab_head .mint-tab-item-label {
-        font-size: 0.14rem;
-    }
-</style>

+ 1 - 0
lss_vue_wx/src/views/my/myAssets.vue

@@ -160,6 +160,7 @@
     .detail_body {
         margin-top: 0.4rem;
         padding-bottom: 0.15rem;
+        background: #EFEFEF;
     }
 
     .tab_head {

+ 4 - 0
lss_vue_wx/src/views/my/myInsDetail.vue

@@ -94,6 +94,10 @@
         background: #fff;
     }
 
+    .context_router {
+        height: 100%;
+    }
+
     .detail_head {
         background: #fff;
         color: #333;

+ 2 - 1
lss_vue_wx/src/views/my/myMessage.vue

@@ -73,7 +73,7 @@
                 } else if(this.pageNum < this.pages) {
                     this.$indicator.open();
                     this.http.post(this.port.my.newList, {
-                        'id': this.id,
+                        'uid': this.user.id,
                         'pageNum': ++this.pageNum
                     } , 
                     res => {
@@ -147,6 +147,7 @@
     .detail_body {
         margin-top: 0.4rem;
         padding-bottom: 0.15rem;
+        background: #EFEFEF;
     }
 
     .tab_head {

+ 1 - 0
lss_vue_wx/src/views/my/myScore.vue

@@ -140,6 +140,7 @@
     .detail_body {
         margin-top: 0.4rem;
         padding-bottom: 0.15rem;
+        background: #EFEFEF;
     }
 
     .detailBox {