manage-client 3.2.52 → 3.2.53-aode

package/.eslintrc.js

@@ -10,11 +10,7 @@ module.exports = {
   'rules': {
     // allow paren-less arrow functions
     'arrow-parens': 0,
-    // allow async-await
-    'generator-star-spacing': 0,
     // allow debugger during development
-    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
-    // 必须使用全等
-    'eqeqeq': 0
+    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
   }
 }

package/CHANGELOG.md

@@ -1,7 +1,5 @@
 # Change Log
 所有关于本产品的变化都在该文档里。
-## 3.1.3-7 -2020-10-16 @王点点
-- 升至3.1.3-7综合查询导出添加导出时间和表尾合计
 ## 1.6.0 -2019-09-19 @郭伟
 - 升至1.8.0切出鄂州分支
 

package/ManageClient.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="ManageClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="3.1.0-17" type="WEB_MODULE" version="4">
+<module external.linked.project.id="ManageClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="3.1.1-25" type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -10,4 +10,4 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
+</module>

package/build/dev-server.js

@@ -11,16 +11,14 @@ var compiler = webpack(config)
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
-var shaoguan='http://119.146.1.106:8300/'
-var qtx='http://36.103.222.144:6300/'
-var bendi = 'http://127.0.0.1:8084/', fuwu_login = 'http://192.168.50.4:8400'
-// var fuwu = 'http://192.168.17.52:8600'
-var system = 'http://192.168.50.4:8400'
-var fuwu = 'http://192.168.50.4:8402'
-//192.168.
 //  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
-// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
+ var str = 'http://192.168.10.14:8300', fuwu = 'http://192.168.10.233:8300',  bendi = 'http://192.168.10.14:8300'
+// var str = 'http://121.36.106.17:8400' , fuwu = 'http://121.36.106.17:8400' , bendi = 'http://192.168.10.14:8300'
 var proxyTable = {
+
+  '/rs/easyexcel/': {
+    target: fuwu
+  },
   '/rs/logic/exportfile': {
     target: fuwu
   },
@@ -31,6 +29,28 @@ var proxyTable = {
   '/rs/search': {
     target: fuwu
   },
+  '/rs/ckh/singleTableParam': {
+    target: fuwu
+  },
+  '/rs/easyexcel/exportCkh': {
+    target: fuwu
+  },
+
+  '/rs/sql/webmeter_getUserGasList': {
+    target: fuwu
+  },
+  '/rs/sql/getNewUserGasAll': {
+    target: fuwu
+  },
+  '/rs/logic/chargevaluesave': {
+    target: fuwu
+  },
+  '/rs/logic/chargevalueaddinfo': {
+    target: fuwu
+  },
+  '/rs/logic/valueaddinfo': {
+    target: fuwu
+  },
   // 查找资源服务数据
   '/rs/logic/getLogin': {
     target: fuwu
@@ -39,9 +59,6 @@ var proxyTable = {
   '/rs/logic/getInitData': {
     target: fuwu
   },
-  '/rs/logic/getSaleInitData':{
-    target: fuwu
-  },
   // 用户登录服务地址
   '/rs/user': {
     target: fuwu
@@ -73,14 +90,8 @@ var proxyTable = {
   '/rs/vue': {
     target: fuwu
   },
-  '/rs/file': {
-    target: fuwu
-  },
-  '/rs/logic/SumSettleFileImport': {
-    target: 'http://127.0.0.1:8080'
-  },
   '/rs': {
-    target: bendi
+    target: fuwu
   }
 }
 
@@ -166,10 +177,10 @@ app.use('/static', express.static('./static'))
 //   })
 // })
 
-module.exports = app.listen(8085, function (err) {
+module.exports = app.listen(8099, function (err) {
   if (err) {
     console.log(err)
     return
   }
-  console.log('Listening at http://localhost:8085')
+  console.log('Listening at http://localhost:8099')
 })

package/build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "0.0.2",
+  "version": "0.0.1",
   "description": "营收模块 前端组件",
   "author": "何宁社 <524395609@qq.com>",
   "license": "ISC",
@@ -92,7 +92,7 @@
     "webpack-dev-middleware": "^1.4.0",
     "webpack-hot-middleware": "^2.6.0",
     "webpack-merge": "^0.8.3",
-    "system-clients": "^3.0.52",
+    "system-clients": "^1.0.18",
     "safecheck-client": "^0.0.7",
     "sale-clients":"^0.0.6"
   }

package/build/webpack.base.conf.js

@@ -15,8 +15,7 @@ module.exports = {
     fallback: [path.join(__dirname, '../node_modules')],
     alias: {
       'src': path.resolve(__dirname, '../src'),
-      'test': path.resolve(__dirname, '../test'),
-      '@src': path.resolve('src')
+      'test': path.resolve(__dirname, '../test')
     }
   },
   resolveLoader: {
@@ -26,7 +25,7 @@ module.exports = {
     loaders: [
       {
         test: /\.vue$/,
-        loader: 'vue-loader'
+        loader: 'vue'
       },
       {
         test: /\.js$/,
@@ -39,8 +38,9 @@ module.exports = {
           `${projectRoot}\\node_modules\\vue-client\\src`,
           `${projectRoot}\\node_modules\\vue-strap\\src`,
           `${projectRoot}\\node_modules\\system-clients\\src`,
+          `${projectRoot}\\node_modules\\jsencrypt`,
+          `${projectRoot}\\node_modules\\axios`,
           `${projectRoot}\\node_modules\\sale-client\\src`,
-          `${projectRoot}\\node_modules\\ldap-clients\\src`,
         ]
       },
       {
@@ -55,10 +55,6 @@ module.exports = {
         test: /\.less$/,
         loader: 'style!css!less'
       },
-      {
-        test: /\.css$/,
-        loader: 'style!css'
-      },
       {
         test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
         loader: 'url',

package/build.gradle

@@ -5,7 +5,7 @@ buildscript {
 	}
 }
 
-version = '3.1.0-17'
+version = '3.1.1-25'
 apply plugin: 'java'
 task release(type:Exec) {
 	workingDir '.'

package/client.iml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="EclipseModuleManager">
+    <conelement value="org.springsource.ide.eclipse.gradle.classpathcontainer" />
+    <src_description expected_position="0" />
+  </component>
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/bin" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="library" exported="" name="org.springsource.ide.eclipse.gradle.classpathcontainer" level="application" />
+  </component>
+</module>

package/config/index.js

@@ -27,9 +27,7 @@ module.exports = {
     autoOpenBrowser: true,
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
-    proxyTable: {
-      timeout:3000    //设置超时时间
-    },
+    proxyTable: {},
     // CSS Sourcemaps off by default because relative paths are "buggy"
     // with this option, according to the CSS-Loader README
     // (https://github.com/webpack/css-loader#sourcemaps)

package/package.json

@@ -1,14 +1,17 @@
 {
   "name": "manage-client",
-  "version": "3.2.52",
+  "version": "3.2.53-aode",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {
     "test": "test"
   },
-  "dependencies": {},
+  "dependencies": {
+    "axios": "^1.2.0",
+    "jsencrypt": "*",
+    "vue-json-excel": "^0.3.0"
+  },
   "devDependencies": {
-    "axios": "^0.21.1",
     "babel-core": "^6.0.0",
     "babel-loader": "^6.0.0",
     "babel-plugin-transform-runtime": "^6.0.0",
@@ -40,7 +43,6 @@
     "isparta-loader": "^2.0.0",
     "jasmine-core": "^2.4.1",
     "jquery": "^3.3.1",
-    "jsencrypt": "3.0.0-rc.1",
     "json-loader": "^0.5.4",
     "karma": "^1.4.1",
     "karma-chrome-launcher": "^2.2.0",
@@ -50,23 +52,21 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.31",
     "karma-webpack": "^2.0.2",
-    "ldap-clients": "3.0.28",
     "less": "^2.7.3",
     "mkdirp": "^0.5.1",
     "mocha": "^3.2.0",
-    "moment": "2.24.0",
     "ncp": "^2.0.0",
     "rimraf": "^2.5.0",
-    "sale-client": "3.4.14",
+    "sale-client": "^1.2.17-aode",
     "selenium-server": "2.52.0",
     "sinon": "^2.1.0",
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.1.89-20",
+    "system-clients": "3.1.94-aode",
     "url-loader": "^0.5.7",
     "vue-amap": "0.5.10",
-    "vue-client": "1.24.33",
+    "vue-client": "^1.22.28-aode",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "8.2.1",

package/src/App.vue

@@ -3,14 +3,14 @@
     <app-base class="bg">
       <div class='flex'>
         <article>
-          <!--<route :comp="{name: 'liaoyuan-manage-home'}"></route>-->
+          <!--<route :comp="{name: 'manage-home'}"></route>-->
           <!--<route :comp="{name: 'meter-reading'}"></route>-->
           <!--<route :comp="{name: 'Gasproperties'}"></route>-->
           <!--<route :comp="{name: 'vender-management'}"></route>-->
           <!--<route :comp="{name: 'malfunction-home'}"></route>-->
           <route :comp="{name: 'login'}"></route>
           <!-- <route :comp="{name: 'load-data'}"></route> -->
-           <!--<route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route>-->
+          <!-- <route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route> -->
           <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
         </article>
       </div>

package/src/Util.js

@@ -213,6 +213,32 @@ export function getNowDate (name) {
   // document.write("<font color=#ffffff>今天是 "+year+"年"+mymonth+"月"+myday+"日 "+weekday+"</font>");
   return year + '年' + mymonth + '月' + myday + '日  ' + week[myweekday]
 }
+export function GetPreMonthDay(date, monthNum) {
+  var dateArr = date.split('-');
+  var year = dateArr[0]; //获取当前日期的年份
+  var month = dateArr[1]; //获取当前日期的月份
+  var day = dateArr[2]; //获取当前日期的日
+  var days = new Date(year, month, 0);
+  days = days.getDate(); //获取当前日期中月的天数
+  var year2 = year;
+  var month2 = parseInt(month) - monthNum;
+  if (month2 <= 0) {
+    var absM = Math.abs(month2);
+    year2 = parseInt(year2) - Math.ceil(absM / 12 == 0 ? 1 : parseInt(absM) / 12);
+    month2 = 12 - (absM % 12);
+  }
+  var day2 = day;
+  var days2 = new Date(year2, month2, 0);
+  days2 = days2.getDate();
+  if (day2 > days2) {
+    day2 = days2;
+  }
+  if (month2 < 10) {
+    month2 = '0' + month2;
+  }
+  var t2 = year2 + '-' + month2
+  return t2;
+}
 
 export function addDate (date, days) {
   // 求取当前时间的工具
@@ -280,6 +306,20 @@ export function uncompileStr (code) {
   return c
 }
 
+//计算日期间隔天数
+export function getDaysBetween(startDate, enDate) {
+  const sDate = Date.parse(startDate)
+  const eDate = Date.parse(enDate)
+  if (sDate > eDate) {
+    return 0
+  }
+  if (sDate === eDate) {
+    return 1
+  }
+  const days = (eDate - sDate) / (1 * 24 * 60 * 60 * 1000)
+  return days
+}
+
 export function dateDescripte (date) {
   let nowTime = new Date().getTime()
   let oldTime = new Date(date).getTime()
@@ -318,31 +358,7 @@ export function nextMonth20 (date) {
   let nextMonth = ds[1] - 0 + 1
   return ds[0] + '-' + (nextMonth < 10 ? '0' + nextMonth : nextMonth) + '-20 00:00:00'
 }
-//
-export function dateSwitch(fmt,dateStr,times){
-  let date=new Date(dateStr).getTime()+times
-  return this.dateFormat(fmt,new Date(date))
-}
-// 时间格式化
-export function dateFormat(fmt, date) {
-  let ret;
-  const opt = {
-    "y+": date.getFullYear().toString(),        // 年
-    "M+": (date.getMonth() + 1).toString(),     // 月
-    "d+": date.getDate().toString(),            // 日
-    "h+": date.getHours().toString(),           // 时
-    "m+": date.getMinutes().toString(),         // 分
-    "s+": date.getSeconds().toString()          // 秒
-    // 有其他格式化字符需求可以继续添加，必须转化成字符串
-  }
-  for (let k in opt) {
-    ret = new RegExp("(" + k + ")").exec(fmt);
-    if (ret) {
-      fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
-    }
-  }
-  return fmt
-}
+
 // export function getNowDate () {
 //   // 求取当前时间的工具
 //   let myweekday = ''

package/src/components/ManageHome/Home/Monitor.vue

@@ -42,6 +42,7 @@
     },
     data() {
       return {
+        date: [2018, 2017, 2016],
         xc: '',
         warn: '',
         suspicious: '',
@@ -91,9 +92,10 @@
             show: false,
           },
           yAxis: {
-            data: data.grade,
             type: 'category',
             axisLabel: {
+              margin: 10 * scale,
+              show: true,
               color: function (param) {
                 if (param == '警告类型') {
                   return '#fff'
@@ -108,7 +110,7 @@
             axisLine: {
               show: false,
             },
-
+            data: data.grade
           },
           series: [{
             type: 'bar',
@@ -207,7 +209,6 @@
           this.warn = this.resdata[0].warn
           this.suspicious = this.resdata[0].suspicious
           this.$parent.loaddata++
-          console.log(this.resdata, '----------警告用户统计----------')
         }
       },
       'monitordata': {
@@ -234,7 +235,6 @@
     },
     ready() {
       this.searchdata()
-
     }
   }
 </script>

package/src/components/ManageHome/Home/UserModule.vue

@@ -95,10 +95,10 @@
               text: result,
               left: '43%',
               top: '47%',
-              padding: [1000 * scale, 1000 * scale],
+              padding: [10 * scale, 10 * scale],
               textStyle: {
                 color: '#00e2ea',
-                fontSize: 120 * scale,
+                fontSize: 12 * scale,
 
               }
             }],
@@ -174,7 +174,7 @@
                       }
                     }
                   },
-                  padding: [100, -100 * scale],
+                  padding: [0, -100 * scale],
                   rich: rich,
                 }
               },

package/src/components/ManageHome/Monitor/NoContact.vue

@@ -139,7 +139,6 @@
               axisLabel: {interval: 0, textStyle: {color: '#ffffff', fontSize: 14 * scale}},
               axisTick: {show: false},
               data: xAxisData,
-              min:6
             },
           ],
           yAxis: [

package/src/components/ManageHomeCS/CustomerService/ContentmentStatistics.vue

@@ -34,13 +34,13 @@
             name: legendData[v],
             type: 'line',
             symbol: "circle",
-            symbolSize: 5 ,
+            symbolSize: 5 * scale,
             itemStyle: {
               normal: {
                 lineStyle: {
                   width: 1,
-                  shadowBlur: 10 ,
-                  shadowOffsetY: 15 ,
+                  shadowBlur: 10 * scale,
+                  shadowOffsetY: 15 * scale,
                 }
               }
             },
@@ -65,9 +65,9 @@
             data: legendData,
             y: 'top',
             // padding: [0, 25*scale, 0, 0],
-            itemWidth: 14 ,
-            itemHeight: 6 ,
-            textStyle: {width: '20%', color: "#15dce2", fontSize: 12 },
+            itemWidth: 14 * scale,
+            itemHeight: 6 * scale,
+            textStyle: {width: '20%', color: "#15dce2", fontSize: 12 * scale},
           },
           color: colors,
           grid: {left: '5%', top: "18%", bottom: "5%", right: "5%", containLabel: true},

package/src/components/ManageHomeCS/CustomerService/ExcepCollect.vue

@@ -38,7 +38,7 @@
           type: 'line',
           smooth: false,  // true: 光滑曲线  , false: 直线
           symbol: 'circle',
-          symbolSize: 5 ,
+          symbolSize: 5 * scale,
           areaStyle: {
             normal: {
               color: new this.$echarts.graphic.LinearGradient(
@@ -56,7 +56,7 @@
             position: 'top',
             textStyle: { //数值样式
               color: '#f7cb32',
-              fontSize: 14
+              fontSize: 14 * scale
             }
           },
           itemStyle: {
@@ -83,9 +83,9 @@
             right:'5%',
             data: legendData,
             y: 'top',
-            itemWidth: 12 ,
-            itemHeight: 6 ,
-            textStyle: {width: '20%', color: "#15dce2", fontSize: 12 },
+            itemWidth: 12 * scale,
+            itemHeight: 6 * scale,
+            textStyle: {width: '20%', color: "#15dce2", fontSize: 12 * scale},
             formatter: function (params) {
               return params
             },

package/src/components/ManageHomeCS/CustomerService/ReasonComplaint.vue

@@ -6,28 +6,14 @@
 </template>
 
 <script>
-  import * as DataSql from "../../../stores/DataSql";
-  import co from "co";
-
   export default {
     name: "ReasonComplaint",
-    data() {
-      return {
-        ReasonComplaint:[],
-        visits:[],
-        grade:[],
-      }
-    },
     methods:{
-      searchdata(){
-        let ReasonComplaint = DataSql.getData(this, 'reasonComplaint', {},'ReasonComplaint')
-        co(ReasonComplaint)
-      },
       setBar() {
         this.xc = this.$echarts.init(document.getElementById('complaint'))
         var scale=this.$parent.$parent.$parent.scale
-        var visits = this.visits
-        var grade = this.grade
+        var visits = [92, 102, 89,100,150]
+        var grade = ['话务员态度差','维修员延误','上门服务态度差' ,'维修未能完成','抢修未成功']
         var data = {
           grade: grade,
           visits: visits,
@@ -109,23 +95,7 @@
       },
     },
     ready() {
-      this.searchdata()
-    },
-    watch:{
-      'ReasonComplaint': {
-        deep: true,
-        handler(val) {
-          console.log('-------------客服')
-          console.log('客服',this.ReasonComplaint)
-          console.log('长度',this.ReasonComplaint.length)
-          for (let i = 4; i >=0 ; i--) {
-            this.visits.push(this.ReasonComplaint[i].count)
-            this.grade.push(this.ReasonComplaint[i].f_content)
-          }
-          this.setBar()
-        }
-      },
-
+      this.setBar()
     }
   }
 </script>

package/src/components/ManageHomeCS/CustomerService/ReasonConsultation.vue

@@ -6,28 +6,14 @@
 </template>
 
 <script>
-  import * as DataSql from "../../../stores/DataSql";
-  import co from "co";
-
   export default {
     name: "ReasonConsultation",
-    data() {
-      return {
-        consultingdata:[],
-        visits:[],
-        grade:[],
-      }
-    },
     methods:{
-      searchdata(){
-        let consultingdata = DataSql.getData(this, 'consultingdata', {},'consultingdata')
-        co(consultingdata)
-      },
       setBar() {
         this.xc = this.$echarts.init(document.getElementById('consultation'))
         var scale=this.$parent.$parent.$parent.scale
-        var visits = this.visits
-        var grade = this.grade
+        var visits = [92, 102, 89,100,150]
+        var grade = ['漏气','卡表故障','管道故障' ,'调压箱故障','壁挂炉故障']
         var data = {
           grade: grade,
           visits: visits,
@@ -108,26 +94,7 @@
       },
     },
     ready() {
-      // 拼接sql，请求后台
-      this.searchdata()
-
-    }
-    ,
-    watch :{
-      'consultingdata': {
-        deep: true,
-        handler(val) {
-          console.log('-------------客服')
-          console.log('客服',this.consultingdata)
-          console.log('长度',this.consultingdata.length)
-          for (let i = 4; i >=0 ; i--) {
-              this.visits.push(this.consultingdata[i].count)
-              this.grade.push(this.consultingdata[i].f_content)
-          }
-          this.setBar()
-        }
-      },
-
+      this.setBar()
     }
   }
 </script>