safecheck-client 3.0.30-3 → 3.0.30-33

package/src/filiale/yongzhou/pc/safeStatisticsYear.vue

@@ -1,100 +1,110 @@
-<template>
-  <div id='app' class="basic-main" style="height: 100%">
-    <criteria-paged :model="model" :pager='false'>
-      <criteria partial='criteria' @condition-changed='search' class="search_area">
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-          <div class="row">
-            <div class="col-sm-2 form-group">
-              <label for="startDate" class="font_normal_body">开始日期:</label>
-              <datepicker id="startDate" placeholder="开始日期"
-                          v-model="model.startDate"
-                          :value.sync="model.startDate"
-                          style="width: 60%;"
-                          :select-year="true"
-                          :disabled-days-of-Week="[]"
-                          :format="'yyyy-01-01 00:00:00'"
-                          condition="tcp.f_create_time >= '{}'"
-                          :show-reset-button="reset">
-              </datepicker>
-            </div>
-            <div class="col-sm-2 form-group">
-              <label for="endDate" class="font_normal_body">结束日期:</label>
-              <datepicker id="endDate" placeholder="结束日期"
-                          v-model="model.endDate"
-                          :select-year="true"
-                          :value.sync="model.endDate"
-                          :disabled-days-of-Week="[]"
-                          style="width: 60%;"
-                          condition="tcp.f_create_time <= '{}'"
-                          :format="'yyyy-12-31 23:59:59'"
-                          :show-reset-button="reset">
-              </datepicker>
-            </div>
-            <div class="form-group col-sm-2"  >
-              <label class="font_normal_body">小&emsp;&emsp;区</label>
-              <input type="text" class="input_search" v-model="model.f_residential_area"
-                     style="width: 60%" placeholder="小区" condition="f_residential_area like '%{}%'">
-            </div>
-            <div class="col-sm-4 form-group" style="margin-top: 8px">
-              <button class="button_search button_spacing" @click="search()">查询</button>
-              <report-print class="button_export button_spacing" style="width:28%" id='shexian'></report-print>
-              <report-excel class="button_export button_spacing" style="width:28%" id='shexian'></report-excel>
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <div partial='list' id='shexian' class="list_area" style="overflow-y: scroll">
-        <table class='tableprint' style="margin: 0px auto">
-          <thead>
-          <tr>
-            <th colspan='5' style="font-weight: normal; text-align: left;">
-              <h3 style="text-align: center">安检年报表</h3>
-            </th>
-          </tr>
-          <tr>
-            <th colspan='5' style="font-weight: normal; text-align: center;">
-              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
-              结束时间：{{ model.model.endDate }}
-            </th>
-          </tr>
-          </thead>
-          <tr>
-            <th colspan='5' style="font-weight: normal;">
-              {{{ model.data.substring(26,model.data.length-8) }}}
-            </th>
-          </tr>
-        </table>
-      </div>
-    </criteria-paged>
-  </div>
-
-</template>
-
-<script>
-  import {DataModel, HttpResetClass} from 'vue-client'
-
-  export default {
-    title: '安检年报表',
-    data () {
-      let model = new DataModel('rs/report/safeStatisticsYear', {})
-      // model.f_filialeid = '(' + this.$login.f.orgid + ')'
-      return {
-        userid: this.$login.f.id,
-        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
-        model: model
-      }
-    },
-    methods: {
-      getRes (obj) {
-        this.model.f_filialeid = this.$login.convertToIn(obj.resids)
-      },
-    },
-    ready () {
-    },
-    computed: {
-      selected () {
-        return this.$refs.grid.selected
-      }
-    }
-  }
-</script>
+<template>
+  <div id='app' class="basic-main" style="height: 100%">
+    <criteria-paged :model="model" :pager='false'>
+      <criteria partial='criteria' @condition-changed='search' class="search_area">
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="col-sm-2 form-group">
+              <label for="startDate" class="font_normal_body">开始日期:</label>
+              <datepicker id="startDate" placeholder="开始日期"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          style="width: 60%;"
+                          :select-year="true"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-01-01 00:00:00'"
+                          condition="tcp.f_create_time >= '{}'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label for="endDate" class="font_normal_body">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期"
+                          v-model="model.endDate"
+                          :select-year="true"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          style="width: 60%;"
+                          condition="tcp.f_create_time <= '{}'"
+                          :format="'yyyy-12-31 23:59:59'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-2"  >
+              <label class="font_normal_body">小&emsp;&emsp;区</label>
+              <input type="text" class="input_search" v-model="model.f_residential_area"
+                     style="width: 60%" placeholder="小区" condition="f_residential_area like '%{}%'">
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">用户类型</label>
+              <v-select :value.sync="model.f_user_type" v-model='model.f_user_type'
+                        :value-single="true" style="width: 60%"
+                        class="select_list select"
+                        :options='$parent.$parent.user_types' placeholder='用户类型'
+                        close-on-select
+                        condition="tcpi.f_user_type = '{}'"></v-select>
+            </div>
+            <div class="col-sm-4 form-group" style="margin-top: 8px">
+              <button class="button_search button_spacing" @click="search()">查询</button>
+              <report-print class="button_export button_spacing" style="width:28%" id='shexian'></report-print>
+              <report-excel class="button_export button_spacing" style="width:28%" id='shexian'></report-excel>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <div partial='list' id='shexian' class="list_area" style="overflow-y: scroll">
+        <table class='tableprint' style="margin: 0px auto">
+          <thead>
+          <tr>
+            <th colspan='5' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">安检年报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='5' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <th colspan='5' style="font-weight: normal;">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </th>
+          </tr>
+        </table>
+      </div>
+    </criteria-paged>
+  </div>
+
+</template>
+
+<script>
+  import {DataModel, HttpResetClass} from 'vue-client'
+
+  export default {
+    title: '安检年报表',
+    data () {
+      let model = new DataModel('rs/report/safeStatisticsYear', {})
+      // model.f_filialeid = '(' + this.$login.f.orgid + ')'
+      return {
+        user_types: [{label:'全部',value:''},{label:'民用',value:'民用'},{label:'非民用',value:'非民用'}],
+        userid: this.$login.f.id,
+        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
+        model: model
+      }
+    },
+    methods: {
+      getRes (obj) {
+        this.model.f_filialeid = this.$login.convertToIn(obj.resids)
+      },
+    },
+    ready () {
+    },
+    computed: {
+      selected () {
+        return this.$refs.grid.selected
+      }
+    }
+  }
+</script>

