Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

src/views/Business/Mgrtsk/Tskmgr.vue

@@ -254,18 +254,8 @@
       </c-button>
     </c-col> -->
     <c-col :span="22" :offset="1">
-      <c-table :border="true" :list="data" style="width:80%,text-align:center">
-        <el-table-column label="Entity" width="auto"></el-table-column>
-        <el-table-column
-          label="Object Identification"
-          width="auto"
-        ></el-table-column>
-        <el-table-column label="Ident" width="auto"></el-table-column>
-        <el-table-column label="Service" width="auto"></el-table-column>
-        <el-table-column label="Status" width="auto"></el-table-column>
-        <el-table-column label="Retries" width="auto"></el-table-column>
-        <el-table-column label="Target" width="auto"></el-table-column>
-      </c-table>
+      <c-istream-table :list="stmData.data" :columns="stmData.columns">
+        </c-istream-table>
     </c-col>
   </div>
 </template>
@@ -281,7 +271,19 @@ export default {
   mixins: [commonProcess],
   data() {
     return {
-      data: [],
+      stmData: {
+                columns: [
+                    "8 1 \"Entity\" 100 1 0",
+                    "7 2 \"Object Identification\" 390 1 0",
+                    "6 3 \"Ident\" 100 1 0",
+                    "1 4 \"Service\" 100 1 0 3 SRVTXT",
+                    "2 5 \"Status\" 100 1 0 2 WFE:STA",
+                    "3 6 \"Retries\" 100 2 20:1 1 FormatRTR",
+                    "4 7 \"Target\" auto 20 30 1"
+                ],
+                data: [
+                ]
+            },
       };
   },
   methods: { ...Event },

src/views/Business/Mgrtsk/index.vue

@@ -110,24 +110,24 @@ import Prttst from "./Prttst";
 import Prtswtr from "./Prtswtr";
 
 export default {
-  name: "Mgrtsk",
-  components: {
-    "m-tskmgr": Tskmgr,
-    "m-srvdsp": Srvdsp,
-    "m-config": Config,
-    "m-prtswtp": Prtswtp,
-    "m-prtswtrp": Prtswtrp,
-    "m-xmldoc": Xmldoc,
-    "m-prttst": Prttst,
-    "m-prtswtr": Prtswtr,
+    name: 'Mgrtsk',
+    components:{
+        "m-tskmgr" : Tskmgr,
+        "m-srvdsp" : Srvdsp,
+        "m-config" : Config,
+        "m-prtswtp" : Prtswtp,
+        "m-prtswtrp" : Prtswtrp,
+        "m-xmldoc" : Xmldoc,
+        "m-prttst" : Prttst,
+        "m-prtswtr" : Prtswtr,
     },
     provide() {
         return {
-      root: this,
-    };
+            root: this
+        }
     },
     mixins: [commonProcess],    // 里面包含了Default、Check等的公共处理
-  data() {
+    data(){
         return {
             tabVal: "tskmgr",
             trnName: "mgrtsk",
@@ -136,19 +136,24 @@ export default {
             defaultRules: Default,
             pattern: Pattern,
             rules: null,
-      codes: { ...CodeTable },
-    };
+            codes: {...CodeTable},
+        }
     },
-  methods: {
-    tabClick() {},
+    methods:{
+        tabClick(){
+        }
     },
-  created: async function () {
+    created:async function(){
         console.log("进入mgrtsk交易");
-    let rtnmsg = await this.init({});
-    if (rtnmsg.respCode == SUCCESS) {
+        let rtnmsg = await this.init({})
+        if(rtnmsg.respCode == SUCCESS)
+        {
            //TODO 处理数据逻辑
-    } else {
-      this.$notify.error({ title: "错误", message: "服务请求失败！" });
+           this.updateModel(rtnmsg.data)
+        }
+        else
+        {
+            this.$notify.error({title: '错误',message: '服务请求失败！'});
         }
   },
 };