Merge branch 'dev_2nd_period_test' into 'feature_dev_20221010_extend'

# Conflicts: # jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
2022-10-28 16:34:39 +08:00
parent 44d8dea8a7 419e4c9be2
commit cd6dc3c44a
113 changed files with 9798 additions and 670 deletions
@@ -109,8 +109,10 @@ export default {
        props = { to: { path: menu.path } }
      }

-      const attrs = { href: menu.path, target: menu.meta.target , title:menu.meta.title }
-
+      const attrs = { href: menu.path, target: menu.meta.target, title: menu.meta.title }
+      if (menu.meta && menu.meta.existTask) {
+        attrs.style = 'color:red'
+      }
      if (menu.children && menu.alwaysShow) {
        // 把有子菜单的 并且 父菜单是要隐藏子菜单的
        // 都给子菜单增加一个 hidden 属性
@@ -162,7 +164,8 @@ export default {
      span
      slot = 'title' >
        { this.renderIcon(menu.meta.icon) }
-        < span title={menu.meta.title}> { menu.meta.title } < /span>
+        < span
+      title = { menu.meta.title } > { menu.meta.title } < /span>
        < /span>
      {
        itemArr
@@ -19,12 +19,16 @@
        <span slot="titleName" slot-scope="text,record" :title="text">
                  {{ text }}
        </span>
+        <span slot="paramsName" slot-scope="text,record">
+            <span class="textName" :title="text">{{text}}</span>
+        </span>
        <div :slot="'titleName'+(index+1)" v-for="(item,index) in content">
-          <span v-if='item.isLock == 1' style='padding-right: 20px'><a-icon type="lock" theme="twoTone" two-tone-color="#00B3BE" /></span>
+          <span v-if='item.isLock == 1' style='padding-right: 20px'><a-icon type="lock" theme="twoTone"
+                                                                            two-tone-color="#00B3BE"/></span>
          <span style='padding-right: 10px'>{{ item.db_field_txt }} </span>
          <a-button @click='onClickSee(item)'>{{$t('See')}}</a-button>
        </div>
-<!--        {{ text && text.length > 8 ? text.slice(0, 7) + '...' : text }}-->
+        <!--        {{ text && text.length > 8 ? text.slice(0, 7) + '...' : text }}-->
        <span slot="ParameterDescription" slot-scope="text,record" :title="text">

          <a-button @click='onClickTitle(record)'>{{$t('See')}}</a-button>
@@ -55,7 +59,7 @@
           <span
             v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "To be collected" || record.state == "Rejected by eng. interface"'>
             <span :title='record.dataValue'
-               @click='ondataValueTobe(record)'>{{ (record.dataValue  == null || record.dataValue  == 'undefined')? '--': record.dataValue }}</span>
+                   @click='ondataValueTobe(record)'>{{ (record.dataValue  == null || record.dataValue  == 'undefined')? '--': record.dataValue }}</span>
           </span>
             <span v-else>
             <span :title='record.dataValue' @click='dataValueTobe(record)'>{{ (record.dataValue  == null || record.dataValue  == 'undefined')? '--': record.dataValue }}</span>
@@ -135,14 +139,14 @@
        <a-row :gutter='24'>
          <a-col :span='24'>
            <a-form-model-item ref='region' :label="$t('areaOfResponsibility')" prop='queryzr'>
-<!--              <a-select allowClear :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"-->
-<!--                        v-model="Dateline.querySdt">-->
-<!--                <a-select-option v-for="(item, key) in querySdtList" :key="key" :value="item.value">-->
-<!--                    <span style="display: inline-block;width: 100%" :title=" item.label ">-->
-<!--                      {{ item.label }}-->
-<!--                    </span>-->
-<!--                </a-select-option>-->
-<!--              </a-select>-->
+              <!--              <a-select allowClear :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"-->
+              <!--                        v-model="Dateline.querySdt">-->
+              <!--                <a-select-option v-for="(item, key) in querySdtList" :key="key" :value="item.value">-->
+              <!--                    <span style="display: inline-block;width: 100%" :title=" item.label ">-->
+              <!--                      {{ item.label }}-->
+              <!--                    </span>-->
+              <!--                </a-select-option>-->
+              <!--              </a-select>-->
              <j-dict-select-tag class="box-input" v-model="Dateline.queryzr"
                                 @input="handleInput('queryzr')"
                                 :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
@@ -155,7 +159,8 @@
      <div class="imports-footer">
        <div class="imports-footer-wrap">

-          <a-button class="imports-btn imports-sub" :loading="confirmLoading" type="primary" @click="handleSubmitzr">{{$t('preservation')}}
+          <a-button class="imports-btn imports-sub" :loading="confirmLoading" type="primary" @click="handleSubmitzr">
+            {{$t('preservation')}}
          </a-button>
          <a-button class="imports-btn" type="primary" @click="cancel">{{$t('cancel')}}</a-button>
        </div>
@@ -235,7 +240,7 @@
        default: {},
        require: true
      },
-      description:'',
+      description: '',
      formInline: {
        type: Object,
        default: true
@@ -300,7 +305,7 @@
        indeterminate: false,
        columns: [],
        content: [],
-        confirmLoading:false,
+        confirmLoading: false,
        selectedRowKeys: [],
        selectedRowrowValue: [],
        dataSource: [],
@@ -316,7 +321,7 @@
        sdt: 0, // 工程接口人
        dre: 0, // 填写人
        areaVisible: false,
-        areaVisiblezr:false,
+        areaVisiblezr: false,
        form: {},
        rules: {
          querySdt: [
@@ -342,13 +347,13 @@
          xs: { span: 24 },
          sm: { span: 7 }
        },
-        queryParamQuery:{},
-        queryParam:{},
+        queryParamQuery: {},
+        queryParam: {},
        querySdtList: [], // 工程接口人
        Dateline: {},
        getquerySdtId: '', // 当前工程接口人的id
        areaVisibleView: false, // 查看配置得弹框
-        seeVisibleView:false,
+        seeVisibleView: false,
        configDetail: {} // 查看配置得详细信息
      }
    },
@@ -394,7 +399,7 @@
        this.$emit('handlePreservation')
        this.getTableList()
      },
-      onClickTitle(val){
+      onClickTitle(val) {
        console.log(val)
        this.description = val.description
        this.seeVisibleView = true
@@ -455,7 +460,11 @@
      // 责任领域 保存
      handleSubmitzr(record) {
        let _this = this
-        let param = { dutyTerritory: this.Dateline.queryzr, ids: this.getquerySdtId,paramsManifestId: this.$route.query.id, }
+        let param = {
+          dutyTerritory: this.Dateline.queryzr,
+          ids: this.getquerySdtId,
+          paramsManifestId: this.$route.query.id
+        }
        this.$refs.ruleFormOne.validate(valid => {
          if (valid) {
            this.confirmLoading = true
@@ -538,7 +547,7 @@
        this.areaVisible = false
        this.$refs['ruleForm'].resetFields()
      },
-      cancel(){
+      cancel() {
        this.areaVisiblezr = false
        this.$refs['ruleFormOne'].resetFields()
      },
@@ -597,7 +606,7 @@
        }
        getAction('/params/userTypeLog/queryCurrentType', query).then((res) => {
          if (res.success) {
-            this.queryParamQuery = {...this.queryParamQuery}
+            this.queryParamQuery = { ...this.queryParamQuery }

            if (res.result && res.result.userType) {
              if (!(result.some(val => val.value == res.result.userType))) {
@@ -631,7 +640,7 @@
        let params = {
          paramsManifestId: paramsManifestid,
          flag: '7',
-          userType:userType,
+          userType: userType
        }
        getAction(url, params).then((res) => {
          if (res.success) {
@@ -662,25 +671,27 @@
                  dataIndex: res.db_field_name,
                  align: 'center',
                  // ellipsis: true,
-                  fixed: res.click5?'left':'',
+                  fixed: res.click5 ? 'left' : '',
                  sorter: res.sort,
                  width: 160
                })
-                console.log(res)
                this.columns[index].scopedSlots = {
                  customRender: 'titleName'
                }
-                if(res.click1){
+                if (res.db_field_name == 'nioNumber') {
+                  this.columns[index].width = 100
+                }
+                if (res.click1) {
                  this.columns[index].scopedSlots = {
                    customRender: 'operationzr'
                  }
                }
-                if(res.click2){
+                if (res.click2) {
                  this.columns[index].scopedSlots = {
                    customRender: 'ParameterDescription'
                  }
                }
-                if(res.click3){
+                if (res.click3) {
                  this.columns[index].scopedSlots = {
                    customRender: 'paramsNameDescription'
                  }
@@ -691,6 +702,12 @@
                    customRender: 'operationbtn'
                  }
                }
+                if (res.db_field_name == 'paramsName') {
+                  this.columns[index].width = 300
+                  this.columns[index].scopedSlots = {
+                    customRender: 'paramsName'
+                  }
+                }
              }
            })
            this.columns = [...this.columns]
@@ -707,7 +724,7 @@
        let params = {
          paramsManifestId: this.$route.query.id,
          pageNo: this.pageNo,
-          pageSize: this.pageSize,
+          pageSize: this.pageSize
          // userTypes: this.currentPersonRole
        }
        let url
@@ -812,7 +829,7 @@
            // })
            let tt = []
            if (this.currentPersonRole !== 'dre') {
-              console.log(res.result.records,'res.result.records')
+              console.log(res.result.records, 'res.result.records')
              res.result.records.forEach((Obj) => {
                Object.keys(Obj).forEach((item) => {
                  if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) {
@@ -912,6 +929,7 @@
    border: none !important;
    padding: 0 !important;
  }
+
  //::v-deep .ant-table-row:first-child {
  //  background: #fff!important;
  //  /*opacity: 0.9;*/
@@ -952,6 +970,7 @@
        font-weight: 400;
      }
    }
+
    .textfield {
      width: 100%;
      margin-bottom: 8px;
@@ -981,6 +1000,19 @@
      }
    }
  }
+
+  .textName {
+    width: 100%;
+    overflow: hidden;
+    display: -webkit-box;
+    text-overflow: ellipsis;
+    /*! autoprefixer: off */
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    /*! autoprefixer: on;*/
+    text-justify: inter-ideograph;
+    word-break: break-all
+  }
 </style>
 <style>
  .resize-table-th {
@@ -1001,7 +1033,7 @@
  }

  .rowClassRed {
-    background: #f3d9de ;
+    background: #f3d9de;
  }

  .rowClassRedYellow {
@@ -28,22 +28,25 @@

          <a-button @click='onClickTitle(record)'>{{$t('See')}}</a-button>
        </span>
-<!--        <span slot="operationbtn" slot-scope="record">-->
-<!--           <span v-if='currentPersonRole === "homo"'>-->
-<!--&lt;!&ndash;           认证工程师  &ndash;&gt;-->
-<!--           <span-->
-<!--             v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "变更" || record.state == "Wait Collect" || record.state == "Sdt Back" || record.state == "Change"'>-->
-<!--&lt;!&ndash;             <span&ndash;&gt;-->
-<!--&lt;!&ndash;               @click='ondataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>&ndash;&gt;-->
-<!--           </span>-->
-<!--             <span v-else>-->
-<!--             <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>-->
-<!--           </span>-->
-<!--           </span>-->
-<!--           <span v-else>-->
-<!--             <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>-->
-<!--           </span>-->
-<!--         </span>-->
+        <span slot="paramsName" slot-scope="text,record">
+            <span class="textName" :title="text">{{text}}</span>
+        </span>
+        <!--        <span slot="operationbtn" slot-scope="record">-->
+        <!--           <span v-if='currentPersonRole === "homo"'>-->
+        <!--&lt;!&ndash;           认证工程师  &ndash;&gt;-->
+        <!--           <span-->
+        <!--             v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "变更" || record.state == "Wait Collect" || record.state == "Sdt Back" || record.state == "Change"'>-->
+        <!--&lt;!&ndash;             <span&ndash;&gt;-->
+        <!--&lt;!&ndash;               @click='ondataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>&ndash;&gt;-->
+        <!--           </span>-->
+        <!--             <span v-else>-->
+        <!--             <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>-->
+        <!--           </span>-->
+        <!--           </span>-->
+        <!--           <span v-else>-->
+        <!--             <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '&#45;&#45;': record.dataValue}}</span>-->
+        <!--           </span>-->
+        <!--         </span>-->
        <span slot="detailClick" slot-scope="text,record">
          <collection-type :detailDate='text'/>
        </span>
@@ -99,7 +102,8 @@
      </div>
    </a-modal>
    <!--  配置信息--->
-    <a-modal v-model="areaVisibleView" :title="$t('configurationInformation')" width='550px' :footer="null" @cancel="hideModal">
+    <a-modal v-model="areaVisibleView" :title="$t('configurationInformation')" width='550px' :footer="null"
+             @cancel="hideModal">
      <div class="content-text">
        <div class="text-field">
          <span class="text-field-left" :title="$t('configurationName')">{{$t('configurationName')}}:</span>
@@ -246,7 +250,7 @@
        sdt: 0, // 工程接口人
        dre: 0, // 填写人
        areaVisible: false,
-        seeVisibleView:false,
+        seeVisibleView: false,
        form: {},
        rules: {
          querySdt: [
@@ -293,7 +297,7 @@
          return 'rowClassRed'
        }
      },
-      onClickTitle(val){
+      onClickTitle(val) {
        console.log(val)
        this.description = val.description
        this.seeVisibleView = true
@@ -310,7 +314,7 @@
        // this.$emit('handlePreservation')
        this.getTableList()
      },
-      hideModal(){
+      hideModal() {
        this.areaVisibleView = false
      },
      // 查看配置详细信息
@@ -507,17 +511,27 @@
                this.columns[index].scopedSlots = {
                  customRender: 'titleName'
                }
+                if (res.db_field_name == 'nioNumber') {
+                  this.columns[index].width = 100
+                }
                if (res.click) {
                  // 工程接口人列表修改
                  this.columns[index].scopedSlots = {
                    customRender: 'operationbtn'
                  }
                }
-                if(res.click2){
+                if (res.click2) {
                  this.columns[index].scopedSlots = {
                    customRender: 'ParameterDescription'
                  }
                }
+                if (res.db_field_name == 'paramsName') {
+                  this.columns[index].width = 300
+                  this.columns[index].ellipsis = false
+                  this.columns[index].scopedSlots = {
+                    customRender: 'paramsName'
+                  }
+                }
              }
            })
            this.columns = [...this.columns]
@@ -532,8 +546,8 @@
        let params = {
          paramsManifestId: this.$route.query.id,
          userTypes: this.currentPersonRole,
-          pageNo:this.pageNo,
-          pageSize:this.pageSize
+          pageNo: this.pageNo,
+          pageSize: this.pageSize
        }
        this.loading = true
        this.$emit('listReset', '')
@@ -723,14 +737,16 @@
    border: none !important;
    padding: 0 !important;
  }
+
  ::v-deep .ant-table-row:first-child {
-    background: #fff!important;
+    background: #fff !important;
    opacity: 0.9;
  }

  ::v-deep .ant-table-body {
-    background: transparent!important;
+    background: transparent !important;
  }
+
  .textfield {
    width: 100%;
    margin-bottom: 8px;
@@ -759,6 +775,7 @@
      font-weight: 400;
    }
  }
+
  .content-text {
    width: 100%;
    display: flex;
@@ -791,6 +808,19 @@
      }
    }
  }
+
+  .textName {
+    width: 100%;
+    overflow: hidden;
+    display: -webkit-box;
+    text-overflow: ellipsis;
+    /*! autoprefixer: off */
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    /*! autoprefixer: on;*/
+    text-justify: inter-ideograph;
+    word-break: break-all
+  }
 </style>
 <style>
  .resize-table-th {
@@ -15,7 +15,7 @@
              <a-list-item :key="index" v-for="(record, index) in announcement1" v-if="index <= 4">
                <div style="margin-left: 5%;width: 80%;">
                  <p style="overflow: hidden; text-overflow: ellipsis;white-space: nowrap;color:#00B3BE">
-                    <a :title="record.titile" @click="showAnnouncement(record)">{{ record.titile }}</a>
+                    <a :title="record.msgContent" @click="showAnnouncement(record)">{{ record.msgContent }}</a>
                  </p>
                </div>
              </a-list-item>
@@ -110,6 +110,11 @@
    //   clearInterval(this.timer)
    // },
    methods: {
+      getText(str) {
+        let words = str.replace(/<[^<>]+>/g, '').replace(/&nbsp;/gi, '') //这里是去除标签
+        //.replace(/\s/g, '') //这里是去除空格
+        return words
+      },
      loadData() {
        getAction(this.url.listCementByUser).then((res) => {
          if (res.success) {
@@ -134,9 +139,12 @@
      showAnnouncement(record) {
        getAction(this.url.readAllMsg, { ids: record.id }).then((res) => {
        })
+        localStorage.setItem('msgContent', record.msgContent)
        this.$router.push({
-          path: '/system/MessageDetails',
-          query: record
+          path: '/isps/userAnnouncement',
+          query: {
+            Date: Date.now()
+          }
        })
      },
      toMyAnnouncement() {