safecheck-client 3.0.34-6 → 3.0.34-7

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/DefectModal.vue

@@ -1,101 +1,101 @@
-<template>
-  <modal :show.sync="$parent.show" 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-12 control-label">隐患级别：</label>
-        <div class="col-sm-12">{{defect.f_defect_level}}</div>
-      </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label text-left">隐患：</label>
-        <div class="col-sm-12">{{defect.f_defect}}</div>
-      </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label">部位：</label>
-        <div class="col-sm-12">{{defect.f_device_type}}</div>
-      </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label">处理方式：</label>
-        <div class="col-sm-12">
-          <radio-group :value.sync="defect.f_resolve_type" type="success" buttons="false" disabled="disabled">
-          <radio disabled="disabled" v-if="defect.f_resolve_type =='现场处理'" value="现场处理">现场处理</radio>
-          <radio disabled="disabled" v-if="defect.f_resolve_type =='用户处理'" value="用户处理">用户处理</radio>
-          <radio disabled="disabled" v-if="defect.f_resolve_type =='维修处理'"  value="维修处理">维修处理</radio>
-        </radio-group></div>
-      </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label">整改结果：</label>
-        <div class="col-sm-12">
-          <v-select id="f_ratification" :value.sync="f_ratification"
-                    :options='ratifications' close-on-select clear-button></v-select></div>
-      </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label">处理人：</label>
-        <div class="col-sm-12">
-          <input type="text" class="form-control" v-model="defect.f_ratifiedpeople" maxlength="20">
-          <!--<chooser :userid.sync='f.id' v-model="defect.f_ratifiedpeople" resource-type="user" :width='200' :select-data.sync='chosenOrg'></chooser>-->
-        </div>
-      </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label">处理时间：</label>
-        <div class="col-sm-12"><datepicker id="f_end"
-                      :value.sync="defect.f_ratifieddate"
-                      :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'"></datepicker></div>
-        </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label">备注：</label>
-        <div class="col-sm-12"><textarea  class="form-control"  v-model="defect.f_remark" rows="3"></textarea></div>
-      </div>
-      </div>
-    </div>
-    <div slot="modal-footer" class="modal-footer">
-      <button type="button" class="btn btn-default" @click="$parent.todo(defect)" v-if="!defect.flag">保存</button>
-      <button type="button" class="btn btn-default" @click="$parent.undo">取消</button>
-    </div>
-  </modal>
-</template>
-
-<script>
-  import { PagedList } from 'vue-client'
-  import Vue from 'vue'
-  import * as Util from '../Util'
-  import RadioGroup from 'vue-client/src/vue-strap/src/radioGroup'
-  import Radio from 'vue-client/src/vue-strap/src/radioBtn'
-
-  export default {
-        title:'隐患处理',
-        props:['defect','f'],
-    data(){
-          return {
-            model: {},
-            chosenOrg:{id:0},
-            ratifications:[
-                {label: '请选择处理结果', value: null},
-                {label: '未处理', value: '未处理'},
-                {label: '已处理', value: '已处理'},
-              ],
-          }
-    },
-    components: {
-      RadioGroup,
-      Radio
-    },
-    watch:{
-         'f_ratification'(val){
-            if(this.defect.f_ratification)
-              this.defect.f_ratification = this.f_ratification[0]
-          },
-          'defect'(val){
-            this.defect.id = this.defect.defectid
-            this.f_ratification = this.defect.ratification
-            this.defect.f_remark = this.defect.remark
-        }
-     },
-    }
-</script>
-
+<template>
+  <modal :show.sync="$parent.show" 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-12 control-label">隐患级别：</label>
+        <div class="col-sm-12">{{defect.f_defect_level}}</div>
+      </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label text-left">隐患：</label>
+        <div class="col-sm-12">{{defect.f_defect}}</div>
+      </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label">部位：</label>
+        <div class="col-sm-12">{{defect.f_device_type}}</div>
+      </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label">处理方式：</label>
+        <div class="col-sm-12">
+          <radio-group :value.sync="defect.f_resolve_type" type="success" buttons="false" disabled="disabled">
+          <radio disabled="disabled" v-if="defect.f_resolve_type =='现场处理'" value="现场处理">现场处理</radio>
+          <radio disabled="disabled" v-if="defect.f_resolve_type =='用户处理'" value="用户处理">用户处理</radio>
+          <radio disabled="disabled" v-if="defect.f_resolve_type =='维修处理'"  value="维修处理">维修处理</radio>
+        </radio-group></div>
+      </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label">整改结果：</label>
+        <div class="col-sm-12">
+          <v-select id="f_ratification" :value.sync="f_ratification"
+                    :options='ratifications' close-on-select clear-button></v-select></div>
+      </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label">处理人：</label>
+        <div class="col-sm-12">
+          <input type="text" class="form-control" v-model="defect.f_ratifiedpeople" maxlength="20">
+          <!--<chooser :userid.sync='f.id' v-model="defect.f_ratifiedpeople" resource-type="user" :width='200' :select-data.sync='chosenOrg'></chooser>-->
+        </div>
+      </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label">处理时间：</label>
+        <div class="col-sm-12"><datepicker id="f_end"
+                      :value.sync="defect.f_ratifieddate"
+                      :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'"></datepicker></div>
+        </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label">备注：</label>
+        <div class="col-sm-12"><textarea  class="form-control"  v-model="defect.f_remark" rows="3"></textarea></div>
+      </div>
+      </div>
+    </div>
+    <div slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-default" @click="$parent.todo(defect)" v-if="!defect.flag">保存</button>
+      <button type="button" class="btn btn-default" @click="$parent.undo">取消</button>
+    </div>
+  </modal>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  import Vue from 'vue'
+  import * as Util from '../Util'
+  import RadioGroup from 'vue-client/src/vue-strap/src/radioGroup'
+  import Radio from 'vue-client/src/vue-strap/src/radioBtn'
+
+  export default {
+        title:'隐患处理',
+        props:['defect','f'],
+    data(){
+          return {
+            model: {},
+            chosenOrg:{id:0},
+            ratifications:[
+                {label: '请选择处理结果', value: null},
+                {label: '未处理', value: '未处理'},
+                {label: '已处理', value: '已处理'},
+              ],
+          }
+    },
+    components: {
+      RadioGroup,
+      Radio
+    },
+    watch:{
+         'f_ratification'(val){
+            if(this.defect.f_ratification)
+              this.defect.f_ratification = this.f_ratification[0]
+          },
+          'defect'(val){
+            this.defect.id = this.defect.defectid
+            this.f_ratification = this.defect.ratification
+            this.defect.f_remark = this.defect.remark
+        }
+     },
+    }
+</script>
+

