safecheck-client 3.0.33-99 → 3.0.34-1

package/src/components/defects/DevicesSeting.vue

@@ -1,106 +1,106 @@
-<template>
-  <div class="over col-md-6">
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='search'>
-        <form class="form-inline" partial>
-          <div class="form-group">
-            <label class="control-label">设备</label>
-            <v-select id="f_device_name" :value.sync="$parent.$parent.model.f_device_name"
-                      condition="f_device_name={}"
-                      placeholder="设备" :options='$parent.$parent.devices_list' close-on-select clear-button> </v-select>
-          </div>
-          <div class="form-group">
-            <label class="control-label">用户类型</label>
-            <v-select id="f_user_type" :value.sync="$parent.$parent.model.f_user_type" placeholder='用户类型'
-                      condition="f_user_type={}"
-                      :options='$parent.$parent.user_types' close-on-select clear-button> </v-select>
-          </div>
-          <div class="form-group">
-            <label class="control-label">是否必检</label>
-            <v-select id="f_write_must" :value.sync="$parent.$parent.f_write_must" placeholder='是否必检'
-                      condition="f_write_must={}"
-                      :options='$parent.$parent.write_must' close-on-select clear-button> </v-select>
-          </div>
-          <div class="form-group">
-            <button type="button" class="btn btn-success width-80" @click="search()">查询</button>
-            <button type="button" class="btn btn-default width-80" @click="showMo()">新增</button>
-          </div>
-        </form>
-      </criteria>
-      <data-grid :model="model" partial='list'  v-ref:grid>
-        <template partial='head'>
-          <tr>
-            <th>设备</th>
-            <th>用户类型</th>
-            <th>保存字段</th>
-            <th>是否必检</th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <td @click="$parent.$parent.$parent.checkitem(row)">{{row.f_device_name}}</td>
-          <td @click="$parent.$parent.$parent.checkitem(row)">{{row.f_user_type}}</td>
-          <td @click="$parent.$parent.$parent.checkitem(row)">{{row.f_device_field}}</td>
-          <td @click="$parent.$parent.$parent.checkitem(row)">{{row.f_write_must}}</td>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-  <div  class="span-row over col-md-6">
-    <devices-and-item ></devices-and-item>
-  </div>
-  <add-devices></add-devices>
-</template>
-<script>
-  import { PagedList } from 'vue-client'
-  import co from 'co'
-  import Vue from 'vue'
-  import * as Util from '../Util'
-  import DevicesAndItem from "./DevicesAndItem";
-
-  let syncDelete = function * (self,row) {
-    yield self.$remove('rs/entity/t_defect_info/', {id: row.id})
-    self.$refs.paged.$refs.criteria.search()
-  }
-
-  export default {
-    components: {DevicesAndItem},
-    title: '安检项配置',
-    data () {
-      return {
-        model:new PagedList('rs/path/getDevices',20) ,
-        user_types: this.$appdata.getParam('用户类型'),
-        write_must: this.$appdata.getParam('是否必检'),
-        devices_list:[],
-        device:[],
-        showModal:false
-      }
-    },
-    ready(){
-      this.$resetpost("rs/logic/获取安检设备",{condition: '1 =1'}).then((respanse) => {
-        respanse.data.data.forEach((item)=>{
-          this.devices_list.push({label:item.f_device_name,value:item.f_device_name})
-        })
-      })
-    },
-    computed: {
-      selected () {
-        return this.$refs.paged.$refs.grid.selected
-      }
-    },
-    methods:{
-      checkitem(row){
-      this.$set('device',row.f_device_item)
-      },
-      showMo () {
-        this.showModal = true
-      },
-      delete(row){
-        let gen = syncDelete(this,row)
-        return co(gen)
-      },
-      undo(){
-        this.showModal = false
-      },
-    }
-  }
-</script>
+<template>
+  <div class="over col-md-6">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='search'>
+        <form class="form-inline" partial>
+          <div class="form-group">
+            <label class="control-label">设备</label>
+            <v-select id="f_device_name" :value.sync="$parent.$parent.model.f_device_name"
+                      condition="f_device_name={}"
+                      placeholder="设备" :options='$parent.$parent.devices_list' close-on-select clear-button> </v-select>
+          </div>
+          <div class="form-group">
+            <label class="control-label">用户类型</label>
+            <v-select id="f_user_type" :value.sync="$parent.$parent.model.f_user_type" placeholder='用户类型'
+                      condition="f_user_type={}"
+                      :options='$parent.$parent.user_types' close-on-select clear-button> </v-select>
+          </div>
+          <div class="form-group">
+            <label class="control-label">是否必检</label>
+            <v-select id="f_write_must" :value.sync="$parent.$parent.f_write_must" placeholder='是否必检'
+                      condition="f_write_must={}"
+                      :options='$parent.$parent.write_must' close-on-select clear-button> </v-select>
+          </div>
+          <div class="form-group">
+            <button type="button" class="btn btn-success width-80" @click="search()">查询</button>
+            <button type="button" class="btn btn-default width-80" @click="showMo()">新增</button>
+          </div>
+        </form>
+      </criteria>
+      <data-grid :model="model" partial='list'  v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th>设备</th>
+            <th>用户类型</th>
+            <th>保存字段</th>
+            <th>是否必检</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td @click="$parent.$parent.$parent.checkitem(row)">{{row.f_device_name}}</td>
+          <td @click="$parent.$parent.$parent.checkitem(row)">{{row.f_user_type}}</td>
+          <td @click="$parent.$parent.$parent.checkitem(row)">{{row.f_device_field}}</td>
+          <td @click="$parent.$parent.$parent.checkitem(row)">{{row.f_write_must}}</td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+  <div  class="span-row over col-md-6">
+    <devices-and-item ></devices-and-item>
+  </div>
+  <add-devices></add-devices>
+</template>
+<script>
+  import { PagedList } from 'vue-client'
+  import co from 'co'
+  import Vue from 'vue'
+  import * as Util from '../Util'
+  import DevicesAndItem from "./DevicesAndItem";
+
+  let syncDelete = function * (self,row) {
+    yield self.$remove('rs/entity/t_defect_info/', {id: row.id})
+    self.$refs.paged.$refs.criteria.search()
+  }
+
+  export default {
+    components: {DevicesAndItem},
+    title: '安检项配置',
+    data () {
+      return {
+        model:new PagedList('rs/path/getDevices',20) ,
+        user_types: this.$appdata.getParam('用户类型'),
+        write_must: this.$appdata.getParam('是否必检'),
+        devices_list:[],
+        device:[],
+        showModal:false
+      }
+    },
+    ready(){
+      this.$resetpost("rs/logic/获取安检设备",{condition: '1 =1'}).then((respanse) => {
+        respanse.data.data.forEach((item)=>{
+          this.devices_list.push({label:item.f_device_name,value:item.f_device_name})
+        })
+      })
+    },
+    computed: {
+      selected () {
+        return this.$refs.paged.$refs.grid.selected
+      }
+    },
+    methods:{
+      checkitem(row){
+      this.$set('device',row.f_device_item)
+      },
+      showMo () {
+        this.showModal = true
+      },
+      delete(row){
+        let gen = syncDelete(this,row)
+        return co(gen)
+      },
+      undo(){
+        this.showModal = false
+      },
+    }
+  }
+</script>

