manage-client 4.1.98 → 4.1.99-weinan

package/.eslintrc.js

@@ -15,6 +15,8 @@ module.exports = {
     // allow debugger during development
     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
     // 必须使用全等
-    'eqeqeq': 0
+    'eqeqeq': 0,
+    "import/no-unresolved": ["error", { "caseSensitive": true }],
+    "camelcase": "off"
   }
 }

package/build/dev-server.js

@@ -6,8 +6,8 @@ const proxyMiddleware = require('http-proxy-middleware')
 const app = express()
 const compiler = webpack(config)
 
-const server = 'http://123.57.92.217:8900/'
-const local = 'http://123.57.92.217:8900/'
+const server = 'http://172.168.1.11:8400/'
+const local = 'http://127.0.0.1:8888/'
 const proxyTable = {
   '/rs/logic/exportfile': {
     target: server
@@ -15,24 +15,30 @@ const proxyTable = {
   '/dataManage': {
     target: server
   },
-  // '/api/af-revenue/sql/': {
-  //   pathRewrite: {
-  //     '^/api/af-revenue': '/'
-  //   },
-  //   target: local
-  // },
-  // '/api/af-revenue/report/': {
-  //   pathRewrite: {
-  //     '^/api/af-revenue': '/'
-  //   },
-  //   target: local
-  // },
-  // '/api/af-revenue/logic': {
-  //   pathRewrite: {
-  //     '^/api/af-revenue': '/'
-  //   },
-  //   target: local
-  // },
+  '/api/af-revenue/sql/': {
+    pathRewrite: {
+      '^/api/af-revenue': '/rs'
+    },
+    target: local
+  },
+  '/api/af-revenue/report/': {
+    pathRewrite: {
+      '^/api/af-revenue': '/rs'
+    },
+    target: local
+  },
+  '/api/af-revenue/logic/getSaleInitData': {
+    // pathRewrite: {
+    //   '^/api/af-revenue': '/rs'
+    // },
+    target: server
+  },
+  '/api/af-revenue/logic': {
+    pathRewrite: {
+      '^/api/af-revenue': '/rs'
+    },
+    target: local
+  },
   '/api': {
     target: server
   },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "4.1.98",
+    "version": "4.1.99-weinan",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {
@@ -67,7 +67,7 @@
         "style": "0.0.3",
         "style-loader": "^0.20.3",
         "swiper": "^5.4.5",
-        "system-clients": "3.2.90-tongchuan",
+        "system-clients": "3.2.87",
         "ldap-clients": "3.0.96",
         "url-loader": "^0.5.7",
         "vue-amap": "0.5.10",

package/src/components/webmeter/instruction/NewQueryInstructHistory.vue

@@ -6,7 +6,13 @@
           <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
             <div class="row">
               <div class="col-sm-2">
-                <res-select-group :show-component="['company']" :initres="$parent.$parent.org" @re-res="$parent.$parent.getorg" style="width:60%"></res-select-group>
+                <label class="font_normal_body">组织机构</label>
+                <res-select :initresid="$parent.$parent.org"
+                            style="width:60%"
+                            @res-select="$parent.$parent.getorg"
+                            :is-mul=false
+                            restype='organization'>
+                </res-select>
               </div>
               <div class="col-sm-2 form-group ">
                 <label class="font_normal_body">客户编号</label>
@@ -306,11 +312,7 @@
         userType:[],
         // instructtype:[],
         // instructstate:[],
-        org:{
-          org:[this.$login.f.orgid],
-          dep:[],
-          user:[],
-        },
+        org:[this.$login.f.orgid],
         orgcondition:'',
         show: false,
         condition:'',
@@ -339,9 +341,12 @@
       hidden(){
         this.criteriaShow = !this.criteriaShow
       },
-      getorg(condition,obj) {
-        this.orgcondition = condition
-        this.orgname = obj.orgnames[0]
+      getorg(obj) {
+        if(plugins.convertToIn(obj)!==null&&plugins.convertToIn(obj)!==''){
+          this.orgcondition = " and f_orgid  in " + plugins.convertToIn(obj)
+        }else{
+          this.orgcondition = " and f_orgid  = " + this.$login.f.orgid
+        }
       },
       initQueryParam () {
         let arr = []

package/src/filiale/WEINAN/BankManager.vue

@@ -1,6 +1,6 @@
 <template lang="html">
   <div id="charts">
-    <div id="bm" :style="{width:'100%',height:'100%'}"></div>
+    <div id="instruct" :style="{width:'100%',height:'100%'}"></div>
   </div>
 </template>
 
@@ -8,162 +8,193 @@
 import * as Util from '../../Util'
 import co from 'co'
 import echarts from 'echarts'
-import {HttpResetClass } from 'vue-client'
+import {HttpResetClass} from 'vue-client'
 
-let getData = function * (self) {
-  let load = new HttpResetClass() //qibiao-shouqi
-  load.load('POST', 'api/af-revenue/sql/qibiao-shouqi',
-  {data: {startDate: self.startdate, endDate: self.enddate, f_orgid: `f_orgid = ${self.orgid}`,condition: '1=1'}},
-  {resolveMsg: null, rejectMsg: null})
-  .then((res) => {
-    self.texttile = '用户类型'
-    // let arrparams = []
-    console.log('获取数据。。', res.data)
-    let meter = Array.from(new Set(res.data.map(x => x.biaoleixing)))
-    let jmeter = []
-    let qkmeter = []
-    let jkmeter = []
-    let webmeter = []
-    jmeter.push(res.data.filter(x => x.biaoleixing === '机表').map(item => item.yongqi).reduce((x, y) => x + y, 0).toFixed(2))
-    jmeter.push(res.data.filter(x => x.biaoleixing === '机表').map(item => item.jine).reduce((x, y) => x+y, 0).toFixed(2))
-
-    qkmeter.push(res.data.filter(x => x.biaoleixing === '气量卡表').map(item => item.yongqi).reduce((x, y) => x + y, 0).toFixed(2))
-    qkmeter.push(res.data.filter(x => x.biaoleixing === '气量卡表').map(item => item.jine).reduce((x, y) => x+y, 0).toFixed(2))
-
-    jkmeter.push(res.data.filter(x => x.biaoleixing === '金额卡表').map(item => item.yongqi).reduce((x, y) => x + y, 0).toFixed(2))
-    jkmeter.push(res.data.filter(x => x.biaoleixing === '金额卡表').map(item => item.jine).reduce((x, y) => x+y, 0).toFixed(2))
-
-    webmeter.push(res.data.filter(x => x.biaoleixing === '物联网表').map(item => item.yongqi).reduce((x, y) => x + y, 0).toFixed(2))
-    webmeter.push(res.data.filter(x => x.biaoleixing === '物联网表').map(item => item.jine).reduce((x, y) => x+y, 0).toFixed(2))
-
-    self.set(meter, jmeter, qkmeter, jkmeter, webmeter)
+let getData = function* (self) {
+  let load = new HttpResetClass()
+  load.load('POST', 'api/af-revenue/sql/manage_homeInstructQuery', {
+    data: {
+      startDate: self.getStartOfRecentFiveDays() + ' 00:00:00',
+      endDate: Util.toStandardDateString() + ' 23:59:59',
+      f_orgid: self.orgid,
+      condition: '1=1'
+    }
+  }, {
+    resolveMsg: null,
+    rejectMsg: null
+  }).then((res) => {
+    let data = res.data
+    // 表型
+    let xPro = data.map(x => x.f_meter_brand)
+    console.log('表型', xPro)
+    let f_total_num = data.map(x => x.f_total_num)
+    let f_success_num = data.map(x => x.f_success_num)
+    let f_failure_num = data.map(x => x.f_failure_num)
+    self.set(xPro, f_total_num, f_success_num, f_failure_num)
   })
 }
 export default {
   props: {
-    startdate: {
-      type: String,
-      default: Util.toStandardDateString()
-    },
-    enddate: {
-      type: String,
-      default: Util.toStandardDateString()
-    },
     orgid: {
       type: String
     }
-},
- data () {
-   title: '气表售气量'
-   return {
-     texttile: '',
-     xc: '',
-
-     minyongvalue: [],
-     feiminyongvalue: []
-   }
- },
- methods: {
-   set (meter, jmeter, qkmeter, jkmeter, webmeter) {
-     this.xc = echarts.init(document.getElementById('bm'))
-     this.xc.setOption({
-       title : {
-         text: '气表售气量',
-         subtext: '数据查询来源',
-         x: 'left'
-       },
-       tooltip : {
-         trigger: 'axis'
-       },
-       legend: {
-         x: 'left',
-         y: 'bottom',
-         data: meter
-       },
-       toolbox: {
-         show : true,
-         feature : {
-           dataView : {show: true, readOnly: false},
-           magicType : {show: true, type: ['line', 'bar']},
-           restore : {show: true},
-           saveAsImage : {show: true}
-         }
-       },
-       calculable : true,
-       xAxis : [
-         {
-           type : 'category',
-           data : ['气量','金额']
-         }
-      ],
-      yAxis : [
-        {
-          type : 'value'
-        }
-      ],
-      series : [
-        {
-          name: '机表',
-          type: 'bar',
-          data: jmeter,
-          markLine : {
-            data : [
-              {type : 'average', name: '平均值'}
-            ]
-          }
+  },
+  data () {
+    return {
+      texttile: '',
+      xc: '',
+      resizeHandler: null // 存储resize监听函数，方便销毁
+    }
+  },
+  methods: {
+    getStartOfRecentFiveDays (returnRaw = false) {
+      const today = new Date()
+      const startDate = new Date(today)
+      startDate.setDate(today.getDate() - 4)
+      if (returnRaw) {
+        return startDate
+      }
+      const year = startDate.getFullYear()
+      const month = String(startDate.getMonth() + 1).padStart(2, '0')
+      const day = String(startDate.getDate()).padStart(2, '0')
+      return `${year}-${month}-${day}`
+    },
+    set (arrparams, f_total_num, f_success_num, f_failure_num) {
+      this.xc = echarts.init(document.getElementById('instruct'))
+      this.xc.setOption({
+        title: {
+          text: '近五天指令执行情况',
+          subtext: '数据查询来源',
+          x: 'left'
         },
-        {
-          name:'气量卡表',
-          type:'bar',
-          data: qkmeter,
-          markLine : {
-          data : [
-              {type : 'average', name : '平均值'}
-            ]
-          }
+        tooltip: {
+          trigger: 'axis'
         },
-        {
-          name:'金额卡表',
-          type:'bar',
-          data: jkmeter,
-          markLine : {
-          data : [
-              {type : 'average', name : '平均值'}
-            ]
+        legend: {
+          x: 'center', // 图例居中，避免左侧挤压
+          y: 'bottom',
+          padding: [0, 0, 10, 0], // 底部预留padding，防止文字截断
+          textStyle: {
+            fontSize: 12
+          },
+          data: ['总数', '成功数量', '失败数量']
+        },
+        toolbox: {
+          show: true,
+          top: 10, // 工具栏上移，不占用下方空间
+          right: 10,
+          feature: {
+            dataView: {show: true, readOnly: false},
+            magicType: {show: true, type: ['line', 'bar']},
+            restore: {show: true},
+            saveAsImage: {show: true}
           }
         },
-        {
-          name:'物联网表',
-          type:'bar',
-          data: webmeter,
-          markLine : {
-          data : [
-              {type : 'average', name : '平均值'}
-            ]
+        calculable: true,
+        xAxis: [
+          {
+            type: 'category',
+            axisLabel: {
+              interval: 0,
+              rotate: 30, // X轴标签旋转，避免文字重叠
+              fontSize: 11, // 缩小X轴文字
+              // 文字换行处理（可选，若表型名称过长）
+              formatter: function(value) {
+                let result = ''
+                const len = value.length
+                // 每4个字符换一行
+                for (let i = 0; i < len; i += 4) {
+                  result += value.substring(i, i + 4) + '\n'
+                }
+                return result.trim()
+              }
+            },
+            data: arrparams
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value',
+            axisLabel: {
+              fontSize: 11 // 缩小Y轴文字
+            }
           }
+        ],
+        series: [
+          {
+            name: '总数',
+            type: 'bar',
+            data: f_total_num,
+            markLine: {
+              data: [
+                {type: 'average', name: '平均值'}
+              ]
+            }
+          },
+          {
+            name: '成功数量',
+            type: 'bar',
+            data: f_success_num,
+            markLine: {
+              data: [
+                {type: 'average', name: '平均值'}
+              ]
+            }
+          },
+          {
+            name: '失败数量',
+            type: 'bar',
+            data: f_failure_num,
+            markLine: {
+              data: [
+                {type: 'average', name: '平均值'}
+              ]
+            }
+          }
+        ]
+      })
+      // 绑定resize监听，自适应窗口变化
+      this.resizeHandler = () => {
+        if (this.xc) {
+          this.xc.resize()
         }
-      ]
-     })
-   },
-   searchdata () {
-     let getGen = getData(this)
-     co(getGen)
-   }
- },
- ready () {
-   this.searchdata()
- },
- watch: {
-   'startdate' (val) {
-     this.searchdata()
-   },
-   'enddate' (val) {
-     this.searchdata()
-   },
-   'orgid' (val) {
-     this.searchdata()
-   }
- }
-
+      }
+      window.addEventListener('resize', this.resizeHandler);
+    },
+    searchdata () {
+      let getGen = getData(this)
+      co(getGen)
+    }
+  },
+  ready () {
+    this.searchdata()
+  },
+  watch: {
+    'startdate' (val) {
+      this.searchdata()
+    },
+    'enddate' (val) {
+      this.searchdata()
+    },
+    'orgid' (val) {
+      this.searchdata()
+    }
+  },
+  // 组件销毁时移除监听，避免内存泄漏
+  beforeDestroy() {
+    if (this.resizeHandler) {
+      window.removeEventListener('resize', this.resizeHandler);
+    }
+    if (this.xc) {
+      this.xc.dispose(); // 销毁ECharts实例
+    }
+  }
 }
 </script>
+
+<style scoped>
+/* 可选：若需要额外样式优化可添加 */
+#charts {
+  box-sizing: border-box;
+}
+</style>

package/src/filiale/WEINAN/BusinessManage.vue

@@ -45,6 +45,9 @@
     <tabs header="迁表查询" v-if="permission('迁表查询')">
       <movemeter-query v-if="show.includes('迁表查询')" @deal-msg="dealMsg" :data="data"></movemeter-query>
     </tabs>
+    <tabs header="异常查询" v-if="permission('业务查询异常查询')">
+      <manage-abnormal-query v-if="show.includes('异常查询')" @deal-msg="dealMsg" :data="data"></manage-abnormal-query>
+    </tabs>
 <!--    <tabs header="卡表抄表查询" v-if="permission('卡表抄表查询')">-->
 <!--      <card-handplan-query v-if="show.includes('卡表抄表查询')" @deal-msg="dealMsg" :data="data"></card-handplan-query>-->
 <!--    </tabs>-->