package/src/components/defects/DevicesAndItem.vue

@@ -1,39 +1,39 @@
-<template>
-<div>
-    <table class="table table-bordered table-hover">
-      <thead>
-      <tr>
-          <th>检查项</th>
-          <th>数据字段</th>
-          <th>数据类型</th>
-          <th>是否必检</th>
-      </tr>
-      </thead>
-      <tbody v-for=" row in model">
-      <tr>
-        <td>{{row.f_item_name}}</td>
-        <td>{{row.f_item_field}}</td>
-        <td>{{row.f_item_type}}</td>
-        <td>{{row.f_write_must}}</td>
-      </tr>
-        </tbody>
-    </table>
-</div>
-</template>
-
-<script>
-
-  export default {
-    title: '安检设备项列表',
-    data () {
-      return {
-        model:this.$parent.device
-      }
-    },
-  watch:{
-    '$parent.device'(val){
-      this.model = val
-    },
-  }
-  }
-</script>
+<template>
+<div>
+    <table class="table table-bordered table-hover">
+      <thead>
+      <tr>
+          <th>检查项</th>
+          <th>数据字段</th>
+          <th>数据类型</th>
+          <th>是否必检</th>
+      </tr>
+      </thead>
+      <tbody v-for=" row in model">
+      <tr>
+        <td>{{row.f_item_name}}</td>
+        <td>{{row.f_item_field}}</td>
+        <td>{{row.f_item_type}}</td>
+        <td>{{row.f_write_must}}</td>
+      </tr>
+        </tbody>
+    </table>
+</div>
+</template>
+
+<script>
+
+  export default {
+    title: '安检设备项列表',
+    data () {
+      return {
+        model:this.$parent.device
+      }
+    },
+  watch:{
+    '$parent.device'(val){
+      this.model = val
+    },
+  }
+  }
+</script>