package/src/components/issueplan/IssuePlanMain.vue

@@ -1,23 +1,23 @@
-<template>
-  <div class="flex">
-    <section>
-      <div class="flex-row">
-        <div class="over col-md-6">
-          <issue-plan-query  v-ref:query ></issue-plan-query>
-        </div>
-        <div class="span-row over col-md-6">
-          <issue-plan-action :item='$refs.query.selected' ></issue-plan-action>
-        </div>
-      </div>
-    </section>
-  </div>
-</template>
-<script>
-import IssuePlanAction from './IssuePlanAction'
-import IssuePlanQuery from './IssuePlanQuery'
-export default {
-  title: '下发计划',
-  props: ['f'],
-  components: { IssuePlanAction, IssuePlanQuery }
-}
-</script>
+<template>
+  <div class="flex">
+    <section>
+      <div class="flex-row">
+        <div class="over col-md-6">
+          <issue-plan-query  v-ref:query ></issue-plan-query>
+        </div>
+        <div class="span-row over col-md-6">
+          <issue-plan-action :item='$refs.query.selected' ></issue-plan-action>
+        </div>
+      </div>
+    </section>
+  </div>
+</template>
+<script>
+import IssuePlanAction from './IssuePlanAction'
+import IssuePlanQuery from './IssuePlanQuery'
+export default {
+  title: '下发计划',
+  props: ['f'],
+  components: { IssuePlanAction, IssuePlanQuery }
+}
+</script>

package/src/components/map/checkScreen.vue

@@ -445,13 +445,15 @@ export default {
 
 
       let a3=[]
-      for(let i=0;i<this.level2.length;i++){
-        a3.push({
-          lnglat: [this.level2[i].f_longitude,this.level2[i].f_latitude], //点标记位置
-          name: '二级隐患',
-          id:i,
-          rowstr:this.level2[i]
-        })
+      for(let o=0;o<this.level2.length;o++){
+        if (this.level2[o].f_longitude && this.level2[o].f_latitude){
+          a3.push({
+            lnglat: [this.level2[o].f_longitude,this.level2[o].f_latitude], //点标记位置
+            name: '二级隐患',
+            id:o,
+            rowstr:this.level2[o]
+          })
+        }
       }
       // 将数组设置到 massMarks 图层
       this.level2Mulchs.setData(a3);
@@ -459,13 +461,15 @@ export default {
       this.level2Mulchs.setMap(this.map);
 
       let a4=[]
-      for(let i=0;i<this.level3.length;i++){
-        a4.push({
-          lnglat: [this.level3[i].f_longitude, this.level3[i].f_latitude], //点标记位置
-          name: '三级隐患',
-          id:i,
-          rowstr:this.level3[i]
-        })
+      for(let p=0;p<this.level3.length;p++){
+        if (this.level3[p].f_longitude&&this.level3[p].f_latitude){
+          a4.push({
+            lnglat: [this.level3[p].f_longitude, this.level3[p].f_latitude], //点标记位置
+            name: '三级隐患',
+            id:p,
+            rowstr:this.level3[p]
+          })
+        }
       }
       // 将数组设置到 massMarks 图层
       this.level3Mulchs.setData(a4);
@@ -474,13 +478,15 @@ export default {
 
 
       let a5=[]
-      for(let i=0;i<this.problems.length;i++){
-        a5.push({
-          lnglat: [this.problems[i].f_longitude, this.problems[i].f_latitude], //点标记位置
-          name: '普通问题',
-          id:i,
-          rowstr:this.problems[i]
-        })
+      for(let l=0;l<this.problems.length;l++){
+        if (this.problems[l].f_longitude&&this.problems[l].f_latitude){
+          a5.push({
+            lnglat: [this.problems[l].f_longitude, this.problems[l].f_latitude], //点标记位置
+            name: '普通问题',
+            id:l,
+            rowstr:this.problems[l]
+          })
+        }
       }
       // 将数组设置到 massMarks 图层
       this.problemsMulchs.setData(a5);