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

package/src/filiale/wensu/pc/DefectListNew.vue

@@ -400,7 +400,7 @@
   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('隐患已处理。')
@@ -432,7 +432,7 @@
       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
@@ -494,7 +494,7 @@
     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 = {
@@ -503,7 +503,7 @@
         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 != '无隐患'`, {})
@@ -515,7 +515,7 @@
     title: '隐患项列表',
     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'
         }),
         showSolveModal: false,
@@ -617,7 +617,7 @@
           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
@@ -685,7 +685,7 @@
         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/filiale/wensu/pc/DefectPaperNew.vue

@@ -52,12 +52,12 @@
                 <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
+                  <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>
@@ -101,9 +101,9 @@
               </v-select>
             </div>
             <div :class="$parent.$parent.style">
-              <label class="font_normal_body">起始时间</label>
+              <label class="font_normal_body">安检起始时间</label>
               <datepicker
-                placeholder='起始时间' style="width:60%"
+                placeholder='安检起始时间' style="width:60%"
                 :disabled-days-of-week="[]"
                 :format="'yyyy-MM-dd'"
                 :show-rest-button="reset"
@@ -113,9 +113,9 @@
               </datepicker>
             </div>
             <div :class="$parent.$parent.style">
-              <label class="font_normal_body">结束时间</label>
+              <label class="font_normal_body">安检结束时间</label>
               <datepicker
-                placeholder='结束时间' style="width:60%"
+                placeholder='安检结束时间' style="width:60%"
                 :disabled-days-of-week="[]"
                 :format="'yyyy-MM-dd'"
                 :show-rest-button="reset"
@@ -233,7 +233,7 @@
                     :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="GetCheckPaperByDefectNew2" template-name='安检计划明细'
+                    sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="GetCheckPaperByDefectNew2" template-name='安检计划明细'
                     :choose-col="true"></export-excel-old>
                 </div>
               </div>
@@ -300,9 +300,9 @@
               </v-select>
             </div>
             <div :class="$parent.$parent.style">
-              <label class="font_normal_body">起始时间</label>
+              <label class="font_normal_body">安检起始时间</label>
               <datepicker
-                placeholder='起始时间' style="width:60%"
+                placeholder='安检起始时间' style="width:60%"
                 :disabled-days-of-week="[]"
                 :format="'yyyy-MM-dd'"
                 :show-rest-button="reset"
@@ -312,9 +312,9 @@
               </datepicker>
             </div>
             <div :class="$parent.$parent.style">
-              <label class="font_normal_body">结束时间</label>
+              <label class="font_normal_body">安检结束时间</label>
               <datepicker
-                placeholder='结束时间' style="width:60%"
+                placeholder='安检结束时间' style="width:60%"
                 :disabled-days-of-week="[]"
                 :format="'yyyy-MM-dd'"
                 :show-rest-button="reset"
@@ -430,6 +430,12 @@
             {{row.f_repair_date}}
           </td>
         </template>
+        <template partial="foot">
+          <td style="text-align: center" colspan="11"><span><b>合计：</b></span></td>
+          <td style="text-align: center">{{model.sums.f_defect_count}}</td>
+          <td style="text-align: center">{{model.sums.f_deal_count}}</td>
+          <td style="text-align: center">{{model.sums.f_defect_count-model.sums.f_deal_count}}</td>
+        </template>
       </data-grid>
     </criteria-paged>
 
@@ -551,14 +557,14 @@ 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'
-    })
+    },{f_defect_count:'',f_deal_count:''})
     model.f_filialeids = '(' + this.$login.f.orgid + ')'
     model.f_defect_content = 'CASE WHEN CHARINDEX( \'"result":"正常"\', f_defect_content ) > 0 THEN \'无隐患\' ELSE replace(replace(replace( replace( RIGHT ( f_defect_content, len( f_defect_content ) - 26 ), substring(\'{}\',2,1), \'\' ), substring(\'{}\',1,1), \'\' ),\']\',\'\'),\'"\',\'\') END'
     return {
       repaired: [{label: '全部', value: ''}, {label: '未完成', value: '未完成'}, {label: '已完成', value: '已完成'}],
-      deals: [{label: '全部', value: ''}, {label: '未处理', value: '未处理'}, {label: '已处理', value: '已处理'},{label: '处理中', value: '处理中'}],
+      deals: [{label: '全部', value: ''}, {label: '未处理', value: '未处理'}, {label: '已处理', value: '已处理'}],
       hasDefectOptions: [{label: '全部', value: ''}, {label: '有隐患', value: '有隐患'}, {
         label: '无隐患',
         value: '无隐患'
@@ -664,7 +670,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',
@@ -704,13 +710,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: {
@@ -766,7 +772,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()
@@ -842,7 +848,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 = {
@@ -851,7 +857,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
@@ -936,7 +942,7 @@ export default {
       //tag
       this.sliceArea = []
       if (val) {
-        new HttpResetClass().load('POST', `/rs/sql/tel_singleTable_OrderBy`, {
+        new HttpResetClass().load('POST', `/api/af-safecheck/sql/tel_singleTable_OrderBy`, {
           data: {
             items: 'name',
             tablename: 't_zone',
@@ -963,7 +969,7 @@ export default {
       //tag
       this.cbcs = []
       if (val) {
-        new HttpResetClass().load('POST', `/rs/sql/tel_singleTable_OrderBy`, {
+        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',
@@ -1030,7 +1036,7 @@ export default {
     async asyncReady (self) {
       // 获取配置信息
       try {
-        let res = await new HttpResetClass().load('post', 'rs/sql/tel_singleTable_OrderBy', {
+        let res = await new HttpResetClass().load('post', 'api/af-safecheck/sql/tel_singleTable_OrderBy', {
           data: {
             items: 'f_dir',
             tablename: 't_organization',

package/src/filiale/wensu/pc/NewCheckpaper.vue

@@ -898,7 +898,7 @@ import {HttpResetClass} from "vue-client";
 let asyncReady = async function (self) {
   // 获取配置信息
   try {
-    let res = await new HttpResetClass().load('post', 'rs/sql/safe_singleTable_OrderBy', {
+    let res = await new HttpResetClass().load('post', 'api/af-safecheck/sql/safe_singleTable_OrderBy', {
       data: {
         items: 'f_dir',
         tablename: 't_organization',
@@ -943,7 +943,7 @@ let asyncReady = async function (self) {
     //   }
     // }
     if (self.data.f_recheck_id) {
-      let res3 = await new HttpResetClass().load('post', 'rs/sql/safe_singleTable_OrderBy', {
+      let res3 = await new HttpResetClass().load('post', 'api/af-safecheck/sql/safe_singleTable_OrderBy', {
         data: {
           items: '*',
           tablename: 't_check_paper',
@@ -1116,7 +1116,7 @@ export default {
         id: this.item.id,
         f_check_item_id: this.item.f_check_item_id
       }
-      new HttpResetClass().load('POST', '/rs/logic/updateAafeAudit', {data: reqdata}, {
+      new HttpResetClass().load('POST', '/api/af-safecheck/logic/updateAafeAudit', {data: reqdata}, {
         resolveMsg: '安检审核成功！',
         rejectMsg: '安检审核出错！'
       }).then((res) => {
@@ -1141,7 +1141,7 @@ export default {
         id: this.item.id,
         f_check_item_id: this.item.f_check_item_id
       }
-      new HttpResetClass().load('POST', '/rs/logic/updateAafeAudit', {data: reqdata}, {
+      new HttpResetClass().load('POST', '/api/af-safecheck/logic/updateAafeAudit', {data: reqdata}, {
         resolveMsg: '安检审核成功！',
         rejectMsg: '安检审核出错！'
       }).then((res) => {