Merge branch 'dev_4newlayout' of http://182.92.169.222:3000/zhc077/projectManagement into dev_4newlayout

ant-design-vue-jeecg/src/views/newLayout/module/Main.vue

@@ -39,7 +39,7 @@
           <el-descriptions-item label="预计剩余天数：">5天</el-descriptions-item>
           <el-descriptions-item label="进度：">55%</el-descriptions-item>
           <el-descriptions-item label="项目图片：">
-            <el-image style="width: 60px; height: 30px" :src="url" :preview-src-list="srcList"> </el-image>
+            <el-image style="width: 60px; height: 30px" :src="url.url" :preview-src-list="srcList"> </el-image>
           </el-descriptions-item>
         </el-descriptions>
         <div class="top">
@@ -174,6 +174,11 @@
                         <i class="el-icon-circle-plus-outline" style="margin-right: 5px"></i>
                         <i class="el-icon-chat-dot-round" style="margin-right: 15px"></i>
                       </div>
+                      <!-- <div class="wt-buttom">
+                
+                        <el-radio style="margin-right: 15px; transform: scale(0.7)" label="1">已解决</el-radio>
+                        <el-radio label="2" style="transform: scale(0.7)">无法解决</el-radio>
+                      </div> -->
                       <div class="wt-buttom">
                         <el-radio v-model="radio" style="margin-right: 15px; transform: scale(0.7)" label="1"
                           >已解决</el-radio
@@ -232,7 +237,7 @@
         <el-button type="primary" @click="dialogKuiVisible = false">提交</el-button>
       </div>
     </el-dialog>
-    <modulex-modal ref="modalForm"></modulex-modal>
+    <modulex-modal ref="modalForm" @ok="modalFormOk"></modulex-modal>
     <functionx-modal ref="modalForm1" @ok="modalFormOk"></functionx-modal>
     <rulex-modal ref="modalForm2" @ok="modalFormOk"></rulex-modal>
   </div>
@@ -252,13 +257,19 @@ export default {
   mixins: [JeecgListMixin, mixinDevice],
   data () {
     return {
+      columns: [],
+      label: 1,
       msg: [],
+      dataSource: [],
       // 模块状态
       state: 0,
       // 占位图片
       src: 'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg',
       // 占位图片
-      url: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
+      url: {
+        url: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
+        list: '/newprojectx/newprojectx/list'
+      },
       srcList: [
         'https://fuss10.elemecdn.com/8/27/f01c15bb73e1ef3793e64e6b7bbccjpeg.jpeg',
         'https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg'
@@ -436,6 +447,16 @@ export default {
       circleUrl: "https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png",
     }
   },
+  watch: {
+    dataSource: {
+      deep: true,
+      immediate: true,
+      handler (newValue, oldValue) {
+        console.log(112)
+        this.changeTab()
+      }
+    }
+  },
   created () {
     this.getData1()
   },