system-phone 1.4.0 → 3.0.2-tc

package/src/components/idea/feedbackAdd.vue

@@ -0,0 +1,366 @@
+<template>
+  <div class="auto select-overspread ">
+    <div class="row auto">
+      <div class="row app-row">
+        <div class="col-xs-4">
+          <label class="font text-left">反馈类型：</label>
+        </div>
+        <div class="col-xs-8" >
+          <v-select class="input-font"
+                    placeholder="请选择反馈"
+                    :value.sync="from.fk_Type"
+                    :options='option'
+                    close-on-select clear-button></v-select>
+        </div>
+      </div>
+      <div class="row app-row">
+        <div class="col-xs-4">
+<!--          <img src="../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">-->
+          <label class="font text-left">反馈内容：</label>
+        </div>
+        <div class="col-xs-8" >
+          <textarea class="form-control"  placeholder="请输入反馈内容"cols="30" rows="3" style="resize: vertical;" v-model="from.fk_Content"></textarea>
+        </div>
+      </div>
+    </div>
+    <div class="row app-row text-center">
+      <button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="save()">提交</button>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass} from "vue-client";
+  import Vue from "vue"
+
+  export default {
+    title: "意见反馈",
+    props: {},
+    data() {
+      return {
+        // option: this.$appdata.getParam('意见反馈类型'),
+        option:[{label:'意见反馈类型一',value:'意见反馈类型一'},{label:'意见反馈类型二',value:'意见反馈类型二'}],
+        from: {
+          // fk_Name: Vue.user.name,
+          // fk_Id: Vue.user.id,
+          fk_Id:'1',
+          fk_Name:'奥德',
+          fk_Type: '',
+          fk_Content: '',
+          fk_Firm:'测试'
+          // fkFirm:Vue.user.orgid,
+        },
+        margintop: document.documentElement.clientHeight * 0.1,
+        show: false
+      }
+    },
+    methods: {
+      save() {
+        /*console.log(this.from.fkType=option.value)*/
+        if(this.from.fk_Type && this.from.fk_Content){
+          this.$resetpost(`/rs/logic/add_feedback`, this.from).then((res) => {
+            alert("添加成功");
+            console.log(this.from);
+          })
+        }else{
+          alert("反馈类型和内容不能为空")
+        }
+
+      },
+    }
+  }
+</script>
+<style scoped="">
+  .app-row {
+    background-color: white;
+    padding: 10px 10px 0 10px;
+    border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+  }
+  .devicetext {
+    font: 13px PingFang-SC-Medium;
+    position:fixed;
+    width:100%;
+    bottom:13px;
+    transform: translate(-50%, -50%);
+  }
+  /*输入框样式*/
+  /*@import url(http://fonts.useso.com/css?family=Source+Sans+Pro:200,300);*/
+  * {
+    box-sizing: border-box;
+    margin: 0;
+    padding: 0;
+    font-weight: 300;
+  }
+  .loginbg {
+    font-family: 'Source Sans Pro', sans-serif;
+    color: white;
+    font-weight: 300;
+  }
+  .loginbg ::-webkit-input-placeholder {
+    /* WebKit browsers */
+    font-family: 'Source Sans Pro', sans-serif;
+    color: white;
+    font-weight: 300;
+  }
+  .loginbg  :-moz-placeholder {
+    /* Mozilla Firefox 4 to 18 */
+    font-family: 'Source Sans Pro', sans-serif;
+    color: white;
+    opacity: 1;
+    font-weight: 300;
+  }
+  .loginbg  ::-moz-placeholder {
+    /* Mozilla Firefox 19+ */
+    font-family: 'Source Sans Pro', sans-serif;
+    color: white;
+    opacity: 1;
+    font-weight: 300;
+  }
+  .loginbg  :-ms-input-placeholder {
+    /* Internet Explorer 10+ */
+    font-family: 'Source Sans Pro', sans-serif;
+    color: white;
+    font-weight: 300;
+  }
+  .wrapper {
+    /*background: #2D83BA;
+    background: -webkit-linear-gradient(top left, #2D83BA 0%, #2D83BA 100%);
+    background: linear-gradient(to bottom right, #2D83BA 0%, #2D83BA 100%);
+    opacity: 0.8;*/
+    /*position: absolute;*/
+    /*top: 50%;
+    right: 10%;
+    width: 40%;
+    height: 350px;
+    margin-top: -150px;*/
+    overflow: hidden;
+  }
+
+  .wrapper.form-success .container h3{
+    -webkit-transform: translateY(85px);
+    -ms-transform: translateY(85px);
+    transform: translateY(85px);
+  }
+  .container {
+    /*max-width: 350px;*/
+    margin: 0 auto;
+    /*padding: 30px 100px 50px 100px;
+    height: 350px;*/
+    text-align: center;
+    /*以下增加*/
+    /*background: #2D83BA;
+    background: -webkit-linear-gradient(top left, #2D83BA 0%, #2D83BA 100%);
+    background: linear-gradient(to bottom right, #2D83BA 0%, #2D83BA 100%);*/
+    opacity: 0.8;
+  }
+  .container h3{
+    font-size: 40px;
+    -webkit-transition-duration: 1s;
+    transition-duration: 1s;
+    -webkit-transition-timing-function: ease-in-put;
+    transition-timing-function: ease-in-put;
+    font-weight: 200;
+  }
+  .form {
+    padding: 20px 0;
+    /*margin-top: 15%;*/
+    position: relative;
+    z-index: 2;
+  }
+  .form input {
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    appearance: none;
+    outline: 0;
+    border: 1px solid #50ABE6;
+    background-color: #50ABE6;
+    width: 250px;
+    border-radius: 3px;
+    padding: 10px 15px;
+    margin: 0 auto 10px auto;
+    display: block;
+    text-align: center;
+    font-size: 18px;
+    color: white;
+    -webkit-transition-duration: 0.25s;
+    transition-duration: 0.25s;
+    font-weight: 300;
+  }
+  .form input:hover {
+    background-color: rgba(255, 255, 255, 0.4);
+  }
+  .form input:focus {
+    background-color: white;
+    width: 300px;
+    color: #53e3a6;
+  }
+
+
+  .form button {
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    appearance: none;
+    outline: 0;
+    background-color: white;
+    border: 0;
+    padding: 10px 15px;
+    color: #253830;
+    border-radius: 3px;
+    width: 250px;
+    cursor: pointer;
+    font-size: 18px;
+    -webkit-transition-duration: 0.25s;
+    transition-duration: 0.25s;
+  }
+  .form button:hover {
+    background-color: #f5f7f9;
+  }
+
+  /*注册字体样式*/
+  .form span {
+    color: #fff;
+    display: table-footer-group;
+    position: absolute;
+    right: 10px;
+    margin-top: 10px;
+    cursor: pointer;
+  }
+  .logotitle {
+    color: #fff;
+    position: absolute;
+    top: 50px;
+    left: 50px;
+    font-size: 50px;
+  }
+  /*注册模态框界面样式*/
+  .modifystyle {
+    background: #FCFEEE;
+  }
+  .modifystyle div{
+    height: auto;
+    margin-bottom: 15px;
+    /*text-align: center;*/
+    /*margin-left: 20%;*/
+  }
+  /*bootstrap字体图标要手动调整，所以使用字体图标的span必须紧跟在input后面，负责会错位*/
+  .modifystyle div input + span{
+    top: 0!important;
+    right: 32%;
+  }
+  .modifystyle span{
+    color: red;
+  }
+
+  /* 通告区内容 */
+  .notice-board {
+    height: auto;
+    position: absolute;
+    top: 50%;
+    margin-top: -150px;
+    margin-left: 100px;
+    color: #fff;
+  }
+  /*修改密码底部按钮部分样式*/
+  .footerbtn {
+    text-align: center;
+    padding: 15px;
+  }
+  .footerbtn button {
+    width: 100px;
+    margin-left: 20px;
+  }
+  .bg-bubbles {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 1;
+  }
+  .bg-bubbles li {
+    position: absolute;
+    list-style: none;
+    display: block;
+    width: 40px;
+    height: 40px;
+    background-color: rgba(255, 255, 255, 0.15);
+    bottom: -160px;
+    -webkit-animation: square 25s infinite;
+    animation: square 25s infinite;
+    -webkit-transition-timing-function: linear;
+    transition-timing-function: linear;
+  }
+  .bg-bubbles li:nth-child(1) {
+    left: 10%;
+  }
+  .bg-bubbles li:nth-child(2) {
+    left: 20%;
+    width: 80px;
+    height: 80px;
+    -webkit-animation-delay: 2s;
+    animation-delay: 2s;
+    -webkit-animation-duration: 17s;
+    animation-duration: 17s;
+  }
+  .bg-bubbles li:nth-child(3) {
+    left: 25%;
+    -webkit-animation-delay: 4s;
+    animation-delay: 4s;
+  }
+  .bg-bubbles li:nth-child(4) {
+    left: 40%;
+    width: 60px;
+    height: 60px;
+    -webkit-animation-duration: 22s;
+    animation-duration: 22s;
+    background-color: rgba(255, 255, 255, 0.25);
+  }
+  .bg-bubbles li:nth-child(5) {
+    left: 70%;
+  }
+  .bg-bubbles li:nth-child(6) {
+    left: 80%;
+    width: 120px;
+    height: 120px;
+    -webkit-animation-delay: 3s;
+    animation-delay: 3s;
+    background-color: rgba(255, 255, 255, 0.2);
+  }
+  .bg-bubbles li:nth-child(7) {
+    left: 32%;
+    width: 160px;
+    height: 160px;
+    -webkit-animation-delay: 7s;
+    animation-delay: 7s;
+  }
+  .bg-bubbles li:nth-child(8) {
+    left: 55%;
+    width: 20px;
+    height: 20px;
+    -webkit-animation-delay: 15s;
+    animation-delay: 15s;
+    -webkit-animation-duration: 40s;
+    animation-duration: 40s;
+  }
+  .bg-bubbles li:nth-child(9) {
+    left: 25%;
+    width: 10px;
+    height: 10px;
+    -webkit-animation-delay: 2s;
+    animation-delay: 2s;
+    -webkit-animation-duration: 40s;
+    animation-duration: 40s;
+    background-color: rgba(255, 255, 255, 0.3);
+  }
+  .bg-bubbles li:nth-child(10) {
+    left: 90%;
+    width: 160px;
+    height: 160px;
+    -webkit-animation-delay: 11s;
+    animation-delay: 11s;
+  }
+
+
+</style>
+
+

