system-clients 3.0.41 → 3.0.42-fanxian

package/src/components/equipment/PosManage.vue

@@ -1,67 +1,67 @@
-<template>
-  <div class="flex-row">
-    <div :class="{'basic-main':!isChange,'binary-left':isChange}">
-      <pos-list :row="row" @select-changed="selected"  style="width:auto;" :f_filialeid.sync="f_filialeids" v-ref:list ></pos-list>
-    </div>
-    <div class="binary-right" style="margin-left: 10px; width: 50%;" v-if="isChange">
-      <pos-add :data="row" :f_filialeids.sync="f_filialeids" v-ref:addbox></pos-add>
-    </div>
-  </div>
-</template>
-<script>
-
-  import PosList from './PosList'
-  import PosAdd from './PosAdd'
-
-  export default {
-    title: 'POS终端管理',
-    components: {
-      PosList, PosAdd
-    },
-    data () {
-      return {
-        isChange: false,
-        row: null,
-
-        f_filialeids: ''
-      }
-    },
-    methods: {
-      selected (obj) {
-        this.isChange = true
-        this.row = obj.val
-      }
-    },
-    events: {
-      'search' () {
-        this.isChange = false
-        this.row = null
-        this.$refs.list.$refs.paged.$refs.cri.search()
-      },
-      'research' () {
-        console.log('重新查询')
-        this.isChange = false
-        this.row = null
-      },
-      'refresh' () {
-        this.isChange = false
-        this.row = null
-        this.$refs.list.search()
-      },
-      'error' (name, row, res) {
-        this.isChange = false
-        this.row = null
-      },
-      'close' () {
-        this.isChange = false
-        this.row = null
-        this.$refs.list.search()
-      },
-      'add' () {
-        this.row = null
-        this.isChange = true
-        this.$refs.list.$refs.paged.$refs.grid.selectStore.selected = null
-      }
-    }
-  }
-</script>
+<template>
+  <div class="flex-row">
+    <div :class="{'basic-main':!isChange,'binary-left':isChange}">
+      <pos-list :row="row" @select-changed="selected"  style="width:auto;" :f_filialeid.sync="f_filialeids" v-ref:list ></pos-list>
+    </div>
+    <div class="binary-right" style="margin-left: 10px; width: 50%;" v-if="isChange">
+      <pos-add :data="row" :f_filialeids.sync="f_filialeids" v-ref:addbox></pos-add>
+    </div>
+  </div>
+</template>
+<script>
+
+  import PosList from './PosList'
+  import PosAdd from './PosAdd'
+
+  export default {
+    title: 'POS终端管理',
+    components: {
+      PosList, PosAdd
+    },
+    data () {
+      return {
+        isChange: false,
+        row: null,
+
+        f_filialeids: ''
+      }
+    },
+    methods: {
+      selected (obj) {
+        this.isChange = true
+        this.row = obj.val
+      }
+    },
+    events: {
+      'search' () {
+        this.isChange = false
+        this.row = null
+        this.$refs.list.$refs.paged.$refs.cri.search()
+      },
+      'research' () {
+        console.log('重新查询')
+        this.isChange = false
+        this.row = null
+      },
+      'refresh' () {
+        this.isChange = false
+        this.row = null
+        this.$refs.list.search()
+      },
+      'error' (name, row, res) {
+        this.isChange = false
+        this.row = null
+      },
+      'close' () {
+        this.isChange = false
+        this.row = null
+        this.$refs.list.search()
+      },
+      'add' () {
+        this.row = null
+        this.isChange = true
+        this.$refs.list.$refs.paged.$refs.grid.selectStore.selected = null
+      }
+    }
+  }
+</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/server/ResSelectGroup.vue

