safecheck-client 4.0.0-65 → 4.0.0-67

package/src/components/report/CheckPlanAreaList.vue

@@ -57,11 +57,11 @@
                      :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
                      @click="$parent.$parent.hidden()">
                 </div>
-<!--                <export-excel   :data="$parent.$parent.exportParameter"
-                                     :field="$parent.$parent.exportExcelField"
-                                     sqlurl="api/af-safecheck/logic/exportfile" sql-name="getCheckPlanAreaList"
-                                     template-name='安检汇总' :choose-col="true">
-                </export-excel>-->
+                <!--                <export-excel   :data="$parent.$parent.exportParameter"
+                                                     :field="$parent.$parent.exportExcelField"
+                                                     sqlurl="api/af-safecheck/logic/exportfile" sql-name="getCheckPlanAreaList"
+                                                     template-name='安检汇总' :choose-col="true">
+                                </export-excel>-->
                 <button id="btnaaaa" style="float: right" class="button_search"
                         @click="$parent.$parent.exportexcel()"
                         v-el:cx>导出</button>
@@ -154,11 +154,11 @@
         <template partial='body'>
           <tr>
             <td style="text-align:center;border-right: 1px solid ">{{$index + 1}}</td>
-<!--            <td style="text-align:center"  v-if="$parent.$parent.$parent.nameForSql.includes('f_plan_month')">{{row.f_plan_month.indexOf('*&')!=-1?'':row.f_plan_month}}</td>-->
-<!--            <td style="text-align:center"  v-if="$parent.$parent.$parent.nameForSql.includes('f_no_checkplan')">{{row.f_no_checkplan.indexOf('*&')!=-1?'':row.f_no_checkplan}}</td>-->
-<!--            <td style="text-align:center"  v-if="$parent.$parent.$parent.nameForSql.includes('f_residential_area')">{{row.f_residential_area.indexOf('*&')!=-1?'':row.f_residential_area}}</td>-->
-<!--            <td style="text-align:center"  v-if="$parent.$parent.$parent.nameForSql.includes('f_plan_name')">{{row.f_plan_name.indexOf('*&')!=-1?'':row.f_plan_name}}</td>-->
-<!--            <td style="text-align:center"  v-if="$parent.$parent.$parent.nameForSql && $parent.$parent.$parent.nameForSql.includes('f_checker_name')">{{row.f_checker_name && row.f_checker_name.indexOf('*&')!=-1?'':row.f_checker_name}}</td>-->
+            <!--            <td style="text-align:center"  v-if="$parent.$parent.$parent.nameForSql.includes('f_plan_month')">{{row.f_plan_month.indexOf('*&')!=-1?'':row.f_plan_month}}</td>-->
+            <!--            <td style="text-align:center"  v-if="$parent.$parent.$parent.nameForSql.includes('f_no_checkplan')">{{row.f_no_checkplan.indexOf('*&')!=-1?'':row.f_no_checkplan}}</td>-->
+            <!--            <td style="text-align:center"  v-if="$parent.$parent.$parent.nameForSql.includes('f_residential_area')">{{row.f_residential_area.indexOf('*&')!=-1?'':row.f_residential_area}}</td>-->
+            <!--            <td style="text-align:center"  v-if="$parent.$parent.$parent.nameForSql.includes('f_plan_name')">{{row.f_plan_name.indexOf('*&')!=-1?'':row.f_plan_name}}</td>-->
+            <!--            <td style="text-align:center"  v-if="$parent.$parent.$parent.nameForSql && $parent.$parent.$parent.nameForSql.includes('f_checker_name')">{{row.f_checker_name && row.f_checker_name.indexOf('*&')!=-1?'':row.f_checker_name}}</td>-->
             <td style="text-align:center" :class="{'td-0':row.f_plan_month==undefined,'td-1':model.rows && model.rows.length!=($index+1)&&row.f_plan_month.indexOf('*&')==-1,'td-2':model.rows && model.rows.length!=($index+1)&&row.f_plan_month.indexOf('*&')!=-1,'td-3':model.rows && model.rows.length==($index+1)&&row.f_plan_month.indexOf('*&')!=-1,'td-4':model.rows && model.rows.length==($index+1)&&row.f_plan_month.indexOf('*&')==-1}" v-if="$parent.$parent.$parent.nameForSql.includes('f_plan_month')">{{row.f_plan_month.indexOf('*&')!=-1?'':row.f_plan_month}}</td>
             <td style="text-align:center" :class="{'td-0':row.f_no_checkplan==undefined,'td-1':model.rows && model.rows.length!=($index+1)&&row.f_no_checkplan.indexOf('*&')==-1,'td-2':model.rows && model.rows.length!=($index+1)&&row.f_no_checkplan.indexOf('*&')!=-1,'td-3':model.rows && model.rows.length==($index+1)&&row.f_no_checkplan.indexOf('*&')!=-1,'td-4':model.rows && model.rows.length==($index+1)&&row.f_no_checkplan.indexOf('*&')==-1}" v-if="$parent.$parent.$parent.nameForSql.includes('f_no_checkplan')">{{row.f_no_checkplan.indexOf('*&')!=-1?'':row.f_no_checkplan}}</td>
             <td style="text-align:center" :class="{'td-0':row.f_residential_area==undefined,'td-1':model.rows && model.rows.length!=($index+1)&&row.f_residential_area.indexOf('*&')==-1,'td-2':model.rows && model.rows.length!=($index+1)&&row.f_residential_area.indexOf('*&')!=-1,'td-3':model.rows && model.rows.length==($index+1)&&row.f_residential_area.indexOf('*&')!=-1,'td-4':model.rows && model.rows.length==($index+1)&&row.f_residential_area.indexOf('*&')==-1}" v-if="$parent.$parent.$parent.nameForSql.includes('f_residential_area')">{{row.f_residential_area.indexOf('*&')!=-1?'':row.f_residential_area}}</td>