package/src/components/iot/InstructMessage.vue

@@ -0,0 +1,313 @@
+<template>
+<div class="flex " style="background: #f8f8f8">
+  <div  class="auto bg-white" style="line-height: 32px;padding: 10px">
+   <label style="float: left">指令：{{row.f_instruct_title}} </label>
+    <div class="auto" style="float: right">
+      <!--<button type="button" class="btn btn-default btn-sm"  @click="$back">返回</button>-->
+      <button type="button" class="btn btn-default btn-sm"  @click="refresh">刷新</button>
+      <button type="button" class="btn btn-primary btn-sm"  @click="cancle">取消</button>
+      <button type="button" class="btn  btn-primary btn-sm"  @click="resend">重送</button>
+    </div>
+  </div>
+  <div class="instruct-state flex-row bg-white" style="margin-top: 5px;height:auto;padding: 10px">
+    <div class="instruct-left col-sm-12 auto">
+      <div class="col-sm-6 col-md-6 col-xs-6 auto">
+        <p  class="flex-row">
+          <span >指令状态:</span>
+          <span class="instruct-content" style="color: #499edf;font-size: 16px;font-weight: bold">{{row.f_instruct_state}}</span>
+        </p>
+      </div>
+      <div class="col-sm-6 col-md-6 col-xs-6 auto">
+        <p  class="flex-row">
+          <span>执行状态:</span>
+          <span class="instruct-content" style="color: #499edf;font-size: 16px;font-weight: bold">{{row.f_receive_state}}</span>
+        </p>
+      </div>
+      <div class="col-sm-6 col-md-6 col-xs-6 auto">
+        <p  class="flex-row">
+          <span>指令编号:</span>
+          <span class="instruct-content">{{row.id}}</span>
+        </p>
+      </div>
+      <div class="col-sm-6 col-md-6 col-xs-6 auto">
+
+        <p  class="flex-row">
+          <span>表编号:</span>
+          <span class="instruct-content">{{row.f_user_id}}</span>
+        </p>
+      </div>
+      <div class="col-sm-6 col-md-6 col-xs-6 auto">
+        <p  class="flex-row">
+          <span>表号:</span>
+          <span class="instruct-content">{{row.f_meternumber}}</span>
+        </p>
+      </div>
+      <div class="col-sm-6 col-md-6 col-xs-6 auto">
+        <p  class="flex-row">
+          <span>操作人员:</span>
+          <span class="instruct-content">{{row.f_inputtor}}</span>
+        </p>
+      </div>
+      <div class="col-sm-6 col-md-6 col-xs-6 auto">
+        <p  class="flex-row">
+          <span>指令说明:</span>
+          <span class="instruct-content">{{row.f_instruct_state}}</span>
+        </p>
+      </div>
+      <div class="col-sm-6 col-md-6 col-xs-6 auto">
+        <p  class="flex-row">
+          <span>表厂别名:</span>
+          <span class="instruct-content">{{row.f_alias}}</span>
+        </p>
+      </div>
+      <div class="col-sm-6 col-md-6 col-xs-12 auto">
+        <p  class="flex-row">
+          <span>生成时间:</span>
+          <span class="instruct-content" style="flex:3 !important;">{{row.f_instruct_date}}</span>
+        </p>
+      </div>
+      <div class="col-sm-6 col-md-6 col-xs-12 auto">
+        <p  class="flex-row">
+          <span>最后发送时间:</span>
+          <span class="instruct-content" style="flex:3 !important;">{{row.f_send_date}}</span>
+        </p>
+      </div>
+      <div class="col-sm-6 col-md-6 col-xs-12 auto">
+        <p  class="flex-row">
+          <span>最后响应时间:</span>
+          <span class="instruct-content" style="flex:3 !important;">{{row.f_callback_date}}</span>
+        </p>
+      </div>
+    </div>
+
+  </div>
+<div class="auto bg-white" style="margin-top: 5px;padding: 10px">
+  <div class="title auto">
+    <span>指令状态</span>
+  </div>
+  <div class="flex-row" style="font-size: 10px;padding: 10px">
+    <timeline>
+      <timeline-item color="#499edf">
+        <p>待发送</p>
+        <p>指令已就绪</p>
+        <p>{{row.f_instruct_date}}</p>
+      </timeline-item>
+      <timeline-item :color="row.f_instruct_state==='已发送'?'#499edf':''" >
+        <p>已发送</p>
+        <p>已发送，等待响应结果</p>
+        <p>{{row.f_send_date}}</p>
+      </timeline-item>
+      <timeline-item color="red" v-if="row.f_instruct_state==='执行失败'">
+        <p>执行失败</p>
+        <p>失败，请查看响应结果</p>
+        <p>{{row.f_callback_date}}</p>
+      </timeline-item>
+      <timeline-item :color="row.f_instruct_state==='执行成功'?'#499edf':''" v-if="row.f_instruct_state!=='执行失败'">
+        <p>执行成功</p>
+        <p>指令已执行成功</p>
+        <p>{{row.f_callback_date}}</p>
+      </timeline-item>
+    </timeline>
+    <!--<div  class="step">-->
+      <!--<div class="step-icon">-->
+        <!--<img src="../../assets/对号.png" class="send-line" style="height: 32px;width:32px;margin-bottom: 5px;padding-right: 5px" alt="" >-->
+      <!--</div>-->
+        <!--<p>待发送</p>-->
+        <!--<p>指令已就绪</p>-->
+        <!--<p>{{row.f_instruct_date}}</p>-->
+
+    <!--</div>-->
+    <!--<div class="step" >-->
+      <!--<div class="step-icon">-->
+        <!--<img src="../../assets/对号.png" style="height: 32px;width:32px;margin-bottom: 5px;padding-right: 5px" alt="" >-->
+      <!--</div>-->
+      <!--<p  class="flex-row">待发送</p>-->
+      <!--<p  class="flex-row">指令已发送</p>-->
+      <!--<p>{{row.f_send_date}}</p>-->
+      <!--</div>-->
+
+    <!--<div class="step" >-->
+      <!--<div  style="height: auto">-->
+      <!--<img src="../../assets/对号.png" class="" style="height: 32px;width:32px;margin-bottom: 5px;padding-right: 5px" alt="" >-->
+      <!--</div>-->
+      <!--<p  class="flex-row">待发送</p>-->
+      <!--<p>指令已执行成功</p>-->
+      <!--<p>{{row.f_callback_date}}</p>-->
+    <!--</div>-->
+  </div>
+
+</div>
+  <div class="row bg-white" style="margin-top: 5px;">
+    <div class="content-head" style="background: #fafafa;height: 2em;">
+      <p style="padding-left: 10px;line-height: 2em">指令内容</p>
+    </div>
+    <div  style="height: auto;padding: 10px" >
+      <p>{</p>
+      <p v-for="item in content">
+        <span>{{item}}</span>
+        <span v-if="$index<content.length-1">,</span>
+      </p>
+    <p>}</p>
+    </div>
+  </div>
+</div>
+</template>
+<script>
+  import {HttpResetClass} from 'vue-client'
+  export default {
+    title: '指令信息',
+    data () {
+      return {
+        content:[],
+        msg: '',
+        show: false
+      }
+    },
+    props:['row'],
+    methods:{
+      refresh(){
+        let data = {
+          items: '*',
+          tablename: 't_instruct',
+          orderitem: 'id  desc',
+          condition: ` id = '${this.row.id}'`
+        }
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/iot_singleTable_OrderBy`, {data: data}).then((row) => {
+          // console.log('查询返回'+JSON.stringify(row))
+        this.row = row.data[0]
+      }).catch((e) => {
+        //   console.log('正在维护！')
+        // console.log('错误信息+++++++'+JSON.stringify(e))
+      })
+      },
+      cancle(){
+        this.$showMessage(`您确认要取消指令吗？`, ['confirm', 'cancel']).then(async (res) => {
+          if (res === 'confirm') {
+          let http = new HttpResetClass()
+          let condition = `id = '${this.row.id}'`
+          // console.log('修改条件===' + JSON.stringify(condition))
+          http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/cancelSendInstruct`, {data: {condition: condition}}).then((row) => {
+            this.$showMessage('取消指令操作成功！')
+            this.refresh()
+          //   console.log('修改返回' + JSON.stringify(row))
+          // this.$showMessage('操作成功！将会在一段时间内重新生成开户指令！')
+        }).catch((e) => {
+            this.$showMessage('操作失败！请稍后重试！')
+          // console.log('错误信息+++++++'+JSON.stringify(e))
+        })
+        }
+      })
+      },
+      resend(){
+        this.$showMessage(`您确认要重新发送指令？`, ['confirm', 'cancel']).then(async (res) => {
+          if (res === 'confirm') {
+          let http = new HttpResetClass()
+          let condition = `id = '${this.row.id}'`
+          // console.log('修改条件===' + JSON.stringify(condition))
+          http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/againSendInstruct`, {data: {condition: condition}}).then((row) => {
+            // console.log('修改返回' + JSON.stringify(row))
+          this.refresh()
+          this.$showMessage('操作成功！将会在一段时间内重新发送指令！')
+        }).catch((e) => {
+            this.$showMessage('操作失败！请稍后重试！')
+          // console.log('错误信息+++++++'+JSON.stringify(e))
+        })
+        }
+      })
+      },
+      getInitData(){
+        let data = JSON.parse(this.row.f_instruct_content)
+        this.content = []
+        for(let key in data){
+          let param = key+':'+data[key]
+          this.content.push(param)
+        }
+      },
+    },
+    watch:{
+      'row'(val){
+        if(val){
+          this.getInitData()
+        }
+      }
+    },
+    ready () {
+     this.getInitData()
+    }
+  }
+</script>
+<style media="screen" scoped>
+div::-webkit-scrollbar {
+  width: 0 !important;
+  height: 0 !important;
+}
+
+div {
+  -ms-overflow-style: none;
+  overflow: -moz-scrollbars-none;
+}
+
+.font-head{
+  font-size: 14px;
+  font-weight: bold;
+  color: #333;
+}
+.instruct-content{
+ flex:1.5 !important;
+}
+.font-content{
+  font-size: 12px;
+  font-weight: normal;
+  color: #666666;
+}
+  .meterinfo{
+    border:1px solid #eeeeee;
+    /*border-right: 2px solid #eeeeee;*/
+  }
+  .instruct-right div{
+    height: auto;
+  }
+  .instruct-state{
+    font-size: 14px;
+  }
+  .instruct{
+    font-size: 10px;
+  }
+  .step{
+    flex:1
+  }
+ .step-icon{
+   height: auto;
+ }
+@media screen and (max-width: 1920px){
+  .step-icon:after{
+    content: "";
+    width: 30%;
+    height: 2px;
+    margin-top: 16px;
+    background-color: #6eb0e3;
+    position: absolute;
+    /*top: 10px;*/
+
+  }
+}
+@media screen and (max-width: 768px){
+  .step-icon:after{
+    content: "";
+    width: 22%;
+    height: 2px;
+    margin-top: 16px;
+    background-color: #6eb0e3;
+    position: absolute;
+    /*top: 10px;*/
+
+  }
+}
+
+.step p{
+  margin-bottom: 5px !important;
+}
+  p span{
+    flex:1
+  }
+</style>