safecheck-client 3.0.30-62 → 3.0.30-62-t4

package/src/components/DefectDealMain/DefectListNew.vue

@@ -252,12 +252,12 @@ import co from 'co'
 const upSolveDefect = function * (self) {
   let uploadData = self.solveModal.uploadData
   //tag)
-  self.$resetpost('/rs/logic/pcRepairDefectNew', self.solveModal.uploadData, {resolveMsg: null, rejectMsg: null})
+  self.$resetpost('/api/af-safecheck/logic/pcRepairDefectNew', self.solveModal.uploadData, {resolveMsg: null, rejectMsg: null})
     .then(res => {
       if (res.data.code === 200) {
         self.$showMessage('隐患已处理。')
         self.showSolveModal = false
-        self.model.search('f_repaire_type != \'无隐患\'', {})
+        self.model.search(`(f_repaire_type != '无隐患' or f_repaire_type is null)`, {})
       }
     })
 }
@@ -284,7 +284,7 @@ const sendRepair = function* (self) {
     uploadData.model.f_filiale_id = self.$login.f.orgid
     uploadData.toRepair = '一级派单'
   }
-  let res = yield self.$resetpost('/rs/sql/GetUserForRepaireNew2', {data: {f_userinfo_id: self.check.f_userinfo_id}})
+  let res = yield self.$resetpost('/api/af-safecheck/sql/GetUserForRepaireNew2', {data: {f_userinfo_id: self.check.f_userinfo_id}})
   preData.userInfo = res.data[0]
   uploadData.model = Object.assign(uploadData.model, preData.userInfo)
   uploadData.user.f_userinfo_id = preData.userInfo.f_userinfo_id
