safecheck-client 3.1.1-gaomi-5 → 4.0.1

package/src/components/equipment/CheckerRate.vue

@@ -53,9 +53,9 @@
                         :fields='["$index+1","f_subcompany","cplan","call","centry","cdeny","cabsent","nouse","dangernum","A","B","C","overduenum","nohandledanger","checkrate","entery_rate"]'>
            </print-table>-->
       <div class="form-group">
-      <export-excel-safe :data="{condition: '1=1',startDate: startDate, endDate: endDate,f_subcompany: clickname.company}"
+      <export-excel :data="{condition: '1=1',startDate: startDate, endDate: endDate,f_subcompany: clickname.company}"
                     :bean= exportbean
-                    sqlurl="rs/logic/exportfile"></export-excel-safe>
+                    sqlurl="api/af-safecheck/logic/exportfile"></export-excel>
         </div>
     </div>
     <criteria-paged :model="model" :pager='false' v-ref:paged1>
@@ -156,14 +156,14 @@
 
   let saveFile = function * (self) {
 // 线验证文件是否重名
-    let count = yield self.$resetpost('rs/sql/singleTable',
+    let count = yield self.$resetpost('api/af-safecheck/sql/singleTable',
       {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
       {resolveMsg: null, rejectMsg: null})
     if (count.data.length > 0) {
       self.$showAlert('无法保存，文件名重名', 'warning', 3000)
       return
     }
-    let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
+    let saveBack = yield self.$resetpost('api/af-safecheck/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
       f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'contrast',
       f_operator: Util.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
       f_outlets: Util.f.f_parentname})
@@ -239,12 +239,12 @@
       },
 
       search(){
-     this.model=new PagedList('rs/sql/QueryCheckerRate',999, {startDate: '\''+this.startDate+'\'', endDate: '\''+this.endDate+'\'',f_subcompany: '\''+this.clickname.company+'\''})
+     this.model=new PagedList('api/af-safecheck/sql/QueryCheckerRate',999, {startDate: '\''+this.startDate+'\'', endDate: '\''+this.endDate+'\'',f_subcompany: '\''+this.clickname.company+'\''})
      this.model.search("1=1")
    },
       // 根据文件路径获取储存的报表内容
       getFileContent(path) {
-        this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        this.$resetpost('api/af-safecheck/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
           this.reportStr = res.data.filecontent
           this.model.state = '正确'
         })

package/src/components/equipment/CookerUsage.vue

@@ -84,7 +84,7 @@ import AppData from '../../stores/AppData'
 export default {
   title: '灶具使用情况',
   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',
       year: 'this.year', f_subcompany: 'this.f_subcompany[0]',
       f_check_type: 'this.f_check_type[0]', f_brand: 'this.f_maker[0]'})

package/src/components/equipment/DeviceUsage.vue

@@ -84,7 +84,7 @@ import AppData from '../../stores/AppData'
 export default {
   title: '工业燃气具使用情况',
   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',
       year: 'this.year', f_subcompany: 'this.f_subcompany[0]',
       f_check_type: 'this.f_check_type[0]', f_brand: 'this.f_maker[0]'})

package/src/components/equipment/FurnaceUsage.vue

@@ -84,7 +84,7 @@ import AppData from '../../stores/AppData'
 export default {
   title: '非居民壁挂炉使用情况',
   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',
       year: 'this.year', f_subcompany: 'this.f_subcompany[0]',
       f_check_type: 'this.f_check_type[0]', f_brand: 'this.f_maker[0]'})

package/src/components/equipment/GasMeterUsage.vue

@@ -88,7 +88,7 @@ import AppData from '../../stores/AppData'
 export default {
   title: '燃气表使用情况',
   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',
       year: 'this.year', f_subcompany: 'this.f_subcompany[0]',
       f_check_type: 'this.f_check_type[0]', f_maker: 'this.f_maker[0]'})

package/src/components/equipment/HeaterUsage.vue

@@ -84,7 +84,7 @@ import AppData from '../../stores/AppData'
 export default {
   title: '热水器使用情况',
   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',
       year: 'this.year', f_subcompany: 'this.f_subcompany[0]',
       f_check_type: 'this.f_check_type[0]', f_brand: 'this.f_maker[0]'})

package/src/components/equipment/MonthCheckRate.vue

