npm - manage-client - Versions diffs - 3.3.242 → 3.3.244-kelai - Mend

manage-client 3.3.242 → 3.3.244-kelai

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (765) hide show

package/build/dev-server.js CHANGED Viewed

@@ -11,25 +11,21 @@ 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 shaoguan = 'http://119.146.1.106:8300/'
+// var qtx= 'http://36.103.222.144:6300/'
 // var bendi = 'http://220.194.141.253:8600/'
 // var bendi = 'http://203.57.101.233:9001'
 // var bendi = 'http://172.168.1.11:9001/'
 // var bendi = 'http://203.57.101.233:8400/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://192.168.50.4:8400/'
+var bendi = 'http://203.57.101.233:8400/'
 // var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://192.168.50.4:8400/'
+var wode = 'http://203.57.101.233:8400/'
 // 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 proxyTable = {
-  '/api/af-revenue': {
-    pathRewrite: {'/api/af-revenue': '/'},
-    target: 'http://127.0.0.1:9026'
-  },
   '/rs/logic/exportfile': {
     target: bendi
   },

package/index.html CHANGED Viewed

@@ -6,23 +6,39 @@
   <META HTTP-EQUIV="pragma" CONTENT="no-cache">
   <META HTTP-EQUIV="Cache-Control" CONTENT="no-cache, must-revalidate">
   <META HTTP-EQUIV="expires" CONTENT="0">