@@ -346,7 +346,7 @@ const sendRepair = function* (self) {
   uploadData.model.f_repairitems = repairitems
   //tag)
   // 调工单接口
-  let result = yield self.$resetpost('/rs/logic/callerSend', uploadData)
+  let result = yield self.$resetpost('/api/af-safecheck/logic/callerSend', uploadData)
   //tag)
   if (result.data.f_service_id) {
     const data = {
@@ -355,10 +355,10 @@ const sendRepair = function* (self) {
       itemsId: self.$login.convertToIn(rows.map(row => row.id))
     }
     //tag
-    let updateRes = yield self.$resetpost('/rs/logic/updateDefectStateNew', data)
+    let updateRes = yield self.$resetpost('/api/af-safecheck/logic/updateDefectStateNew', data)
     if (updateRes.data.code == 200) {
       self.$showMessage('隐患已转维修。')
-      self.model.search(`f_repaire_type != '无隐患'`, {})
+      self.model.search(`(f_repaire_type != '无隐患' or f_repaire_type is null)`, {})
     }
   }
 }
@@ -368,7 +368,7 @@ export default {
   props: ['check'],
   data() {
     return {
-      model: new PagedList('rs/sql/GetDefectByPaperIdNew2', 100, {
+      model: new PagedList('api/af-safecheck/sql/GetDefectByPaperIdNew2', 100, {
         f_paper_id: 'this.f_paper_id', f_item_value: 'this.f_item_value'
       }),
       imgshow: false,
@@ -474,7 +474,7 @@ export default {
     this.model.f_item_value = `(SELECT stuff(( SELECT ',' + f_item_value FROM t_devices_items_lists WHERE ( f_is_defect = 'true' OR di.f_is_defect = 'true') AND f_item_id = di.id FOR xml path ( '' ) ),1,1,'' ) )`
     if (this.check) {
       this.model.f_paper_id = this.check.id
-      this.model.search(`f_repaire_type != '无隐患'`, {})
+      this.model.search(`(f_repaire_type != '无隐患' or f_repaire_type is null)`, {})
     }
     this.getEmp()
   },
@@ -494,9 +494,9 @@ export default {
         info:info
       }
       let http = new HttpResetClass()
-      http.load('POST', 'rs/logic/DefectAuditUpdate', data, {resolveMsg: null, rejectMsg: null}).then((res) => {
+      http.load('POST', 'api/af-safecheck/logic/DefectAuditUpdate', data, {resolveMsg: null, rejectMsg: null}).then((res) => {
         if(res.data.code == 200){
-          this.model.search(`f_repaire_type != '无隐患'`, {})
+          this.model.search(`(f_repaire_type != '无隐患' or f_repaire_type is null)`, {})
           this.showSolveModal = false
           this.showToRepairModal = false
           this.$showMessage('提交成功')
@@ -574,7 +574,7 @@ export default {
   watch: {
     'check'() {
       this.model.f_paper_id = this.check.id
-      this.model.search(`f_repaire_type != '无隐患'`, {})
+      this.model.search(`(f_repaire_type != '无隐患' or f_repaire_type is null)`, {})
     },
     'model.rows'() {
       if (this.model.rows.length > 0) {

package/src/components/DefectDealMain/DefectPaperNew.vue

@@ -58,10 +58,10 @@
                 <button style="float: right" class="button_search button_spacing" @click="search">查询</button>
 <!--                <button style="float: right" class="button_search button_spacing" @click="$parent.$parent.toRepair">转维修</button>-->
                 <div style="float: right">
-                  <export-excel-safe   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids,f_defect_content:$parent.$parent.model.f_defect_content}"
+                  <export-excel   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids,f_defect_content:$parent.$parent.model.f_defect_content}"
                                       :field="$parent.$parent.getfield"
                                       progress="safeGetExportProgress"
-                                      sqlurl="rs/logic/SafeExportExcel" sql-name="GetCheckPaperByDefectNew2" template-name='安检隐患明细' :choose-col="true"></export-excel-safe>
+                                      sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="GetCheckPaperByDefectNew2" template-name='安检隐患明细' :choose-col="true"></export-excel>
                 </div>
               </div>
             </div>
@@ -224,10 +224,10 @@
                 <button style="float: right" class="button_search button_spacing" @click="search">查询</button>
 <!--                <button style="float: right" class="button_search button_spacing" @click="$parent.$parent.toRepair">转维修</button>-->
                 <div style="float: right">
-                  <export-excel-safe   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids,f_defect_content:$parent.$parent.model.f_defect_content}"
+                  <export-excel   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids,f_defect_content:$parent.$parent.model.f_defect_content}"
                                       :field="$parent.$parent.getfield"
                                       progress="safeGetExportProgress"
-                                      sqlurl="rs/logic/SafeExportExcel" sql-name="GetCheckPaperByDefectNew2" template-name='安检计划明细' :choose-col="true"></export-excel-safe>
+                                      sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="GetCheckPaperByDefectNew2" template-name='安检计划明细' :choose-col="true"></export-excel>
                 </div>
               </div>
             </div>
@@ -540,7 +540,7 @@ let select = function* (self) {
 export default {
   title: '隐患查询',
   data() {
-    let model = new PagedList('rs/sql/GetCheckPaperByDefectNew2', 20, {
+    let model = new PagedList('api/af-safecheck/sql/GetCheckPaperByDefectNew2', 20, {
       f_filialeids: 'this.f_filialeids',f_defect_content: 'this.f_defect_content'
     })
     model.f_filialeids = '(' + this.$login.f.orgid + ')'
@@ -643,7 +643,7 @@ export default {
 
         })
         let http1 = new HttpResetClass()
-        http1.load('POST', 'rs/sql/tel_singleTable_OrderBy', {
+        http1.load('POST', 'api/af-safecheck/sql/tel_singleTable_OrderBy', {
           data: {
             items: 'id,f_user_telephone',
             tablename: 't_user',
@@ -683,13 +683,13 @@ export default {
         f_defect_content: this.model.params.f_defect_content,
         condition:this.model.params.condition
       }
-      let res1= await new HttpResetClass().load('post','rs/sql/GetCheckPaperByDefectNew2',{data: data })
+      let res1= await new HttpResetClass().load('post','api/af-safecheck/sql/GetCheckPaperByDefectNew2',{data: data })
       for (let i = 0; i < res1.data.length; i++) {
         let data1={
           f_paper_id: res1.data[i].id,
           condition:`f_repaire_type != '无隐患'`
         }
-        let res2 = await new HttpResetClass().load('POST' , 'rs/sql/GetDefectByPaperIdNew2' , {data: data1 } )
+        let res2 = await new HttpResetClass().load('POST' , 'api/af-safecheck/sql/GetDefectByPaperIdNew2' , {data: data1 } )
         //tag
         const uploadData = {
           model: {
@@ -745,7 +745,7 @@ export default {
         uploadData.model.f_outlets = this.$login.f.deps
         uploadData.model.f_filiale_id = this.$login.f.orgid
         uploadData.toRepair = '一级派单'
-        let res3 = await new HttpResetClass().load('post','/rs/sql/GetUserForRepaireNew2', {data: {f_userinfo_id: res1.data[i].f_userinfo_id}})
+        let res3 = await new HttpResetClass().load('post','/api/af-safecheck/sql/GetUserForRepaireNew2', {data: {f_userinfo_id: res1.data[i].f_userinfo_id}})
         uploadData.model = Object.assign(uploadData.model, res3.data[0])
         uploadData.user.f_userinfo_id = res3.data[0].f_userinfo_id
         uploadData.model.f_repair_date = Util.getNowDate()
@@ -821,7 +821,7 @@ export default {
           //tag)
           let rows=this.callSends[this.timercount].rows
           //tag)
-          let result = await this.$resetpost('/rs/logic/callerSend', this.callSends[this.timercount])
+          let result = await this.$resetpost('/api/af-safecheck/logic/callerSend', this.callSends[this.timercount])
           //tag)
           if (result.data.f_service_id) {
             const data = {
@@ -830,7 +830,7 @@ export default {
               itemsId: this.$login.convertToIn(rows.map(row => row.id))
             }
             //tag
-            let updateRes = await this.$resetpost('/rs/logic/updateDefectStateNew', data)
+            let updateRes = await this.$resetpost('/api/af-safecheck/logic/updateDefectStateNew', data)
           }
           this.toRepairCount++
           //tag
@@ -917,7 +917,7 @@ export default {
       //tag
       this.sliceArea=[]
       if (val){
-        new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_OrderBy`, {data: {
+        new HttpResetClass().load('POST',`/api/af-safecheck/sql/tel_singleTable_OrderBy`, {data: {
             items: 'name',
             tablename: 't_zone',
             condition: `parentid  in ${val}`,
@@ -942,7 +942,7 @@ export default {
       //tag
       this.cbcs=[]
       if (val){
-        new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_OrderBy`, {data: {
+        new HttpResetClass().load('POST',`/api/af-safecheck/sql/tel_singleTable_OrderBy`, {data: {
             items: 'f_book_name,f_book_slice_area,id',
             tablename: 't_meter_book',
             condition: `f_filiale_id  in ${val}`,

package/src/components/ExportExcel.vue

@@ -41,6 +41,8 @@ import {HttpResetClass} from 'vue-client'
 import Vue from "vue";
 
 let postGen = function* (self) {
+  // 如果请求以 api 开头，说明是 v4 请求，直接用返回结果下载文件
+  let v4Export = self.sqlurl.indexOf('api') === 0 && self.$appdata.getSingleValue('v4后台')
   try {
     let p = {}
     // 判断如果有field，说明表头为自动生成，否则为模板导出
@@ -275,9 +277,9 @@ export default {
     },
     async progressTask() {
       let self = this
-      let url ='rs/logic/getBatchOperaPro'
+      let url ='api/af-safecheck/logic/getBatchOperaPro'
       if(Vue.$appdata.getSingleValue('安检excel单值')){
-        url = 'rs/logic/getBatchOperaProNew'
+        url = 'api/af-safecheck/logic/getBatchOperaProNew'
       }
 
       let res = await self.HttpReset.load('POST', url,{data: {uuid: self.uuid}}, {resolveMsg: null, rejectMsg: null})

package/src/components/LoadData.vue

@@ -0,0 +1,62 @@
+<template>
+<!--  石泉单页面打包用-->
+  <div class="loadingdata" :class="{'loaderror': show, 'loadsuccess': !show}">
+    <!-- <h2 style="margin: 0" v-if="show">{{msg}}</h2> -->
+    <h2 style="margin: 0" v-if="show">参数加载失败，请检查网络状态和服务状态...</h2>
+  </div>
+</template>
+
+<script>
+import co from 'co'
+import Vue from "vue";
+
+let saveGen = function* (self) {
+  try {
+    yield self.$login.login()
+    yield self.$appdata.load()
+  } catch (ret) {
+    console.error('登录失败', ret)
+  }
+}
+export default {
+  title: '加载参数',
+  data () {
+    return {
+      msg: '',
+      show: false
+    }
+  },
+  props: {
+    componentName: {}
+  },
+  ready () {
+    if (!this.componentName) {
+      this.componentName = Vue.$login.getUrlParames('goto')
+    }
+    console.log('跳转页面', this.componentName)
+    let gen = saveGen(this)
+    co(gen).then(() => {
+      this.$goto(this.componentName)
+    }).catch(() => {
+      this.$goto(this.componentName)
+    })
+  }
+}
+</script>
+<style media="screen">
+.loadingdata {
+  position: fixed;
+  background: #fff;
+  opacity: 0.6;
+  top: 0;
+  width: 100%;
+}
+
+.loaderror {
+  opacity: 1;
+}
+
+.loadsuccess {
+  display: none;
+}
+</style>

package/src/components/NewDefectList/DefectListNew.vue

@@ -241,7 +241,7 @@ import Vue from "vue";
 const upSolveDefect = function * (self) {
   let uploadData = self.solveModal.uploadData
   //tag)
-  self.$resetpost('/rs/logic/pcRepairDefectNew', self.solveModal.uploadData, {resolveMsg: null, rejectMsg: null})
+  self.$resetpost('/api/af-safecheck/logic/pcRepairDefectNew', self.solveModal.uploadData, {resolveMsg: null, rejectMsg: null})
     .then(res => {
       if (res.data.code === 200) {
         self.$showMessage('隐患已处理。')
@@ -282,13 +282,14 @@ const sendRepair = function* (self) {
     uploadData.model.f_filiale_id = self.$login.f.orgid
     uploadData.toRepair = '一级派单'
   }
-  let res = yield self.$resetpost('/rs/sql/GetUserForRepaireNew', {data: {f_userinfo_id: self.check.f_userinfo_id}})
+  let res = yield self.$resetpost('/api/af-safecheck/sql/GetUserForRepaireNew', {data: {f_userinfo_id: self.check.f_userinfo_id}})
   preData.userInfo = res.data[0]
   uploadData.model = Object.assign(uploadData.model, preData.userInfo)
   uploadData.user.f_userinfo_id = preData.userInfo.f_userinfo_id
   uploadData.model.f_repair_date = Util.getNowDate()
   uploadData.model.f_repairtype = preData.f_repairtype
   uploadData.model.f_remarks = preData.f_remarks
+  uploadData.model.f_paper_id = self.check.id
   // 拼接failure
   let failure = []
   self.model.rows.forEach(row => {
@@ -344,7 +345,7 @@ const sendRepair = function* (self) {
   uploadData.model.f_repairitems = repairitems
   //tag)
   // 调工单接口
-  let result = yield self.$resetpost('/rs/logic/callerSend', uploadData)
+  let result = yield self.$resetpost('/api/af-safecheck/logic/callerSend', uploadData)
   //tag)
   if (result.data.f_service_id) {
     const data = {
@@ -353,7 +354,7 @@ const sendRepair = function* (self) {
       itemsId: self.$login.convertToIn(rows.map(row => row.id))
     }
     //tag
-    let updateRes = yield self.$resetpost('/rs/logic/updateDefectStateNew', data)
+    let updateRes = yield self.$resetpost('/api/af-safecheck/logic/updateDefectStateNew', data)
     if (updateRes.data.code == 200) {
       self.$showMessage('隐患已转维修。')
       self.model.search(`f_repaire_type != '无隐患'`, {})
@@ -365,7 +366,7 @@ export default {
   title: '隐患项列表',
   data() {
     return {
-      model: new PagedList('rs/sql/GetDefectByPaperIdNew', 100, {
+      model: new PagedList('api/af-safecheck/sql/GetDefectByPaperIdNew', 100, {
         f_paper_id: 'this.f_paper_id',f_item_value: 'this.f_item_value'
       }),
       showSolveModal: false,
@@ -479,7 +480,7 @@ export default {
         info:info
       }
       let http = new HttpResetClass()
-      http.load('POST', 'rs/logic/DefectAuditUpdate', data, {resolveMsg: null, rejectMsg: null}).then((res) => {
+      http.load('POST', 'api/af-safecheck/logic/DefectAuditUpdate', data, {resolveMsg: null, rejectMsg: null}).then((res) => {
         if(res.data.code == 200){
           this.model.search(`f_repaire_type != '无隐患'`, {})
           this.showSolveModal = false
@@ -569,7 +570,7 @@ export default {
       http.load('POST', '/rs/search', {data: val}, {resolveMsg: null, rejectMsg: null}).then((res) => {
         res.data.forEach((item) => {
           let http1 = new HttpResetClass()
-          http1.load('POST', 'rs/sql/tel_singleTable_OrderBy', {
+          http1.load('POST', 'api/af-safecheck/sql/tel_singleTable_OrderBy', {
             data: {
               items: 'f_user_telephone',
               tablename: 't_user',

package/src/components/NewDefectList/DefectPaperNew.vue

@@ -64,10 +64,10 @@
                 <button style="float: right" class="button_search button_spacing" @click="search">查询</button>
                 <button style="float: right" v-if="$parent.$parent.transfer=='是'" class="button_search button_spacing" @click="$parent.$parent.toRepair">转维修</button>
                 <div style="float: right">
-                  <export-excel-safe   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids,f_defect_content:$parent.$parent.model.f_defect_content}"
+                  <export-excel   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids,f_defect_content:$parent.$parent.model.f_defect_content}"
                                       :field="$parent.$parent.getfield"
                                       progress="safeGetExportProgress"
-                                      sqlurl="rs/logic/SafeExportExcel" sql-name="GetCheckPaperByDefectNew" template-name='安检隐患明细' :choose-col="true"></export-excel-safe>
+                                      sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="GetCheckPaperByDefectNew" template-name='安检隐患明细' :choose-col="true"></export-excel>
                 </div>
               </div>
             </div>
@@ -200,7 +200,7 @@
                   <export-excel-old   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids}"
                                       :field="$parent.$parent.getfield"
                                       progress="safeGetExportProgress"
-                                      sqlurl="rs/logic/SafeExportExcel" sql-name="GetCheckPaperByDefectNew" template-name='安检计划明细' :choose-col="true"></export-excel-old>
+                                      sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="GetCheckPaperByDefectNew" template-name='安检计划明细' :choose-col="true"></export-excel-old>
                 </div>
               </div>
             </div>
@@ -480,7 +480,7 @@ let select = function* (self) {
 export default {
   title: '隐患查询',
   data() {
-    let model = new PagedList('rs/sql/GetCheckPaperByDefectNew', 20, {
+    let model = new PagedList('api/af-safecheck/sql/GetCheckPaperByDefectNew', 20, {
       f_filialeids: 'this.f_filialeids',f_defect_content: 'this.f_defect_content'
     })
     model.f_filialeids = '(' + this.$login.f.orgid + ')'
@@ -597,7 +597,7 @@ export default {
 
         })
         let http1 = new HttpResetClass()
-        http1.load('POST', 'rs/sql/tel_singleTable_OrderBy', {
+        http1.load('POST', 'api/af-safecheck/sql/tel_singleTable_OrderBy', {
           data: {
             items: 'id,f_user_telephone',
             tablename: 't_user',
@@ -681,7 +681,7 @@ export default {
       }
       for(let i=0; i<this.checkes.length; i++){
           try {
-            let result =await new HttpResetClass().load('post','/rs/logic/phoneUploadRectification', {
+            let result =await new HttpResetClass().load('post','/api/af-safecheck/logic/phoneUploadRectification', {
               id:this.checkes[i],
               repData:rep,
               source:'pc'
@@ -713,13 +713,13 @@ export default {
         f_defect_content: this.model.params.f_defect_content,
         condition: `${this.model.params.condition} and id in(${this.getcon()})`
       }
-      let res1= await new HttpResetClass().load('post','rs/sql/GetCheckPaperByDefectNew',{data: data })
+      let res1= await new HttpResetClass().load('post','api/af-safecheck/sql/GetCheckPaperByDefectNew',{data: data })
       for (let i = 0; i < res1.data.length; i++) {
         let data1={
           f_paper_id: res1.data[i].id,
           condition:`f_repaire_type = '隐患未处理'`
         }
-        let res2 = await new HttpResetClass().load('POST' , 'rs/sql/GetDefectByPaperIdNew' , {data: data1 } )
+        let res2 = await new HttpResetClass().load('POST' , 'api/af-safecheck/sql/GetDefectByPaperIdNew' , {data: data1 } )
         //tag
         if(res2.data.length==0){
           continue
@@ -776,7 +776,7 @@ export default {
         uploadData.model.f_outlets = this.$login.f.deps
         uploadData.model.f_filiale_id = this.$login.f.orgid
         uploadData.toRepair = '一级派单'
-        // let res3 = await new HttpResetClass().load('post','/rs/sql/GetUserForRepaireNew', {data: {f_userinfo_id: res1.data[i].f_userinfo_id}})
+        // let res3 = await new HttpResetClass().load('post','/api/af-safecheck/sql/GetUserForRepaireNew', {data: {f_userinfo_id: res1.data[i].f_userinfo_id}})
         // uploadData.model = Object.assign(uploadData.model, res3.data[0])
         let failure = []
         res2.data.forEach(row => {
@@ -847,7 +847,7 @@ export default {
           //tag)
           let rows=this.callSends[this.timercount].rows
           //tag)
-          let result = await this.$resetpost('/rs/logic/callerSend1', this.callSends[this.timercount])
+          let result = await this.$resetpost('/api/af-safecheck/logic/callerSend1', this.callSends[this.timercount])
           //tag)
           if (result.data.f_service_id) {
             const data = {
@@ -856,7 +856,7 @@ export default {
               itemsId: this.$login.convertToIn(rows.map(row => row.id))
             }
             //tag
-            let updateRes = await this.$resetpost('/rs/logic/updateDefectStateNew', data)
+            let updateRes = await this.$resetpost('/api/af-safecheck/logic/updateDefectStateNew', data)
           }
           this.toRepairCount++
           //tag
@@ -943,7 +943,7 @@ export default {
       //tag
       this.sliceArea=[]
       if (val){
-        new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_OrderBy`, {data: {
+        new HttpResetClass().load('POST',`/api/af-safecheck/sql/tel_singleTable_OrderBy`, {data: {
             items: 'name',
             tablename: 't_zone',
             condition: `parentid  in ${val}`,
@@ -968,7 +968,7 @@ export default {
       //tag
       this.cbcs=[]
       if (val){
-        new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_OrderBy`, {data: {
+        new HttpResetClass().load('POST',`/api/af-safecheck/sql/tel_singleTable_OrderBy`, {data: {
             items: 'f_book_name,f_book_slice_area,id',
             tablename: 't_meter_book',
             condition: `f_filiale_id  in ${val}`,

package/src/components/Util/ImgSelfSafePlus.vue

@@ -3,7 +3,7 @@
     <img :src="src" :alt="alt" @click.stop="open()" :width="width" :height="height" title="点击查看图片"
          :id="'vc-imgself-img-'+attach">
     <div class="full-img" v-show="show" @contextmenu.prevent.stop="clearStyle">
-      <img :src="src" alt="" class="img-state" :alt="alt || ''" @mousewheel="bigimg(this)" id="image" draggable="false"
+      <img :src="src2" alt="" class="img-state" :alt="alt || ''" @mousewheel="bigimg(this)" id="image" draggable="false"
            @mousedown.prevent="dropImage" style="position:fixed">
       <div class="btns row">
         <button type="button" name="button" class="btn btn-primary" @click.stop="leftRevolve()">向左旋转</button>
@@ -51,7 +51,8 @@
         container:null,
         positionX: null,
         positionY: null,
-        powerh: 1.0
+        powerh: 1.0,
+        src2:""
       }
     },
     ready(){
@@ -64,6 +65,7 @@
       }
       // 将新创建的 div 挂载到 body 上
       document.body.appendChild(this.container);
+      this.src2=this.src
     },
     beforeDestroy(){
       // 销毁挂载的
@@ -75,12 +77,12 @@
       nextPage() {
         console.log(this.list)
         //当前图片，是最后一张图片
-        if (this.src=== this.list[this.list.length - 1].f_overall_path) {
-            this.src= this.list[0].f_overall_path
+        if (this.src2=== this.list[this.list.length - 1].f_overall_path) {
+            this.src2= this.list[0].f_overall_path
           } else {
           for (let i = 0; i < this.list.length; i++) {
-            if (this.src=== this.list[i].f_overall_path) {
-              this.src= this.list[i + 1].f_overall_path
+            if (this.src2=== this.list[i].f_overall_path) {
+              this.src2= this.list[i + 1].f_overall_path
               break
             }
           }
@@ -90,12 +92,12 @@
       previousPage() {
         console.log(this.list)
         //当前图片，是第一张图片
-        if (this.src === this.list[0].f_overall_path) {
-          this.src= this.list[this.list.length - 1].f_overall_path
+        if (this.src2 === this.list[0].f_overall_path) {
+          this.src2= this.list[this.list.length - 1].f_overall_path
         } else {
           for (let i = 0; i < this.list.length; i++) {
-            if (this.src=== this.list[i].f_overall_path) {
-              this.src= this.list[i - 1].f_overall_path
+            if (this.src2=== this.list[i].f_overall_path) {
+              this.src2= this.list[i - 1].f_overall_path
               break
             }
           }
@@ -171,6 +173,13 @@
 
       }
     },
+    watch:{
+      'src'(val){
+        if(val){
+          this.src2 = val
+        }
+      }
+    }
   }
 </script>
 <style media="screen" scoped>

package/src/components/Util/SafecheckUpload.vue

@@ -158,7 +158,7 @@ export default {
         tablename: 't_files',
         condition: condition + ` order by f_uploaddate desc `
       }
-      let getFile = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
+      let getFile = await http.load('POST', 'api/af-safecheck/sql/singleTable', {data: data}, {
         warnMsg: null,
         resolveMsg: null
       })

package/src/components/Util.js

@@ -20,6 +20,13 @@ export function getAttendanceState(item, timeToWork, timeToGo) {
     item.f_state = '正常'
 }
 
+export function dateAddDay (date, day) {
+  date.setDate(date.getDate() + Number.parseInt(day));
+  let month = date.getMonth()+1
+  let date2 = date.getDate()
+  return date.getFullYear() + '-' + (month<10? '0'+ month : month) + '-' + (date2<10? '0'+ date2 : date2)
+}
+
 // 字符串进行解密
 export function uncompileStr (code) {
   code = unescape(code)

package/src/components/android/AddGas.vue

@@ -79,7 +79,7 @@ export default {
   },
   ready () {
     // 获取用户档案
-    this.$resetpost(Vue.dataUrl + 'rs/sql/singleTable', {
+    this.$resetpost(Vue.dataUrl + 'api/af-safecheck/sql/singleTable', {
       data: {
         tablename: 'T_USERFILES',
         condition: "f_userid = '" + this.bukadata.f_userid + "'"
@@ -88,7 +88,7 @@ export default {
       this.userinfo = Object.assign({}, this.userinfo, res.data[0])
     })
     // //  获取卡号
-    // this.$resetpost(Vue.dataUrl + 'rs/sql/singleTable', {
+    // this.$resetpost(Vue.dataUrl + 'api/af-safecheck/sql/singleTable', {
     //   data: {
     //     tablename: 'T_USERFILES',
     //     condition: "f_userid = '" + this.bukadata.f_userid + "'"

package/src/components/android/AddPlanItem.vue

@@ -223,7 +223,7 @@
   export default {
     title: '安检员B',
     data () {
-      let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/提取用户档案`, 20, { groupitem: '""', orderitem: '"f_residential_area,CAST(build as int),f_unit,CAST(floor1 as int),f_room"',f_check_type:'this.f_check_type[0]',
+      let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/提取用户档案`, 20, { groupitem: '""', orderitem: '"f_residential_area,CAST(build as int),f_unit,CAST(floor1 as int),f_room"',f_check_type:'this.f_check_type[0]',
         f_user_name:'this.model.f_username',myCycle: 'this.myCycle',fyCycle: 'this.fyCycle', f_user_type:'this.f_user_type',f_sign: 'this.f_sign[0]', f_residential_area:'this.model.f_districtname', f_address:'this.model.f_address',f_user_state: 'this.f_user_state[0]',f_orgids:'this.f_orgids',f_unit:'this.model.f_unit',f_building:'this.model.f_building',f_filialeid:'this.f_filialeid'})
       model.f_sign = ['']
       model.f_user_type = ''
@@ -262,7 +262,7 @@
       }
     },
     ready () {
-      // this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/getSafeCheckCycle`,{},{resolveMsg: null, rejectMsg: null}).then((res) => {
+      // this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getSafeCheckCycle`,{},{resolveMsg: null, rejectMsg: null}).then((res) => {
       //   //tag)
       //   if(res.data.code == 200){
       //     this.model.myCycle = res.data.civil.value
@@ -298,7 +298,7 @@
       },
       getCheckTime(){
         //tag
-        new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`,{data: {
+        new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/tel_singleTable_OrderBy`,{data: {
             items: 'f_circle,f_start_time',
             tablename: 't_safe_circle',
             condition: `f_filialeid  = '${Vue.user.orgid}'`,
@@ -342,7 +342,7 @@
               info.f_state = '未检'
               info.f_no_checkplan = '无计划安检'
               //tag
-              this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
+              this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
                 //tag)
                 info['f_plan_meters'] = response.data
                 var pardate = {
@@ -361,7 +361,7 @@
           info.f_state = '未检'
           info.f_no_checkplan = '无计划安检'
           //tag
-          this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
+          this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
             //tag)
             info['f_plan_meters'] = response.data
             var pardate = {
@@ -378,7 +378,7 @@
       Mreadibook(){
         this.cbc=[]
         let http = new HttpResetClass()
-        http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/getMeterBooksData`,
+        http.load('POST',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getMeterBooksData`,
           {data: {f_orgid: "('"+Vue.user.orgid+"')"}},
           {resolveMsg: null, rejectMsg: '获取失败！！！'}).then((getMeterReadingBooks)=>{
           this.cbc = [{label: '全部', value: ''}]