system-clients 3.0.45 → 3.0.46-fanxian

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Wed May 20 18:08:03 CST 2020
-gradle.version=3.5.1
+#Fri Mar 13 10:30:51 GMT+08:00 2020
+gradle.version=3.5

package/build/webpack.base.conf.js

@@ -1,75 +1,75 @@
-var path = require('path')
-var cssLoaders = require('./css-loaders')
-var projectRoot = path.resolve(__dirname, '../')
-
-module.exports = {
-  entry: {
-    app: './src/main.js'
-  },
-  output: {
-    path: path.resolve(__dirname, '../dist/static'),
-    publicPath: 'static/',
-    filename: '[name].js'
-  },
-  resolve: {
-    extensions: ['', '.js', '.vue'],
-    fallback: [path.join(__dirname, '../node_modules')],
-    alias: {
-      'test': path.resolve(__dirname, '../test'),
-      'src': path.resolve(__dirname, '../src')
-    }
-  },
-  resolveLoader: {
-    fallback: [path.join(__dirname, '../node_modules')]
-  },
-  module: {
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: 'vue'
-      },
-      {
-        test: /\.js$/,
-        loader: 'babel',
-        include: [
-          `${projectRoot}\\src`,
-          `${projectRoot}\\build`,
-          `${projectRoot}\\examples`,
-          `${projectRoot}\\test`,
-          `${projectRoot}\\node_modules\\vue-client\\src`,
-          `${projectRoot}\\node_modules\\vue-strap\\src`
-        ]
-      },
-      {
-        test: /\.json$/,
-        loader: 'json'
-      },
-      {
-        test: /\.html$/,
-        loader: 'vue-html'
-      },
-      {
-        test: /\.less$/,
-        loader: 'style!css!less'
-      },
-      {
-        test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
-        loader: 'url',
-        query: {
-          limit: 10000,
-          name: '[name].[ext]?[hash:7]'
-        }
-      }
-    ]
-  },
-  vue: {
-    loaders: cssLoaders({
-      sourceMap: false,
-      extract: false
-    })
-  },
-  plugins: [],
-  eslint: {
-    formatter: require('eslint-friendly-formatter')
-  }
-}
+var path = require('path')
+var cssLoaders = require('./css-loaders')
+var projectRoot = path.resolve(__dirname, '../')
+
+module.exports = {
+  entry: {
+    app: './src/main.js'
+  },
+  output: {
+    path: path.resolve(__dirname, '../dist/static'),
+    publicPath: 'static/',
+    filename: '[name].js'
+  },
+  resolve: {
+    extensions: ['', '.js', '.vue'],
+    fallback: [path.join(__dirname, '../node_modules')],
+    alias: {
+      'test': path.resolve(__dirname, '../test'),
+      'src': path.resolve(__dirname, '../src')
+    }
+  },
+  resolveLoader: {
+    fallback: [path.join(__dirname, '../node_modules')]
+  },
+  module: {
+    loaders: [
+      {
+        test: /\.vue$/,
+        loader: 'vue'
+      },
+      {
+        test: /\.js$/,
+        loader: 'babel',
+        include: [
+          `${projectRoot}\\src`,
+          `${projectRoot}\\build`,
+          `${projectRoot}\\examples`,
+          `${projectRoot}\\test`,
+          `${projectRoot}\\node_modules\\vue-client\\src`,
+          `${projectRoot}\\node_modules\\vue-strap\\src`
+        ]
+      },
+      {
+        test: /\.json$/,
+        loader: 'json'
+      },
+      {
+        test: /\.html$/,
+        loader: 'vue-html'
+      },
+      {
+        test: /\.less$/,
+        loader: 'style!css!less'
+      },
+      {
+        test: /\.(png|jpg|gif|svg|woff2?|eot|ttf|mp3)(\?.*)?$/,
+        loader: 'url',
+        query: {
+          limit: 10000,
+          name: '[name].[ext]?[hash:7]'
+        }
+      }
+    ]
+  },
+  vue: {
+    loaders: cssLoaders({
+      sourceMap: false,
+      extract: false
+    })
+  },
+  plugins: [],
+  eslint: {
+    formatter: require('eslint-friendly-formatter')
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.0.45",
+  "version": "3.0.46-fanxian",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {

package/src/components/Main.vue

@@ -56,8 +56,19 @@
     <!--              </div>-->
     <!--            </div>-->
     <!--    </div>-->
-    <div class='flex-row  system-main' id="box" v-el:box v-if="!isManger">
-      <div class="auto "  :class="{'login-operator1':$refs.mic.tabs.length === 0,'login-operator':$refs.mic.tabs.length != 0}">
+
+    <div class='flex-row aaa system-main' id="box" v-el:box v-if="!isManger">
+      <div class="auto" style="position: fixed;right: 370px;top: 15px;color: #333">
+        <button class="btn" @click="showAbnormity = true" style="background: none;">
+          <img
+            src="../assets/shezhi-hover.png" height="15" width="15">
+          异常警报<label style="display: inline-block;width: 8px;height: 8px;border-radius: 50%;background-color: red;text-align: center;line-height: 30px;" v-show="showaData"></label>
+        </button>
+        <button class="btn" @click="stopSound" style="background: none;">
+          关闭警报
+        </button>
+      </div>
+      <div class="auto" style="position: fixed;right: 30px;top: 20px;color: #333">
             <span>
                <img
                  src="../assets/people.png" height="15" width="15">
@@ -114,12 +125,26 @@
     <!-- 修改密码组件 -->
     <modify-pw :show.sync="show" v-if="show"></modify-pw>
     <!-- 修改密码模态框 -->
+    <!--  异常查看  -->
+    <modal v-if="showAbnormity" :show.sync="showAbnormity"  :width="1000" v-ref:modal  backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="stopSoundNew"><span>&times;</span></button>
+        <h4 class="modal-title">异常报警</h4>
+      </header>
+      <article  slot="modal-body" class="modal-body modifystyle auto form-horizontal">
+        <alarm-information :mergeinfo=abnormityWarningData></alarm-information>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button  type="button" class="btn btn-success" @click='stopSoundNew'>确认</button>
+      </footer>
+    </modal>
   </div>
 </template>
 
 <script>
   import vue from 'vue'
   import co from 'co'
+  import source from '../../static/newStyle/alarm.mp3'
 
   window.onunload = () => {
     vue.http({url: `rs/user/update/${this.$login.f.ename}`, method: 'GET'})
@@ -150,7 +175,16 @@
         tabs:[],       //已初始化页签数组
         selecttab:'',
         setting:true,
-        srcsetting:'../../static/newStyle/setting.png'
+        srcsetting:'../../static/newStyle/setting.png',
+        abnormityWarningData: {
+          data: []
+        },
+        showAbnormity: false,
+        showaData: false,
+        audio: null,
+        isTimeAb: parseInt(this.$appdata.getSingleValue('异常报警查询时间')),
+        isBell: this.$appdata.getSingleValue('是否响铃')
+
 
         // headerHint: true, // 右侧顶部提示信息
         // value: 25645.26,
@@ -202,8 +236,52 @@
       // 				return false
       // 			}
       this.changeShow()
+      // 在组件挂载后立即开始定时任务
+      this.abnormityWarning()
+      this.abnormityWarData()
     },
     methods: {
+      handleMouseMoveOnce () {
+        const handleMouseMove = (event) => {
+          this.playSound()
+          // 移除事件监听器
+          document.removeEventListener('mousemove', handleMouseMove)
+        }
+        // 添加事件监听器
+        document.addEventListener('mousemove', handleMouseMove)
+      },
+      abnormityWarning () {
+        setInterval(() => {
+          this.abnormityWarningData = []
+          this.$resetpost('rs/sql/getAbnormityWarning', {data: {}}, {resolveMsg: '', rejectMsg: ''}).then(item => {
+            this.abnormityWarningData = item
+            if (this.isBell === '是') {
+              if (this.abnormityWarningData.data.length > 0) {
+                this.playSound()
+                this.showaData = true
+                this.showAbnormity = true
+              } else {
+                this.showaData = false
+              }
+            }
+          })
+        }, this.isTimeAb)
+      },
+      abnormityWarData () {
+        this.$resetpost('rs/sql/getAbnormityWarning', {data: {}}, {resolveMsg: '', rejectMsg: ''}).then(item => {
+          this.abnormityWarningData = item
+          if (this.isBell === '是') {
+            if (this.abnormityWarningData.data.length > 0) {
+              // this.handleMouseMoveOnce()
+              this.playSound()
+              this.showaData = true
+              this.showAbnormity = true
+            } else {
+              this.showaData = false
+            }
+          }
+        })
+      },
       hindsetting(){
 
         this.setting=!this.setting
@@ -271,6 +349,27 @@
       tabcg(val){
         console.log(val)
         this.tabs = val
+      },
+      playSound () {
+        if (this.audio) {
+          this.audio.pause()
+          this.audio = null
+        }
+        this.audio = new Audio(source)
+        // this.audio.src = 'static/newStyle/alarm.mp3' // 替换为实际的音频文件路径
+        this.audio.loop = true // 设置循环播放
+        this.audio.autoplay = true
+        this.audio.play()
+      },
+      stopSound () {
+        if (this.audio) {
+          this.audio.pause()
+          this.audio = null
+        }
+      },
+      stopSoundNew () {
+        this.showAbnormity = false
+        this.stopSound()
       }
     },
     computed: {

package/src/components/equipment/EquipmentManage.vue

@@ -1,65 +1,65 @@
-<template>
-  <div class="flex">
-    <div class="auto">
-      <div class="form-horizontal select-overspread" style="background: white; padding: 0 1%;">
-        <div class="row">
-          <div class="col-sm-2 form-group">
-            <label class="font_normal_body">终端类型</label>
-            <v-select id="f_charge_type"
-                      v-model="model.f_equipment_type"
-                      placeholder='终端类型'
-                      :value.sync="model.f_equipment_type"
-                      :options='equipmentType'
-                      close-on-select clear-button>
-            </v-select>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div v-if="model.f_equipment_type[0] === 'PC'">
-      <pc-manage></pc-manage>
-    </div>
-    <div v-if="model.f_equipment_type[0] === 'POS'">
-      <pos-manage></pos-manage>
-    </div>
-    <div v-if="model.f_equipment_type[0] === 'PHONE'">
-      <phone-manage></phone-manage>
-    </div>
-  </div>
-</template>
-
-<script>
-
-  export default {
-    title: '终端控制',
-    data () {
-      return {
-        filialeNameStr: this.$login.f.f_fengongsi,
-        filialeCodeStr: this.$login.f.orgid,
-        userid:this.$login.f.id,
-        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
-        equipmentType: this.$appdata.getParam('终端类型'),
-        model: {
-            f_equipment_type: []
-        }
-      }
-    },
-    ready () {
-      console.log('看看终端类型',  this.equipmentType)
-      this.model.f_equipment_type = [this.equipmentType[0].value]
-    },
-    methods: {
-      del (row) {
-          console.log('要删除了', row)
-      },
-
-      getRes (obj) {
-        this.filialeNameStr = obj.res
-        this.filialeCodeStr = obj.resids
-      },
-    },
-    computed: {
-
-    }
-  }
-</script>
+<template>
+  <div class="flex">
+    <div class="auto">
+      <div class="form-horizontal select-overspread" style="height: auto">
+        <div class="row">
+          <div class="col-sm-2">
+            <label class="font_normal_body">终端类型</label>
+            <v-select id="f_charge_type"
+                      v-model="model.f_equipment_type"
+                      placeholder='终端类型'
+                      :value.sync="model.f_equipment_type"
+                      :options='equipmentType'
+                      close-on-select clear-button>
+            </v-select>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div v-if="model.f_equipment_type[0] === 'PC'">
+      <pc-manage></pc-manage>
+    </div>
+    <div v-if="model.f_equipment_type[0] === 'POS'">
+      <pos-manage></pos-manage>
+    </div>
+    <div v-if="model.f_equipment_type[0] === 'PHONE'">
+      <phone-manage></phone-manage>
+    </div>
+  </div>
+</template>
+
+<script>
+
+  export default {
+    title: '终端控制',
+    data () {
+      return {
+        filialeNameStr: this.$login.f.f_fengongsi,
+        filialeCodeStr: this.$login.f.orgid,
+        userid:this.$login.f.id,
+        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
+        equipmentType: this.$appdata.getParam('终端类型'),
+        model: {
+            f_equipment_type: []
+        }
+      }
+    },
+    ready () {
+      console.log('看看终端类型',  this.equipmentType)
+      this.model.f_equipment_type = [this.equipmentType[0].value]
+    },
+    methods: {
+      del (row) {
+          console.log('要删除了', row)
+      },
+
+      getRes (obj) {
+        this.filialeNameStr = obj.res
+        this.filialeCodeStr = obj.resids
+      },
+    },
+    computed: {
+
+    }
+  }
+</script>

package/src/components/parammanage/AlarmInformation.vue

@@ -0,0 +1,122 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main">
+      <criteria-paged :model="model" v-ref:paged >
+        <criteria partial='criteria' v-ref:criteria @condition-changed='$parent.search' >
+          <div v-show="false" novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          </div>
+
+        </criteria>
+        <data-grid  :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th><nobr>客户编号</nobr></th>
+              <th><nobr>客户姓名</nobr></th>
+              <th><nobr>上报时间</nobr></th>
+              <th><nobr>上报级别</nobr></th>
+              <th><nobr>报警类型</nobr></th>
+              <th><nobr>报警详情</nobr></th>
+              <th>操作</th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <tr>
+              <td style="text-align:center"><nobr>{{row.f_userinfo_code}}</nobr></td>
+              <td style="text-align:center"><nobr>{{row.f_user_name}}</nobr></td>
+              <td style="text-align:center"><nobr>{{row.f_insert_date}}</nobr></td>
+              <td style="text-align:center"><nobr>{{row.f_error_level}}</nobr></td>
+              <td style="text-align:center"><nobr>{{row.f_error_type}}</nobr></td>
+              <td style="text-align:center"><nobr>{{row.f_error_msg}}</nobr></td>
+              <td style="text-align:center;" v-if="row.f_is_read == false" >
+                <span ><a href="#" @click.stop="$parent.$parent.$parent.backSend1(row.id)">添加备注</a></span>
+              </td>
+              <td style="text-align:center;" v-if="row.f_is_read === true"><span title="备注信息:{{row.f_error_reason}}">备注信息</span></td>
+            </tr>
+          </template>
+          <template partial='foot'></template>
+        </data-grid>
+      </criteria-paged>
+
+      <modal :show.sync="watchshow"  v-ref:modal backdrop="false">
+        <header slot="modal-header" class="modal-header">
+          <button type="button" class="close" @click="tableFault()"><span>&times;</span></button>
+          <h4 class="modal-title">信息备注</h4>
+        </header>
+        <article slot="modal-body" class="modal-body">
+          <div class="col-sm-12">
+            <label class="font_normal_body">添加信息备注</label>
+            <textarea name="name" rows="2" style="width: 100%"
+                      class="ver-textarea" class="form-control"
+                      placeholder='请填写信息备注'
+                      v-model='f_error_reason'></textarea>
+          </div>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+          <button v-show="watchshow" type="button" class="btn btn-default" @click='tableFault()'>取消</button>
+          <button v-show="watchshow" type="button" class="btn btn-danger btn-ln fr" @click='saveException()'>确认</button>
+        </footer>
+      </modal>
+    </div>
+  </div>
+</template>
+<script>
+  import {PagedList} from 'vue-client'
+
+  export default {
+    title: '异常警报信息',
+    props: ['mergeinfo'],
+    data () {
+      return {
+        watchshow: false,
+        cancelid: '',
+        condition: '1=1',
+        error_condition: '',
+        f_error_reason: '',
+        model: new PagedList('rs/sql/getAbnormityWarning', 8)
+      }
+    },
+    ready () {
+      this.model
+      this.$refs.paged.$refs.criteria.search()
+    },
+    methods: {
+      backSend1(megrow){
+        this.watchshow = true
+        this.cancelid = megrow
+      },
+      tableFault (val) {
+        if (val) {
+          console.log('开启弹窗')
+        } else {
+          console.log('返回置空')
+          this.f_error_reason = ''
+        }
+        this.watchshow = !this.watchshow
+      },
+      search (args) {
+        console.log(args)
+        this.condition = '1=1'
+        this.model.search(args.condition, args.model)
+      },
+      saveException () {
+        let send = {
+          id: this.cancelid,      // 当前记录ID
+          f_is_read: 1,
+          f_error_reason: this.f_error_reason   // 备注原因
+        }
+        let param = {
+          tablename: 't_exception',
+          id:1,
+          basedata: send
+        }
+        this.$resetpost('rs/logic/iat_saveTable', param).then(() => {
+          // this.params.rows.splice(index, 1)
+          this.watchshow = false
+          this.$refs.paged
+          this.f_error_reason = ''
+        })
+      }
+    }
+
+  }
+</script>

package/src/components/parammanage/ParamManages.vue

@@ -1,43 +1,43 @@
-<template>
-  <div id="unit" class="flex-row">
-    <div style="flex: 1;margin-right: 15px;">
-      <param-pages></param-pages>
-    </div>
-    <div style="flex: 1">
-      <single-pages></single-pages>
-    </div>
-
-  </div>
-</template>
-<script>
-
-export default {
-  title: '参数设置',
-
-}
-</script>
-<style>
-  .edit-tree {
-    border: none;
-    border-bottom: 1px solid #337ab7;
-    outline: none;
-  }
-  .no-edit {
-    border: none;
-    background: none;
-    outline: none;
-  }
-  #params-tree .active {
-    background: none;
-    border: 1px solid #ddd;
-    color: #000;
-  }
-  .flex-around {
-    display: flex;
-    justify-content: space-around;
-  }
-  .add-postition {
-    position: relative;
-    left: 40%;
-  }
-</style>
+<template>
+  <div id="unit" class="flex-row">
+    <div style="flex: 1;margin-right: 15px;">
+      <param-pages></param-pages>
+    </div>
+    <div style="flex: 1">
+      <single-pages></single-pages>
+    </div>
+
+  </div>
+</template>
+<script>
+
+export default {
+  title: '参数设置',
+
+}
+</script>
+<style>
+  .edit-tree {
+    border: none;
+    border-bottom: 1px solid #337ab7;
+    outline: none;
+  }
+  .no-edit {
+    border: none;
+    background: none;
+    outline: none;
+  }
+  #params-tree .active {
+    background: none;
+    border: 1px solid #ddd;
+    color: #000;
+  }
+  .flex-around {
+    display: flex;
+    justify-content: space-around;
+  }
+  .add-postition {
+    position: relative;
+    left: 40%;
+  }
+</style>