WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改禅道已知bug

Browse Source
This commit is contained in:
qq787203167
2022-07-04 10:42:59 +08:00
parent c12cc42160
commit 0df8425cbd
5 changed files with 101 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/CollectionType/index.vue
+60 -46
View File
@@ -24,7 +24,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 中文--> <!-- 中文-->
<div v-if="item.controlVerify == '2'"> <div v-else-if="item.controlVerify == '2'">
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')+$t('chinese')" :placeholder="$t('pleaseEnter')+$t('chinese')"
@@ -32,7 +32,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 正整数 --> <!-- 正整数 -->
<div v-if="item.controlVerify == '3'"> <div v-else-if="item.controlVerify == '3'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -41,7 +41,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 正浮点书 --> <!-- 正浮点书 -->
<div v-if="item.controlVerify == '4'"> <div v-else-if="item.controlVerify == '4'">
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)" onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)"
@@ -49,7 +49,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 整数或小数 --> <!-- 整数或小数 -->
<div v-if="item.controlVerify == '5'"> <div v-else-if="item.controlVerify == '5'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -57,7 +57,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 一位小数 --> <!-- 一位小数 -->
<div v-if="item.controlVerify == '6'"> <div v-else-if="item.controlVerify == '6'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -66,7 +66,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 两位小数--> <!-- 两位小数-->
<div v-if="item.controlVerify == '7'"> <div v-else-if="item.controlVerify == '7'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -75,7 +75,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 三位小数--> <!-- 三位小数-->
<div v-if="item.controlVerify == '8'"> <div v-else-if="item.controlVerify == '8'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -84,7 +84,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 四位小数--> <!-- 四位小数-->
<div v-if="item.controlVerify == '9'"> <div v-else-if="item.controlVerify == '9'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -156,7 +156,7 @@
</a-select-option> </a-select-option>
</a-select> </a-select>
</div> </div>
<div v-if='item.type==="text"'> <div v-else-if='item.type==="text"'>
<!-- 文本校验 分情况--> <!-- 文本校验 分情况-->
<!-- 1 无--> <!-- 1 无-->
<!-- 2 中文--> <!-- 2 中文-->
@@ -176,7 +176,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 中文--> <!-- 中文-->
<div v-if="item.controlVerify == '2'"> <div v-else-if="item.controlVerify == '2'">
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:maxLength="1000" :maxLength="1000"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
@@ -185,7 +185,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 正整数 --> <!-- 正整数 -->
<div v-if="item.controlVerify == '3'"> <div v-else-if="item.controlVerify == '3'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -194,7 +194,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 正浮点书 --> <!-- 正浮点书 -->
<div v-if="item.controlVerify == '4'"> <div v-else-if="item.controlVerify == '4'">
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)" onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)"
@@ -202,7 +202,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 整数或小数 --> <!-- 整数或小数 -->
<div v-if="item.controlVerify == '5'"> <div v-else-if="item.controlVerify == '5'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -210,7 +210,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 一位小数 --> <!-- 一位小数 -->
<div v-if="item.controlVerify == '6'"> <div v-else-if="item.controlVerify == '6'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -219,7 +219,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 两位小数--> <!-- 两位小数-->
<div v-if="item.controlVerify == '7'"> <div v-else-if="item.controlVerify == '7'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -228,7 +228,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 三位小数--> <!-- 三位小数-->
<div v-if="item.controlVerify == '8'"> <div v-else-if="item.controlVerify == '8'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -237,7 +237,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 四位小数--> <!-- 四位小数-->
<div v-if="item.controlVerify == '9'"> <div v-else-if="item.controlVerify == '9'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -271,7 +271,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 中文--> <!-- 中文-->
<div v-if="item.controlVerify == '2'"> <div v-else-if="item.controlVerify == '2'">
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:maxLength="1000" :maxLength="1000"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
@@ -280,7 +280,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 正整数 --> <!-- 正整数 -->
<div v-if="item.controlVerify == '3'"> <div v-else-if="item.controlVerify == '3'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -289,7 +289,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 正浮点书 --> <!-- 正浮点书 -->
<div v-if="item.controlVerify == '4'"> <div v-else-if="item.controlVerify == '4'">
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)" onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)"
@@ -297,7 +297,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 整数或小数 --> <!-- 整数或小数 -->
<div v-if="item.controlVerify == '5'"> <div v-else-if="item.controlVerify == '5'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -305,7 +305,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 一位小数 --> <!-- 一位小数 -->
<div v-if="item.controlVerify == '6'"> <div v-else-if="item.controlVerify == '6'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -314,7 +314,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 两位小数--> <!-- 两位小数-->
<div v-if="item.controlVerify == '7'"> <div v-else-if="item.controlVerify == '7'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -323,7 +323,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 三位小数--> <!-- 三位小数-->
<div v-if="item.controlVerify == '8'"> <div v-else-if="item.controlVerify == '8'">
<a-input-number class="box-input inputWid" <a-input-number class="box-input inputWid"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -332,7 +332,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 四位小数--> <!-- 四位小数-->
<div v-if="item.controlVerify == '9'"> <div v-else-if="item.controlVerify == '9'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -378,7 +378,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 中文--> <!-- 中文-->
<div v-if="item.controlVerify == '2'"> <div v-else-if="item.controlVerify == '2'">
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:maxLength="1000" :maxLength="1000"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
@@ -387,7 +387,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 正整数 --> <!-- 正整数 -->
<div v-if="item.controlVerify == '3'"> <div v-else-if="item.controlVerify == '3'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -396,7 +396,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 正浮点书 --> <!-- 正浮点书 -->
<div v-if="item.controlVerify == '4'"> <div v-else-if="item.controlVerify == '4'">
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)" onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)"
@@ -404,7 +404,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 整数或小数 --> <!-- 整数或小数 -->
<div v-if="item.controlVerify == '5'"> <div v-else-if="item.controlVerify == '5'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -412,7 +412,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 一位小数 --> <!-- 一位小数 -->
<div v-if="item.controlVerify == '6'"> <div v-else-if="item.controlVerify == '6'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -421,7 +421,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 两位小数--> <!-- 两位小数-->
<div v-if="item.controlVerify == '7'"> <div v-else-if="item.controlVerify == '7'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -430,7 +430,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 三位小数--> <!-- 三位小数-->
<div v-if="item.controlVerify == '8'"> <div v-else-if="item.controlVerify == '8'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -439,7 +439,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 四位小数--> <!-- 四位小数-->
<div v-if="item.controlVerify == '9'"> <div v-else-if="item.controlVerify == '9'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -472,7 +472,7 @@
</a-select-option> </a-select-option>
</a-select> </a-select>
</div> </div>
<div v-if='item.type==="file"'> <div v-else-if='item.type==="file"'>
<a-button type="primary" class="button-text inputWid" <a-button type="primary" class="button-text inputWid"
@click="clickButtonToUpload(item)"> @click="clickButtonToUpload(item)">
{{ (item.dataValue === 'null' || item.dataValue === '' || {{ (item.dataValue === 'null' || item.dataValue === '' ||
@@ -496,7 +496,7 @@
</a-select-option> </a-select-option>
</a-select> </a-select>
</div> </div>
<div v-if='item.type==="file"'> <div v-else-if='item.type==="file"'>
<a-button type="primary" class="button-text inputWid" <a-button type="primary" class="button-text inputWid"
@click="clickButtonToUpload(item)"> @click="clickButtonToUpload(item)">
{{ (item.dataValue === 'null' || item.dataValue === '' || {{ (item.dataValue === 'null' || item.dataValue === '' ||
@@ -540,7 +540,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 中文--> <!-- 中文-->
<div v-if="item.controlVerify == '2'"> <div v-else-if="item.controlVerify == '2'">
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:maxLength="1000" :maxLength="1000"
@@ -549,7 +549,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 正整数 --> <!-- 正整数 -->
<div v-if="item.controlVerify == '3'"> <div v-else-if="item.controlVerify == '3'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -558,7 +558,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 正浮点书 --> <!-- 正浮点书 -->
<div v-if="item.controlVerify == '4'"> <div v-else-if="item.controlVerify == '4'">
<a-input class="box-input inputWid" <a-input class="box-input inputWid"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)" onkeyup="(this.v=function(){this.value=this.value.replace(/[^\d\.]/g,'');}).call(this)"
@@ -566,7 +566,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 整数或小数 --> <!-- 整数或小数 -->
<div v-if="item.controlVerify == '5'"> <div v-else-if="item.controlVerify == '5'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -574,7 +574,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 一位小数 --> <!-- 一位小数 -->
<div v-if="item.controlVerify == '6'"> <div v-else-if="item.controlVerify == '6'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -583,7 +583,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 两位小数--> <!-- 两位小数-->
<div v-if="item.controlVerify == '7'"> <div v-else-if="item.controlVerify == '7'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -592,7 +592,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 三位小数--> <!-- 三位小数-->
<div v-if="item.controlVerify == '8'"> <div v-else-if="item.controlVerify == '8'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -601,7 +601,7 @@
v-model="item.dataValue"/> v-model="item.dataValue"/>
</div> </div>
<!-- 四位小数--> <!-- 四位小数-->
<div v-if="item.controlVerify == '9'"> <div v-else-if="item.controlVerify == '9'">
<a-input-number class="box-input inputWid add--number" <a-input-number class="box-input inputWid add--number"
:disabled="item.isLock == '1' ? true: false" :disabled="item.isLock == '1' ? true: false"
:max="99999" :max="99999"
@@ -717,6 +717,7 @@
.ant-table td { .ant-table td {
white-space: nowrap; white-space: nowrap;
} }
.selectWid .ant-select-selection--multiple { .selectWid .ant-select-selection--multiple {
overflow: auto; overflow: auto;
} }
@@ -724,6 +725,14 @@
.selectWid .ant-select-selection--multiple::-webkit-scrollbar { .selectWid .ant-select-selection--multiple::-webkit-scrollbar {
display: none; /* Chrome Safari */ display: none; /* Chrome Safari */
} }
.selectWid .ant-select-selection {
height: 38px !important;
line-height: 38px!important;
}
.selectWid .ant-select-selection__rendered {
line-height: 36px!important;
}
</style> </style>
<style lang="less" scoped> <style lang="less" scoped>
.box { .box {
@@ -742,7 +751,7 @@
} }
.add_flex { .add_flex {
display: flex; /*display: flex;*/
} }
/deep/ .box { /deep/ .box {
@@ -760,11 +769,14 @@
.inputWid { .inputWid {
min-width: 150px; min-width: 150px;
height: 38px;
display: inline-block;
} }
.add-width { .add-width {
width: 33%; width: calc(33.3% - 5px);
margin-right: 5px; margin-right: 5px;
float: left;
} }
.add--number { .add--number {
@@ -774,9 +786,11 @@
.ant-input-disabled { .ant-input-disabled {
color: rgba(0, 0, 0, 0.65); color: rgba(0, 0, 0, 0.65);
} }
.ant-select-disabled{
.ant-select-disabled {
color: rgba(0, 0, 0, 0.65); color: rgba(0, 0, 0, 0.65);
} }
.itemOption { .itemOption {
display: inline-block; display: inline-block;
width: 100%; width: 100%;
jero-web/src/components/TaskCutOffTime/index.vue
+1 -1
View File
@@ -12,7 +12,7 @@
<a-row :gutter='24'> <a-row :gutter='24'>
<a-col :span='24'> <a-col :span='24'>
<span style='display: flex;justify-content: center;margin-bottom: 20px;'> <span style='margin-top: 6px;margin-right: 7px'>{{$t('cutoffTime')}}</span> <span style='display: flex;justify-content: center;margin-bottom: 20px;'> <span style='margin-top: 6px;margin-right: 7px'>{{$t('cutoffTime')}}</span>
<a-date-picker show-time :placeholder="$t('PleaseSelect')+$t('cutoffTime')" @change="onChange" @ok="onOk" /> <a-date-picker :placeholder="$t('PleaseSelect')+$t('cutoffTime')" @change="onChange" @ok="onOk" />
</span> </span>
</a-col> </a-col>
</a-row> </a-row>
jero-web/src/components/tableCollection/index.vue
+1 -1
View File
@@ -7,7 +7,7 @@
rowKey="id" rowKey="id"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:pagination="false" :pagination="false"
:scroll="{x: '100%',y:'calc(100vh - 160px)'}" :scroll="{x: '100%',y:'calc(100vh - 230px)'}"
:data-source="dataSource" :data-source="dataSource"
:loading="loading" :loading="loading"
sticky sticky
jero-web/src/components/uploadFileChange/file.vue
+1 -1
View File
@@ -56,7 +56,7 @@ export default {
this.containerId = 'container-ty-' + new Date().getTime() this.containerId = 'container-ty-' + new Date().getTime()
}, },
mounted() { mounted() {
console.log(this.detailDate,'lldetailDate') // console.log(this.detailDate,'lldetailDate')
let long = localStorage.getItem('language') let long = localStorage.getItem('language')
this.cut = '' this.cut = ''
if (long && long == 'zh-cn') { if (long && long == 'zh-cn') {
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+38 -3
View File
@@ -75,7 +75,7 @@
</a-form> </a-form>
</div> </div>
</div> </div>
<div class="table-operator"> <div class="table-operator" v-if="!this.$route.query.it">
<!-- // 认证工程师 homo--> <!-- // 认证工程师 homo-->
<!-- // 工程接口人 sdt--> <!-- // 工程接口人 sdt-->
<!-- // 填写人 dre--> <!-- // 填写人 dre-->
@@ -154,6 +154,7 @@
</div> </div>
<!-- 角色切换 --> <!-- 角色切换 -->
<div class="operator-text" <div class="operator-text"
v-if="!this.$route.query.it"
@click="roleSwitchingClick"> @click="roleSwitchingClick">
<a-icon type="select"/> <a-icon type="select"/>
{{ $t('roleSwitching') }} {{ $t('roleSwitching') }}
@@ -178,6 +179,7 @@
</a-modal> </a-modal>
<!-- 冻结配置---> <!-- 冻结配置--->
<a-modal v-model="areaVisibleFreeze" :title="$t('FreezeConfiguration')" width='600px' :footer="null"> <a-modal v-model="areaVisibleFreeze" :title="$t('FreezeConfiguration')" width='600px' :footer="null">
<a-spin :spinning="confirmLoading">
<a-form-model <a-form-model
class='tag-module' class='tag-module'
ref='ruleForm' ref='ruleForm'
@@ -201,6 +203,7 @@
</a-col> </a-col>
</a-row> </a-row>
</a-form-model> </a-form-model>
</a-spin>
<div style='padding-left: 60px;color: red'> <div style='padding-left: 60px;color: red'>
{{$t('Attentionfreeze')}} {{$t('Attentionfreeze')}}
</div> </div>
@@ -461,6 +464,7 @@
templatetitleId: '', templatetitleId: '',
rowId: '', rowId: '',
version: 0, version: 0,
confirmLoading:false,
itemId: '', itemId: '',
selectedRowKeysValue: [], // table列表所选得数据 selectedRowKeysValue: [], // table列表所选得数据
token: Vue.ls.get(ACCESS_TOKEN), token: Vue.ls.get(ACCESS_TOKEN),
@@ -851,7 +855,22 @@
this.areaVisibleFreeze = true this.areaVisibleFreeze = true
this.Dateline = {} this.Dateline = {}
// 获取冻结配置数据 // 获取冻结配置数据
this.getFreeze() this.confirmLoading = true
this.getFreeze(()=> {
this.getLockedConfigIdList()
})
},
getLockedConfigIdList() {
getAction('/params/collectManifest/getLockedConfigIdList',
{ paramsManifestId: this.paramsManifest.id }).then((res) => {
if (res.success) {
this.Dateline.paramsConfig = res.result
this.Dateline = {...this.Dateline}
}else{
this.Dateline.paramsConfig = []
}
this.confirmLoading = false
})
}, },
// 冻结配置提交 // 冻结配置提交
handleSubmitFreeze() { handleSubmitFreeze() {
@@ -894,7 +913,7 @@
cancleImportsFreeze() { cancleImportsFreeze() {
this.areaVisibleFreeze = false this.areaVisibleFreeze = false
}, },
getFreeze() { getFreeze(callback) {
let _this = this let _this = this
let param = { paramsManifestId: this.paramsManifest.id, configFlag: 1 } let param = { paramsManifestId: this.paramsManifest.id, configFlag: 1 }
axios({ axios({
@@ -916,11 +935,15 @@
.then((res) => { .then((res) => {
if (res.data.success) { if (res.data.success) {
this.FreezeList = res.data.result this.FreezeList = res.data.result
callback && callback()
} else { } else {
_this.$message.warning(res.data.message) _this.$message.warning(res.data.message)
_this.confirmLoading = false
} }
}) })
.catch((error) => { .catch((error) => {
_this.confirmLoading = false
}) })
}, },
// 下发收集的权限 // 下发收集的权限
@@ -1345,7 +1368,19 @@
} }
} }
</script> </script>
<style>
.popconfirm {
z-index: 999;
}
.popconfirm .ant-popover-buttons {
display: none !important;
}
.popconfirm .anticon-exclamation-circle {
display: none !important;
}
</style>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';