telephone-clients 4.0.0-1-4 → 4.0.0-1-5

package/CHANGELOG.md

@@ -1,37 +1,37 @@
-# Change Log
-所有关于本产品的变化都在该文档里。
-
-## [Unreleased]
-
-## 1.1.7 - 2018-11-23 @ 王智鹏
-- 添加安卓端可以查询购气信息
-
-## 1.1.0 - 2018-11-11 @ 何宁社
-- 去掉样式
-
-## 1.0.19 - 2018-11-1 @ 何宁社
-- 派通气单时，自动建档
-
-## 1.0.11 - 2018-9-11 @ 文明
-### Fixed
-- 修改获取参数的方式及登入人的信息
-
-## 1.0.10 - 2018-9-3 @ 何宁社
-### Fixed
-- 删除错误的局部组件注册
-
-## 1.0.9 - 2018-9-3 @ 何宁社
-### Fixed
-- 解决部分组件的大写问题
-
-## 1.0.7 - 2018-9-3 @ 何宁社
-### Fixed
-- 解决Console的大写问题
-
-## 0.0.2 - 2018-5-6 @ 何宁社
-### Added
-- 把故障编辑及故障显示组件独立出来了
-
-## 0.0.1 - 2017-12-01
-### Added
-- pc端，微信端界面完成，接下来主要完成文字客服，语音客服，业务逻辑，手机app等功能
+# Change Log
+所有关于本产品的变化都在该文档里。
+
+## [Unreleased]
+
+## 1.1.7 - 2018-11-23 @ 王智鹏
+- 添加安卓端可以查询购气信息
+
+## 1.1.0 - 2018-11-11 @ 何宁社
+- 去掉样式
+
+## 1.0.19 - 2018-11-1 @ 何宁社
+- 派通气单时，自动建档
+
+## 1.0.11 - 2018-9-11 @ 文明
+### Fixed
+- 修改获取参数的方式及登入人的信息
+
+## 1.0.10 - 2018-9-3 @ 何宁社
+### Fixed
+- 删除错误的局部组件注册
+
+## 1.0.9 - 2018-9-3 @ 何宁社
+### Fixed
+- 解决部分组件的大写问题
+
+## 1.0.7 - 2018-9-3 @ 何宁社
+### Fixed
+- 解决Console的大写问题
+
+## 0.0.2 - 2018-5-6 @ 何宁社
+### Added
+- 把故障编辑及故障显示组件独立出来了
+
+## 0.0.1 - 2017-12-01
+### Added
+- pc端，微信端界面完成，接下来主要完成文字客服，语音客服，业务逻辑，手机app等功能

package/README.md

@@ -1,39 +1,39 @@
-# TelephoneClient
-
-#### 项目介绍
-{**以下是码云平台说明，您可以替换为您的项目简介**
-码云是开源中国推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台
-无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
-
-#### 软件架构
-软件架构说明
-
-
-#### 安装教程
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### 使用说明
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### 参与贡献
-
-1. Fork 本项目
-2. 新建 Feat_xxx 分支
-3. 提交代码
-4. 新建 Pull Request
-
-
-#### 码云特技
-
-1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com)
-3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
-4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
-5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
+# TelephoneClient
+
+#### 项目介绍
+{**以下是码云平台说明，您可以替换为您的项目简介**
+码云是开源中国推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台
+无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
+
+#### 软件架构
+软件架构说明
+
+
+#### 安装教程
+
+1. xxxx
+2. xxxx
+3. xxxx
+
+#### 使用说明
+
+1. xxxx
+2. xxxx
+3. xxxx
+
+#### 参与贡献
+
+1. Fork 本项目
+2. 新建 Feat_xxx 分支
+3. 提交代码
+4. 新建 Pull Request
+
+
+#### 码云特技
+
+1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
+2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com)
+3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
+4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
+5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
 6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

package/package.json