-  <title>奥枫信息系统</title>
-  <style media="screen">
-    /*url(./static/newmainbg.jpg)*/
-    body {
-      width: 100%;
-      background: #7f8eaf no-repeat center bottom;
-      background-size: cover;
-    }
+  <link rel="stylesheet" href="http://cache.amap.com/lbs/static/main1119.css"/>
+  <script src="https://webapi.amap.com/maps?v=1.4.2&key=a511f5f7695b395a4eebf72b20e0f6e9"></script>
+  <!--引入UI组件库（1.1版本） -->
+  <script src="https://webapi.amap.com/ui/1.1/main.js?v=1.1.1"></script>
-    body .loginbg {
-      width: 100%;
-      height: 100%;
-      background: url(./static/loginbg.jpg) no-repeat center top;
+  <script type="text/javascript" src="http://cache.amap.com/lbs/static/addToolbar.js"></script>
+  <title>智慧燃气</title>
+  <script src="./static/wasm_exec.js"></script>
+  <script src="./static/Functions.js"></script>
+  <script src="./static/init.js"></script>
+  <script src="./static/tools.js"></script>
+  <script src="./static/Jsons.js"></script>
+  <script src="./static/class.js"></script>
+  <script>
+    window._AMapSecurityConfig = {
+      securityJsCode: '63ff2a8a1ebed829c0626296c2cd5f9f'
     }
+    global.loadWasm().then(()=>{
+      global.run()
+    })
+  </script>
+  <style media="screen">
+    /*url(./static/newmainbg.jpg)*/
+    body{width: 100%;background:#7f8eaf  no-repeat center bottom; background-size: cover;}
+    body .loginbg{ width:100%; height:100%; background:url(./static/loginbgmain.jpg) no-repeat center top;}
   </style>
 </head>
 <body id="bodymain" class="themeOne">
 <app></app>
 </body>
 </html>
+<style>
+  * {
+    font-family: PingFangSC-Regular;
+  }
+</style>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "3.3.242",
+    "version": "3.3.244-kelai",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {

package/src/App.vue CHANGED Viewed

@@ -1,29 +1,61 @@
 <template>
-  <div>
-    <app-base class="bg">
-      <div class='flex'>
-        <article>
-          <!--<route :comp="{name: 'liaoyuan-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: 'call-report-main-page'}"></route>-->
-          <!-- <route :comp="{name: 'load-data'}"></route> -->
-           <!--<route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route>-->
-          <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['api/af-revenue/sql/getMeterBrand','api/af-revenue/sql/getPriceType','api/af-revenue/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
-        </article>
-      </div>
-    </app-base>
-  </div>
+  <app-base class="bg" @click="isTimeOut">
+    <div class='flex'>
+      <article>
+        <route :comp="{name: 'login'}"></route>
+      </article>
+    </div>
+  </app-base>
 </template>
 <script>
+import Vue from 'vue'
 export default {
+  data () {
+    return {
+      lastTime: null, // 最后一次点击的时间
+      currentTime: null, // 当前点击的时间
+      // 获取一次不在获取控制
+      getConfig: false,
+      config: {
+        timeOut: 0, // 单位: 分钟
+        exitPrompt: '因您长时间未操作, 请重新登陆!'
+      },
+    }
+  },
+  ready() {
+    Vue.mmType = 'AES'
+    Vue.mm = "OXuYieBb4eoIne^K"
+    Vue.timeout = 120000
+  },
+  created () {
+    this.lastTime = new Date().getTime()
+  },
+  methods: {
+    async isTimeOut () {
+      // 获取config配置
+      if (!this.getConfig && this.$login.f && this.$login.f.dir) {
+        await this.$getConfig(this, 'App')
+        this.getConfig = true
+      }
+      // 无配置,不开启
+      if (this.config.timeOut <= 0) return
+      // 记录这次点击的时间
+      this.currentTime = new Date().getTime()
+      // 判断上次最后一次点击的时间和这次点击的时间间隔是否大于超时时间
+      if (this.currentTime - this.lastTime > (this.config.timeOut * 60 * 1000)) {
+        // 如果是登录状态
+        if (this.$login.f.id) {
+          await this.$showMessage(this.config.exitPrompt)
+          window.location.reload()
+        } else {
+          this.lastTime = new Date().getTime()
+        }
+      } else {
+        // 如果在超时时间内点击，则把这次点击的时间记录覆盖掉之前存的最后一次点击的时间
+        this.lastTime = new Date().getTime()
+      }
+    }
+  }
 }
 </script>

package/src/components/webmeter/newwebmeter/NewException/TotalExceptionByMeter.vue CHANGED Viewed

@@ -367,7 +367,7 @@
           user:[]
         },
         condition: '1=1',
-        org:`u.${[this.$login.f.orgid]}`,
+        org:[this.$login.f.orgid],
         orgCondtionStr: ` and u.f_orgid = ${this.$login.f.orgid}`
       }
     },

package/src/filiale/kelai/NewAccountQuery.vue CHANGED Viewed

@@ -65,41 +65,41 @@
                                 sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="newAccountQuery" template-name='开户查询导出'
                                 :choose-col="true"></export-excel>
-<!--                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>-->
+                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
                 </div>
               </div>
               <div class="row" v-show="$parent.$parent.criteriaShow">
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">用气性质</label>
-                  <v-select :value.sync="model.f_gasproperties"
-                            v-model="model.f_gasproperties"
-                            :options='$parent.$parent.gaspropertyTypes' placeholder='请选择'
-                            condition=" f_gasproperties = '{}'"
-                            close-on-select></v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">气表品牌</label>
-                  <v-select :value.sync="model.f_meter_brand"
-                            v-model="model.f_meter_brand"
-                            :options='$parent.$parent.meterbrands' placeholder='请选择'
-                            condition="f_meter_brand = '{}'"
-                            close-on-select></v-select>
-                </div>
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">用气性质</label>-->
+<!--                  <v-select :value.sync="model.f_gasproperties"-->
+<!--                            v-model="model.f_gasproperties"-->
+<!--                            :options='$parent.$parent.gaspropertyTypes' placeholder='请选择'-->
+<!--                            condition=" f_gasproperties = '{}'"-->
+<!--                            close-on-select></v-select>-->
+<!--                </div>-->
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">气表品牌</label>-->
+<!--                  <v-select :value.sync="model.f_meter_brand"-->
+<!--                            v-model="model.f_meter_brand"-->
+<!--                            :options='$parent.$parent.meterbrands' placeholder='请选择'-->
+<!--                            condition="f_meter_brand = '{}'"-->
+<!--                            close-on-select></v-select>-->
+<!--                </div>-->
                 <div class="col-sm-2 form-group">
                 <label class="font_normal_body">客户地址</label>
                 <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
                        condition="f_address like '%{}%'" placeholder='客户地址'>
                 </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_residential_area"
-                         condition="f_residential_area like '%{}%'" placeholder="小区"/>
-                </div>
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>-->
+<!--                  <input type="text" style="width:60%" class="input_search" v-model="model.f_residential_area"-->
+<!--                         condition="f_residential_area like '%{}%'" placeholder="小区"/>-->
+<!--                </div>-->
               </div>
-              <div class="row" v-show="$parent.$parent.criteriaShow">
-                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+<!--              <div class="row" v-show="$parent.$parent.criteriaShow">-->
+<!--                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>-->
-              </div>
+<!--              </div>-->
             </div>
           </criteria>

package/src/filiale/kelai/NewGasStatistics.vue CHANGED Viewed

@@ -82,8 +82,9 @@
                   <v-select :value.sync="model.f_price_name"
                             v-model="model.f_price_name"
                             :options="$parent.$parent.getPricenames"
-                            condition="ss.f_price_name = '{}'"
-                            close-on-select></v-select>
+                            condition="ss.f_price_name in {}"
+                            multiple
+                            value-single="false"></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">气表品牌</label>
@@ -373,7 +374,7 @@ export default {
       date.push(`终止时间:${this.$refs.paged.$refs.criteria.model.endDate}`)
       this.other.push(date)
     },
-    initParams() {
+    async initParams() {
       // 初始化气表品牌
       let brandArr = []
       this.$MagGetSaleParam.getGasbrand().forEach((item) => {
@@ -385,12 +386,40 @@ export default {
         }
       })
       this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
-      //初始化气表价格
-      this.prices = this.$MagGetSaleParam.getPrices();
+      // 初始化气表价格 - 直接调用 SQL 查询
+      try {
+        // 构建查询条件 - 始终使用当前登录用户的组织ID
+        let orgIds = `'${this.$login.f.orgid}'`
+        let condition = `f_filialeid = ${orgIds} `
+        // 查询 t_stairprice 表
+        let res = await this.$resetpost('api/af-revenue/sql/manage_singleTable', {
+          data: {
+            items: '*',
+            tablename: 't_stairprice',
+            orderitem: 'f_priority',
+            condition: condition
+          }
+        }, {newly: true, resolveMsg: null, rejectMsg: '获取价格数据出错！！！'})
+        if (res.data && res.data.length > 0) {
+          this.prices = res.data
+        } else {
+          this.prices = []
+        }
+      } catch (error) {
+        console.error('获取价格数据失败:', error)
+        this.prices = []
+      }
     },
     async updateParams() {
-      await this.$MagLoadParams.loadParam(this.f_filialeid)
-      this.initParams()
+      // 由于我们现在直接获取价格数据，不再需要调用 $MagLoadParams.loadParam
+      // 如果其他数据仍然需要通过该方法获取，可以保留下面的调用
+      // await this.$MagLoadParams.loadParam(this.f_filialeid)
+      // 调用异步的 initParams 方法
+      await this.initParams()
     },
     getorg(obj) {
       if(plugins.convertToIn(obj)!==null&&plugins.convertToIn(obj)!==''){
@@ -472,34 +501,38 @@ export default {
       return `开始时间：${this.$refs.paged.$refs.criteria.model.startDate} 结束时间：${this.$refs.paged.$refs.criteria.model.endDate}`
     },
     getPricenames() {
-      let f_user_type = this.$refs.paged.$refs.criteria.model.f_user_type;
-      let f_gasproperties = this.$refs.paged.$refs.criteria.model.f_gasproperties;
       let pricetype = this.$refs.paged.$refs.criteria.model.pricetype;
-      console.log("打印一下:",f_user_type,f_gasproperties,pricetype,this.f_filialeid,this.prices)
-      console.log("查看f_orgid:",this.$login.f.f_orgid)
       if(this.$refs.paged.$refs.criteria.model !==null) {
         let rs = []
         let priceArr = []
         if ( pricetype.length >0) {
-          let params = {
-            f_price_type: pricetype[0],
-            filter: this.org[0],
-            prices: this.prices
-          }
-          console.log("打印一下params:",params)
-          this.$MagGetSaleParam.getPrice(params).forEach((item) => {
-            console.log("====================================》")
-            let temp = {}
-            temp.label = item.label
-            temp.value = item.value.f_price_name
-            priceArr.push(temp)
-            console.log("打印一下temp:",temp)
+          let f_price_type = pricetype[0]
+          let filter = this.$login.f.orgid
+          // 在组件内部实现气价名称筛选逻辑
+          this.prices.forEach((item) => {
+            // 根据气价类型和组织ID筛选
+            if (item.f_price_type === f_price_type && item.f_filialeid === filter) {
+              let temp = {}
+              temp.label = item.f_price_name
+              temp.value = item.f_price_name
+              priceArr.push(temp)
+            }
           })
-          rs = [{label: '全部', value: ''}, ...priceArr]
+          // 数组去重
+          let uniquePriceArr = []
+          let hash = {}
+          for (let item of priceArr) {
+            if (!hash[item.value]) {
+              hash[item.value] = true
+              uniquePriceArr.push(item)
+            }
+          }
+          rs = [{label: '全部', value: ''}, ...uniquePriceArr]
         }
         if (rs.length === 0) {
-          console.log('rs读出来是空')
           this.$refs.paged.$refs.criteria.model.f_price_name = ''
         }
         return rs
@@ -520,6 +553,45 @@ export default {
     tableState() {
       return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
     },
+    // 价格类型和价格名称的级联数据
+    priceCascaderData() {
+      if (!this.prices || this.prices.length === 0) {
+        return []
+      }
+      // 按价格类型分组
+      let typeMap = new Map()
+      this.prices.forEach(price => {
+        let typeKey = price.f_price_type
+        if (!typeMap.has(typeKey)) {
+          typeMap.set(typeKey, [])
+        }
+        typeMap.get(typeKey).push(price)
+      })
+      // 构建级联数据格式
+      let cascaderData = []
+      typeMap.forEach((prices, type) => {
+        // 创建价格类型节点
+        let typeItem = {
+          label: type,
+          value: type,
+          children: []
+        }
+        // 为每个价格类型添加价格名称子节点
+        prices.forEach(price => {
+          typeItem.children.push({
+            label: price.f_price_name,
+            value: price.f_price_name
+          })
+        })
+        cascaderData.push(typeItem)
+      })
+      return cascaderData
+    },
     gasState() {
       return [{label:'正常', value:'正常'},
         {label:'异常', value:'异常'},

package/src/filiale/tongchuan/InspectListGas.vue CHANGED Viewed

@@ -9,7 +9,7 @@
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">&emsp;公&emsp;&emsp;司</label>
                   <right-tree @re-res="$parent.$parent.getorg"
-                              :initresid='$parent.$parent.org'></right-tree>
+                              :initresid='$parent.$parent.org'></right-treee>
                 </div>
                 <div class="col-sm-2 form-group ">

package/src/main.js CHANGED Viewed

@@ -6,7 +6,8 @@ import { all } from 'vue-client'
 import { system } from 'system-clients'
 import { ldap } from 'ldap-clients'
 import saleManage from './saleManage'
-import ShanXianSaleManage from './filiale/shexian/sale'
+import ShanXianSaleManage from './filiale/kelai/sale'
+ // import ShanXianwebSaleManage from './filiale/rongcheng/webmeterManage'
 import webmeterManage from './webmeterManage'
 import reportManage from './reportManage'
 import newmanage from './newmanage'
@@ -56,7 +57,7 @@ require('./components/qinhua/Style/qinhuaStyle.less')
 // require('./bootstrap/less/manageStyle/manageChile.less')
 // require('./bootstrap/less/manageStyle/safeStyle.less')
-//大屏展示要放开的样式
+// 大屏展示要放开的样式
 // require('system-clients/src/styles/less/manageStyle/manageChile.less')
 // require('system-clients/src/styles/less/manageStyle/safeStyle.less')
 // require('system-clients/src/styles/less/manageStyle/manageStyle.less')

package/.gitattributes DELETED Viewed

@@ -1,6 +0,0 @@
-#
-# https://help.github.com/articles/dealing-with-line-endings/
-#
-# These are explicitly windows files and should use crlf
-*.bat           text eol=crlf