safecheck-client 4.0.0-99 → 4.0.1-10

package/src/components/Hello.vue

@@ -1,39 +1,39 @@
-<template>
-  <div class="hello">这是自己
-    <h1>Welcome to Your Vue.js App{{msg}} </h1>
-  </div>
-</template>
-
-<script>
-export default {
-  title: 'Hello',
-  name: 'hello',
-  props: ['msg'],
-  methods: {
-    toTable () {
-      this.$back()
-    }
-  }
-}
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-h1, h2 {
-  font-weight: normal;
-}
-
-ul {
-  list-style-type: none;
-  padding: 0;
-}
-
-li {
-  display: inline-block;
-  margin: 0 10px;
-}
-
-a {
-  color: #42b983;
-}
-</style>
+<template>
+  <div class="hello">这是自己
+    <h1>Welcome to Your Vue.js App{{msg}} </h1>
+  </div>
+</template>
+
+<script>
+export default {
+  title: 'Hello',
+  name: 'hello',
+  props: ['msg'],
+  methods: {
+    toTable () {
+      this.$back()
+    }
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped>
+h1, h2 {
+  font-weight: normal;
+}
+
+ul {
+  list-style-type: none;
+  padding: 0;
+}
+
+li {
+  display: inline-block;
+  margin: 0 10px;
+}
+
+a {
+  color: #42b983;
+}
+</style>

package/src/components/LeftTree.vue

@@ -1,27 +1,27 @@
-<template>
-  <div class='over'>
-    <tree :model='functions.functions' :is-click="false">
-      <span partial>{{row.data.name}}</span>
-    </tree>
-  </div>
-</template>
-
-<script>
-export default {
-  props: ['functions'],
-  title: '左侧树菜单',
-  methods: {
-    open (row) {
-      if (row.data.link) {
-        this.$goto(row.data.link, {f: this.functions}, 'home-page')
-      }
-    }
-  },
-  events: {
-    'select-changed': function (data) {
-      // 事件回调内的 `this` 自动绑定到注册它的实例上
-      this.open(data.val)
-    }
-  }
-}
-</script>
+<template>
+  <div class='over'>
+    <tree :model='functions.functions' :is-click="false">
+      <span partial>{{row.data.name}}</span>
+    </tree>
+  </div>
+</template>
+
+<script>
+export default {
+  props: ['functions'],
+  title: '左侧树菜单',
+  methods: {
+    open (row) {
+      if (row.data.link) {
+        this.$goto(row.data.link, {f: this.functions}, 'home-page')
+      }
+    }
+  },
+  events: {
+    'select-changed': function (data) {
+      // 事件回调内的 `this` 自动绑定到注册它的实例上
+      this.open(data.val)
+    }
+  }
+}
+</script>

package/src/components/NewDefectList/DefectListNew.vue

@@ -278,6 +278,9 @@ const sendRepair = function* (self) {
     uploadData.model.f_meetunit = preData.f_meetunit
     uploadData.model.f_orgstr = preData.f_reciever
     uploadData.model.f_outlets = preData.f_outlets
+    uploadData.model.f_orgid = self.$login.f.orgid
+    uploadData.model.f_filiale = self.$login.f.org
+    uploadData.model.f_filiale_id = self.$login.f.orgid
   } else if (preData.dispatchType == '派发给维修员') {
     uploadData.model.serviceacitivity[0].f_reciever = preData.f_repairman
     // uploadData.model.f_meetunit = self.$login.f.orgpathnames

package/src/components/NewDefectList/DefectPaperNew.vue

@@ -154,7 +154,28 @@
               <label class="font_normal_body">小区名称：</label>
               <input style="width: 60%" class="input_search" v-model="model.f_residential_area" placeholder="请输入小区（可模糊查询）" condition="f_residential_area like '%{}%'">
             </div>
-
+            <div :class="$parent.$parent.style"  >
+              <label class="font_normal_body">检&ensp;查&ensp;项</label>
+              <v-select :value.sync="model.f_device_type"
+                        v-model="model.f_device_type"
+                        style="width: 60%"
+                        class="select_list select"
+                        :options='$parent.$parent.device_types'
+                        placeholder='检查项'
+                        :multiple="true"
+              ></v-select>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">隐患名称</label>
+              <v-select :value.sync="model.f_item_name"
+                        v-model='model.f_item_name'
+                        style="width: 60%"
+                        class="select_list select"
+                        :options='$parent.$parent.DefectConfigs'
+                        placeholder='隐患名称'
+                        :multiple="true"
+              ></v-select>
+            </div>
           </div>
 
 
@@ -313,6 +334,28 @@
                 <input style="width: 60%" class="input_search" v-model="model.f_residential_area" placeholder="请输入小区（可模糊查询）" condition="f_residential_area like '%{}%'">
               </div>
             </div>
+            <div :class="$parent.$parent.style"  >
+              <label class="font_normal_body">检&ensp;查&ensp;项</label>
+              <v-select :value.sync="model.f_device_type"
+                        v-model="model.f_device_type"
+                        style="width: 60%"
+                        class="select_list select"
+                        :options='$parent.$parent.device_types'
+                        placeholder='检查项'
+                        :multiple="true"
+              ></v-select>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">隐患名称</label>
+              <v-select :value.sync="model.f_item_name"
+                        v-model='model.f_item_name'
+                        style="width: 60%"
+                        class="select_list select"
+                        :options='$parent.$parent.DefectConfigs'
+                        placeholder='隐患名称'
+                        :multiple="true"
+              ></v-select>
+            </div>
           </div>
         </div>
       </criteria>
@@ -464,7 +507,22 @@ import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
 import co from 'co'
 import Vue from 'vue'
 import * as Util from '../../components/Util'
-
+import {isEmpty} from '../../components/Util'
+let asyncReady = async function (self) {
+  // 获取配置信息
+  try {
+    let res = await new HttpResetClass().load('get','/api/af-safecheck/vue',null, {resolveMsg: null, rejectMsg: null})
+    self.delConfigKey(res.data)
+    Vue.config.safecheck=res.data
+    self.getDefectInfoConfig(res.data)
+    console.log('获取配置结果===', res.data)
+  } catch (error) {
+    // 忽略704,文件找不到异常R
+    if (error.status !== 704) {
+      throw error
+    }
+  }
+}
 let select = function* (self) {
   let http = new HttpResetClass()
   let getGasman = yield http.load('POST', '/rs/search', {
@@ -481,7 +539,7 @@ export default {
   title: '隐患查询',
   data() {
     let model = new PagedList('api/af-safecheck/sql/GetCheckPaperByDefectNew', 20, {
-      f_filialeids: 'this.f_filialeids',f_defect_content: 'this.f_defect_content'
+      f_filialeids: 'this.f_filialeids',f_defect_content: 'this.f_defect_content',condition1:'this.condition1',
     })
     model.f_filialeids = '(' + this.$login.f.orgid + ')'
     model.f_defect_content="CASE WHEN CHARINDEX( '\"result\":\"正常\"', f_defect_content ) > 0 THEN '无隐患' ELSE replace(replace(replace( replace( RIGHT ( f_defect_content, len( f_defect_content ) - 26 ), substring('{}',2,1), '' ), substring('{}',1,1), '' ),']',''),'\"','') END"
@@ -524,6 +582,9 @@ export default {
       repairedOptions:[{label: '全部', value: ''},{label: '已修', value: '已修'}, {label: '未修', value: '未修'}],
       repairers:[],
       cbcs:[],
+      DefectConfig:'' ,
+      DefectConfigs:[{label:'全部',value:''},{label: '金额异常差值', value: '金额异常差值'},{label: '气量异常差值', value: '气量异常差值'}],
+      device_types:[{label:'全部',value:''}],
       thead: '',
       headData: ['入户状态','用户编号','用户名','用户电话','用户小区','用户地址','安检时间','安检员','计划名','是否有隐患','隐患数','隐患明细','处理数','完成数','处理情况','完成情况','维修员'],
       bodyData: ['f_entry_status','f_userinfo_code','f_user_name','f_user_phone','f_residential_area','f_address','f_offsite_time','f_checker_name','f_plan_name','f_has_defect','f_defect_count','defecttext','f_deal_count','f_repair_count','f_is_deal','f_is_repair','f_repairman'],
@@ -582,6 +643,39 @@ export default {
       }
       return result
     },
+    readConfig() {
+      let gen = asyncReady(this)
+      return co(gen)
+    },
+    delConfigKey(obj){
+      // 从琉璃中获取的配置中会包含 $开头的一些额外描述新的key。为了兼容v3的代码逻辑在此函数中去掉
+      Object.keys(obj).forEach(key =>{
+        Object.keys(obj[key]).forEach(col => {
+          // 检查键是否以$开头
+          if (col.startsWith('$')) {
+            // 使用delete操作符删除键
+            delete obj[key][col];
+          }
+        })
+      })
+    },
+    getDefectInfoConfig(val){
+      try {
+        if (val.DevicesSetConfig != undefined) {
+          this.DefectConfig = val.DevicesConfig
+          // 获取到配置项，进行遍历，获取每个隐患项
+          for (var Key1 in this.DefectConfig){
+            this.device_types.push({label:Key1,value:Key1})
+            for(var Key2 in this.DefectConfig[Key1].items){
+              this.DefectConfigs.push({label:Key2,value:Key2})
+            }
+          }
+          // 非民用或其他配置项加入，在进行遍历
+        }
+      }catch (e) {
+        //tag
+      }
+    },
     getEmp() {
       let val = {source: 'this.getParentByType($organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$)!=null ).where(row.getAttributes().get($rolestr$).indexOf($维修员$) != -1))', userid: `${this.$login.f.id}`}
       let http = new HttpResetClass()
@@ -1002,12 +1096,22 @@ export default {
       this.criteriaShow = !this.criteriaShow
     },
     search(args) {
+      let condition1 = '1=1'
+      if (!isEmpty(args.model.f_device_type)) {
+        condition1 += ` and f_device_type in (${args.model.f_device_type.map(item=>{return `'${item}'`}).join()})`
+        args.condition += 'and f_paper_device_num > 0'
+      }
+      if (!isEmpty(args.model.f_item_name)) {
+        condition1 += ` and f_item_name in (${args.model.f_item_name.map(item=>{return `'${item}'`}).join()})`
+        args.condition += 'and f_paper_device_num > 0'
+      }
       //tag
       if (this.f_check_plan.f_plan_name) {
         args.condition += ` and f_check_plan_id = '${this.f_check_plan.id}'`
       }
       this.checkes = []
       this.checkAll=false
+      this.model.condition1 = condition1
       this.model.search(args.condition, args.model)
     },
     getRes(obj) {
@@ -1032,6 +1136,7 @@ export default {
     }
   },
   ready() {
+    this.readConfig()
     //tag
     this.transfer=Vue.$appdata.getSingleValue('安检转工单')
     this.$refs.paged.$refs.criteria.model.f_has_defect = '有隐患'