@@ -1,120 +1,120 @@
-{
-  "name": "telephone-clients",
-  "version": "4.0.0-1-4",
-  "description": "呼叫模块前台组件",
-  "main": "src/index.js",
-  "directories": {
-    "example": "examples",
-    "test": "test"
-  },
-  "scripts": {
-    "unit": "karma start test/unit/karma.conf.js",
-    "example": "node build/example-server.js",
-    "dev": "webpack-dev-server --config ./build/dev-server.js",
-    "android": "node build/dev-android.js",
-    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "e2e": "node test/e2e/runner.js",
-    "release": "bash build/release.sh"
-  },
-  "repository": "http://gitee.com/aote/telephone",
-  "keywords": [
-    "telephone-clients"
-  ],
-  "author": "申志明",
-  "license": "ISC",
-  "dependencies": {
-    "html2canvas": "^1.1.4",
-    "html2pdf.js": "^0.10.1",
-    "jspdf": "^2.3.1",
-    "@keeex/qrcodejs-kx": "^1.0.2",
-    "date-fns": "^2.29.3",
-    "dayjs": "^1.11.6",
-    "less": "^2.7.1",
-    "less-loader": "^2.2.3",
-    "qrcodejs2": "^0.0.2",
-    "src": "^1.1.2",
-    "swiper": "^6.1.2",
-    "vue": "^1.0.17",
-    "vue-awesome-swiper": "^4.1.1"
-  },
-  "devDependencies": {
-    "safecheck-client": "3.0.27-92",
-    "address-client": "3.0.23",
-    "babel-core": "^6.26.0",
-    "babel-loader": "^6.0.0",
-    "babel-plugin-transform-runtime": "^6.0.0",
-    "babel-preset-es2015": "^6.0.0",
-    "babel-preset-stage-2": "^6.0.0",
-    "chai": "^3.5.0",
-    "chromedriver": "^2.21.2",
-    "compression-webpack-plugin": "^1.1.2",
-    "connect-history-api-fallback": "^1.1.0",
-    "cross-env": "^1.0.7",
-    "cross-spawn": "^2.1.5",
-    "css-loader": "^0.23.0",
-    "echarts": "^4.1.0",
-    "eslint": "^2.0.0",
-    "eslint-config-standard": "^5.1.0",
-    "eslint-friendly-formatter": "^1.2.2",
-    "eslint-loader": "^1.3.0",
-    "eslint-plugin-html": "^1.3.0",
-    "eslint-plugin-promise": "^1.0.8",
-    "eslint-plugin-standard": "^1.3.2",
-    "eslint-plugin-vue": "^0.1.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^3.0.2",
-    "file-loader": "^0.8.4",
-    "function-bind": "^1.0.2",
-    "html-webpack-plugin": "^2.30.1",
-    "http-proxy-middleware": "^0.11.0",
-    "inject-loader": "^2.0.1",
-    "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",
-    "karma-coverage": "^1.1.1",
-    "karma-mocha": "^1.3.0",
-    "karma-sinon-chai": "^1.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.31",
-    "karma-webpack": "^2.0.2",
-    "less-loader": "^2.2.3",
-    "lolex": "^1.5.2",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "ncp": "^2.0.0",
-    "nightwatch": "^0.8.18",
-    "ol": "^4.6.4",
-    "phantomjs-prebuilt": "^2.1.3",
-    "proj4": "^2.2.1",
-    "rimraf": "^2.5.0",
-    "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.3.2",
-    "system-phone": "1.2.100",
-    "terser-webpack-plugin-legacy": "^1.2.5",
-    "url-loader": "^0.5.7",
-    "vue-client": "1.25.8",
-    "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-loader": "^8.2.1",
-    "vue-resource": "^1.5.0",
-    "vue-router": "^0.7.13",
-    "vue-strap": "^1.0.9",
-    "vue-style-loader": "^1.0.0",
-    "vue-validator": "2.1.7",
-    "webpack": "^3.12.0",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-dev-server": "^2.9.7",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3"
-  }
-}
+{
+  "name": "telephone-clients",
+  "version": "4.0.0-1-5",
+  "description": "呼叫模块前台组件",
+  "main": "src/index.js",
+  "directories": {
+    "example": "examples",
+    "test": "test"
+  },
+  "scripts": {
+    "unit": "karma start test/unit/karma.conf.js",
+    "example": "node build/example-server.js",
+    "dev": "webpack-dev-server --config ./build/dev-server.js",
+    "android": "node build/dev-android.js",
+    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "e2e": "node test/e2e/runner.js",
+    "release": "bash build/release.sh"
+  },
+  "repository": "http://gitee.com/aote/telephone",
+  "keywords": [
+    "telephone-clients"
+  ],
+  "author": "申志明",
+  "license": "ISC",
+  "dependencies": {
+    "html2canvas": "^1.1.4",
+    "html2pdf.js": "^0.10.1",
+    "jspdf": "^2.3.1",
+    "@keeex/qrcodejs-kx": "^1.0.2",
+    "date-fns": "^2.29.3",
+    "dayjs": "^1.11.6",
+    "less": "^2.7.1",
+    "less-loader": "^2.2.3",
+    "qrcodejs2": "^0.0.2",
+    "src": "^1.1.2",
+    "swiper": "^6.1.2",
+    "vue": "^1.0.17",
+    "vue-awesome-swiper": "^4.1.1"
+  },
+  "devDependencies": {
+    "safecheck-client": "3.0.27-92",
+    "address-client": "3.0.23",
+    "babel-core": "^6.26.0",
+    "babel-loader": "^6.0.0",
+    "babel-plugin-transform-runtime": "^6.0.0",
+    "babel-preset-es2015": "^6.0.0",
+    "babel-preset-stage-2": "^6.0.0",
+    "chai": "^3.5.0",
+    "chromedriver": "^2.21.2",
+    "compression-webpack-plugin": "^1.1.2",
+    "connect-history-api-fallback": "^1.1.0",
+    "cross-env": "^1.0.7",
+    "cross-spawn": "^2.1.5",
+    "css-loader": "^0.23.0",
+    "echarts": "^4.1.0",
+    "eslint": "^2.0.0",
+    "eslint-config-standard": "^5.1.0",
+    "eslint-friendly-formatter": "^1.2.2",
+    "eslint-loader": "^1.3.0",
+    "eslint-plugin-html": "^1.3.0",
+    "eslint-plugin-promise": "^1.0.8",
+    "eslint-plugin-standard": "^1.3.2",
+    "eslint-plugin-vue": "^0.1.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.13.3",
+    "extract-text-webpack-plugin": "^3.0.2",
+    "file-loader": "^0.8.4",
+    "function-bind": "^1.0.2",
+    "html-webpack-plugin": "^2.30.1",
+    "http-proxy-middleware": "^0.11.0",
+    "inject-loader": "^2.0.1",
+    "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",
+    "karma-coverage": "^1.1.1",
+    "karma-mocha": "^1.3.0",
+    "karma-sinon-chai": "^1.3.1",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-webpack": "^2.0.2",
+    "less-loader": "^2.2.3",
+    "lolex": "^1.5.2",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "ncp": "^2.0.0",
+    "nightwatch": "^0.8.18",
+    "ol": "^4.6.4",
+    "phantomjs-prebuilt": "^2.1.3",
+    "proj4": "^2.2.1",
+    "rimraf": "^2.5.0",
+    "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": "^4.0.5",
+    "system-phone": "1.2.100",
+    "terser-webpack-plugin-legacy": "^1.2.5",
+    "url-loader": "^0.5.7",
+    "vue-client": "1.25.31",
+    "vue-hot-reload-api": "^1.2.0",
+    "vue-html-loader": "^1.0.0",
+    "vue-loader": "^8.2.1",
+    "vue-resource": "^1.5.0",
+    "vue-router": "^0.7.13",
+    "vue-strap": "^1.0.9",
+    "vue-style-loader": "^1.0.0",
+    "vue-validator": "2.1.7",
+    "webpack": "^3.12.0",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-dev-server": "^2.9.7",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3"
+  }
+}

