Compare commits

..

No commits in common. "5456d7a40b3d65af6ddc2fbd41af0de1164bd38a" and "06b505544b9527af44dca778ba5da811ab47bb73" have entirely different histories.

3 changed files with 14 additions and 14 deletions

View File

@ -13,6 +13,14 @@
<el-form-item :label="$t('dictionary:agreement:table:FileVersion')" prop="FileVersion"> <el-form-item :label="$t('dictionary:agreement:table:FileVersion')" prop="FileVersion">
<el-input v-model="form.FileVersion" clearable style="width: 50%" /> <el-input v-model="form.FileVersion" clearable style="width: 50%" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('dictionary:agreement:table:FileContent')" prop="FileContent">
<div class="html_temp">
<prism-editor class="my-editor" v-model="form.FileContent" :highlight="highlighter" :line-numbers="true"
style="width: 50%;max-height: 300px;"></prism-editor>
<div v-html="form.FileContent" style="width: 45%;"></div>
</div>
</el-form-item>
<el-form-item :label="$t('dictionary:agreement:table:UpdateDate')" prop="UpdateDate"> <el-form-item :label="$t('dictionary:agreement:table:UpdateDate')" prop="UpdateDate">
<el-date-picker v-model="form.UpdateDate" type="datetime" <el-date-picker v-model="form.UpdateDate" type="datetime"
:placeholder="$t('trials:seletctedReviews:table:selectionTime')" value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('trials:seletctedReviews:table:selectionTime')" value-format="yyyy-MM-dd HH:mm:ss"
@ -25,14 +33,6 @@
format="yyyy-MM-dd HH:mm:ss" clearable style="width: 50%;"> format="yyyy-MM-dd HH:mm:ss" clearable style="width: 50%;">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item :label="$t('dictionary:agreement:table:FileContent')" prop="FileContent">
<div class="html_temp">
<prism-editor class="my-editor" v-model="form.FileContent" :highlight="highlighter" :line-numbers="true"
style="width: 50%;max-height: 300px;"></prism-editor>
<div v-html="form.FileContent" style="width: 45%;"></div>
</div>
</el-form-item>
</div> </div>
<div class="base-dialog-footer" style="text-align: right; margin-top: 10px"> <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
<el-form-item style="text-align: right"> <el-form-item style="text-align: right">

View File

@ -111,9 +111,9 @@
<el-button type="text" @click="handleEdit(scope.row)"> <el-button type="text" @click="handleEdit(scope.row)">
{{ $t('common:button:edit') }} {{ $t('common:button:edit') }}
</el-button> </el-button>
<!-- <el-button type="text" @click="handleDelete(scope.row)"> <el-button type="text" @click="handleDelete(scope.row)">
{{ $t('common:button:delete') }} {{ $t('common:button:delete') }}
</el-button> --> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

View File

@ -1307,9 +1307,6 @@ export default {
this.isFirstLoadIns = false this.isFirstLoadIns = false
// this.initWwc() // this.initWwc()
this.imageId = instanceId this.imageId = instanceId
if (this.isInitWwwc) {
this.resetWwwc()
}
} }
this.stack.instanceId = instanceId this.stack.instanceId = instanceId
@ -1329,6 +1326,9 @@ export default {
this.scrollSyncInfo.offset = 0 this.scrollSyncInfo.offset = 0
} }
this.renderMeasuredData(e) this.renderMeasuredData(e)
if (this.isInitWwwc) {
this.resetWwwc()
}
}, },
getOrientationMarker(element) { getOrientationMarker(element) {
const enabledElement = cornerstone.getEnabledElement(element) const enabledElement = cornerstone.getEnabledElement(element)
@ -1708,7 +1708,7 @@ export default {
resetWwwc() { resetWwwc() {
// console.log('resetWwwc') // console.log('resetWwwc')
this.isInitWwwc = true this.isInitWwwc = true
// this.toolState.viewportInvert = false this.toolState.viewportInvert = false
var viewport = cornerstone.getViewport(this.canvas) var viewport = cornerstone.getViewport(this.canvas)
// viewport.invert = false // viewport.invert = false
var image = cornerstone.getImage(this.canvas) var image = cornerstone.getImage(this.canvas)