修改i

src/components/Table/index.vue

@@ -6,7 +6,7 @@
       </div>
       <template v-if="tableData.length">
         <div>
-          <el-table :data="filteredTableData" :summary-method="getSummaries" :span-method="tableSpanMethod" stripe :show-summary="showSummary" border ref="table" :height="minHeight - 8 + 'vh'" class="table" style="width: 100%; overflow: auto" @select="selectHandler">
+          <el-table :data="filteredTableData" :summary-method="getSummaries" :span-method="tableSpanMethod" stripe :show-summary="showSummary" border ref="table" :height="minHeight - 8 + 'vh'" class="table infinite-list" style="width: 100%; overflow: auto" @select="selectHandler">
             <el-table-column
               v-if="selectionEnable"
               type="selection"
@@ -39,7 +39,7 @@
                 </span>
               </template>
             </el-table-column>
-            <el-table-column fixed="right" label="操作" width="150">
+            <el-table-column fixed="right" label="操作" width="180">
               <template slot-scope="scope">
                 <div class="hd-td">
                   <div class="hd-tr">
@@ -47,6 +47,7 @@
                     <el-button type="text" @click="handleEdit(scope.row)" size="small" class="rmScs">编辑</el-button>
                     <el-button class="rmSc" type="text" @click="handleRemove(scope.row)" size="small">删除</el-button>
                     <el-button class="rmScs" v-if="withColumnSet" type="text" size="small" @click="handleColumnSet(scope.row)">列设置</el-button>
+                    <el-button class="rmScs" v-if="withItemSet" type="text" size="small" @click="handleItemSet(scope.row)">数据项</el-button>
                   </div>
                 </div>
               </template>
@@ -78,6 +79,9 @@
                         </el-option>
                       </el-select>
                     </template>
+                    <!-- <template v-else-if="item.dataType == 'longtext'">
+                      <el-input size="small" :rows="1" type="textarea" v-model="tableForm[item.columnName]"></el-input>
+                    </template> -->
                     <template v-else>
                       <el-input size="small" v-model="tableForm[item.columnName]"></el-input>
                     </template>
@@ -186,6 +190,11 @@ export default {
     withColumnSet: {
       type: Boolean,
       default: false
+    },
+    // 表格-操作-项设置按钮显示
+    withItemSet: {
+      type: Boolean,
+      default: false
     }
   },
   components: { Dialog, NoData },