@@ -193,260 +193,260 @@
 </template>
 
 <script>
-  /**
-   *阶梯气价查询列表
-   */
-  import {PagedList} from 'vue-client'
-  import { HttpResetClass } from 'vue-client'
-  import * as Util from "../Util";
-  import XLSX from 'xlsx'
-  export default {
-    data () {
-      return {
-        model: new PagedList('api/af-safecheck/sql/getCheckPlanAreaList', 99999,{},{f_plan_total:'',f_weijian:'',f_yijian:'',f_ruhu:'',f_buyu:'',f_jujian:''}),
-        // 公司下拉
-        curorgid: [this.$login.f.orgid],
-        row: {},
-        f_orgid: '',
-        nameForSql: [],
-        groupNameForSql: '',
-        listflag:false,
-        nameflag:false,
-        criteriaShow: false,
-        f_check_start:new Date().getFullYear() + '-01',
-        f_check_end:new Date().getFullYear() + '-12',
-        planName:[{label: '全部', value: ''}],
-        exportExcelField: {
-          'f_weijian':'未检',
-          'f_yijian':'已检',
-          'f_ruhu':'入户',
-          'f_buyu':'到访不遇',
-          'f_jujian':'拒检',
-          'f_check_bv':'安检率'
-        }
-      }
-    },
-    props: {
+/**
+ *阶梯气价查询列表
+ */
+import {PagedList} from 'vue-client'
+import { HttpResetClass } from 'vue-client'
+import * as Util from "../Util";
+import XLSX from 'xlsx'
+export default {
+  data () {
+    return {
+      model: new PagedList('api/af-safecheck/sql/getCheckPlanAreaList', 99999,{},{f_plan_total:'',f_weijian:'',f_yijian:'',f_ruhu:'',f_buyu:'',f_jujian:''}),
+      // 公司下拉
+      curorgid: [this.$login.f.orgid],
       row: {},
-      config: {},
-      ispartial: false,
-      f_filialeid: {
-        type: String
+      f_orgid: '',
+      nameForSql: [],
+      groupNameForSql: '',
+      listflag:false,
+      nameflag:false,
+      criteriaShow: false,
+      f_check_start:new Date().getFullYear() + '-01',
+      f_check_end:new Date().getFullYear() + '-12',
+      planName:[{label: '全部', value: ''}],
+      exportExcelField: {
+        'f_weijian':'未检',
+        'f_yijian':'已检',
+        'f_ruhu':'入户',
+        'f_buyu':'到访不遇',
+        'f_jujian':'拒检',
+        'f_check_bv':'安检率'
       }
-    },
-    ready () {
-      this.nameForSql = ['f_plan_month', 'f_plan_name','f_checker_name']
-      this.groupNameForSql = 'f_plan_month', 'f_plan_name','f_checker_name'
-      this.pl()
-      // this.search()
+    }
+  },
+  props: {
+    row: {},
+    config: {},
+    ispartial: false,
+    f_filialeid: {
+      type: String
+    }
+  },
+  ready () {
+    this.nameForSql = ['f_plan_month', 'f_plan_name','f_checker_name']
+    this.groupNameForSql = 'f_plan_month', 'f_plan_name','f_checker_name'
+    this.pl()
+    // this.search()
 
-    },
-    methods: {
-      exportexcel(){
-        //tag
+  },
+  methods: {
+    exportexcel(){
+      //tag
 // 以上四行也可以直接一行搞定，如果不需要对表格数据进行修改的话
-        const aa = document.getElementsByClassName("list_area table_sy excelid")[0]
-        console.log(aa)
-        let workbook = XLSX.utils.table_to_book(document.getElementsByClassName("list_area table_sy excelid")[0])
-        try {
-          XLSX.writeFile(workbook, '安检情况汇总导出.xlsx');
-        } catch(e) {
-          //tag;
+      const aa = document.getElementsByClassName("list_area table_sy excelid")[0]
+      console.log(aa)
+      let workbook = XLSX.utils.table_to_book(document.getElementsByClassName("list_area table_sy excelid")[0])
+      try {
+        XLSX.writeFile(workbook, '安检情况汇总导出.xlsx');
+      } catch(e) {
+        //tag;
+      }
+    },
+    // 获取导出列
+    getexportExcelField(){
+      this.exportExcelField = {
+        'f_weijian':'未检',
+        'f_yijian':'已检',
+        'f_ruhu':'入户',
+        'f_buyu':'到访不遇',
+        'f_jujian':'拒检',
+        'f_check_bv':'安检率',
+        'f_plan_total':'计划总数'
+      }
+      let forName = this.groupNameForSql.split(",")
+      for (let i = 0; i < forName.length; i++) {
+        let ff = forName[i]
+        if (ff==='f_plan_month') {
+          this.exportExcelField.f_plan_month='计划月份'
         }
-      },
-      // 获取导出列
-      getexportExcelField(){
-        this.exportExcelField = {
-          'f_weijian':'未检',
-          'f_yijian':'已检',
-          'f_ruhu':'入户',
-          'f_buyu':'到访不遇',
-          'f_jujian':'拒检',
-          'f_check_bv':'安检率',
-          'f_plan_total':'计划总数'
+        if (ff==='f_no_checkplan') {
+          this.exportExcelField.f_no_checkplan='计划类型'
         }
-        let forName = this.groupNameForSql.split(",")
-        for (let i = 0; i < forName.length; i++) {
-          let ff = forName[i]
-          if (ff==='f_plan_month') {
-            this.exportExcelField.f_plan_month='计划月份'
-          }
-          if (ff==='f_no_checkplan') {
-            this.exportExcelField.f_no_checkplan='计划类型'
-          }
-          if (ff==='f_plan_name') {
-            this.exportExcelField.f_plan_name='计划名称'
-          }
-          if (ff==='f_checker_name') {
-            this.exportExcelField.f_checker_name='安检员'
-          }if (ff==='f_residential_area') {
-            this.exportExcelField.f_residential_area='小区名称'
-          }if (ff==='f_user_number') {
-            this.exportExcelField.f_user_number='档案数量'
-          }
+        if (ff==='f_plan_name') {
+          this.exportExcelField.f_plan_name='计划名称'
         }
-      },
-       pl() {
-         let getGasman = new HttpResetClass()
-         getGasman.load('POST', `api/af-safecheck/sql/safe_singleTable_OrderBy`, {
-          data: {
-            items: "id,f_plan_name",
-            tablename: "t_check_plan",
-            condition: `f_filialeid = '${this.curorgid}'`,
-            orderitem: "id"
-          }
-        }, {resolveMsg: null, rejectMsg: null}).then((plne) => {
-          //tag
-          //tag
-          //tag
-          for (let i = 0; i < plne.data.length; i++) {
-            this.planName.push({label: plne.data[i].f_plan_name, value: plne.data[i].id})
-          }
-          //tag
-        })
-      },
-      hiddenr() {
-        this.$parent.isdetail = !this.$parent.isdetail
-      },
-      hidden() {
-        this.criteriaShow = !this.criteriaShow
-       },
-      search () {
-        this.$refs.paged.$refs.cri.search()
-        this.$dispatch('search')
-      },
-      getorg (val) {
-        this.f_orgid = this.$login.convertToIn(val.resids)
-        this.f_filialeid = val[0]
-
-      },
-      selfSearch (args) {
-        if (!this.f_orgid) {
-          this.getorg([this.$login.f.orgid])
-          args.condition = `f_filialeid  in ('${this.$login.f.orgid}') and ${args.condition}`
+        if (ff==='f_checker_name') {
+          this.exportExcelField.f_checker_name='安检员'
+        }if (ff==='f_residential_area') {
+          this.exportExcelField.f_residential_area='小区名称'
+        }if (ff==='f_user_number') {
+          this.exportExcelField.f_user_number='档案数量'
         }
-        if (this.f_orgid) {
-          args.condition = `f_filialeid  in ${this.f_orgid} and ${args.condition}`
+      }
+    },
+    pl() {
+      let getGasman = new HttpResetClass()
+      getGasman.load('POST', `api/af-safecheck/sql/safe_singleTable_OrderBy`, {
+        data: {
+          items: "id,f_plan_name",
+          tablename: "t_check_plan",
+          condition: `f_filialeid = '${this.curorgid}'`,
+          orderitem: "id"
         }
-        if(this.f_check_start && this.f_check_end){
-          if(new Date(this.f_check_start).getFullYear() == new Date(this.f_check_end).getFullYear() ){
-            args.condition += ` and f_year>=${new Date(this.f_check_start).getFullYear()} and f_month>=${new Date(this.f_check_start).getMonth()+1} and f_month<=${new Date(this.f_check_end).getMonth()+1}`
-          }else {
-            args.condition += ` and (
+      }, {resolveMsg: null, rejectMsg: null}).then((plne) => {
+        //tag
+        //tag
+        //tag
+        for (let i = 0; i < plne.data.length; i++) {
+          this.planName.push({label: plne.data[i].f_plan_name, value: plne.data[i].id})
+        }
+        //tag
+      })
+    },
+    hiddenr() {
+      this.$parent.isdetail = !this.$parent.isdetail
+    },
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    search () {
+      this.$refs.paged.$refs.cri.search()
+      this.$dispatch('search')
+    },
+    getorg (val) {
+      this.f_orgid = this.$login.convertToIn(val.resids)
+      this.f_filialeid = val[0]
+
+    },
+    selfSearch (args) {
+      if (!this.f_orgid) {
+        this.getorg([this.$login.f.orgid])
+        args.condition = `f_filialeid  in ('${this.$login.f.orgid}') and ${args.condition}`
+      }
+      if (this.f_orgid) {
+        args.condition = `f_filialeid  in ${this.f_orgid} and ${args.condition}`
+      }
+      if(this.f_check_start && this.f_check_end){
+        if(new Date(this.f_check_start).getFullYear() == new Date(this.f_check_end).getFullYear() ){
+          args.condition += ` and f_year>=${new Date(this.f_check_start).getFullYear()} and f_month>=${new Date(this.f_check_start).getMonth()+1} and f_month<=${new Date(this.f_check_end).getMonth()+1}`
+        }else {
+          args.condition += ` and (
               (f_year = ${new Date(this.f_check_start).getFullYear()} and f_month >= ${new Date(this.f_check_start).getMonth()+1})
               or
                ( f_year > ${new Date(this.f_check_start).getFullYear()} and  f_year < ${new Date(this.f_check_end).getFullYear()})
               or
                (f_year = ${new Date(this.f_check_end).getFullYear()} and f_month <= ${new Date(this.f_check_end).getMonth()+1}))`
-          }
-        } else {
-          if(this.f_check_start){
-            args.condition += ` and f_year>=${new Date(this.f_check_start).getFullYear()} and f_month>=${new Date(this.f_check_start).getMonth()+1}`
-          }
-          if(this.f_check_end){
-            args.condition += ` and f_year<=${new Date(this.f_check_end).getFullYear()} and f_month<=${new Date(this.f_check_end).getMonth()+1}`
-          }
         }
-        this.$refs.paged.$refs.grid.$el.scrollTop = 0
-        if (this.groupNameForSql=='undefined'){
-          //tag
-          this.$showMessage("请至少选择一项进行汇总")
-          return
+      } else {
+        if(this.f_check_start){
+          args.condition += ` and f_year>=${new Date(this.f_check_start).getFullYear()} and f_month>=${new Date(this.f_check_start).getMonth()+1}`
+        }
+        if(this.f_check_end){
+          args.condition += ` and f_year<=${new Date(this.f_check_end).getFullYear()} and f_month<=${new Date(this.f_check_end).getMonth()+1}`
         }
-        this.model.paramSource = {groupName: `'${this.groupNameForSql}'`}
-        this.model.search(args.condition, args.model)
-      },
+      }
+      this.$refs.paged.$refs.grid.$el.scrollTop = 0
+      if (this.groupNameForSql=='undefined'){
+        //tag
+        this.$showMessage("请至少选择一项进行汇总")
+        return
+      }
+      this.model.paramSource = {groupName: `'${this.groupNameForSql}'`}
+      this.model.search(args.condition, args.model)
+    },
 
-      // 拼接groupName1
-      getGroupName1 () {
-        var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number']
-        var newtemp=[]
+    // 拼接groupName1
+    getGroupName1 () {
+      var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number']
+      var newtemp=[]
 
-        for (var i=0;i<temp.length;i++){
-          for (var j=0;j<this.nameForSql.length;j++){
-            //tag
-            if(temp[i]==this.nameForSql[j]){
-              newtemp.push(this.nameForSql[j])
-            }
+      for (var i=0;i<temp.length;i++){
+        for (var j=0;j<this.nameForSql.length;j++){
+          //tag
+          if(temp[i]==this.nameForSql[j]){
+            newtemp.push(this.nameForSql[j])
           }
         }
-        let str = ''
+      }
+      let str = ''
 
-        for (var i=0;i < newtemp.length - 1; i++) {
-          str += newtemp[i] + ','
-        }
-        str += newtemp[i]
-        this.groupNameForSql = str.trim()
+      for (var i=0;i < newtemp.length - 1; i++) {
+        str += newtemp[i] + ','
       }
+      str += newtemp[i]
+      this.groupNameForSql = str.trim()
+    }
+  },
+  watch: {
+    // 'nameForSql' () {
+    //
+    //   this.getGroupName1()
+    // },
+    'nameForSql' () {
+      var e = document.createEvent("MouseEvents");
+      e.initEvent("click", true, true);
+      document.getElementById("btnaaa").dispatchEvent(e);
     },
-    watch: {
-      // 'nameForSql' () {
-      //
-      //   this.getGroupName1()
-      // },
-      'nameForSql' () {
-        var e = document.createEvent("MouseEvents");
-        e.initEvent("click", true, true);
-        document.getElementById("btnaaa").dispatchEvent(e);
-      },
-      'model.rows'(){
-        //tag
-        if(this.listflag){
-          return;
-        }
-        this.listflag=true
-        //tag
-        var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number']
-        var newtemp=[]
-        for (var i=0;i<temp.length;i++){
-          for (var j=0;j<this.nameForSql.length;j++){
-            //tag
-            if(temp[i]==this.nameForSql[j]){
-              newtemp.push(this.nameForSql[j])
-            }
+    'model.rows'(){
+      //tag
+      if(this.listflag){
+        return;
+      }
+      this.listflag=true
+      //tag
+      var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number']
+      var newtemp=[]
+      for (var i=0;i<temp.length;i++){
+        for (var j=0;j<this.nameForSql.length;j++){
+          //tag
+          if(temp[i]==this.nameForSql[j]){
+            newtemp.push(this.nameForSql[j])
           }
         }
-        if((newtemp.includes('f_user_number')&&newtemp.length==2)||(!newtemp.includes('f_user_number')&&newtemp.length==1)){
-          return
-        }
-        var temp=JSON.parse(JSON.stringify(this.model.rows))
+      }
+      if((newtemp.includes('f_user_number')&&newtemp.length==2)||(!newtemp.includes('f_user_number')&&newtemp.length==1)){
+        return
+      }
+      var temp=JSON.parse(JSON.stringify(this.model.rows))
 
-        //遍历查询结果 为指定列增加样式
-        for (var i=0;i<newtemp.length-1;i++){
-          if(newtemp[i]=='f_user_number'){
-            return;
-          }
-          //tag
-          var ss=''
-          for (var j=0;j<temp.length;j++){
-            if(j>0&&i>0){
-              var flag=false
-              for(var t=i-1;t>-1;t--){
-                //tag
-                //tag
-                //tag
-                //tag
-                if(temp[j-1][newtemp[t]]!=temp[j][newtemp[t]]&&(temp[j][newtemp[t]] !=null && temp[j][newtemp[t]].indexOf('*&') )==-1){
-                  flag=true
-                  break
-                }
-              }
+      //遍历查询结果 为指定列增加样式
+      for (var i=0;i<newtemp.length-1;i++){
+        if(newtemp[i]=='f_user_number'){
+          return;
+        }
+        //tag
+        var ss=''
+        for (var j=0;j<temp.length;j++){
+          if(j>0&&i>0){
+            var flag=false
+            for(var t=i-1;t>-1;t--){
+              //tag
               //tag
-              if(flag){
-                ss=temp[j][newtemp[i]]
-                continue
+              //tag
+              //tag
+              if(temp[j-1][newtemp[t]]!=temp[j][newtemp[t]]&&(temp[j][newtemp[t]] !=null && temp[j][newtemp[t]].indexOf('*&') )==-1){
+                flag=true
+                break
               }
             }
-            if(temp[j][newtemp[i]]==ss){
-              temp[j][newtemp[i]]=temp[j][newtemp[i]]+'*&'
-            }else {
+            //tag
+            if(flag){
               ss=temp[j][newtemp[i]]
+              continue
             }
           }
+          if(temp[j][newtemp[i]]==ss){
+            temp[j][newtemp[i]]=temp[j][newtemp[i]]+'*&'
+          }else {
+            ss=temp[j][newtemp[i]]
+          }
         }
-        //tag
-        this.model.rows=JSON.parse(JSON.stringify(temp))
-      },
+      }
+      //tag
+      this.model.rows=JSON.parse(JSON.stringify(temp))
+    },
     'model.rows.length'() {
       // 如果查询无结果，将合计置为0
       if(this.model.rows.length < 1){
@@ -458,48 +458,48 @@
         this.model.sums.f_jujian = 0
       }
     }
-    },
-    computed:{
-      exportParameter(){
-        // excel 导出条件拼接
-        return {
-            condition: this.$refs.paged.model.condition,
-            groupName: this.groupNameForSql
-          }
+  },
+  computed:{
+    exportParameter(){
+      // excel 导出条件拼接
+      return {
+        condition: this.$refs.paged.model.condition,
+        groupName: this.groupNameForSql
       }
     }
   }
+}
 </script>
 
 <style scoped>
 
-  .td-0{
-    border: 1px solid #000000;
-  }
+.td-0{
+  border: 1px solid #000000;
+}
 
-  .td-1{
-    border: none;
-    border-top: 1px solid #000000;
-    border-left: 1px solid #000000;
-    border-right: 1px solid #000000;
-  }
+.td-1{
+  border: none;
+  border-top: 1px solid #000000;
+  border-left: 1px solid #000000;
+  border-right: 1px solid #000000;
+}
 
-  .td-2{
-    border: none;
-    border-left: 1px solid #000000;
-    border-right: 1px solid #000000;
-  }
-  .td-4{
-    border: none;
-    border-top: 1px solid #000000;
-    border-left: 1px solid #000000;
-    border-right: 1px solid #000000;
-    border-bottom: 1px solid #000000;
-  }
-  .td-3{
-    border: none;
-    border-left: 1px solid #000000;
-    border-right: 1px solid #000000;
-    border-bottom: 1px solid #000000;
-  }
+.td-2{
+  border: none;
+  border-left: 1px solid #000000;
+  border-right: 1px solid #000000;
+}
+.td-4{
+  border: none;
+  border-top: 1px solid #000000;
+  border-left: 1px solid #000000;
+  border-right: 1px solid #000000;
+  border-bottom: 1px solid #000000;
+}
+.td-3{
+  border: none;
+  border-left: 1px solid #000000;
+  border-right: 1px solid #000000;
+  border-bottom: 1px solid #000000;
+}
 </style>