Browse Source

fix: 任务面板样式修改

develop
song 4 years ago
parent
commit
6a2102bd08
  1. 1
      CHANGELOG.md
  2. 6
      src/components/Upload/Upload.vue
  3. 3
      src/mixins/tool.js
  4. 2
      src/pagesProject/project/components/ConfigInfo/components/Family.vue
  5. 22
      src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue
  6. 6
      src/pagesProject/project/components/Evaluated/components/EvaluatedDetail.vue
  7. 2
      src/pagesProject/project/components/Roles/Roles.vue

1
CHANGELOG.md

@ -150,6 +150,7 @@
- | 修改合并手机号逻辑 | [5d391a3](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/5d391a3) - | 修改合并手机号逻辑 | [5d391a3](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/5d391a3)
- | 修改定期任务状态0和4时不加载圆圈 | [30e352f](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/30e352f) - | 修改定期任务状态0和4时不加载圆圈 | [30e352f](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/30e352f)
- | 修改小红点传参 | [87b20fd](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/87b20fd) - | 修改小红点传参 | [87b20fd](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/87b20fd)
- | 修改扫码逻辑 | [e1234a6](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/e1234a6)
- | 修改报错 | [531c14d](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/531c14d) - | 修改报错 | [531c14d](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/531c14d)
- | 修改接口路径 | [df6acf2](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/df6acf2) - | 修改接口路径 | [df6acf2](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/df6acf2)
- | 修改时间轴bug | [fe08608](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/fe08608) - | 修改时间轴bug | [fe08608](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/fe08608)

6
src/components/Upload/Upload.vue

@ -9,9 +9,9 @@
:class=" :class="
identityInfo.isMax === 0 && identityInfo.personNumber > 1 identityInfo.isMax === 0 && identityInfo.personNumber > 1
? 'icons4' ? 'icons4'
: identityInfo.isMax === 1 && identityInfo.personNumber <= 1 : (identityInfo.isMax === 1 && identityInfo.personNumber <= 1) || (!identityInfo.isMax && identityInfo.personNumber > 1)
? 'icons2' ? 'icons3'
: 'icons3' : 'icons2'
" "
> >
<u-icon class="icons" size="88" name="https://www.tall.wiki/staticrec/yanyuan/icon1.png" @click="scancode"></u-icon> <u-icon class="icons" size="88" name="https://www.tall.wiki/staticrec/yanyuan/icon1.png" @click="scancode"></u-icon>

3
src/mixins/tool.js

@ -84,9 +84,7 @@ export default {
.showModal('提示', '是否申请成为家属?') .showModal('提示', '是否申请成为家属?')
.then(async () => { .then(async () => {
const params = { bindUserId }; const params = { bindUserId };
console.log('params: ', params);
const res = await this.getCreateTrainee(params); const res = await this.getCreateTrainee(params);
console.log('res: ', res);
if (!res.length) { if (!res.length) {
this.$t.ui.showToast('提醒工具箱拥有者添加使用者信息'); this.$t.ui.showToast('提醒工具箱拥有者添加使用者信息');
setTimeout(() => { setTimeout(() => {
@ -193,7 +191,6 @@ export default {
async handleUpgrade() { async handleUpgrade() {
try { try {
const params = { keyUserIds: this.keyUserIds }; const params = { keyUserIds: this.keyUserIds };
console.log('params: ', params);
await this.$u.api.upgradeTrainee(params); await this.$u.api.upgradeTrainee(params);
this.$refs.uModal.clearLoading(); this.$refs.uModal.clearLoading();
this.setAlert('使用者设置成功', 'success'); this.setAlert('使用者设置成功', 'success');

2
src/pagesProject/project/components/ConfigInfo/components/Family.vue

@ -91,7 +91,7 @@ export default {
item.open = false; item.open = false;
} }
}); });
this.itemList = date; this.itemList = [...date];
} }
} catch (error) { } catch (error) {
console.error('error: ', error); console.error('error: ', error);

22
src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue

@ -17,16 +17,18 @@
<u-icon name="arrow-up" color="#909399" v-if="task.data.showDetail"></u-icon> <u-icon name="arrow-up" color="#909399" v-if="task.data.showDetail"></u-icon>
<u-icon name="arrow-down" color="#909399" v-else></u-icon> <u-icon name="arrow-down" color="#909399" v-else></u-icon>
</view> </view>
<view class="bg-white" v-if="obj && obj.id && task.data.showDetail"> <view class="bg-white flex flex-col" v-if="obj && obj.id && task.data.showDetail">
<UCharts <view :style="{ width: '100%', height: cHeight + 'px' }">
:canvas-id="obj.id" <UCharts
:chartType="obj.chartType" :canvas-id="obj.id"
:cWidth="cWidth" :chartType="obj.chartType"
:cHeight="cHeight" :cWidth="cWidth"
:opts="obj.opts" :cHeight="cHeight"
:ref="obj.id" :opts="obj.opts"
:max="obj.max" :ref="obj.id"
/> :max="obj.max"
/>
</view>
<view class="mt-2"> <view class="mt-2">
<view>测评结果</view> <view>测评结果</view>
<u-rate <u-rate

6
src/pagesProject/project/components/Evaluated/components/EvaluatedDetail.vue

@ -35,7 +35,7 @@
</view> </view>
</view> </view>
<!-- 训练结果 --> <!-- 训练结果 -->
<view v-if="train.trains.length" class="mb-2"> <view v-if="train.trains.length" class="mb-2 flex flex-col">
<view v-for="(trainResult, resultIndex) in train.trains" :key="trainResult.trainRecordId"> <view v-for="(trainResult, resultIndex) in train.trains" :key="trainResult.trainRecordId">
<view v-if="trainResult.resultType === 0"> <view v-if="trainResult.resultType === 0">
<view class="font-bold text-xs my-1">训练结果</view> <view class="font-bold text-xs my-1">训练结果</view>
@ -43,7 +43,9 @@
</view> </view>
<view v-if="trainResult.resultType === 1"> <view v-if="trainResult.resultType === 1">
<view class="font-bold text-xs my-1">过程还原</view> <view class="font-bold text-xs my-1">过程还原</view>
<ProcessRestore :trainResult="trainResult" /> <view style="width: 100%; height: 450px">
<ProcessRestore :trainResult="trainResult" />
</view>
</view> </view>
</view> </view>
</view> </view>

2
src/pagesProject/project/components/Roles/Roles.vue

@ -105,7 +105,7 @@ export default {
query query
.selectAll('.tab-children') .selectAll('.tab-children')
.boundingClientRect(data => { .boundingClientRect(data => {
this.roleLeft = data[0].left; this.roleLeft = data && data.length ? data[0].left : 0;
}) })
.exec(); .exec();
}); });

Loading…
Cancel
Save