safecheck-client 3.1.1-gaomi-7 → 4.0.1

package/src/components/defect/ImgButton.vue

@@ -11,8 +11,10 @@
                 <button type="button" name="button" class="btn btn-primary" @click="rightRevolve()" :id="'vc-imgself-rightRevolve-'+attach">向右旋转</button>
                 <button type="button" name="button" class="btn btn-primary" @click="close()" :id="'vc-imgself-close-'+attach">关闭</button>
             </div>
+
         </div>
     </div>
+
 </template>
 
 <script>
@@ -24,6 +26,9 @@
       src: {
         type: String
       },
+      src1: {
+        type: String
+      },
       width: {
         default: 60
       },
@@ -51,9 +56,8 @@
     },
     methods: {
       open () {
-
         this.deg = 0
-        this.power = 0.25
+        this.power = 0.5
         this.show = true
       },
       close () {
@@ -113,6 +117,6 @@
         margin-right: 20px;
     }
     .img-state {
-    transform: rotate(0deg) scale(0.25 ,0.25)
+
     }
 </style>

package/src/components/defects/AddDefectModal.vue

@@ -93,7 +93,7 @@
             }
           }
           if(errorring) {
-            this.$resetpost(`rs/logic/添加总隐患信息`,
+            this.$resetpost(`api/af-safecheck/logic/添加总隐患信息`,
               {data: this.model},
               {resolveMsg: null, rejectMsg: null}).then(
               (response) => {
@@ -110,7 +110,7 @@
     },
     ready(){
       let that = this
-      this.$resetpost("rs/logic/获取安检设备",{condition: '1 =1'}).then((respanse) => {
+      this.$resetpost("api/af-safecheck/logic/获取安检设备",{condition: '1 =1'}).then((respanse) => {
         respanse.data.data.forEach((item)=>{
           that.devices.push({label:item.f_device_name,value:item.f_device_name})
         })

package/src/components/defects/AddDevice.vue

@@ -85,7 +85,7 @@
     },
     ready(){
       let that = this
-      this.$resetpost("rs/logic/获取安检设备",{condition: '1 =1'}).then((respanse) => {
+      this.$resetpost("api/af-safecheck/logic/获取安检设备",{condition: '1 =1'}).then((respanse) => {
         respanse.data.data.forEach((item)=>{
           that.devices.push({label:item.f_device_name,value:item.f_device_name})
         })

package/src/components/defects/CheckPaperItem.vue

@@ -36,7 +36,7 @@
       </partial-view>
     </div>
     <check-paper-items :row="rowdata"></check-paper-items>
-    <!--<work-history :row-one="workhistoryid" v-if="repaierShow"></work-history>-->
+    <work-history :row-one="workhistoryid" v-if="repaierShow"></work-history>
   </div>
 </template>
 
@@ -44,11 +44,11 @@
   import Vue from 'vue'
   import co from 'co'
   // import RepairOrder from 'telephone-clients/src/components/workorder/RepairOrder'
-  // import WorkHistory from 'telephone-clients/src/components/pc/WorkHistory'
+  import WorkHistory from 'telephone-clients/src/components/pc/WorkHistory'
 
   let readRepair = async function (self) {
     let condition = "f_service_id = '" + self.rowdata.f_safetorepair_id+"'"
-    let res = await self.$resetpost('rs/sql/singleTable',{data:{tablename:'t_serviceworkorder',condition:condition}}, { resolveMsg: null, rejectMsg: null })
+    let res = await self.$resetpost('api/af-safecheck/sql/singleTable',{data:{tablename:'t_serviceworkorder',condition:condition}}, { resolveMsg: null, rejectMsg: null })
     self.workhistoryid.id = res.data[0].id
     self.workhistoryid.f_workorder_type = '报修单'
     self.repaierShow =true
@@ -85,7 +85,7 @@
       }
     },
     components: {
-      // 'work-history' : WorkHistory
+      'work-history' : WorkHistory
       // 'repair-order': RepairOrder
     }
   }

package/src/components/defects/CheckPaperItems.vue

@@ -54,7 +54,7 @@
     props: ['row'],
 
     data () {
-      let model = new PagedList('rs/sql/CheckPaperSearchItem', 100, {
+      let model = new PagedList('api/af-safecheck/sql/CheckPaperSearchItem', 100, {
         f_paper_id: 'this.f_paper_id',
       })
       model.f_paper_id = this.row.id

package/src/components/defects/CheckPaperSearch.vue

@@ -127,37 +127,6 @@
               condition="f_defect_content  like '%{}%'"
               close-on-select clear-button> </v-select>
           </div>
-            <div class="col-sm-4" style="width: 20%">
-              <label class="font_normal_body" style="margin-right: 2px">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
-              <right-tree @re-res="$parent.$parent.getorg" :initresid="$parent.$parent.$login.f.orgid">
-              </right-tree>
-            </div>
-
-            <div class="col-sm-4" style="width: 20%">
-              <label class="font_normal_body">片&emsp;&emsp;区</label>
-              <v-select class="select_list select"
-                        placeholder='片区/管理站' style="width: 60%"
-                        :value.sync="model.f_slice_area" v-model="model.f_slice_area"
-                        :options='$parent.$parent.sliceArea'
-                        filer-key="name"
-                        close-on-select clear-button
-                        condition="f_slice_area='{}'"
-                        :value-single="true">
-              </v-select>
-            </div>
-            <div class="col-sm-2 form-group">
-              <label class="font_normal_body">抄&ensp;表&ensp;册</label>
-              <v-select class="select_list select"
-                        placeholder='抄表册' style="width: 60%"
-                        :value.sync="model.f_meter_book_num" v-model="model.f_meter_book_num"
-                        :options='$parent.$parent.cbc'
-                        filer-key="name"
-                        close-on-select clear-button
-                        condition="f_meter_book_num={}"
-                        :value-single="true">
-              </v-select>
-            </div>
-
           <div class="col-sm-4 " style="width: 20%" v-show="model.f_check_result == '有隐患'" v-if="$parent.$parent.criteriaShow">
             <label class="font_normal_body">隐患筛选</label>
             <input type="text" class="input_search" style="width:60%"
@@ -211,11 +180,10 @@
   import { PagedList } from 'vue-client'
   import Vue from 'vue'
   import co from 'co'
-  import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
 
   let select = function * (self) {
     let getGasman = yield self.$resetpost('/rs/search', {
-      source: 'tool.getChildrenOfResName($安检员$)',
+      source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1))',
       userid: self.$login.f.id
     }, {resolveMsg: null, rejectMsg: null})
     console.log('获取安检员', getGasman)
@@ -247,11 +215,7 @@
         f_entry_status:  [{label: '全部', value: ''}, ...this.$appdata.getParam('安检状态')],
         f_devices:  [{label: '全部', value: ''}, ...this.$appdata.getParam('安检项')],
         f_check_results:  [{label: '全部', value: ''}, {label: '正常', value: '正常'},{label: '有隐患', value: '有隐患'}],
-        f_repaired: [{label: '全部', value: ''},{label:'维修状态',value:''},{label:'已修',value:'已修'},{label:'未修',value:'未修'}],
-        f_orgid: '',
-        curorgid: [this.$login.f.orgid],
-        sliceArea: [],
-        cbc:[]
+        f_repaired: [{label: '全部', value: ''},{label:'维修状态',value:''},{label:'已修',value:'已修'},{label:'未修',value:'未修'}]
       }
     },
     ready(){
@@ -259,46 +223,11 @@
       console.log('login-------',this.$login)
       this.$refs.paged.$refs.criteria.model.f_filialeid = this.$login.f.orgid
       this.$refs.paged.$refs.criteria.model.f_device_type = ['']
-      this.pianqu()
+
       let gen = select(this)
       return co(gen)
     },
     methods: {
-      pianqu() {
-        let http = new HttpResetClass()
-        let getAllArea =  http.load('POST', '/rs/search', {
-          source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
-          userid: this.$login.f.id
-        }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'}).then((getAllArea)=>{
-          this.sliceArea = [{label: '全部', value: ''}]
-          console.log('11111111111111111111111111111111111111')
-          console.log(getAllArea.data)
-          console.log('11111111111111111111111111111111111111')
-          getAllArea.data.forEach((res) => {
-            this.sliceArea.push({label: res.name, value:res.name})
-          })
-          console.log('片区' + this.sliceArea)
-        })
-
-      },
-      Mreadibook(){
-        let http = new HttpResetClass()
-        let getMeterReadingBooks =  http.load('POST','rs/logic/getMeterBooksData',
-          {data: {f_orgid: `${this.f_orgid}`}},
-          {resolveMsg: null, rejectMsg: '获取失败！！！'}).then((getAllArea)=>{
-          this.cbc = [{label: '全部', value: ''}]
-          console.log('22222222222222222222222222222222222222')
-          console.log(JSON.stringify(getAllArea))
-          console.log('22222222222222222222222222222222222222')
-          getAllArea.data.meterbooks.forEach((res) => {
-            this.cbc.push({label: res.f_book_name, value: res.id})
-          })
-        })
-      },
-      getorg (val) {
-        this.f_orgid = this.$login.convertToIn(val.resids)
-        this.Mreadibook()
-      },
         hidden() {
             this.criteriaShow = !this.criteriaShow
         },

package/src/components/defects/DefectSeting.vue

@@ -62,7 +62,7 @@
   export default {
     title: '隐患设置',
     data () {
-      let model = new PagedList('rs/sql/getDefect', 20,)
+      let model = new PagedList('api/af-safecheck/sql/getDefect', 20,)
 
       return {
         fun:this.$login.f,
@@ -88,7 +88,7 @@
       },
     },
     ready(){
-      this.$resetpost("rs/logic/获取安检设备",{condition: '1 =1'}).then((respanse) => {
+      this.$resetpost("api/af-safecheck/logic/获取安检设备",{condition: '1 =1'}).then((respanse) => {
         respanse.data.data.forEach((item)=>{
           this.devices_option.push({label:item.f_device_name,value:item.f_device_name})
         })

package/src/components/defects/DefectsQuery.vue

@@ -112,7 +112,7 @@
     title: '隐患查询',
     props: ['f'],
     data () {
-      let model = new PagedList('rs/sql/隐患明细查询', 20,
+      let model = new PagedList('api/af-safecheck/sql/隐患明细查询', 20,
         {date1: 'this.model.date1', date2: 'this.model.date2',
           f_defect_level: 'this.f_defect_', f_subcompany: 'this.f_subcompany[0]',
           f_filialeid:'this.f_filialeid',

package/src/components/defects/DevicesSeting.vue

@@ -76,7 +76,7 @@
       }
     },
     ready(){
-      this.$resetpost("rs/logic/获取安检设备",{condition: '1 =1'}).then((respanse) => {
+      this.$resetpost("api/af-safecheck/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})
         })

package/src/components/discrepancy/differenceMain.vue

@@ -0,0 +1,47 @@
+<template>
+    <div class="flex">
+        <section>
+            <div class="row"  style="height: 100%" :class="{'basic-main':!showItem,'binary':showItem}">
+                <div :class="{'binary-left':showItem}" >
+                    <difference-paper v-ref:check></difference-paper>
+                </div>
+            </div>
+        </section>
+    </div>
+</template>
+
+<script>
+  import DefectPaper from './differencePaper.vue'
+  export default {
+    title: '金额气量差值查询',
+    props: ['f'],
+    components: {DefectPaper},
+    data() {
+      return {
+        showItem: false
+      }
+    },
+    methods: {
+      // selected(row) {
+      //   this.showItem = true
+      // }
+    },
+    watch:{
+
+    }
+  }
+</script>
+<style>
+    .form-input-group label {
+        text-align: right;
+        width: auto;
+    }
+
+    .datapanel {
+        color: #333;
+        background-color: white;
+        box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
+        padding: 5px 7px 5px 7px;
+        border-radius: 10px;
+    }
+</style>