Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

applications/architecture-dee/src/layout/components/AppMain.vue

@@ -50,7 +50,7 @@ export default {
   position: relative;
   overflow: hidden;
   /* background: #E8EDEF; */
-  padding: 0px 4px 4px 4px;
+  /* padding: 0px 4px 4px 4px; */
   box-sizing: border-box;
 }
 .fixed-header+.app-main {

applications/architecture-dee/src/styles/dee-theme/mixins/common.scss

@@ -152,7 +152,7 @@
   .sub-title{
     color: $themeColor;
   }
-  .el-table__body tr.current-row > td.el-table__cell{
+  .el-table__body tr.current-row > td:has(> .cell){
     background: $themeTintColor;
   }
   .right-hidden-box, .left-hidden-box{
@@ -388,9 +388,11 @@
     }
   }
 
-  .show-page-com{
-    .page-content-item{
+  .show-page-com {
+    margin-top: 0px!important;
+    .page-content-item {
       .page-content-box{
+        border:0px!important;
         .crumbs-title{
           color:#2f2f2f;
           font-size:15px;

applications/dee-mes/src/privateComponents/components/ProblemProgressCom/config.js

@@ -11,6 +11,13 @@ export default {
             defaultValue: '',
             name: 'el-input'
           }
+        },
+        {
+          key: 'readOnly',
+          title: '只读',
+          component: {
+            name: 'el-checkbox'
+          }
         }
       ]
     }

applications/dee-mes/src/privateComponents/components/ProblemProgressCom/index.vue

@@ -14,6 +14,7 @@
               v-model="item.progressTime"
               size="small"
               type="date"
+              :disabled="itemObj.readOnly"
               value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择日期"
             />
@@ -28,10 +29,10 @@
             <!-- :rules="[
             {required: true, message: '该项必填', trigger: 'blur'},
           ]" -->
-            <el-input v-model="item.progressItem" autosize type="textarea" size="small" @change="changeVal" />
+            <el-input v-model="item.progressItem" :disabled="itemObj.readOnly" autosize type="textarea" size="small" @change="changeVal" />
           </el-form-item>
         </el-col>
-        <el-col :span="2">
+        <el-col v-if="!itemObj.readOnly" :span="2">
           <el-form-item class="btn-box">
             <span v-if="index+1 == resultFormData.length" class="btn-item" title="新增" @click="addItem" @change="changeVal">
               <img src="/icons/c-add.png" alt="">

applications/dee-mes/src/privateComponents/components/Visualization/AssembleKanban.vue

@@ -2537,11 +2537,13 @@ export default {
     this.initSupervise()
     this.onresize()
     this.init()
+    document.getElementsByClassName('page-content-item')[0].style['padding'] = '0px'
   },
   beforeDestroy() {
     // 销毁侦听器
     const el = $('.assemble-kanban').parent()[0]
     this.erd.uninstall(el)
+    document.getElementsByClassName('page-content-item')[0].style['padding'] = '4px'
   },
   methods: {
     init() {
@@ -3043,7 +3045,8 @@ export default {
 
 <style lang="scss" scoped>
 .show-page-com .page-content-box .dee-as-com{
-overflow: hidden;
+  padding:0px;
+  overflow: hidden;
 }
 /deep/{
   .assemble-kanban {

applications/dee-mes/src/privateComponents/components/Visualization/ExperimentKanban.vue

@@ -2490,12 +2490,14 @@ export default {
     this.initSupervise()
     this.initSuperviseTable()
     this.init()
+    document.getElementsByClassName('page-content-item')[0].style['padding'] = '0px'
   },
 
   beforeDestroy() {
     // 销毁侦听器
     const el = $('.experiment-kanban').parent()[0]
     this.erd.uninstall(el)
+    document.getElementsByClassName('page-content-item')[0].style['padding'] = '4px'
   },
   methods: {
     init() {
@@ -2917,9 +2919,11 @@ export default {
 
 <style scoped lang="scss">
 .show-page-com .page-content-box .dee-as-com{
-overflow: hidden;
+  padding:0px;
+  overflow: hidden;
 }
-/deep/{.experiment-kanban {
+/deep/{
+  .experiment-kanban {
   width: 1920px;
   height: 1080px;
   transform-origin: left top;

applications/dee-mes/src/privateComponents/components/Visualization/ProductionKanban.vue

@@ -212,11 +212,13 @@ export default {
     this.getMaterial()
     this.onresize()
     this.init()
+    document.getElementsByClassName('page-content-item')[0].style['padding'] = '0px'
   },
   beforeDestroy() {
   // 销毁侦听器
     const el = $('.production-kanban').parent()[0]
     this.erd.uninstall(el)
+    document.getElementsByClassName('page-content-item')[0].style['padding'] = '4px'
   },
   methods: {
     init() {
@@ -467,7 +469,8 @@ export default {
 
 <style scoped lang="scss">
 .show-page-com .page-content-box .dee-as-com{
-overflow: hidden;
+  padding:0px;
+  overflow: hidden;
 }
 /deep/{
 .production-kanban {

applications/dee-task-center/src/views/workflow/task-center/myPlanTask/outStorageUseApply/index.vue

@@ -96,7 +96,7 @@ export default {
   },
   // 组件方法
   methods: {
-    getPersonList(){
+    getPersonList() {
       const httpParams = {
         'pageFrom': 1,
         'pageSize': 9999,