safecheck-client 3.0.30-62 → 3.0.30-62-t4

package/src/components/android/AreaSelect.vue

@@ -0,0 +1,198 @@
+<style scoped>
+.app-row {
+  background-color: white;
+  padding: 10px 10px 0 10px;
+  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+}
+
+.search_input {
+  border: 0;
+  outline: none;
+}
+
+.font {
+  font: 15px PingFang-SC-Medium;
+  color: #666666;
+}
+
+.input-font {
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
+
+.btn-font {
+  font: 600 16px PingFang-SC-Bold;
+  color: #499EDF;
+}
+
+.btn-color {
+  background-color: #FFFFFF;
+  border-radius: 10px;
+  border: 1px solid #499EDF;
+}
+
+.app-text {
+  font-size: 12px;
+}
+
+.panel-self {
+  border-radius: 10px;
+  border: 1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+
+table {
+  text-align: center;
+  white-space: nowrap;
+  font-size: 12px;
+  width: 50%;
+  border-collapse: collapse;
+  margin: 20px 0;
+  margin: auto;
+}
+
+th,
+td {
+  padding: 12px;
+  border-bottom: 1px solid #ddd;
+}
+
+th {
+  background-color: #f2f2f2;
+}
+
+tr:hover {
+  background-color: #f5f5f5;
+}
+</style>
+<template>
+  <div style="height: auto;width: 100%">
+    <criteria-paged :model="model" v-ref:paged :pager="false">
+      <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
+        <div partial>
+          <form>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_userinfo_code" class="font text-left">小区名称：</label>
+              </div>
+              <div class="col-xs-8">
+                <input id="f_userinfo_code" class="search_input input-font"
+                       v-model=model.f_residential_area condition="f_residential_area like '%{}%'" />
+              </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 for="f_userinfo_code" class="font text-left">小区地址：</label>
+              </div>
+              <div class="col-xs-8">
+                <input id="f_userinfo_code" class="search_input input-font" v-model=model.f_area_address
+                       condition="f_area_address like '%{}%'" />
+              </div>
+            </div>
+            <div class="row text-center" style="margin-top: 20px;">
+              <button type="button" class="btn btn-lg btn-font btn-color" style="width: 25%;"
+                      @click="search">查询</button>
+              <img @click="$parent.$parent.getNewOrder" src="../../assets/shuaxindaiban1.png"
+                   style="float: right;margin-right: 3%;width: 40px;padding: 5px; float:right">
+            </div>
+            <div class="col-sm-12">
+            </div>
+            <div style="height:30px;"></div>
+          </form>
+        </div>
+      </criteria>
+      <list :model="model" partial='list'>
+        <div partial>
+          <div class="auto app-text" style="margin-top: 5px;">
+            <div class="panel" style="padding: 10px 10px 5px 10px;">
+              <div class="panel-body panel-self" @click="$parent.$parent.$parent.gotoBuildingSelect(row)">
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left">
+                    <b>小区名称:</b>
+                  </p>
+                  <p class="panel-title col-xs-5 text-left input-font" style="width: 74%">{{
+                      row.f_residential_area }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left">
+                    <b>小区地址:</b>
+                  </p>
+                  <p class="panel-title col-xs-7 text-left input-font" style="width: 79%">{{
+                      row.f_area_address }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <table>
+                    <tr>
+                      <td style="color: #00A3F0">{{ row.jihuazongshu }}</td>
+                      <td style="color: #3CC51F">{{ row.yijian }}</td>
+                      <td style="color: coral">{{ row.weijian }}</td>
+                      <td style="color: red">{{ row.daofangbuyu }}</td>
+                    </tr>
+                    <tr>
+                      <th>计划总户数</th>
+                      <th>已检户数</th>
+                      <th>未检户数</th>
+                      <th>到访不遇户数</th>
+                    </tr>
+                  </table>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+  </div>
+</template>
+<script>
+import LocalPagedList from '../../plugins/LocalPagedList'
+export default {
+  title: 'area-select',
+  props: ['row'],
+  data() {
+    return {
+      model: new LocalPagedList('androidGetuserinfo', 20, { condition: 'this.condition' }),
+    }
+  },
+  ready() {
+  },
+  methods: {
+    getNewOrder() {
+      HostApp.__this__ = this
+      HostApp.logicWithHint({
+        'logic': 'SafeCheckServiceTimeOut',
+        'callback': 'javascript:HostApp.__this__.getNewOrderCallBack()',
+        'data': { params: '' },
+        'backresult': 1
+      })
+      HostApp.logicWithHint({
+        'logic': 'FreshPlanItem',
+        'callback': 'javascript:HostApp.__this__.getNewOrderCallBack()',
+        'data': { params: '' },
+        'backresult': 1
+      })
+    },
+    getNewOrderCallBack() {
+      this.model.search()
+    },
+    gotoBuildingSelect(row) {
+      let _this = this
+      _this.$goto('building-select', { row: row, f_plan_id: this.row.id }, 'self', _this.$back)
+    },
+    search(args) {
+      this.model.rows = []
+      args.condition += ` and f_plan_id = '${this.row.id}'`
+      let criteria = {
+        items: `tcpi.f_residential_area,tcpi.f_area_address,COUNT(tcpi.id) as jihuazongshu,sum( CASE WHEN tcpi.f_state = '未检' THEN 1 ELSE 0 END ) as weijian,sum( CASE WHEN tcpi.f_state = '已检' THEN 1 ELSE 0 END ) as yijian,sum( CASE WHEN tcpi.f_last_check_state = '到访不遇' THEN 1 ELSE 0 END ) as daofangbuyu`,
+        tablename: 't_check_plan_item tcpi ',
+        condition: args.condition,
+        groupitem: 'tcpi.f_residential_area,tcpi.f_area_address'
+      }
+      let result = HostApp._executeTask({ 'type': 'sql', 'data': { 'alias': 'safe_singleTable_GroupBy', 'criteria': criteria } })
+      this.model.rows = result.data.rows
+    }
+  }
+}
+</script>

package/src/components/android/BlackUserOnLine.vue

@@ -134,7 +134,7 @@ import * as Util from '../Util'
 export default {
   title: '安检员B',
   data () {
-    let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, 20,{
+    let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/tel_singleTable_OrderBy`, 20,{
       items: '"tu.f_userinfo_code,tu.f_user_name,tu.f_user_phone,tu.f_userinfo_id,td.f_comments,ta.f_address,td.f_state"',
       tablename: '"t_userinfo tu left join t_userproperties td on tu.f_userinfo_id = td.f_userinfo_id and td.f_state = \'有效\' and f_parameter_key = \'blackList\' left join t_user_address ta on tu.f_userinfo_id = ta.f_userinfo_id"',
       orderitem: '"tu.f_userinfo_code desc"',
@@ -170,7 +170,7 @@ export default {
         return
       }
       let http = new HttpResetClass()
-      let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+      let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
         data: {
           items: "version",
           tablename: "t_userinfo",
@@ -178,7 +178,7 @@ export default {
           orderitem: "f_userinfo_id"
         }
       }, {resolveMsg: null, rejectMsg: null})
-      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/backlistOperate`, {
+      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
         data: {
           "f_operat_type": "取消拉黑",
           "f_state": "有效",
@@ -215,7 +215,7 @@ export default {
         return
       }
       let http = new HttpResetClass()
-      let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+      let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
         data: {
           items: "version",
           tablename: "t_userinfo",
@@ -223,7 +223,7 @@ export default {
           orderitem: "f_userinfo_id"
         }
       }, {resolveMsg: null, rejectMsg: null})
-      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/backlistOperate`, {
+      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
         data: {
           "f_operat_type": "拉黑",
           "f_state": "有效",

package/src/components/android/BuildingSelect.vue

@@ -0,0 +1,192 @@
+<style scoped>
+.app-row {
+  background-color: white;
+  padding: 10px 10px 0 10px;
+  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+}
+
+.search_input {
+  border: 0;
+  outline: none;
+}
+
+.font {
+  font: 15px PingFang-SC-Medium;
+  color: #666666;
+}
+
+.input-font {
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
+
+.btn-font {
+  font: 600 16px PingFang-SC-Bold;
+  color: #499EDF;
+}
+
+.btn-color {
+  background-color: #FFFFFF;
+  border-radius: 10px;
+  border: 1px solid #499EDF;
+}
+
+.app-text {
+  font-size: 12px;
+}
+
+.panel-self {
+  border-radius: 10px;
+  border: 1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+
+table {
+  text-align: center;
+  white-space: nowrap;
+  font-size: 12px;
+  width: 50%;
+  border-collapse: collapse;
+  margin: 20px 0;
+  margin: auto;
+}
+
+th,
+td {
+  padding: 12px;
+  border-bottom: 1px solid #ddd;
+}
+
+th {
+  background-color: #f2f2f2;
+}
+
+tr:hover {
+  background-color: #f5f5f5;
+}
+</style>
+<template>
+  <div style="height: auto;width: 100%">
+    <criteria-paged :model="model" v-ref:paged :pager="false">
+      <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
+        <div partial>
+          <form>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_userinfo_code" class="font text-left">楼栋：</label>
+              </div>
+              <div class="col-xs-8">
+                <input id="f_userinfo_code" class="search_input input-font" v-model=model.f_building
+                       condition="f_building like '%{}%'" />
+              </div>
+            </div>
+            <div class="row text-center" style="margin-top: 20px;">
+              <button type="button" class="btn btn-lg btn-font btn-color" style="width: 25%;"
+                      @click="search">查询</button>
+              <img @click="$parent.$parent.getNewOrder" src="../../assets/shuaxindaiban1.png"
+                   style="float: right;margin-right: 3%;width: 40px;padding: 5px; float:right">
+            </div>
+            <div class="col-sm-12">
+            </div>
+            <div style="height:30px;"></div>
+          </form>
+        </div>
+      </criteria>
+      <list :model="model" partial='list'>
+        <div partial>
+          <div class="auto app-text" style="margin-top: 5px;">
+            <div class="panel" style="padding: 10px 10px 5px 10px;">
+              <div class="panel-body panel-self" @click="$parent.$parent.$parent.gotoUserinfoSelect(row)">
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left">
+                    <b>小区名称:</b></p>
+                  <p class="panel-title col-xs-5 text-left input-font" style="width: 74%">{{
+                      $parent.$parent.$parent.row.f_residential_area }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left">
+                    <b>小区地址:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font" style="width: 79%">{{
+                      $parent.$parent.$parent.row.f_area_address }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left">
+                    <b>楼栋:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font" style="width: 79%">{{
+                      row.f_building }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <table>
+                    <tr>
+                      <td style="color: #00A3F0">{{ row.jihuazongshu }}</td>
+                      <td style="color: #3CC51F">{{ row.yijian }}</td>
+                      <td style="color: coral">{{ row.weijian }}</td>
+                      <td style="color: red">{{ row.daofangbuyu }}</td>
+                    </tr>
+                    <tr>
+                      <th>计划总户数</th>
+                      <th>已检户数</th>
+                      <th>未检户数</th>
+                      <th>到访不遇户数</th>
+                    </tr>
+                  </table>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+  </div>
+</template>
+<script>
+import LocalPagedList from '../../plugins/LocalPagedList'
+export default {
+  title: 'building-select',
+  props: ['row', 'f_plan_id'],
+  data() {
+    return {
+      model: new LocalPagedList('androidGetuserinfo', 20, { condition: 'this.condition' }),
+    }
+  },
+  ready() {
+  },
+  methods: {
+    getNewOrder() {
+      HostApp.__this__ = this
+      HostApp.logicWithHint({
+        'logic': 'SafeCheckServiceTimeOut',
+        'callback': 'javascript:HostApp.__this__.getNewOrderCallBack()',
+        'data': { params: '' },
+        'backresult': 1
+      })
+      HostApp.logicWithHint({
+        'logic': 'FreshPlanItem',
+        'callback': 'javascript:HostApp.__this__.getNewOrderCallBack()',
+        'data': { params: '' },
+        'backresult': 1
+      })
+    },
+    getNewOrderCallBack() {
+      this.model.search()
+    },
+    gotoUserinfoSelect(row) {
+      let _this = this
+      _this.$goto('userinfo-select', { row: { f_plan_id: this.f_plan_id, f_residential_area: this.row.f_residential_area, f_area_address: this.row.f_area_address, f_building: row.f_building } }, 'self', _this.$back)
+    },
+    search(args) {
+      this.model.rows = []
+      args.condition += ` and f_plan_id = '${this.f_plan_id}' and f_residential_area = '${this.row.f_residential_area}'`
+      let criteria = {
+        items: `tcpi.f_building,COUNT(tcpi.id) as jihuazongshu,sum( CASE WHEN tcpi.f_state = '未检' THEN 1 ELSE 0 END ) as weijian,sum( CASE WHEN tcpi.f_state = '已检' THEN 1 ELSE 0 END ) as yijian,sum( CASE WHEN tcpi.f_last_check_state = '到访不遇' THEN 1 ELSE 0 END ) as daofangbuyu`,
+        tablename: 't_check_plan_item tcpi ',
+        condition: args.condition,
+        groupitem: 'tcpi.f_building'
+      }
+      let result = HostApp._executeTask({ 'type': 'sql', 'data': { 'alias': 'safe_singleTable_GroupBy', 'criteria': criteria } })
+      this.model.rows = result.data.rows
+    },
+  }
+}
+</script>

package/src/components/android/CheckNotice.vue

@@ -53,7 +53,7 @@ export default {
       if (Vue.android) {
         this.model = this.$androidUtil.bzLogic('提取安检通知', {f_subcompany: Vue.user.f_subcompany}).data
       } else {
-        this.$resetpost('AndroidRest/rs/sql/提取通知', {data: {f_subcompany: Vue.user.f_subcompany}}, {
+        this.$resetpost('AndroidRest/api/af-safecheck/sql/提取通知', {data: {f_subcompany: Vue.user.f_subcompany}}, {
           resolveMsg: null,
           rejectMsg: null
         }).then(

package/src/components/android/CheckPlan.vue

@@ -140,7 +140,7 @@ export default {
         this.$set('model.rows', response.data)
         this.getCount()
       } else {
-        this.$resetpost(`AndroidRest/rs/logic/提取安检计划`, {
+        this.$resetpost(`AndroidRest/api/af-safecheck/logic/提取安检计划`, {
           f_checker_id: this.user.id,
           f_checker: this.user.name,
           f_plan_year: this.c_plan_year[0]
@@ -189,7 +189,7 @@ export default {
           })
         })
       }else{
-        this.$resetpost('rs/sql/已下载计划',{data:{'ids': ids.substring(1)}}).then((respanse)=>{
+        this.$resetpost('api/af-safecheck/sql/已下载计划',{data:{'ids': ids.substring(1)}}).then((respanse)=>{
           //tag
           records = respanse.data
           records.forEach((record)=> {

package/src/components/android/CheckPlanDown.vue

@@ -86,7 +86,7 @@ export default {
   title: '共享计划下载',
   data () {
     return {
-      model: new PagedList( `${this.$androidUtil.getProxyUrl()}/rs/sql/getShareCheckPlan`,5,{f_fengongsi:`'${Vue.user.orgid}'`}),
+      model: new PagedList( `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/getShareCheckPlan`,5,{f_fengongsi:`'${Vue.user.orgid}'`}),
       checkPlanInfo: [],
       localcheckPlanInfo:[]
     }

package/src/components/android/CheckPlanItems.vue

@@ -269,7 +269,7 @@ export default {
   props: ['f_plan_id', 'f_residential_area'],
   data() {
     return {
-      model: Vue.android ? new LocalPagedList('androidGetuserinfo', 5, {f_plan_id: 'this.f_plan_id'}) : new PagedList(`AndroidRest/rs/sql/androidGetuserinfo`, 5, {f_plan_id: 'this.f_plan_id' }),
+      model: Vue.android ? new LocalPagedList('androidGetuserinfo', 5, {f_plan_id: 'this.f_plan_id'}) : new PagedList(`AndroidRest/api/af-safecheck/sql/androidGetuserinfo`, 5, {f_plan_id: 'this.f_plan_id' }),
       showModal: false,
       param: null,
       f_preset_dt : Util.to3339TimeString(),
@@ -347,7 +347,7 @@ export default {
     },
     inspect(row) {
       if (row.f_upload_state == '未传' || (row.f_upload_state == '已传' && row.f_state == '未检')) {
-        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}}).then((response) => {
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}}).then((response) => {
           //tag)
         row['f_plan_meters'] = response.data