@@ -266,8 +275,13 @@ export default {
     this.$refs['table']?.doLayout()
   },
   methods: {
+    load(){
+      // alert(1)
+    },
     changeSelect(data){
-      // this.tableForm[this.tableOptions[data][0].setvalue] = this.tableForm[data];
+      if(this.tableForm[this.tableOptions[data][0].setvalue]){
+        this.tableForm[this.tableOptions[data][0].setvalue] = this.tableForm[data];
+      }
       // console.log(this.tableForm)
     },
     //获取表格数据
@@ -345,6 +359,7 @@ export default {
     //初始化表格
     initTableData () {
       this.tableColsCopy = this.tableCols.filter((item) => item.needShow);
+      console.log(this.tableColsCopy)
       this.tableDataCopy = _.cloneDeep(this.tableData);
       const datas = _.cloneDeep(this.tableColsCopy);
       const reqUts = []
@@ -358,6 +373,7 @@ export default {
           // const reqUt = this.getSelectData(item.listqueryTemplateID)
           // reqUts.push(reqUt)
           this.tableOptions[item.columnName] = await this.getSelectData(item.listqueryTemplateID)
+          console.log(this.tableOptions[item.columnName])
         }
         // this.filterValues[item.columnName] = ''
       });
@@ -497,12 +513,14 @@ export default {
     async handleEdit (row) {
       if(this.isDialog) {
         if (this.editId) {
-          this.tableForm = await this.queryOriginRow(this.editId, row.queryTemplateColumnSetID)
+          let data  = await this.queryOriginRow(this.editId, row.queryTemplateColumnSetID)
+          this.tableForm =  JSON.parse(JSON.stringify(data))
+          // this.tableForm =this.tableForm;
           // Object.entries(tableForm).forEach(([key, value]) => {
           //   this.tableForm[key] = value
           // })
         } else {
-          this.tableForm = row;
+          this.tableForm =  JSON.parse(JSON.stringify(row));
         }
         this.flag = true;
         this.tableType = "edit";
@@ -566,6 +584,15 @@ export default {
         }
       })
     },
+    // 表格-跳转数据项设置页
+    handleItemSet(row) {
+      this.$router.push({
+        path: '/systemSettings/datastructureChild',
+        query: {
+          dataStructureID: row.dataStructureID
+        }
+      })
+    },
     // 表格-选中行
     selectHandler(selection, row) {
       this.$emit('selection-change', selection, row)

src/router/routes/routes-file-three.js

@@ -2,7 +2,7 @@ import Layout from '@/layout'
 const integrationRoutes = {
   path: '/integration',
   component: Layout,
-  meta: { roles: ['dataCollect'] },
+  meta: { roles: ['system_menu'] },
   children: [
     {
       path: '/integration',

src/router/routes/routes-file-two.js

@@ -44,15 +44,15 @@ const systemSettingsRoutes = {
           src: require('@/assets/nav/ic_setting_top_default.png'),
           srcer: require('@/assets/nav/ic_setting_top_check.png')
         },
-        {
-          path: '/systemSettings/machineManagement',
-          name: 'machineManagement',
-          component: () => import('@/views/systemSettings/views/machineManagement/machineHome'),
-          meta: { title: '机器维护' },
-          hidden: true,
-          src: require('@/assets/nav/ic_setting_top_default.png'),
-          srcer: require('@/assets/nav/ic_setting_top_check.png')
-        },
+        // {
+        //   path: '/systemSettings/machineManagement',
+        //   name: 'machineManagement',
+        //   component: () => import('@/views/systemSettings/views/machineManagement/machineHome'),
+        //   meta: { title: '机器维护' },
+        //   hidden: true,
+        //   src: require('@/assets/nav/ic_setting_top_default.png'),
+        //   srcer: require('@/assets/nav/ic_setting_top_check.png')
+        // },
         {
           path: '/systemSettings/queryTemplate',
           name: 'queryTemplate',
@@ -98,12 +98,35 @@ const systemSettingsRoutes = {
         {
           path: '/systemSettings/datastructure',
           name: 'datastructure',
-          component: () => import('@/views/systemSettings/views/datastructure/datastructureHome'),
+          component: { render(c) { return c('router-view') } },
           meta: { title: '数据结构' },
           hidden: true,
           src: require('@/assets/nav/ic_setting_top_default.png'),
-          srcer: require('@/assets/nav/ic_setting_top_check.png')
+          srcer: require('@/assets/nav/ic_setting_top_check.png'),
+          children: [{
+            path: '/systemSettings/datastructure',
+            component: () => import('@/views/systemSettings/views/datastructure/datastructureHome'),
+          },
+          {
+            path: '/systemSettings/datastructureChild',
+            name: 'datastructureChild',
+            component: () => import('@/views/systemSettings/views/datastructure/datastructureChild'),
+            meta: { title: '数据项' },
+            hidden: false,
+            isAlone: true,
+            src: require('@/assets/nav/ic_setting_top@2x.png')
+          }
+          ]
         },
+        // {
+        //   path: '/systemSettings/dataStructureItem',
+        //   name: 'dataStructureItem',
+        //   component: () => import('@/views/systemSettings/views/dataStructureItem/dataStructureItemHome'),
+        //   meta: { title: '数据结构项' },
+        //   hidden: true,
+        //   src: require('@/assets/nav/ic_setting_top_default.png'),
+        //   srcer: require('@/assets/nav/ic_setting_top_check.png')
+        // },
         {
           path: '/systemSettings/sourceservice',
           name: 'sourceservice',
@@ -114,41 +137,33 @@ const systemSettingsRoutes = {
           srcer: require('@/assets/nav/ic_setting_top_check.png')
         },
         {
-          path: '/systemSettings/serviceoutput',
-          name: 'serviceoutput',
-          component: () => import('@/views/systemSettings/views/serviceoutput/serviceoutputHome'),
-          meta: { title: '服务输出' },
-          hidden: true,
-          src: require('@/assets/nav/ic_setting_top_default.png'),
-          srcer: require('@/assets/nav/ic_setting_top_check.png')
-        },
-        {
-          path: '/systemSettings/servicedeployment',
-          name: 'servicedeployment',
-          component: () => import('@/views/systemSettings/views/servicedeployment/servicedeploymentHome'),
-          meta: { title: '服务部署' },
-          hidden: true,
-          src: require('@/assets/nav/ic_setting_top_default.png'),
-          srcer: require('@/assets/nav/ic_setting_top_check.png')
-        },
-        {
-          path: '/systemSettings/dataStructureItem',
-          name: 'dataStructureItem',
-          component: () => import('@/views/systemSettings/views/dataStructureItem/dataStructureItemHome'),
-          meta: { title: '数据结构项' },
-          hidden: true,
-          src: require('@/assets/nav/ic_setting_top_default.png'),
-          srcer: require('@/assets/nav/ic_setting_top_check.png')
-        },
-        {
-          path: '/systemSettings/queryItemSettings',
-          name: 'queryItemSettings',
-          component: () => import('@/views/systemSettings/views/queryItemSettings/queryItemSettingsHome'),
-          meta: { title: '查询项设置' },
+          path: '/systemSettings/log',
+          name: 'log',
+          component: () => import('@/views/systemSettings/views/log'),
+          meta: { title: '日志查询' },
           hidden: true,
           src: require('@/assets/nav/ic_setting_top_default.png'),
           srcer: require('@/assets/nav/ic_setting_top_check.png')
         },
+        // {
+        //   path: '/systemSettings/servicedeployment',
+        //   name: 'servicedeployment',
+        //   component: () => import('@/views/systemSettings/views/servicedeployment/servicedeploymentHome'),
+        //   meta: { title: '服务部署' },
+        //   hidden: true,
+        //   src: require('@/assets/nav/ic_setting_top_default.png'),
+        //   srcer: require('@/assets/nav/ic_setting_top_check.png')
+        // },
+
+        // {
+        //   path: '/systemSettings/queryItemSettings',
+        //   name: 'queryItemSettings',
+        //   component: () => import('@/views/systemSettings/views/queryItemSettings/queryItemSettingsHome'),
+        //   meta: { title: '查询项设置' },
+        //   hidden: true,
+        //   src: require('@/assets/nav/ic_setting_top_default.png'),
+        //   srcer: require('@/assets/nav/ic_setting_top_check.png')
+        // },
       ]
     }
   ]

src/views/systemSettings/views/dataStructureItem/dataStructureItemHome.vue

@@ -9,13 +9,15 @@
         width="800px"
       />
     </div>
+
   </div>
 </template>
 <script>
 import DataTable from "@/components/Table";
 export default {
   data() {
-    return {};
+    return {
+    };
   },
   components: { DataTable },
 };
@@ -41,4 +43,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/views/systemSettings/views/datastructure/datastructureChild.vue

@@ -0,0 +1,405 @@
+<template>
+  <div class="queryItemSettings_home">
+    <div class="wrap">
+      <DataTable
+        ref="DataTable"
+        data-id="9"
+        edit-id="51"
+        :data-content="{ dataStructureID }"
+        :rows="12"
+        label-width="140px"
+        :min-height="70"
+        width="800px"
+        :isDialog="false"
+        @handleAdd="handleAdd"
+        @handleEdit="handleEdit"
+      />
+    </div>
+    <Dialog :width="width" :flag="flag">
+      <div class="dialog-content">
+        <div class="title">{{ tableTitle }}</div>
+        <div class="content">
+          <el-form ref="ruleForm" :model="tableForm" :label-width="labelWidth">
+            <el-row :gutter="20">
+              <!-- <el-col :span="12">
+                  <el-form-item label="数据项名称">
+                    <template v-if="
+                        item.listqueryTemplateID ||
+                        item.listqueryTemplateID == 0
+                      ">
+                      <el-select size="small" clearable style="width: 100%" v-model="tableForm[item.columnName]" @change="changeSelect(item.columnName)" placeholder="请选择">
+                        <el-option v-for="item in tableOptions[item.columnName]" :key="item.v" :label="item.k" :value="item.v">
+                        </el-option>
+                      </el-select>
+                    </template>
+                    <template v-else>
+                      <el-input size="small" v-model="tableForm[item.columnName]"></el-input>
+                    </template>
+                  </el-form-item>
+                </el-col> -->
+              <el-col :span="12">
+                <el-form-item label="数据项名称">
+                  <el-input
+                    size="small"
+                    v-model="tableForm.ItemName"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="数据项类型">
+                  <el-select
+                    size="small"
+                    clearable
+                    style="width: 100%"
+                    v-model="tableForm.dataType"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in tableOptions.dataType"
+                      :key="item.v"
+                      :label="item.k"
+                      :value="item.v"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="输出标识符">
+                  <el-input
+                    size="small"
+                    v-model="tableForm.outputIdentifier"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="描述">
+                  <el-input
+                    size="small"
+                    v-model="tableForm.ItemDescribe"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="唯一项">
+                  <el-select
+                    size="small"
+                    clearable
+                    style="width: 100%"
+                    v-model="tableForm.isKey"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in tableOptions.OptionArr"
+                      :key="item.v"
+                      :label="item.k"
+                      :value="item.v"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="必填项">
+                  <el-select
+                    size="small"
+                    clearable
+                    style="width: 100%"
+                    v-model="tableForm.isMust"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in tableOptions.OptionArr"
+                      :key="item.v"
+                      :label="item.k"
+                      :value="item.v"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="多条拆分">
+                  <el-select
+                    size="small"
+                    clearable
+                    style="width: 100%"
+                    v-model="tableForm.isSplite"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in tableOptions.OptionArr"
+                      :key="item.v"
+                      :label="item.k"
+                      :value="item.v"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="取值表达式">
+                  <el-input
+                    size="small"
+                    type="textarea"
+                    v-model="tableForm.computingExpression"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="实时计算表达式">
+                  <el-input
+                    size="small"
+                    type="textarea"
+                    v-model="tableForm.calculationExpression"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="计算结果标识符">
+                  <el-input
+                    size="small"
+                    v-model="tableForm.calcIdentifier"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="计算参数">
+                  <el-input
+                    size="small"
+                    v-model="tableForm.calcparameter"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="计算数据源">
+                  <el-select
+                    size="small"
+                    clearable
+                    style="width: 100%"
+                    v-model="tableForm.dataSourceID"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in tableOptions.listValues"
+                      :key="item.v"
+                      :label="item.k"
+                      :value="item.v"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+        <div class="foot right t30">
+          <el-button size="medium" @click="handleOk" class="r24" type="primary"
+            >确定</el-button
+          >
+          <el-button @click="flag = false" size="medium">取消</el-button>
+        </div>
+      </div>
+    </Dialog>
+  </div>
+</template>
+<script>
+import DataTable from "@/components/Table";
+import Dialog from "@/layout/components/Dialog/index.vue";
+import { Query,GeneralDataReception } from "@/api/dataIntegration";
+export default {
+  components: { DataTable, Dialog },
+  data() {
+    return {
+      dataStructureID: null,
+      flag: false,
+      width: "800px",
+      tableTitle: "新增",
+      tableForm: {},
+      labelWidth: "110px",
+      tableOptions: {
+        dataType: [
+          {
+            v: 1,
+            k: "字符串",
+            setValue: "v",
+            setlabel: "k",
+          },
+          {
+            v: 2,
+            k: "数字",
+            setValue: "v",
+            setlabel: "k",
+          },
+          {
+            v: 3,
+            k: "日期",
+            setValue: "v",
+            setlabel: "k",
+          },
+          {
+            v: 4,
+            k: "时间",
+            setValue: "v",
+            setlabel: "k",
+          },
+          {
+            v: 5,
+            k: "日期时间",
+            setValue: "v",
+            setlabel: "k",
+          },
+        ],
+        OptionArr: [
+          {
+            v: 1,
+            k: "是",
+            setValue: "v",
+            setlabel: "k",
+          },
+          {
+            v: 0,
+            k: "否",
+            setValue: "v",
+            setlabel: "k",
+          },
+        ],
+        listValues:[]
+      },
+      tableType:"add"
+    };
+  },
+  created() {
+    if (!this.$route.query.dataStructureID) {
+      this.$router.push("/systemSettings/datastructure");
+      return;
+    }
+    this.dataStructureID = Number(this.$route.query.dataStructureID);
+    this.getData()
+  },
+  methods:{
+    handleAdd(){
+      this.flag = true
+      this.tableType= 'add'
+    },
+    handleEdit(row){
+      this.tableTitle="编辑",
+      this.flag = true
+      this.tableType= 'edit'
+      this.queryDetial(row.ItemID)
+    },
+    //弹框-确定
+    handleOk () {
+      this.submitClickHandler();
+    },
+    // 新增/编辑-确认
+    submitClickHandler () {
+      this.loading = true;
+      this.$refs["ruleForm"].validate((valid) => {
+        console.log(this.tableForm)
+        this.tableForm['dataStructureID'] = this.dataStructureID;
+        if (valid) {
+          if (this.tableType == "add") {
+            this.tableForm.event = 1;
+          } else {
+            this.tableForm.event = 2;
+          }
+          this.generalDataReception(this.tableForm);
+        } else {
+          return false;
+        }
+      });
+    },
+    async generalDataReception (data) {
+      try {
+        data = {
+          ...data,
+          ...this.dataContent
+        }
+        const { code, message } = await GeneralDataReception({
+          serviceId: 11,
+          dataContent: JSON.stringify(data),
+        });
+        this.loading = true;
+        if (code == 0) {
+          this.$message.success("操作成功");
+          this.$refs['DataTable'].getQuery();
+          this.flag = false;
+          this.rmFlag = false;
+          this.tableObj = {};
+          this.tableForm = {};
+        } else {
+          this.$message.error("操作失败");
+          this.flag = false;
+          this.rmFlag = false;
+          this.tableObj = {};
+          this.tableForm = {};
+        }
+      } catch (error) {
+        console.log(error);
+        this.flag = false;
+        this.rmFlag = false;
+        this.tableObj = {};
+        this.tableForm = {};
+      }
+    },
+    async getData(){
+      try {
+        this.loading = true;
+        const { code, returnData } = await Query({
+          id: 21,
+          dataContent: [],
+        });
+        if (code == 0) {
+            console.log(returnData)
+            this.tableOptions.listValues = returnData.listValues
+        } else {
+          this.loading = false;
+        }
+      } catch (error) {
+        this.loading = false;
+        console.log(error);
+      }
+    },
+    async queryDetial(id){
+      try {
+        const { code, returnData } = await Query({
+          id: 51,
+          dataContent: [id],
+        });
+        if (code == 0) {
+            console.log(returnData)
+            this.tableForm = JSON.parse(JSON.stringify(returnData.listValues[0]))
+        } else {
+          this.loading = false;
+        }
+      } catch (error) {
+        this.loading = false;
+        console.log(error);
+      }
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.queryItemSettings-home {
+  .wrap {
+    padding: 16px 0;
+    .service-header {
+      line-height: 32px;
+      font-size: 14px;
+      .btn-white {
+        border: 1px solid #9ebbf7;
+        background: #f5f7fa;
+        -webkit-box-shadow: 0px 6px 7px 0px rgb(0 0 0 / 6%);
+        box-shadow: 0px 6px 7px 0px rgb(0 0 0 / 6%);
+        border-radius: 4px;
+        font-family: Microsoft YaHei;
+        font-weight: bold;
+        color: #2d67e3;
+      }
+      margin-bottom: 30px;
+    }
+  }
+}
+</style>

src/views/systemSettings/views/datastructure/datastructureHome.vue

@@ -7,6 +7,7 @@
         labelWidth="130px"
         :minHeight="70"
         width="800px"
+        :withItemSet="true"
       />
     </div>
   </div>

src/views/systemSettings/views/log/index.vue

@@ -0,0 +1,291 @@
+<template>
+  <div class="interfaceLog">
+    <div class="interfaceLog_head flex">
+      <div class="interfaceLog_head_time flex-wrap">
+        <!-- <div class="interfaceLog_head_time_start mr10">
+          <el-date-picker v-model="timeStart" size="small" type="date" placeholder="选择开始日期">
+          </el-date-picker>
+        </div>
+        <div class="interfaceLog_head_time_end">
+          <el-date-picker v-model="timeEnd" size="small" type="date" placeholder="选择结束日期">
+          </el-date-picker>
+        </div> -->
+        <el-date-picker
+          v-model="date"
+          size="small"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          :default-time="['00:00:00', '23:59:59']"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @change="dateChange"
+        >
+        </el-date-picker>
+      </div>
+      <div class="interfaceLog_head_btn">
+        <Search
+          @getSearchData="getSearchData"
+          :isTitle="false"
+          @clearSearchData="clearSearchData"
+        />
+      </div>
+    </div>
+    <div class="interfaceLog_content flex-wrap">
+      <el-table
+        :data="tableData"
+        class="table"
+        border
+        style="width: 100%"
+        @row-click="rowClick"
+        :height="720"
+      >
+        <el-table-column prop="logType" label="日志类型" width="100px">
+        </el-table-column>
+        <el-table-column prop="logObject" label="日志对象"> </el-table-column>
+        <el-table-column prop="logTime" label="日志时间"> </el-table-column>
+        <!-- <el-table-column prop="time" label="发生时间">
+        </el-table-column> -->
+        <el-table-column
+          prop="logPositionID"
+          label="发生位置"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+        <el-table-column label="日志结果" width="100px">
+          <template slot-scope="scope">
+            <span
+              :class="scope.row.resultCode == '成功' ? 'success' : 'error'"
+              >{{ scope.row.resultCode }}</span
+            >
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="resultDetails"
+          label="日志详情"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+      </el-table>
+      <div class="interfaceLog_content_progress">
+        <el-timeline v-if="preDatas != []">
+          <el-timeline-item v-for="(item, index) in preDatas" :key="index">
+            <div class="list">
+              <div class="list_status"></div>
+              <div class="list_title">{{ item.logType }}</div>
+              <div
+                class="list_code"
+                :class="item.resultCode == '成功' ? 'success' : 'error'"
+              >
+                {{ item.resultCode }}
+              </div>
+              <div class="list_time">{{ item.logTime }}</div>
+              <div class="list_detial">{{ item.resultDetails }}</div>
+            </div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Search from "@/layout/components/Search";
+import { Query } from "@/api/dataIntegration";
+export default {
+  name: "InterfaceLog",
+  components: { Search },
+  data() {
+    return {
+      timeStart: "",
+      timeEnd: "",
+      tableData: [],
+      preDatas: [],
+      date: "",
+      keyWords: null,
+      preDatas: [],
+    };
+  },
+  created() {
+    this.getNowTime();
+  },
+  methods: {
+    rowClick(row, column, event) {
+      this.preDatas = [];
+      if (row.logObject) {
+        this.tableData.forEach((item) => {
+          if (item.logObject == row.logObject) {
+            this.preDatas.push(item);
+          }
+        });
+      } else {
+        this.preDatas.push(row);
+      }
+    },
+    dateChange() {
+      if (this.date != null) {
+        this.getQuery();
+      }
+    },
+    getNowTime() {
+      var now = new Date();
+      var year = now.getFullYear(); //得到年份
+      var month = now.getMonth(); //得到月份
+      var date = now.getDate(); //得到日期
+      var hour = now.getHours(); //得到时
+      var min = now.getMinutes(); //得到分
+      var second = now.getSeconds(); //得到秒
+      month = month + 1;
+      month = month.toString().padStart(2, "0");
+      date = date.toString().padStart(2, "0");
+      var defaultDate = `${year}-${month}-${date}`;
+      this.date = [defaultDate, defaultDate];
+      this.timeEnd = defaultDate;
+      this.getQuery();
+    },
+    //获取表格数据
+    async getQuery() {
+      try {
+        this.loading = true;
+        const { code, returnData } = await Query({
+          id: 15,
+          dataContent: [this.date[0] + " 00:00:00", this.date[1] + " 23:59:59"],
+        });
+        if (code == 0) {
+          this.tableData = returnData.listValues;
+          console.log(returnData);
+        } else {
+          this.loading = false;
+          this.$message.error("获取数据失败");
+        }
+      } catch (error) {
+        this.loading = false;
+        console.log(error);
+      }
+    },
+    getSearchData(val) {
+      console.log(val);
+      this.keyWords = val;
+      this.getQuery();
+    },
+    clearSearchData() {},
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.interfaceLog {
+  padding: 8px 32px 12px 8px;
+  .mr10 {
+    margin-right: 10px;
+  }
+  ::v-deep .interfaceLog_head_time {
+    .el-input__prefix {
+      left: 10px;
+      color: #101116;
+      top: 10px;
+    }
+    .el-input--prefix .el-input__inner {
+      padding-left: 50px;
+    }
+  }
+  .interfaceLog_head_btn {
+    ::v-deep .btn {
+      margin-right: 0;
+    }
+  }
+  .interfaceLog_content {
+    margin-top: 8px;
+    ::v-deep .table {
+      color: #101116;
+      thead {
+        color: #101116;
+      }
+      .success {
+        color: #33bf47;
+      }
+      .error {
+        color: #df4545;
+      }
+    }
+    &_progress {
+      width: 368px;
+      background: #fafcff;
+      margin-left: 8px;
+      padding: 13px 32px;
+      overflow: hidden;
+      ::v-deep .el-timeline {
+        padding: 0;
+        .el-timeline-item {
+          position: relative;
+          &::after {
+            position: absolute;
+            content: "";
+            height: 1px;
+            width: calc(100% + 4px);
+            background-color: #dfe3ea;
+            left: 28px;
+            bottom: 20px;
+          }
+          &:last-child {
+            &::after {
+              height: 0;
+            }
+          }
+        }
+        .el-timeline-item__node--normal {
+          z-index: 2;
+          background-color: #fff;
+          width: 10px;
+          height: 10px;
+          left: 0px;
+          top: 2px;
+        }
+        .el-timeline-item__tail {
+          border-left: 4px solid #dfe3ea;
+          left: 3px;
+        }
+        .el-timeline-item:last-child .el-timeline-item__tail {
+          height: 1000%;
+          display: block;
+        }
+        .list {
+          &_status {
+            position: absolute;
+            width: 20px;
+            height: 20px;
+            background: #2d67e3;
+            left: -5px;
+            border-radius: 50%;
+            z-index: 1;
+          }
+          &_title,
+          &_code {
+            margin-bottom: 7px;
+            font-size: 14px;
+            font-family: Microsoft YaHei;
+            font-weight: bold;
+            color: #101116;
+          }
+          &_time {
+            font-size: 12px;
+            font-family: Helvetica;
+            font-weight: 400;
+            color: #afb4bf;
+          }
+          &_detial {
+            font-family: Helvetica;
+            word-wrap: break-word;
+          }
+          .success {
+            color: #33bf47;
+          }
+          .error {
+            color: #df4545;
+          }
+        }
+      }
+    }
+  }
+}
+</style>

src/views/systemSettings/views/protocolManagement/protocolHome.vue

@@ -21,7 +21,7 @@
         </div>
       </div> -->
       <div class="protocol-content">
-        <DataTable data-id="1" :rows="12" labelWidth="100px" :minHeight="70" width="800px" />
+        <DataTable data-id="1" :rows="12" labelWidth="100px" :minHeight="70" width="800px" :showOverflowTooltip="true"/>
         <!-- <el-row :gutter="24">
           <el-col v-for="item in dataList" :key="item.protocolId" :span="4">
             <div class="grid-content">

src/views/systemSettings/views/serviceManagement/serviceEdit.vue

@@ -316,7 +316,7 @@
               data-id="7"
               :data-content="{ serviceID: serviceID }"
               :rows="12"
-              :min-height="70"
+              :min-height="45"
               margin-top="0"
               :is-btn="false"
               :is-dialog="true"
@@ -339,7 +339,7 @@
               data-id="3"
               :data-content="{ serviceID: serviceID }"
               :rows="12"
-              :min-height="70"
+              :min-height="45"
               margin-top="0"
               :is-btn="false"
               :is-dialog="true"

src/views/systemSettings/views/sourceservice/sourceserviceHome.vue

@@ -5,6 +5,7 @@
         data-id="6"
         :rows="12"
         labelWidth="110px"
+        :showOverflowTooltip="true"
         :minHeight="70"
         width="800px"
       />
@@ -41,4 +42,4 @@ export default {
     }
   }
 }
-</style>
+</style>