safecheck-client 3.0.34-4 → 3.0.34-43

package/src/components/defects/AddDefectModal.vue

@@ -1,120 +1,120 @@
-<template>
-  <modal :show.sync="$parent.showModal" v-ref:modal>
-    <div slot="modal-header" class="modal-header">
-      <h4 class="modal-title">
-        添加隐患
-      </h4>
-    </div>
-
-    <div slot="modal-body" class="modal-body">
-      <div class="row auto">
-        <validator name='v'>
-
-      <div class="form-group">
-      <label for="f_defect" class=" col-sm-3 control-label">隐患:</label>
-      <div class="col-sm-3">
-        <input class="form-control" type="text" v-model="model.f_defect" placeholder='隐患' v-validate:f_defect='{ required: true }'>
-      </div>
-
-      <label for="f_defect_level"  class="col-sm-3 control-label">隐患级别:</label>
-      <div class="col-sm-3">
-        <input class="form-control" type="text" v-model="model.f_defect_level" placeholder='例如：A1' v-validate:f_defect_level='{ required: true }'>
-      </div>
-
-    <div class="form-group">
-      <label for="f_defect_field"  class=" col-sm-3 control-label">隐患字段:</label>
-      <div class="col-sm-3">
-        <input class="form-control" type="text" v-model="model.f_defect_field" placeholder='例如：f_defect_field' v-validate:f_defect_field='{ required: true }'>
-      </div>
-
-      <label for="f_defect_path" class="col-sm-3 control-label">隐患照片路径字段:</label>
-      <div class="col-sm-3">
-        <input class="form-control" type="text" v-model="model.f_defect_path" placeholder='例如：f_defect_path' v-validate:f_defect_path='{ required: true }'>
-      </div>
-
-    </div>
-    <div class="form-group">
-      <label  class=" col-sm-3 control-label">设备类别:</label>
-      <div class="col-sm-3">
-        <v-select id="f_state" :value.sync="model.f_device_type"
-                  :options='devices'
-                  close-on-select clear-button></v-select>
-      </div>
-
-      <label  class="col-sm-3 control-label">设备:</label>
-      <div class="col-sm-3">
-        <input class="form-control" type="text" v-model="model.f_device_id" placeholder='设备' >
-      </div>
-
-    </div>
-    <div class="form-group">
-      <label  for="f_remark" class=" col-sm-3 control-label">备注:</label>
-      <div class="col-sm-3">
-        <input class="form-control" type="text" v-model="model.f_remark" placeholder='备注'>
-      </div>
-    </div>
-        </validator>
-      </div>
-    </div>
-    <div slot="modal-footer" class="modal-footer">
-      <button type="button" class="btn btn-primary" @click="addDefect" >保存</button>
-      <button type="button" class="btn btn-default" @click="$parent.undo()">取消</button>
-    </div>
-  </modal>
-</template>
-
-<script>
-  import Vue from 'vue'
-
-
-  export default {
-    title: '添加隐患信息',
-    props:['showModal'],
-    data() {
-      return {
-        model:{},
-        devices:[]
-      }
-    },
-    methods: {
-      addDefect() {
-        let errorring = true
-        if(this.model.f_defect_field)
-          if(this.model.f_defect_field.endsWith("_path")){
-            errorring = false
-            alert("隐患字段不能以 _path结尾")
-          }
-          if(errorring) {
-            if (this.model.f_defect_path) {
-              if (!this.model.f_defect_path.endsWith("_path")) {
-                errorring = false
-                alert("图片路径字段必须以 _path结尾")
-              }
-            }
-          }
-          if(errorring) {
-            this.$resetpost(`rs/logic/添加总隐患信息`,
-              {data: this.model},
-              {resolveMsg: null, rejectMsg: null}).then(
-              (response) => {
-                window.alert('添加隐患信息成功')
-              }
-            ).catch(
-              (response) => {
-                window.alert('添加隐患信息失败')
-              }
-            )
-          }
-        this.$parent.undo()
-      },
-    },
-    ready(){
-      let that = this
-      this.$resetpost("rs/logic/获取安检设备",{condition: '1 =1'}).then((respanse) => {
-        respanse.data.data.forEach((item)=>{
-          that.devices.push({label:item.f_device_name,value:item.f_device_name})
-        })
-    })
-  }
-  }
-</script>
+<template>
+  <modal :show.sync="$parent.showModal" v-ref:modal>
+    <div slot="modal-header" class="modal-header">
+      <h4 class="modal-title">
+        添加隐患
+      </h4>
+    </div>
+
+    <div slot="modal-body" class="modal-body">
+      <div class="row auto">
+        <validator name='v'>
+
+      <div class="form-group">
+      <label for="f_defect" class=" col-sm-3 control-label">隐患:</label>
+      <div class="col-sm-3">
+        <input class="form-control" type="text" v-model="model.f_defect" placeholder='隐患' v-validate:f_defect='{ required: true }'>
+      </div>
+
+      <label for="f_defect_level"  class="col-sm-3 control-label">隐患级别:</label>
+      <div class="col-sm-3">
+        <input class="form-control" type="text" v-model="model.f_defect_level" placeholder='例如：A1' v-validate:f_defect_level='{ required: true }'>
+      </div>
+
+    <div class="form-group">
+      <label for="f_defect_field"  class=" col-sm-3 control-label">隐患字段:</label>
+      <div class="col-sm-3">
+        <input class="form-control" type="text" v-model="model.f_defect_field" placeholder='例如：f_defect_field' v-validate:f_defect_field='{ required: true }'>
+      </div>
+
+      <label for="f_defect_path" class="col-sm-3 control-label">隐患照片路径字段:</label>
+      <div class="col-sm-3">
+        <input class="form-control" type="text" v-model="model.f_defect_path" placeholder='例如：f_defect_path' v-validate:f_defect_path='{ required: true }'>
+      </div>
+
+    </div>
+    <div class="form-group">
+      <label  class=" col-sm-3 control-label">设备类别:</label>
+      <div class="col-sm-3">
+        <v-select id="f_state" :value.sync="model.f_device_type"
+                  :options='devices'
+                  close-on-select clear-button></v-select>
+      </div>
+
+      <label  class="col-sm-3 control-label">设备:</label>
+      <div class="col-sm-3">
+        <input class="form-control" type="text" v-model="model.f_device_id" placeholder='设备' >
+      </div>
+
+    </div>
+    <div class="form-group">
+      <label  for="f_remark" class=" col-sm-3 control-label">备注:</label>
+      <div class="col-sm-3">
+        <input class="form-control" type="text" v-model="model.f_remark" placeholder='备注'>
+      </div>
+    </div>
+        </validator>
+      </div>
+    </div>
+    <div slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-primary" @click="addDefect" >保存</button>
+      <button type="button" class="btn btn-default" @click="$parent.undo()">取消</button>
+    </div>
+  </modal>
+</template>
+
+<script>
+  import Vue from 'vue'
+
+
+  export default {
+    title: '添加隐患信息',
+    props:['showModal'],
+    data() {
+      return {
+        model:{},
+        devices:[]
+      }
+    },
+    methods: {
+      addDefect() {
+        let errorring = true
+        if(this.model.f_defect_field)
+          if(this.model.f_defect_field.endsWith("_path")){
+            errorring = false
+            alert("隐患字段不能以 _path结尾")
+          }
+          if(errorring) {
+            if (this.model.f_defect_path) {
+              if (!this.model.f_defect_path.endsWith("_path")) {
+                errorring = false
+                alert("图片路径字段必须以 _path结尾")
+              }
+            }
+          }
+          if(errorring) {
+            this.$resetpost(`rs/logic/添加总隐患信息`,
+              {data: this.model},
+              {resolveMsg: null, rejectMsg: null}).then(
+              (response) => {
+                window.alert('添加隐患信息成功')
+              }
+            ).catch(
+              (response) => {
+                window.alert('添加隐患信息失败')
+              }
+            )
+          }
+        this.$parent.undo()
+      },
+    },
+    ready(){
+      let that = this
+      this.$resetpost("rs/logic/获取安检设备",{condition: '1 =1'}).then((respanse) => {
+        respanse.data.data.forEach((item)=>{
+          that.devices.push({label:item.f_device_name,value:item.f_device_name})
+        })
+    })
+  }
+  }
+</script>