package/src/filiale/yongzhou/pc/safeTable.vue

@@ -1,128 +1,136 @@
-<template>
-
-  <div style="height: 25px;width: auto">
-      <button class="button_spacing button_search" @click="showaudio(1)" :class="{color:searchs.search1}">
-        安检情况明细
-      </button>
-      <button class="button_spacing button_search" @click="showaudio(2)" :class="{color:searchs.search2}">
-        小区隐患明细表
-      </button>
-      <button class="button_spacing button_search" @click="showaudio(3)" :class="{color:searchs.search3}">
-        隐患类型明细表工商
-      </button>
-      <button class="button_spacing button_search" @click="showaudio(4)" :class="{color:searchs.search4}">
-        隐患类型明细表民用
-      </button>
-      <button class="button_spacing button_search" @click="showaudio(5)" :class="{color:searchs.search5}">
-        安检员明细
-      </button>
-      <button class="button_spacing button_search" @click="showaudio(6)" :class="{color:searchs.search6}">
-        安检日报表
-      </button>
-      <button class="button_spacing button_search" @click="showaudio(7)" :class="{color:searchs.search7}">
-        安检月报表
-      </button>
-      <button class="button_spacing button_search" @click="showaudio(8)" :class="{color:searchs.search8}">
-        安检年报表
-      </button>
-  </div>
-    <!--安检情况明细-->
-    <div v-if="searchs.search1">
-      <safe-detail></safe-detail>
-    </div>
-    <!--小区隐患明细表-->
-    <div v-if="searchs.search2">
-      <community-detail ></community-detail>
-    </div>
-    <!--隐患类型明细表工商-->
-    <div v-if="searchs.search3">
-      <community-type-detail-g ></community-type-detail-g>
-    </div>
-    <!--隐患类型明细表民用-->
-    <div v-if="searchs.search4">
-      <community-type-detail-m ></community-type-detail-m>
-    </div>
-<!--    安检员明细-->
-    <div v-if="searchs.search5">
-      <safe-statistics ></safe-statistics>
-    </div>
-<!--安检日报表-->
-    <div v-if="searchs.search6">
-      <safe-statistics-day ></safe-statistics-day>
-    </div>
-    <!--安检月报表-->
-    <div v-if="searchs.search7">
-      <safe-statistics-month ></safe-statistics-month>
-    </div>
-<!--安检年报表-->
-    <div v-if="searchs.search8">
-      <safe-statistics-year ></safe-statistics-year>
-    </div>
-</template>
-
-
-<script>
-import * as Util from '../../Util'
-import {HttpResetClass} from "vue-client";
-
-export default {
-  title: '安检报表',
-  data() {
-    return {
-      searchs: {
-        search1: false,
-        search2: false,
-        search3: false,
-        search4: false,
-        search5: false,
-        search6: false,
-        search7: false,
-        search8: false
-      },
-      currentActiveSearch:''
-    }
-  },
-  methods: {
-    showaudio(index){
-      for (const key in this.searchs) {
-        this.searchs[key] = false;
-      }
-      this.searchs[`search${index}`] = true;
-      this.currentActiveSearch = index;
-    }
-  }
-}
-</script>
-
-<style scoped>
-.div-1 {
-  height: 99%;
-  width: 100%
-}
-.color{
-  background-color: #f7cb32;
-}
-.div-2 {
-  height: 7%;
-  width: 100%;
-}
-
-.div-3 {
-  height: 90%;
-  width: 100%;
-  overflow-y: scroll;
-}
-
-.td-1 {
-  float: left;
-}
-
-.td-2 {
-  float: right;
-}
-
-.td-3 {
-  margin-bottom: 1%;
-}
-
-</style>
+<template>
+
+  <div style="height: 25px;width: auto">
+      <button class="button_spacing button_search" @click="showaudio(1)" :class="{color:searchs.search1}">
+        安检情况明细
+      </button>
+      <button class="button_spacing button_search" @click="showaudio(2)" :class="{color:searchs.search2}">
+        小区隐患明细表
+      </button>
+      <button class="button_spacing button_search" @click="showaudio(3)" :class="{color:searchs.search3}">
+        隐患类型明细表工商
+      </button>
+      <button class="button_spacing button_search" @click="showaudio(4)" :class="{color:searchs.search4}">
+        隐患类型明细表民用
+      </button>
+      <button class="button_spacing button_search" @click="showaudio(5)" :class="{color:searchs.search5}">
+        安检员明细(有计划)
+      </button>
+      <button class="button_spacing button_search" @click="showaudio(9)" :class="{color:searchs.search9}">
+        安检员明细(无计划)
+      </button>
+      <button class="button_spacing button_search" @click="showaudio(6)" :class="{color:searchs.search6}">
+        安检日报表
+      </button>
+      <button class="button_spacing button_search" @click="showaudio(7)" :class="{color:searchs.search7}">
+        安检月报表
+      </button>
+      <button class="button_spacing button_search" @click="showaudio(8)" :class="{color:searchs.search8}">
+        安检年报表
+      </button>
+  </div>
+    <!--安检情况明细-->
+    <div v-if="searchs.search1">
+      <safe-detail></safe-detail>
+    </div>
+    <!--小区隐患明细表-->
+    <div v-if="searchs.search2">
+      <community-detail ></community-detail>
+    </div>
+    <!--隐患类型明细表工商-->
+    <div v-if="searchs.search3">
+      <community-type-detail-g ></community-type-detail-g>
+    </div>
+    <!--隐患类型明细表民用-->
+    <div v-if="searchs.search4">
+      <community-type-detail-m ></community-type-detail-m>
+    </div>
+<!--    安检员明细-->
+    <div v-if="searchs.search5">
+      <safe-statistics ></safe-statistics>
+    </div>
+<!--安检日报表-->
+    <div v-if="searchs.search6">
+      <safe-statistics-day ></safe-statistics-day>
+    </div>
+    <!--安检月报表-->
+    <div v-if="searchs.search7">
+      <safe-statistics-month ></safe-statistics-month>
+    </div>
+<!--安检年报表-->
+    <div v-if="searchs.search8">
+      <safe-statistics-year ></safe-statistics-year>
+    </div>
+<!--安检年报表-->
+  <div v-if="searchs.search9">
+    <no-checkplan-safecheck ></no-checkplan-safecheck>
+  </div>
+</template>
+
+
+<script>
+import * as Util from '../../Util'
+import {HttpResetClass} from "vue-client";
+
+export default {
+  title: '安检报表',
+  data() {
+    return {
+      searchs: {
+        search1: false,
+        search2: false,
+        search3: false,
+        search4: false,
+        search5: false,
+        search6: false,
+        search7: false,
+        search8: false,
+        search9: false
+      },
+      currentActiveSearch:''
+    }
+  },
+  methods: {
+    showaudio(index){
+      for (const key in this.searchs) {
+        this.searchs[key] = false;
+      }
+      this.searchs[`search${index}`] = true;
+      this.currentActiveSearch = index;
+    }
+  }
+}
+</script>
+
+<style scoped>
+.div-1 {
+  height: 99%;
+  width: 100%
+}
+.color{
+  background-color: #f7cb32;
+}
+.div-2 {
+  height: 7%;
+  width: 100%;
+}
+
+.div-3 {
+  height: 90%;
+  width: 100%;
+  overflow-y: scroll;
+}
+
+.td-1 {
+  float: left;
+}
+
+.td-2 {
+  float: right;
+}
+
+.td-3 {
+  margin-bottom: 1%;
+}
+
+</style>