@@ -53,9 +53,9 @@
                         :fields='["$index+1","f_subcompany","cplan","call","centry","cdeny","cabsent","nouse","dangernum","A","B","C","overduenum","nohandledanger","checkrate","entery_rate"]'>
            </print-table>-->
       <div class="form-group">
-        <export-excel-safe :data="{condition: '1=1',startDate: startDate, endDate: endDate,f_subcompany: clickname.company}"
+        <export-excel :data="{condition: '1=1',startDate: startDate, endDate: endDate,f_subcompany: clickname.company}"
                       :bean= exportbean
-                      sqlurl="rs/logic/exportfile"></export-excel-safe>
+                      sqlurl="api/af-safecheck/logic/exportfile"></export-excel>
       </div>
     </div>
     <criteria-paged :model="model" :pager='false' v-ref:paged1>
@@ -157,14 +157,14 @@
 
   let saveFile = function * (self) {
 // 线验证文件是否重名
-    let count = yield self.$resetpost('rs/sql/singleTable',
+    let count = yield self.$resetpost('api/af-safecheck/sql/singleTable',
       {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
       {resolveMsg: null, rejectMsg: null})
     if (count.data.length > 0) {
       self.$showAlert('无法保存，文件名重名', 'warning', 3000)
       return
     }
-    let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
+    let saveBack = yield self.$resetpost('api/af-safecheck/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
       f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'contrast',
       f_operator: Util.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
       f_outlets: Util.f.f_parentname})
@@ -245,12 +245,12 @@
       },
 
       search(){
-        this.model=new PagedList('rs/sql/QueryMonthCheckRate',999, {startDate: '\''+this.startDate+'\'', endDate: '\''+this.endDate+'\'',f_subcompany: '\''+this.clickname.company+'\''})
+        this.model=new PagedList('api/af-safecheck/sql/QueryMonthCheckRate',999, {startDate: '\''+this.startDate+'\'', endDate: '\''+this.endDate+'\'',f_subcompany: '\''+this.clickname.company+'\''})
         this.model.search("1=1")
       },
       // 根据文件路径获取储存的报表内容
       getFileContent(path) {
-        this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        this.$resetpost('api/af-safecheck/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
           this.reportStr = res.data.filecontent
         this.model.state = '正确'
       })

package/src/components/gasusage/GasUsage.vue

@@ -93,7 +93,7 @@ export default {
   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_check_type: 'this.f_check_type[0]',  f_subcompany: 'this.f_subcompany[0]', f_plan_id: 'this.f_check_plan.id'})
     model.f_subcompany = [Vue.f_subcompany]

package/src/components/issueplan/IssuePlanAction.vue