@@ -1,140 +1,140 @@
-<template>
-  <div :class="style">
-    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
-    <right-tree @re-res="getorg"
-                :initresid='initres.org'></right-tree>
-  </div>
-  <div :class="style">
-    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp;</label>
-    <res-select restype='department'
-                @res-select="getdep"
-                :parentresid="depresid"
-                :initresid='initres.dep'
-                :is-mul="mul">
-    </res-select>
-  </div>
-  <div :class="style">
-    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp;</label>
-    <res-select restype='user'
-                @res-select="getuser"
-                :parentresid="userresid"
-                :initresid='initres.user'
-                :is-mul="mul">
-    </res-select>
-  </div>
-  <div :class="style " >
-    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;片区&nbsp;&nbsp;&nbsp;</label>
-    <v-select :value.sync="slice_area" v-model="slice_area"  @change='getarea'
-              :options='sliceArea' placeholder='片区/管理站' filer-key="name"
-              close-on-select v-ref:slice>
-    </v-select>
-  </div>
-</template>
-<script>
-  import plugin from '../../plugins/GetLoginInfoService'
-  export default {
-    title: '资源选择测试',
-    props: {
-      style: {
-        type: String,
-        default: 'col-sm-2'
-      },
-      mul: {
-        type: Boolean,
-        default: true
-      },
-      //初始值
-      initres: {
-        type: Object,
-        default: null,
-      },
-    },
-    data () {
-      return {
-        orgresid:[this.$login.f.orgid],
-        depresid:[],
-        userresid:[],
-        sliceArea: [],
-        slice_area:[],
-
-        obj:{
-          orgnames:[],
-          depnames:[],
-          operatornames:[]
-        }
-      }
-    },
-    ready () {
-      console.log('开始获取组织结构。。。')
-      this.initAreas(this.$login.f.orgid)
-    },
-    methods:{
-
-      // 初始化片区
-      async initAreas (val) {
-        if (val) {
-          let getAllArea = await this.$resetpost('/rs/search', {
-            source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
-            userid: this.$login.f.id
-          }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
-          let arr = getAllArea.data.filter((res) => {
-            return res.parentid == val
-          })
-          console.log('过滤之后的片区', arr)
-          this.sliceArea = []
-          arr.forEach((res) => {
-            this.sliceArea.push({label: res.name, value: {name: res.name, code:res.number}})
-          })
-        }
-      },
-      returnOrg(ids){
-
-        let condition;
-        if(this.depresid.length > 0)
-          condition = " and f_orgid in " + plugin.convertToIn(this.depresid);
-        else
-          condition = " and f_orgid = " + this.$login.f.orgid;
-        if(this.userresid.length > 0){
-          condition += " and f_depid in " + plugin.convertToIn(this.userresid);
-        }
-        if(ids && ids.length > 0){
-          condition += " and f_operatorid in " + plugin.convertToIn(ids);
-        }
-        if(this.slice_area.length>0){
-          condition += " and f_zones = '" + this.slice_area[0].name+"'"
-        }
-        this.$dispatch('re-res',condition,this.obj)
-      },
-      getorg (obj) {
-        console.log("选中公司的数据11",obj.resids)
-        this.depresid=obj.resids
-        this.obj.orgnames = obj.res
-        this.initAreas(obj.resids)
-        this.returnOrg();
-      },
-      getdep(obj,val) {
-        console.log("选中部门的数据22",obj)
-        this.obj.depnames = val
-        this.userresid=obj
-        this.returnOrg();
-      },
-      getuser(obj) {
-        this.obj.operatornames = obj
-        console.log("选中用户的数据33",obj)
-        this.returnOrg(obj);
-      },
-      getarea(val) {
-        this.slice_area=val
-        console.log("选中的大区",val)
-        if(this.obj.operatornames){
-          this.returnOrg(this.obj.operatornames);
-        }else{
-          this.returnOrg();
-        }
-      }
-    },
-    watch: {
-
-    }
-  }
-</script>
+<template>
+  <div :class="style">
+    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
+    <right-tree @re-res="getorg"
+                :initresid='initres.org'></right-tree>
+  </div>
+  <div :class="style">
+    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp;</label>
+    <res-select restype='department'
+                @res-select="getdep"
+                :parentresid="depresid"
+                :initresid='initres.dep'
+                :is-mul="mul">
+    </res-select>
+  </div>
+  <div :class="style">
+    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp;</label>
+    <res-select restype='user'
+                @res-select="getuser"
+                :parentresid="userresid"
+                :initresid='initres.user'
+                :is-mul="mul">
+    </res-select>
+  </div>
+  <div :class="style " >
+    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;片区&nbsp;&nbsp;&nbsp;</label>
+    <v-select :value.sync="slice_area" v-model="slice_area"  @change='getarea'
+              :options='sliceArea' placeholder='片区/管理站' filer-key="name"
+              close-on-select v-ref:slice>
+    </v-select>
+  </div>
+</template>
+<script>
+  import plugin from '../../plugins/GetLoginInfoService'
+  export default {
+    title: '资源选择测试',
+    props: {
+      style: {
+        type: String,
+        default: 'col-sm-2'
+      },
+      mul: {
+        type: Boolean,
+        default: true
+      },
+      //初始值
+      initres: {
+        type: Object,
+        default: null,
+      },
+    },
+    data () {
+      return {
+        orgresid:[this.$login.f.orgid],
+        depresid:[],
+        userresid:[],
+        sliceArea: [],
+        slice_area:[],
+
+        obj:{
+          orgnames:[],
+          depnames:[],
+          operatornames:[]
+        }
+      }
+    },
+    ready () {
+      console.log('开始获取组织结构。。。')
+      this.initAreas(this.$login.f.orgid)
+    },
+    methods:{
+
+      // 初始化片区
+      async initAreas (val) {
+        if (val) {
+          let getAllArea = await this.$resetpost('/rs/search', {
+            source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
+            userid: this.$login.f.id
+          }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
+          let arr = getAllArea.data.filter((res) => {
+            return res.parentid == val
+          })
+          console.log('过滤之后的片区', arr)
+          this.sliceArea = []
+          arr.forEach((res) => {
+            this.sliceArea.push({label: res.name, value: {name: res.name, code:res.number}})
+          })
+        }
+      },
+      returnOrg(ids){
+
+        let condition;
+        if(this.depresid.length > 0)
+          condition = " and f_orgid in " + plugin.convertToIn(this.depresid);
+        else
+          condition = " and f_orgid = " + this.$login.f.orgid;
+        if(this.userresid.length > 0){
+          condition += " and f_depid in " + plugin.convertToIn(this.userresid);
+        }
+        if(ids && ids.length > 0){
+          condition += " and f_operatorid in " + plugin.convertToIn(ids);
+        }
+        if(this.slice_area.length>0){
+          condition += " and f_zones = '" + this.slice_area[0].name+"'"
+        }
+        this.$dispatch('re-res',condition,this.obj)
+      },
+      getorg (obj) {
+        console.log("选中公司的数据11",obj.resids)
+        this.depresid=obj.resids
+        this.obj.orgnames = obj.res
+        this.initAreas(obj.resids)
+        this.returnOrg();
+      },
+      getdep(obj,val) {
+        console.log("选中部门的数据22",obj)
+        this.obj.depnames = val
+        this.userresid=obj
+        this.returnOrg();
+      },
+      getuser(obj) {
+        this.obj.operatornames = obj
+        console.log("选中用户的数据33",obj)
+        this.returnOrg(obj);
+      },
+      getarea(val) {
+        this.slice_area=val
+        console.log("选中的大区",val)
+        if(this.obj.operatornames){
+          this.returnOrg(this.obj.operatornames);
+        }else{
+          this.returnOrg();
+        }
+      }
+    },
+    watch: {
+
+    }
+  }
+</script>