package/src/filiale/yongzhou/pc.js

@@ -1,23 +1,24 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-//手机特殊目录注册到该文件中
-let specialComp = {
-  "plan-manage":(resolve) => { require(['./pc/PlanManage.vue'], resolve) },
-  "role-selector-safe":(resolve) => { require(['./pc/RoleSelector.vue'], resolve) },
-  "check-user-list":(resolve) => { require(['./pc/checkUserList.vue'], resolve) },
-  "safe-table":(resolve) => { require(['./pc/safeTable.vue'], resolve) },
-  "safe-detail":(resolve) => { require(['./pc/safeDetail.vue'], resolve) },
-  "community-detail":(resolve) => { require(['./pc/communityDetail.vue'], resolve) },
-  "community-type-detail-g":(resolve) => { require(['./pc/communityTypeDetailG.vue'], resolve) },
-  "community-type-detail-m":(resolve) => { require(['./pc/communityTypeDetailM.vue'], resolve) },
-  "safe-statistics":(resolve) => { require(['./pc/safeStatistics.vue'], resolve) },
-  "safe-statistics-day":(resolve) => { require(['./pc/safeStatisticsDay.vue'], resolve) },
-  "safe-statistics-month":(resolve) => { require(['./pc/safeStatisticsMonth.vue'], resolve) },
-  "safe-statistics-year":(resolve) => { require(['./pc/safeStatisticsYear.vue'], resolve) },
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+//手机特殊目录注册到该文件中
+let specialComp = {
+  "plan-manage":(resolve) => { require(['./pc/PlanManage.vue'], resolve) },
+  "role-selector-safe":(resolve) => { require(['./pc/RoleSelector.vue'], resolve) },
+  "check-user-list":(resolve) => { require(['./pc/checkUserList.vue'], resolve) },
+  "safe-table":(resolve) => { require(['./pc/safeTable.vue'], resolve) },
+  "safe-detail":(resolve) => { require(['./pc/safeDetail.vue'], resolve) },
+  "community-detail":(resolve) => { require(['./pc/communityDetail.vue'], resolve) },
+  "community-type-detail-g":(resolve) => { require(['./pc/communityTypeDetailG.vue'], resolve) },
+  "community-type-detail-m":(resolve) => { require(['./pc/communityTypeDetailM.vue'], resolve) },
+  "safe-statistics":(resolve) => { require(['./pc/safeStatistics.vue'], resolve) },
+  "safe-statistics-day":(resolve) => { require(['./pc/safeStatisticsDay.vue'], resolve) },
+  "safe-statistics-month":(resolve) => { require(['./pc/safeStatisticsMonth.vue'], resolve) },
+  "safe-statistics-year":(resolve) => { require(['./pc/safeStatisticsYear.vue'], resolve) },
+  "no-checkplan-safecheck":(resolve) => { require(['./pc/NoCheckplanSafecheck.vue'], resolve) },
+}
+exports.specialComp = specialComp
+
+
+
+