@@ -51,7 +51,7 @@ let saveGen = function * (self) {
   self.model.id = self.item.id
   self.model.f_issued = self.f_issued[0]
   self.model.f_issue_time = self.$login.toStandardTimeString()
-  yield self.$resetpost('rs/logic/BespeakCheckPlan', {data: self.model}, {resolveMsg: '下发计划成功！', rejectMsg: '下发计划失败！'}).then((respanse)=>{
+  yield self.$resetpost('api/af-safecheck/logic/BespeakCheckPlan', {data: self.model}, {resolveMsg: '下发计划成功！', rejectMsg: '下发计划失败！'}).then((respanse)=>{
     if(respanse.data.code == 200){
       window.alert("预约计划下发成功!")
     }else{
@@ -62,7 +62,7 @@ let saveGen = function * (self) {
 
 let fetchItems = function * (self) {
   let f_plan_id = "f_plan_id='" + self.item.id + "'"
-  let plan = yield self.$resetpost('rs/sql/预约计划下发详情',
+  let plan = yield self.$resetpost('api/af-safecheck/sql/预约计划下发详情',
   { data: {items: '*', tablename: 't_check_plan_item', condition: f_plan_id, groupitem: '', orderitem: 'f_userinfoid'} },
   { resolveMsg: null, rejectMsg: null })
   self.model.rows = plan.data

package/src/components/issueplan/IssuePlanQuery.vue

@@ -81,7 +81,7 @@ export default {
     let moptions = []
     for(let i=1; i<=12; i++)
       moptions.push({label: i + '', value: i + ''})
-    let model = new PagedList('rs/sql/预约计划下发', 20, { items: '"*"', tablename: '"t_check_plan"', groupitem: '""',
+    let model = new PagedList('api/af-safecheck/sql/预约计划下发', 20, { items: '"*"', tablename: '"t_check_plan"', groupitem: '""',
     orderitem: '"f_plan_month"', f_checker:'this.chosenOrg.name', f_checker_id: 'this.chosenOrg.id', f_subcompany: 'this.f_subcompany' })
     model.f_subcompany = this.$login.f.f_fengongsi
     model.chosenOrg = {id:0, name: ''}

package/src/components/levelplan/AdjustPlan.vue

@@ -44,7 +44,7 @@
       if(row.sign == '1')
         self.model.checkerB.push(row)
     }
-    yield self.$resetpost('rs/logic/ChangeCheckplan', {data: self.model}).then((respanse)=>{
+    yield self.$resetpost('api/af-safecheck/logic/ChangeCheckplan', {data: self.model}).then((respanse)=>{
       if(respanse.code == 200) {
       window.alert("计划生成成功！")
     }
@@ -131,7 +131,7 @@
       // 全部向右边调整
       addAllRight () {
         let condition = this.$refs.left.$refs.paged.$refs.criteria.condition
-        this.$resetpost('rs/sql/根据年月安检员查询安检项?pageSize=9999999',{data:{condition:condition,f_plan_year: this.$refs.left.model.c_plan_year[0], f_plan_month: this.$refs.left.model.c_plan_month[0],f_subcompany:this.$refs.left.model.f_subcompany, f_checker_id: this.$refs.left.model.chosenOrg.id}},-1).then(
+        this.$resetpost('api/af-safecheck/sql/根据年月安检员查询安检项?pageSize=9999999',{data:{condition:condition,f_plan_year: this.$refs.left.model.c_plan_year[0], f_plan_month: this.$refs.left.model.c_plan_month[0],f_subcompany:this.$refs.left.model.f_subcompany, f_checker_id: this.$refs.left.model.chosenOrg.id}},-1).then(
           (respanse)=> {
           if (this.$refs.left.model.rows.length != 0) {
           // 压入数组中
@@ -157,7 +157,7 @@
       addAllLeft () {
         console.log(this.$refs.right)
         let condition = this.$refs.right.$refs.paged.$refs.criteria.condition
-        this.$resetpost('rs/sql/根据安检员查询安检项?pageSize=9999999',{data:{condition:condition,f_subcompany:this.$refs.right.model.f_subcompany, f_checker_id: this.$refs.right.model.chosenOrg.id}},-1).then(
+        this.$resetpost('api/af-safecheck/sql/根据安检员查询安检项?pageSize=9999999',{data:{condition:condition,f_subcompany:this.$refs.right.model.f_subcompany, f_checker_id: this.$refs.right.model.chosenOrg.id}},-1).then(
           (respanse)=>{
           // 为调整的数据添加标记
           if (this.$refs.right.model.rows.length != 0) {

package/src/components/levelplan/CheckerLeft.vue

@@ -72,7 +72,7 @@
   import co from  'co'
 
   let syncDelete = function * (self,row) {
-    yield self.$resetpost('rs/logic/deleteCheckPlanItem', {id:row.id },{
+    yield self.$resetpost('api/af-safecheck/logic/deleteCheckPlanItem', {id:row.id },{
       warnMsg: '删除数据不可恢复，确认删除吗？',
       resolveMsg: '恭喜！删除成功！',
       rejectMsg: '删除失败：'
@@ -90,7 +90,7 @@
       let moptions = []
       for(let i=1; i<=12; i++)
         moptions.push({label: i + '', value: i + ''})
-      let model = new PagedList('rs/sql/根据年月安检员查询安检项', 3000,
+      let model = new PagedList('api/af-safecheck/sql/根据年月安检员查询安检项', 3000,
         {f_subcompany: 'this.f_subcompany', f_plan_year: 'this.c_plan_year[0]', f_plan_month: 'this.c_plan_month[0]'})
       model.c_plan_year = [year+'']
       model.c_plan_month = [moptions[new Date().getMonth()].value]

package/src/components/levelplan/CheckerPlanAdjust.vue

@@ -58,51 +58,64 @@
 
               <div class="col-sm-3 " style="width: 20%">
                 <label class="font_normal_body" >安&nbsp;&nbsp;检&nbsp;员</label>
-                <v-select class="select select_list"
+                <input type="text" class="input_search"  style="width: 60%;" v-model="model.f_checker"
+                       placeholder="安检员姓名" condition="c.f_checker like '%{}%'">
+<!--                <v-select class="select select_list"
                           :value.sync="model.f_checker_id" v-model='model.f_checker_id'
                           :value-single="true"
                           :options='$parent.$parent.checkersid' placeholder='安检员'
                           close-on-select style=";width: 60%"
-                          condition="c.f_checker_id = '{}'"></v-select>
+                          condition="c.f_checker_id = '{}'"></v-select>-->
+              </div>
+              <div class="col-sm-3 " style="width: 20%">
+                <label class="font_normal_body" >安检状态</label>
+                <v-select class="select select_list"
+                          :value.sync="$parent.$parent.f_check_state" v-model='$parent.$parent.f_check_state'
+                          :value-single="true"
+                          :options='$parent.$parent.check_versions' placeholder='到访不遇次数'
+                          close-on-select style=";width: 60%"
+                          ></v-select>
               </div>
-
-
             </div>
           </div>
         </criteria>
         <data-grid class="list_area table_sy" partial='list' :model="model" style="overflow: hidden" v-ref:grid >
           <template partial='head'>
             <tr>
-              <th><nobr>全选&nbsp;&nbsp;<input type="checkbox" @click='$parent.$parent.$parent.changeStates'  v-model='$parent.$parent.$parent.checkedAll'></nobr></th>
+              <th><nobr><input type="checkbox" v-model="$parent.$parent.$parent.checkAll"/> 全选</nobr></th>
               <th>计划名称</th>
               <th>用户编号</th>
               <th>用户名</th>
               <th>小区名称</th>
               <th>地址</th>
-              <th>操作</th>
-              <th>标记</th>
+              <th>安检员</th>
+              <th>到访不遇次数</th>
+              <!--<th>操作</th>
+              <th>标记</th>-->
             </tr>
           </template>
           <template partial='body'>
-            <td style="text-align: center"><nobr><input type="checkbox" v-model="row.checked" v-bind:checked="row.checked"  @click="$parent.$parent.$parent.addChecked(row)"></nobr></td>
+            <td style="text-align: center"><nobr><input type="checkbox" onClick="event.cancelBubble = true" :checked="$parent.$parent.$parent.isChecked(row.id)"  @change="$parent.$parent.$parent.setCheckes(row.id)"></nobr></td>
             <td style="text-align: center">{{row.f_plan_name}}</td>
             <td style="text-align: center">{{row.f_userinfo_code}}</td>
             <td style="text-align: center">{{row.f_user_name}}</td>
             <td style="text-align: center">{{row.f_residential_area}}</td>
             <td style="text-align: center">{{row.f_address}}</td>
-            <td style="text-align: center"><img src="../../../static/images/newStyle/clear.png" @click="$parent.$parent.$parent.delete(row)"></td>
-            <td style="text-align: center">{{row.sign=='1'?'◆':''}}</td>
+            <td style="text-align: center">{{row.f_checker}}</td>
+            <td style="text-align: center">{{row.f_check_version}}</td>
+            <!--<td style="text-align: center"><img src="../../../static/images/newStyle/clear.png" @click="$parent.$parent.$parent.delete(row)"></td>
+            <td style="text-align: center">{{row.sign=='1'?'◆':''}}</td>-->
           </template>
         </data-grid>
       </criteria-paged>
-      <modal :show.sync="showModal" v-ref:modal>
+      <modal :show.sync="showModal" v-if="showModal" :backdrop="false" v-ref:modal>
         <div slot="modal-header" class="modal-header">
           <h4 class="modal-title">
             选择计划
           </h4>
         </div>
         <div slot="modal-body" class="modal-body">
-          <plan-chooser :f.sync="fun"  v-ref:chooser></plan-chooser>
+          <plan-chooser :f.sync="fun" :safetype="safetype"  v-ref:chooser></plan-chooser>
         </div>
         <div slot="modal-footer" class="modal-footer" style="text-align: center">
           <button  class="button_search button_spacing" @click="ok()">确认</button>
@@ -123,7 +136,7 @@
 
   let select = function * (self) {
     let getGasman = yield self.$resetpost('/rs/search', {
-      source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1))',
+      source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($resourcetype$)==$user$).where(row.getAttributes().get($state$)==$在职$).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1)',
       userid: self.$login.f.id
     }, {resolveMsg: null, rejectMsg: null})
     console.log('获取安检员', getGasman)
@@ -134,7 +147,7 @@
   }
 
   let syncDelete = function * (self,row) {
-    yield self.$resetpost('rs/logic/deleteCheckPlanItem', {id:row.id },{
+    yield self.$resetpost('api/af-safecheck/logic/deleteCheckPlanItem', {id:row.id },{
       warnMsg: '删除数据不可恢复，确认删除吗？',
       resolveMsg: '恭喜！删除成功！',
       rejectMsg: '删除失败：'
@@ -152,7 +165,7 @@
       let moptions = []
       for(let i=1; i<=12; i++)
         moptions.push({label: i + '', value: i + ''})
-      let model = new PagedList('rs/sql/根据年月安检员查询安检项', 20,
+      let model = new PagedList('api/af-safecheck/sql/FetchPlanItemByYearMonthCheckerId', 20,
         {f_filialeid: 'this.f_filialeid', f_plan_year: 'this.c_plan_year[0]', f_plan_month: 'this.c_plan_month[0]'})
       model.c_plan_year = [year+'']
       model.c_plan_month = [moptions[new Date().getMonth()].value]
@@ -165,11 +178,16 @@
           criteriaShow:false,
         checkersid:[],
         fun:this.$login.f,
+        safetype:'年度普检',
         checker:this.$login.f,
         leftCheckers:this.$parent.checkers,
         model: model,
         c_year_list: options,
-        c_month_list: moptions
+        c_month_list: moptions,
+        f_check_state:'',
+        check_versions:[{label: '未检', value: '未检'},{label: '到访不遇一次', value: '到访不遇一次'},{label: '到访不遇两次', value: '到访不遇两次'}],
+        checkAll:false,
+        checkes:[]
       }
     },
     watch: {
@@ -179,6 +197,22 @@
       }
     },
     methods:{
+      isChecked(v) {
+        // 如果全选，不在的按选中算，否则，在的按选中算
+        if (this.checkAll) {
+          return this.checkes.indexOf(v) == -1
+        } else {
+          return this.checkes.indexOf(v) != -1
+        }
+      },
+      setCheckes(id) {
+        let index=this.checkes.indexOf(id)
+        if(index<0){
+          this.checkes.push(id)
+        }else{
+          this.checkes.splice(index,1)
+        }
+      },
       ok(){
         if(!this.$refs.chooser.selectedRow.id){
           this.$showMessage('未选择目标计划!', ['confirm'])
@@ -186,20 +220,34 @@
         }
         console.log(`选择目标计划id:${this.$refs.chooser.selectedRow.id}`)
         // 执行调整业务
+        let condition1=this.model.params.condition
+        if(this.model.params.f_filialeid){
+          condition1+=` and i.f_filialeid='${this.model.params.f_filialeid}'`
+        }
+        if(this.model.params.f_plan_year){
+          condition1+=` and c.f_plan_year='${this.model.params.f_plan_year}'`
+        }
+        if(this.model.params.f_plan_month){
+          condition1+=` and c.f_plan_month='${this.model.params.f_plan_month}'`
+        }
         let http = new HttpResetClass()
-        http.load('POST', 'rs/logic/CheckerPlanAdjust', {
+        http.load('POST', 'api/af-safecheck/logic/CheckerPlanAdjust', {
           data: {
             f_plan_id:this.$refs.chooser.selectedRow.id,
-            checkrows:this.checkrows
+            condition:condition1,
+            switchCheckAll:true,
+            checkAll:this.checkAll,
+            param:this.checkes,
+            columnName:'i.id',
           }
         }, {resolveMsg: null, rejectMsg: null}).then((res) => {
           console.log(res.data)
           console.log("计划调整结果")
-          this.$showMessage(`共调整 ${this.checkrows.length} 个，其中${res.data.existitem}个在${this.$refs.chooser.selectedRow.f_plan_name}已存在，新增${res.data.updateitem}个！`)
-          this.$refs.chooser.model.rows=[]
-          this.$refs.chooser.selectedRow={}
-          this.$refs.chooser.model.f_checker_id=''
+          //this.$showMessage(`共调整 ${this.checkrows.length} 个，其中${res.data.existitem}个在${this.$refs.chooser.selectedRow.f_plan_name}已存在，新增${res.data.updateitem}个！`)
+          this.$showMessage('调整成功！')
           this.showModal = false
+          this.checkAll = false
+          this.checkes = []
           this.$refs.paged.$refs.criteria.search()
         })
       },
@@ -212,23 +260,11 @@
         this.$refs.chooser.selectedRow={}
       },
       adjust(){   //  调整计划
-        if(this.checkrows.length == 0){
+        if(this.checkAll  ||  this.checkes.length>0){
+          if(this.checkAll && this.model.rows.length==this.checkes.length){}
+          this.showModal = true
+        }else{
           this.$showMessage('请选择用户后，再进行调整!', ['confirm'])
-          return
-        }
-        this.showModal = true
-      },
-      addChecked(item) {
-        console.log(item);
-        if (!item.checked) {
-          this.checkrows.push(item);
-          console.log(this.checkrows);
-        } else {
-          for (let i = 0; i < this.checkrows.length; i++) {
-            if (item.id == this.checkrows[i].id) {
-              this.checkrows.splice(i, 1)
-            }
-          }
         }
       },
        // 全选
@@ -260,11 +296,21 @@
         }
       },
       search(args ){
-        this.model.rows = []
-        this.model.count = 0
-        this.checkrows = []
-        this.checkedAll = false
+        this.checkAll = false
+        this.checkes = []
+        /*if(this.f_check_version=='全部'){
+          args.condition+= `and i.f_state ='未检' or (i.f_check_version and f_last_check_state='到访不遇')`
+        }else */
+        args.condition+=` and i.f_safecheck_type='年度普检'`
+        if(this.f_check_state=='未检'){
+          args.condition+= `and (i.f_state='未检' or i.f_last_check_state ='到访不遇')`
+        }else if(this.f_check_state=='到访不遇一次'){
+          args.condition+= `and i.f_state='已检' and i.f_check_version='1' and i.f_last_check_state='到访不遇'`
+        }else if(this.f_check_state=='到访不遇两次'){
+          args.condition+= `and i.f_state='已检' and i.f_check_version='2' and i.f_last_check_state='到访不遇'`
+        }
         this.model.search(args.condition, args.model)
+        console.log('this.model---'+JSON.stringify(this.model))
       },
       delete(row){
         let gen = syncDelete(this,row)
@@ -272,6 +318,7 @@
       }
     },
     ready () {
+      this.f_check_state='未检'
       this.model.id = this.$login.f.id
       this.model.f_subcompany = this.$login.f.f_fengongsi
       this.model.f_filialeid  = this.$login.f.orgid
@@ -293,6 +340,11 @@
             this.$set('$refs.paged.model.rows[' + i + '].checked', false)
           }
         }
+      },
+      'checkAll'(val){
+        this.checkAll=val;
+        // 全选改变后，清空选中数据
+        this.checkes = []
       }
     },
     computed: {

package/src/components/levelplan/CheckerRight.vue

@@ -71,7 +71,7 @@
   import co from  'co'
 
   let syncDelete = function * (self,row) {
-    yield self.$resetpost('rs/logic/deleteCheckPlanItem',{tablename:'t_check_plan_item',id:row.id },{
+    yield self.$resetpost('api/af-safecheck/logic/deleteCheckPlanItem',{tablename:'t_check_plan_item',id:row.id },{
       warnMsg: '删除数据不可恢复，确认删除吗？',
       resolveMsg: '恭喜！删除成功！',
       rejectMsg: '删除失败：'
@@ -82,7 +82,7 @@
   export default {
     title: '安检员B',
     data () {
-      let model = new PagedList('rs/sql/根据安检员查询安检项', 3000,
+      let model = new PagedList('api/af-safecheck/sql/根据安检员查询安检项', 3000,
         {f_subcompany: 'this.f_subcompany', f_checker_id: 'this.chosenOrg.id'})
       model.chosenOrg = {id:0}
       return {

package/src/components/map/FootPrintList.vue

@@ -18,10 +18,10 @@
       data(){
         return {
           curuser:{},
-          points:{url:"rs/sql/SafeCheckGetAllCurrentPosition",data: {subcompany:this.$login.f.f_fengongsi}},
+          points:{url:"api/af-safecheck/sql/SafeCheckGetAllCurrentPosition",data: {subcompany:this.$login.f.f_fengongsi}},
           single:{},
           data:{},
-          url:'rs/logic/SafecheckFetchFootprint',
+          url:'api/af-safecheck/logic/SafecheckFetchFootprint',
           f_fengongsi:this.$login.f.f_fengongsi
         }
       },