package/src/components/defects/AddDevice.vue

@@ -1,95 +1,95 @@
-<template>
-  <modal :show.sync="$parent.showModal" v-ref:modal>
-    <div slot="modal-header" class="modal-header">
-      <h4 class="modal-title">
-        添加安检设备
-      </h4>
-    </div>
-    <div slot="modal-body" class="modal-body">
-      <div class="row auto">
-        <div class="form-group">
-          <label class=" col-sm-3 control-label">设备名称:</label>
-          <div class="col-sm-3">
-            <input class="form-control" type="text" v-model="model.f_defect" placeholder='设备名称'>
-          </div>
-          <label  class="col-sm-3 control-label">用户类型:</label>
-          <div class="col-sm-3">
-            <v-select id="f_user_type" :value.sync="model.f_user_type"
-                      :options='user_type'
-                      close-on-select clear-button></v-select>
-          </div>
-        </div>
-        <div class="form-group">
-          <label  class=" col-sm-3 control-label">设备保存字段:</label>
-          <div class="col-sm-3">
-            <input class="form-control" type="text" v-model="model.f_device_field" placeholder='例如：f_device_field'>
-          </div>
-
-          <label class="col-sm-3 control-label">是否必检:</label>
-          <div class="col-sm-3">
-            <input class="form-control" type="text" v-model="model.f_write_must" placeholder='是否必检'>
-          </div>
-        </div>
-    </div>
-    </div>
-    <div slot="modal-footer" class="modal-footer">
-      <button type="button" class="btn btn-primary" @click="addDevice" >保存</button>
-      <button type="button" class="btn btn-default" @click="$parent.undo()">取消</button>
-    </div>
-  </modal>
-</template>
-
-<script>
-  import Vue from 'vue'
-
-
-  export default {
-    title: '添加设备信息',
-    data() {
-      return {
-        model:{},
-        devices:[]
-      }
-    },
-    methods: {
-      addDevice() {
-        let errorring = true
-        if(this.model.f_defect_field)
-          if(this.model.f_defect_field.endsWith("_path")){
-            errorring = false
-            alert("隐患字段不能以 _path结尾")
-          }
-        if(errorring) {
-          if (this.model.f_defect_path) {
-            if (!this.model.f_defect_path.endsWith("_path")) {
-              errorring = false
-              alert("图片路径字段必须以 _path结尾")
-            }
-          }
-        }
-        if(errorring) {
-          this.$resetpost('rs/entity/t_device_info',
-            {data: this.model},
-            {resolveMsg: null, rejectMsg: null}).then(
-            (response) => {
-              window.alert('添加隐患信息成功')
-            }
-          ).catch(
-            (response) => {
-              window.alert('添加隐患信息失败')
-            }
-          )
-        }
-        this.$parent.undo()
-      },
-    },
-    ready(){
-      let that = this
-      this.$resetpost("rs/logic/获取安检设备",{condition: '1 =1'}).then((respanse) => {
-        respanse.data.data.forEach((item)=>{
-          that.devices.push({label:item.f_device_name,value:item.f_device_name})
-        })
-      })
-    }
-  }
-</script>
+<template>
+  <modal :show.sync="$parent.showModal" v-ref:modal>
+    <div slot="modal-header" class="modal-header">
+      <h4 class="modal-title">
+        添加安检设备
+      </h4>
+    </div>
+    <div slot="modal-body" class="modal-body">
+      <div class="row auto">
+        <div class="form-group">
+          <label class=" col-sm-3 control-label">设备名称:</label>
+          <div class="col-sm-3">
+            <input class="form-control" type="text" v-model="model.f_defect" placeholder='设备名称'>
+          </div>
+          <label  class="col-sm-3 control-label">用户类型:</label>
+          <div class="col-sm-3">
+            <v-select id="f_user_type" :value.sync="model.f_user_type"
+                      :options='user_type'
+                      close-on-select clear-button></v-select>
+          </div>
+        </div>
+        <div class="form-group">
+          <label  class=" col-sm-3 control-label">设备保存字段:</label>
+          <div class="col-sm-3">
+            <input class="form-control" type="text" v-model="model.f_device_field" placeholder='例如：f_device_field'>
+          </div>
+
+          <label class="col-sm-3 control-label">是否必检:</label>
+          <div class="col-sm-3">
+            <input class="form-control" type="text" v-model="model.f_write_must" placeholder='是否必检'>
+          </div>
+        </div>
+    </div>
+    </div>
+    <div slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-primary" @click="addDevice" >保存</button>
+      <button type="button" class="btn btn-default" @click="$parent.undo()">取消</button>
+    </div>
+  </modal>
+</template>
+
+<script>
+  import Vue from 'vue'
+
+
+  export default {
+    title: '添加设备信息',
+    data() {
+      return {
+        model:{},
+        devices:[]
+      }
+    },
+    methods: {
+      addDevice() {
+        let errorring = true
+        if(this.model.f_defect_field)
+          if(this.model.f_defect_field.endsWith("_path")){
+            errorring = false
+            alert("隐患字段不能以 _path结尾")
+          }
+        if(errorring) {
+          if (this.model.f_defect_path) {
+            if (!this.model.f_defect_path.endsWith("_path")) {
+              errorring = false
+              alert("图片路径字段必须以 _path结尾")
+            }
+          }
+        }
+        if(errorring) {
+          this.$resetpost('rs/entity/t_device_info',
+            {data: this.model},
+            {resolveMsg: null, rejectMsg: null}).then(
+            (response) => {
+              window.alert('添加隐患信息成功')
+            }
+          ).catch(
+            (response) => {
+              window.alert('添加隐患信息失败')
+            }
+          )
+        }
+        this.$parent.undo()
+      },
+    },
+    ready(){
+      let that = this
+      this.$resetpost("rs/logic/获取安检设备",{condition: '1 =1'}).then((respanse) => {
+        respanse.data.data.forEach((item)=>{
+          that.devices.push({label:item.f_device_name,value:item.f_device_name})
+        })
+      })
+    }
+  }
+</script>

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>