system-clients 3.0.47-fanxian → 3.0.48-fanxian

package/src/components/parammanage/AlarmInformation.vue

@@ -1,122 +1,124 @@
-<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>
+<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_operator: this.$login.f.name,
+          f_error_operatorid: this.$login.f.id,
+          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/ParamManage.vue

@@ -1,42 +1,42 @@
-<template>
-  <div id="unit" class="flex-row">
-    <div class="binary-left">
-      <param-page></param-page>
-    </div>
-    <div class="binary-right">
-      <single-page></single-page>
-    </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 class="binary-left">
+      <param-page></param-page>
+    </div>
+    <div class="binary-right">
+      <single-page></single-page>
+    </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>

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>