update

hailu

2021-10-18 9f56f16743704683e036c251418fe46d0c7fd4ff

update

 src/components/main/main.vue

@@ -143,6 +143,7 @@
    },
    turnToPage(route) {
      let {name, params, query} = {}
      console.log(route)
      if (typeof route === 'string') {
        name = route
      } else {

 src/router/index.js

@@ -35,6 +35,7 @@
  console.log(to.name,'name',bool)
  if (from.name) {
    localStorage.setItem('setUrlRec', to.name)
    console.log("我执行了！",to.name)
  }
  console.log(from.name,to.name,localStorage.getItem('setUrlRec'))
  if (bool && from.name === null && localStorage.getItem('setUrlRec')) {

 src/view/diligenceTools/components/tab5.vue

@@ -78,6 +78,7 @@
            <p v-if="params.row.PartyList && params.row.PartyList.length > 0" v-for="item in params.row.PartyList">
              <span v-if="item.RoleType == 1">被告</span>
              <span v-if="item.RoleType == 2">原告</span>
              <span v-if="item.RoleType == ''">其他当事人</span>
              <span v-if="item.RoleType == 3">第三方人</span>
              <span> - </span>
              <span>{{ item.Name }}</span>
@@ -559,6 +560,7 @@
                 v-for="item in courtNoticeListDetail.PartyList">
                <span v-if="item.RoleType == 1">被告</span>
                <span v-if="item.RoleType == 2">原告</span>
                <span v-if="item.RoleType == ''">其他当事人</span>
                <span v-if="item.RoleType == 3">第三方人</span>
                <span> - </span>
                <span>{{ item.Name }}</span>

 src/view/enterpriseControl/offSiteCheck.vue

@@ -22,10 +22,10 @@
              <!--                    <li v-for="item in companyNameListpop">{{item}}</li>-->
              <!--                  </ul>-->
              <!--                </div>-->
              <div style="width:270px;">
              <div style="width:240px;">
                <FormItem>
<!--                  @on-open-change="opencloseFun"-->
                  <Select class="overclass" @on-open-change="opencloseFun" :max-tag-count="1"  allow-create multiple @on-select="companySelect"  filterable v-model="offSiteCheckModel.companyName" style="width: 100%;white-space: nowrap;" label="企业名称" size="large">
                  <Select transfer class="overclass" @on-open-change="opencloseFun"  :max-tag-count="1"  multiple @on-select="companySelect"  filterable v-model="offSiteCheckModel.companyName" style="width: 100%;white-space: nowrap;" label="企业名称" size="large">
                    <Option :value="item.value" :label="item.CompanyName" @click.native="gogogoCompany" v-for="item in CompanyNameList" :key="item.Id">{{item.CompanyName}}</Option>
                  </Select>
                </FormItem>
@@ -39,9 +39,9 @@
              <!--                    <li v-for="item in offSiteCheckpop">{{item}}</li>-->
              <!--                  </ul>-->
              <!--                </div>-->
              <div style="width: 180px;margin-left: 15px">
              <div style="width: 150px;margin-left: 15px">
                <FormItem>
                  <Select @on-open-change="opencloseColor" class="overclass" :max-tag-count="1"  allow-create @on-select="selectYJLevel"  multiple filterable v-model="offSiteCheckModel.Name" style="width: 100%;white-space: nowrap;" label="预警等级" size="large">
                  <Select transfer @on-open-change="opencloseColor" allow-create class="overclass" :max-tag-count="1"  @on-select="selectYJLevel"  multiple filterable v-model="offSiteCheckModel.Name" style="width: 100%;white-space: nowrap;" label="预警等级" size="large">
                    <Option v-for="item in yujinColor" :value="item.value"  @click.native="gogogoYJLevel" :label="item.label" :key="item.label">{{item.label}}</Option>
                  </Select>
                </FormItem>
@@ -63,19 +63,20 @@
              <!--                    <li v-for="item in typeListpop">{{item}}</li>-->
              <!--                  </ul>-->
              <!--                </div>-->
              <div style="width:280px;margin-left: 15px;margin-right: 15px">
                <FormItem>
<!--                  @on-open-change="eventTypeChange"-->
                  <Select @on-open-change="eventTypeChange" class="overclass" :max-tag-count="1"  multiple  allow-create @on-select="typeSelect" filterable v-model="offSiteCheckModel.type" style="width: 100%;white-space: nowrap;" label="事件类别" size="large">
<!--                    <Option value="all">预警模块全部</Option>-->
                    <Option v-for="item in typelist" :value="item.Id" @click.native="gogogo" :label="item.Name" :key="item.Id">{{item.Name}}</Option>
                  </Select>
                </FormItem>
              <div style="margin-left: 15px;margin-right: 15px;width:240px">
                    <FormItem>
                      <!--                  @on-open-change="eventTypeChange"-->
                      <Select transfer @on-open-change="eventTypeChange" class="overclass" :max-tag-count="1"  multiple  @on-select="typeSelect" filterable v-model="offSiteCheckModel.type"  label="事件类别" size="large">
                        <!--                    <Option value="all">预警模块全部</Option>-->
                        <Option v-for="item in typelist" :value="item.Id" @click.native="gogogo" :label="item.Name" :key="item.Id">{{item.Name}}</Option>
                      </Select>
                    </FormItem>

              </div>
<!--              {{item.Id=='999999'&&offSiteCheckModel.type.length==typelist.length-1?'取消全选': item.Name}}-->
              <!--              </Poptip>-->
              <Tooltip  theme="light" transfer  content="时间" placement="top" max-width="120">
                <div style="display:flex;align-items: center;border-radius: 4px;border:1px solid #ccc;margin-bottom: 12px">
                <div class="timeclass" style="display:flex;align-items: center;border-radius: 4px;border:1px solid #ccc;margin-bottom: 12px">
                  <div style="display: inline-block;"><Button class="s" style="font-size: 14px;border:0;border-right:1px solid #ccc;border-radius: 0;box-shadow: none;" size="large" @click="Btn_year('2')">1个月</Button></div>
                  <div style="display: inline-block;"><Button class="s1" style="font-size: 14px;border:0;border-right:1px solid #ccc;border-radius: 0;box-shadow: none;" size="large" @click="Btn_year('3')">3个月</Button></div>
                  <div style="display: inline-block;"><Button class="s2" style="font-size: 14px;border:0;border-right:1px solid #ccc;border-radius: 0;box-shadow: none;" size="large" @click="Btn_year('4')">6个月</Button></div>
@@ -8585,12 +8586,16 @@
        id: params.Id
      }
      axios.request({
        url: '/QiChaCha/GetCourtNoticeInfo',
        url: '/QiChaCha/GetCourtAnnoCheckDetail',
        data,
        method: 'post'
      }).then(res => {
        if (res.data.Check) {
          this.courtNoticeListDetail = res.data.Data
          this.$nextTick(() => {
            $('.contentClass2 a').removeAttr('href')
            $('.contentClass2 a').css({cursor: 'auto', color: '#515a6e'})
          })
          this.nothingData=false
          this.loading_go=false
        } else {
@@ -11711,6 +11716,12 @@
</script>

<style lang="less">
.overclass .ivu-form-item{
  margin-bottom: 12px;
}
.timeclass .ivu-btn-large{
  padding: 0 5px;
}
.overclass .ivu-select-selection{
  overflow: hidden;
}