package/release.bat

@@ -1,5 +1,5 @@
-git add -A
-git commit -m "[build] %1"
-git tag -a V%1 -m "Release version %1"
-git push origin --tags
-git push
+git add -A
+git commit -m "[build] %1"
+git tag -a V%1 -m "Release version %1"
+git push origin --tags
+git push

package/src/components/android/AddMyTask.vue

@@ -214,13 +214,6 @@ export default {
   data() {
     return {
       model: new PagedList(`${this.$androidUtil.getProxyUrl()}/af-telephone/rs/sql/phoneOperatorService`, 20, { userid: `"${Vue.user.name}"` }, null, false),
-      searchData: {
-        condition:{
-          condition: '1=1',
-          sign:'1=1'
-        },
-        // userid: Vue.user.ename
-      },
       repairTypeOptions: [],
       typeData: [],
       showMessage: true
@@ -233,12 +226,7 @@ export default {
     }
     this.repairTypeOptions = this.$appdata.getParam('报修类型')
   },
-  mounted(){
 
-  },
-  destroyed(){
-
-  },
   methods: {
     //  获取现有的报修类型对应的数量
     async initRepairTypeNum(val) {
@@ -279,8 +267,6 @@ export default {
       }
     },
     search (args) {
-      //tag
-      //tag
       let data = {}
       data.condition = this.$refs.paged.$refs.cri.condition?this.$refs.paged.$refs.cri.condition:'1=1'
       data.condition += " "+"and f_workorder_type like '%报修单%'";
@@ -344,11 +330,7 @@ export default {
     },
     makeAPhoneCall(phoneNumber) {
       this.$androidUtil.makeAPhoneCall(phoneNumber)
-    },
-  },
-  computed:{
-
+    }
   }
-
 }
 </script>

package/src/components/pc/TelLossList.vue

@@ -2,12 +2,18 @@
   <div class="flex-row">
     <div id="stand-work-list" class="flex bg-white p-10 basic-main" style="flex-direction: row">
       <div style="width: 40%;height: 100%" v-show="leftShow">
-        <div class="row" style="height: 10%;width: 50%">
-          <div class="form-group form-input-group" style="display: flex;justify-content: flex-start">
-            <label class="font_normal_body" style="width: 40%">查询日期</label>
+        <div class="row" style="height: 10%;width: 100%">
+          <div class="form-group form-input-group" style="display: flex;justify-content: flex-start;width: 80%">
+            <label class="font_normal_body" style="width: 20%">开始日期</label>
             <datepicker placeholder="查询日期"
-                        :value.sync="searchDate"
-                        v-model="searchDate"
+                        :value.sync="startDate"
+                        v-model="startDate"
+                        :format="'yyyy-MM-dd HH:mm:ss'"
+            ></datepicker>
+            <label class="font_normal_body" style="width: 20%">结束日期</label>
+            <datepicker placeholder="查询日期"
+                        :value.sync="endDate"
+                        v-model="endDate"
                         :format="'yyyy-MM-dd HH:mm:ss'"
             ></datepicker>
             <button type="button" name="button"
@@ -128,7 +134,8 @@ export default {
       wavflie: '',
       idwavfile: '',
       leftShow: true,
-      searchDate: Util.toStandardDateString(),
+      startDate: Util.toStandardDateString(),
+      endDate: Util.toStandardDateString(),
       orderMan: '',
       msgs: [],
       huifangs: [{label: "全部", value: ""}, {label: "已回访", value: "已回访"}, {label: "未回访", value: "未回访"}],
@@ -234,16 +241,16 @@ export default {
       this.model.f_flghuifang = '未回访'
     },
     searchEcharts() {
-      console.log("9334", this.searchDate)
-      this.renderEcharts(this.searchDate)
+      console.log("9334", this.startDate)
+      this.renderEcharts(this.startDate,this.endDate)
     },
     //获取当前日期
-    renderEcharts(date) {
-      console.log("933", Util.addDate(3, date), Util.addDate(-3), date)
+    renderEcharts(startDate,endDate) {
+      console.log("933", startDate, endDate)
       new HttpResetClass().load("post", 'af-telephone/rs/sql/getLossPhoneByTime', {
         data: {
           groupitem: 'SUBSTRING(outltime, 0, 11)',
-          condition: `outltime>='${Util.addDate(-3, date)} 00:00:00' and outltime<='${Util.addDate(3, date)} 23:59:59'`
+          condition: `outltime>='${startDate} 00:00:00' and outltime<='${endDate} 23:59:59'`
         }
       }, {resolveMsg: null, rejectMsg: null}).then(res => {
         let myChart1 = this.$echarts.init(document.getElementById(("husunzhexian1")))
@@ -253,7 +260,7 @@ export default {
       new HttpResetClass().load("post", 'af-telephone/rs/sql/getLossPhoneByTime', {
         data: {
           groupitem: "SUBSTRING(outltime, 12, 2)+':00'",
-          condition: `outltime>='${Util.toStandardDateString(date)} 08:00:00' and outltime<='${Util.toStandardDateString(date)} 18:59:59'`
+          condition: `outltime>='${startDate} 08:00:00' and outltime<='${endDate} 18:59:59'`
         }
       }, {resolveMsg: null, rejectMsg: null}).then(res => {
         let myChart1 = this.$echarts.init(document.getElementById(("husunzhexian2")))

package/src/components/pc/VisitInfo.vue

@@ -237,8 +237,8 @@
           try{
             http.load('POST', wxcon.voiceUrl, {
               aId: this.$login.f.id,
-              aChannel: this.aChannel,
-              aModule: this.aModule,
+              aChannel: Util.attendant.aChannel,
+              aModule: Util.attendant.aModule,
               aBzType:"callout",
               bzExtra: telnum,
               bzId: telnum,