收集资料配置修改

史敦盼
Commit a4fc00eb authored Jun 24, 2024 by 史敦盼
Showing with 545 additions and 238 deletions
src/components/TableConfig.vue
src/views/archiViewConfig/index.vue
src/views/collectDataConfiguration/Detail.vue
src/views/collectDataConfiguration/TableConfig.vue
--- a/src/components/TableConfig.vue
+++ b/src/components/TableConfig.vue
@@ -4,7 +4,7 @@
 * @Autor: pan
 * @Date: 2024-03-11 14:53:40
 * @LastEditors: pan
- * @LastEditTime: 2024-06-19 17:25:07
+ * @LastEditTime: 2024-06-24 09:39:43
 -->
 <!-- 示例
 columns: [{ label: '头像', prop: 'avatar', align: 'center', __slotName: 'avatar',callback: (row, title) => {
@@ -81,18 +81,28 @@
              v-for="items in item.actionButtons"
              :key="items.title"
              v-bind="items"
-              :icon="typeof items.icon == 'function' ? items.icon(scope.row) : items.icon"
+              :icon="
+                typeof items.icon == 'function'
+                  ? items.icon(scope.row)
+                  : items.icon
+              "
              :disabled="
                items.disabledCallback
                  ? items.disabledCallback(scope.row, items.title)
                  : false
              "
-              @click="item.callback(scope.row, items.title ? items.title : 'titleChange')"
+              @click="
-              >
+                item.callback(
-              <span v-if="items.titleChange">{{items.titleChange(scope.row, items)}}</span>
+                  scope.row,
-              <span v-else-if="!items.circle">{{ items.title }}</span>
+                  items.title ? items.title : 'titleChange',
-              </el-button
+                )
+              "
            >
+              <span v-if="items.titleChange">{{
+                items.titleChange(scope.row, items)
+              }}</span>
+              <span v-else-if="!items.circle">{{ items.title }}</span>
+            </el-button>
          </template>
        </el-table-column>
        <!-- 普通渲染 -->
@@ -206,9 +216,13 @@ export default {
        return [10, 20, 50, 100, 200]
      },
    },
+    queryImmediate: {
+      type: Boolean,
+      default: true,
+    },
  },
  components: {
-    Functional
+    Functional,
  },
  data() {
    return {
@@ -235,7 +249,9 @@ export default {
    },
  },
  created() {
-    this.queryData()
+    if (this.queryImmediate) {
+      this.queryData()
+    }
  },
  methods: {
    indexMethod(index) {

--- a/src/views/archiViewConfig/index.vue
+++ b/src/views/archiViewConfig/index.vue
@@ -5,64 +5,146 @@
        <div class="search_menu_item_container">
          <div class="search_menu_item">
            <span class="search_title">架构视图名称</span>
-            <el-input v-model="params.viewName" placeholder="请输入内容" class="search_item"></el-input>
+            <el-input
+              v-model="params.viewName"
+              placeholder="请输入内容"
+              class="search_item"
+            ></el-input>
          </div>
          <div class="search_menu_item">
            <span class="search_title">架构大类</span>
-            <el-select v-model="params.archiStage" placeholder="请选择" clearable class="search_item">
+            <el-select
-              <el-option v-for="(item, idnex) in archiStageList" :key="idnex" :label="item.label"
+              v-model="params.archiStage"
-                :value="item.value"></el-option>
+              placeholder="请选择"
+              clearable
+              class="search_item"
+            >
+              <el-option
+                v-for="(item, idnex) in archiStageList"
+                :key="idnex"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
            </el-select>
          </div>
          <div class="search_menu_item">
            <span class="search_title">架构层次</span>
-            <el-select v-model="params.archiLevelId" placeholder="请选择" clearable class="search_item">
+            <el-select
-              <el-option v-for="(item, idnex) in levelList" :key="idnex" :label="item.label"
+              v-model="params.archiLevelId"
-                :value="item.value"></el-option>
+              placeholder="请选择"
+              clearable
+              class="search_item"
+            >
+              <el-option
+                v-for="(item, idnex) in levelList"
+                :key="idnex"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
            </el-select>
          </div>
          <div class="search_menu_item">
            <span class="search_title">架构归属</span>
-            <el-select v-model="params.archiBelongId" placeholder="请选择" clearable class="search_item">
+            <el-select
-              <el-option v-for="(item, idnex) in belongList" :key="idnex" :label="item.label"
+              v-model="params.archiBelongId"
-                :value="item.value"></el-option>
+              placeholder="请选择"
+              clearable
+              class="search_item"
+            >
+              <el-option
+                v-for="(item, idnex) in belongList"
+                :key="idnex"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
            </el-select>
          </div>
          <div class="search_menu_item">
            <span class="search_title">状态</span>
-            <el-select v-model="params.state" clearable placeholder="请选择" class="search_item">
+            <el-select
-              <el-option v-for="(item, idnex) in stateList" :key="idnex" :label="item.label"
+              v-model="params.state"
-                :value="item.value"></el-option>
+              clearable
+              placeholder="请选择"
+              class="search_item"
+            >
+              <el-option
+                v-for="(item, idnex) in stateList"
+                :key="idnex"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
            </el-select>
          </div>
        </div>
        <div class="search_menu_btn_container">
          <div class="query_btn" @click="getTable">
-            <img class="btn_icon" src="@/assets/archi-ele-list/search.png" alt="" />
+            <img
+              class="btn_icon"
+              src="@/assets/archi-ele-list/search.png"
+              alt=""
+            />
            <p>查询</p>
          </div>
          <div class="reset_btn" @click="reset">
-            <img class="btn_icon" src="@/assets/archi-ele-list/reset.png" alt="" />
+            <img
+              class="btn_icon"
+              src="@/assets/archi-ele-list/reset.png"
+              alt=""
+            />
            <p>重置</p>
          </div>
        </div>
      </div>
      <div class="search_btn">
        <div class="add_btn" @click="operate('add')">
-          <img class="btn_icon" src="@/assets/archi-ele-list/create.png" alt="" />
+          <img
+            class="btn_icon"
+            src="@/assets/archi-ele-list/create.png"
+            alt=""
+          />
          <p>新建</p>
        </div>
        <div class="version_btn" @click="operate('pushAll')">
-          <img class="btn_icon" src="@/assets/archi-ele-list/version.png" alt="" />
+          <img
+            class="btn_icon"
+            src="@/assets/archi-ele-list/version.png"
+            alt=""
+          />
          <p>版本发布</p>
        </div>
      </div>
-      <el-table :data="tableData" stripe border @selection-change="handleSelectionChange" :height="tableHeight">
+      <el-table
-        <el-table-column type="selection" width="55" :selectable="selectInit"></el-table-column>
+        :data="tableData"
-        <el-table-column type="index" :index="indexMethod" label="序号" width="80" align="center"></el-table-column>
+        stripe
-        <el-table-column prop="viewName" label="架构视图名称" width="150" align="center"
+        border
-          show-overflow-tooltip></el-table-column>
+        @selection-change="handleSelectionChange"
-        <el-table-column prop="archiStage" label="架构大类" width="150" align="center">
+        :height="tableHeight"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          :selectable="selectInit"
+        ></el-table-column>
+        <el-table-column
+          type="index"
+          :index="indexMethod"
+          label="序号"
+          width="80"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="viewName"
+          label="架构视图名称"
+          width="150"
+          align="center"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          prop="archiStage"
+          label="架构大类"
+          width="150"
+          align="center"
+        >
          <template slot-scope="scope">
            <span v-if="scope.row.archiStage == 1">总体架构</span>
            <span v-else-if="scope.row.archiStage == 2">系统架构</span>
@@ -70,21 +152,47 @@
            <span v-else-if="scope.row.archiStage == 4">其他架构</span>
          </template>
        </el-table-column>
-        <el-table-column prop="archiLevelId" label="架构层次" width="150" align="center">
+        <el-table-column
+          prop="archiLevelId"
+          label="架构层次"
+          width="150"
+          align="center"
+        >
          <template slot-scope="scope">
            <span>{{ dicObj.archiLevelId[scope.row.archiLevelId] }}</span>
          </template>
        </el-table-column>
-        <el-table-column prop="archiBelongId" label="架构归属" width="150" align="center">
+        <el-table-column
+          prop="archiBelongId"
+          label="架构归属"
+          width="150"
+          align="center"
+        >
          <template slot-scope="scope">
            <span>{{ dicObj.archiBelongId[scope.row.archiBelongId] }}</span>
          </template>
        </el-table-column>
-        <el-table-column prop="viewCode" label="视图编码" width="150" align="center"
+        <el-table-column
-          show-overflow-tooltip></el-table-column>
+          prop="viewCode"
-        <el-table-column prop="content" label="视图描述" width="150" align="center" show-overflow-tooltip></el-table-column>
+          label="视图编码"
-        <el-table-column prop="eleName" label="元素范围" align="center" width="200"
+          width="150"
-          :show-overflow-tooltip="true"></el-table-column>
+          align="center"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          prop="content"
+          label="视图描述"
+          width="150"
+          align="center"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          prop="eleName"
+          label="元素范围"
+          align="center"
+          width="200"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
        <!-- <el-table-column
          prop="relName"
          label="元素关系范围"
@@ -92,7 +200,12 @@
          width="200"
          :show-overflow-tooltip="true"
        ></el-table-column> -->
-        <el-table-column prop="version" label="版本" width="150" align="center"></el-table-column>
+        <el-table-column
+          prop="version"
+          label="版本"
+          width="150"
+          align="center"
+        ></el-table-column>
        <el-table-column prop="state" label="状态" width="80" align="center">
          <template slot-scope="scope">
            <span>{{ dicObj.state[scope.row.state] }}</span>
@@ -100,42 +213,94 @@
        </el-table-column>
        <el-table-column label="操作" width="440" align="center">
          <template slot-scope="scope">
-            <div style="
+            <div
+              style="
                display: flex;
                align-items: center;
                justify-content: center;
-              ">
+              "
-              <el-button type="primary" icon="el-icon-view" size="mini"
+            >
-                @click="operate('view', scope.row)">查看</el-button>
+              <el-button
-              <el-button type="primary" icon="el-icon-edit" size="mini" @click="operate('edit', scope.row)"
+                type="primary"
-                :disabled="scope.row.state == 1">编辑</el-button>
+                icon="el-icon-view"
-              <el-button type="primary" icon="el-icon-upload2" size="mini" @click="operate('pushEdit', scope.row)"
+                size="mini"
-                :disabled="scope.row.state == 1">发布</el-button>
+                @click="operate('view', scope.row)"
-              <el-button class="tingYong_btn" icon="el-icon-remove-outline" size="mini"
+                >查看</el-button
-                @click="operate('stop', scope.row)" :disabled="scope.row.state != 1">停用</el-button>
+              >
-              <el-button class="shanChu_btn" icon="el-icon-delete" size="mini" @click="operate('del', scope.row)"
+              <el-button
-                :disabled="scope.row.state != 2">删除</el-button>
+                type="primary"
+                icon="el-icon-edit"
+                size="mini"
+                @click="operate('edit', scope.row)"
+                :disabled="scope.row.state == 1"
+                >编辑</el-button
+              >
+              <el-button
+                type="primary"
+                icon="el-icon-upload2"
+                size="mini"
+                @click="operate('pushEdit', scope.row)"
+                :disabled="scope.row.state == 1"
+                >发布</el-button
+              >
+              <el-button
+                class="tingYong_btn"
+                icon="el-icon-remove-outline"
+                size="mini"
+                @click="operate('stop', scope.row)"
+                :disabled="scope.row.state != 1"
+                >停用</el-button
+              >
+              <el-button
+                class="shanChu_btn"
+                icon="el-icon-delete"
+                size="mini"
+                @click="operate('del', scope.row)"
+                :disabled="scope.row.state != 2"
+                >删除</el-button
+              >
            </div>
          </template>
        </el-table-column>
      </el-table>
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+      <el-pagination
-        :current-page="page.current" :page-sizes="page.sizes" :page-size="page.size"
+        background
-        layout="total, sizes, prev, pager, next, jumper" :total="page.total">
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="page.current"
+        :page-sizes="page.sizes"
+        :page-size="page.size"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="page.total"
+      >
      </el-pagination>
    </div>
-    <el-dialog :title="title" :visible.sync="add_dialog" top="4%" class="dialog1" :center="false" width="60%">
+    <el-dialog
+      :title="title"
+      :visible.sync="add_dialog"
+      top="4%"
+      class="dialog1"
+      :center="false"
+      width="60%"
+    >
      <div class="add_dialog_content">
        <el-form :model="formData" :rules="rules" ref="viewForm">
          <div class="form_item_container">
            <el-form-item class="cross" label="架构视图名称:" prop="viewName">
-              <el-input v-model="formData.viewName" maxlength="100"
+              <el-input
-                :disabled="title == '查看架构视图' ? true : false"></el-input>
+                v-model="formData.viewName"
+                maxlength="100"
+                :disabled="title == '查看架构视图' ? true : false"
+              ></el-input>
            </el-form-item>
            <el-form-item class="cross" label="架构大类:" prop="archiStage">
-              <el-select v-model="formData.archiStage" placeholder="请选择" clearable
+              <el-select
-                :disabled="title == '查看架构视图' ? true : false">
+                v-model="formData.archiStage"
+                placeholder="请选择"
+                clearable
+                :disabled="title == '查看架构视图' ? true : false"
+              >
                <el-option label="总体架构" :value="1"></el-option>
                <el-option label="系统架构" :value="2"></el-option>
                <el-option label="概设架构" :value="3"></el-option>
@@ -143,28 +308,63 @@
              </el-select>
            </el-form-item>
            <el-form-item class="cross" label="架构层次:" prop="archiLevelId">
-              <el-select v-model="formData.archiLevelId" placeholder="请选择" clearable
+              <el-select
-                :disabled="title == '查看架构视图' ? true : false">
+                v-model="formData.archiLevelId"
-                <el-option v-for="(item, idnex) in levelList" :key="idnex" :label="item.label"
+                placeholder="请选择"
-                  :value="item.value"></el-option>
+                clearable
+                :disabled="title == '查看架构视图' ? true : false"
+              >
+                <el-option
+                  v-for="(item, idnex) in levelList"
+                  :key="idnex"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
              </el-select>
            </el-form-item>
            <el-form-item class="cross" label="架构归属:" prop="archiBelongId">
-              <el-select v-model="formData.archiBelongId" placeholder="请选择" clearable
+              <el-select
-                :disabled="title == '查看架构视图' ? true : false">
+                v-model="formData.archiBelongId"
-                <el-option v-for="(item, idnex) in belongList" :key="idnex" :label="item.label"
+                placeholder="请选择"
-                  :value="item.value"></el-option>
+                clearable
+                :disabled="title == '查看架构视图' ? true : false"
+              >
+                <el-option
+                  v-for="(item, idnex) in belongList"
+                  :key="idnex"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
              </el-select>
            </el-form-item>
-            <el-form-item v-if="this.openType == 'edit' || this.openType == 'view'" class="cross1" label="视图编码:"
+            <el-form-item
-              prop="viewCode">
+              v-if="this.openType == 'edit' || this.openType == 'view'"
-              <el-input type="textarea" :rows="1" maxlength="200" disabled show-word-limit placeholder="请输入内容"
+              class="cross1"
-                class="dialog_form_item_content" v-model="formData.viewCode"></el-input>
+              label="视图编码:"
+              prop="viewCode"
+            >
+              <el-input
+                type="textarea"
+                :rows="1"
+                maxlength="200"
+                disabled
+                show-word-limit
+                placeholder="请输入内容"
+                class="dialog_form_item_content"
+                v-model="formData.viewCode"
+              ></el-input>
            </el-form-item>
            <el-form-item class="cross1" label="视图描述:" prop="content">
-              <el-input type="textarea" :rows="3" maxlength="200" :disabled="title == '查看架构视图' ? true : false"
+              <el-input
-                show-word-limit placeholder="请输入内容" class="dialog_form_item_content"
+                type="textarea"
-                v-model="formData.content"></el-input>
+                :rows="3"
+                maxlength="200"
+                :disabled="title == '查看架构视图' ? true : false"
+                show-word-limit
+                placeholder="请输入内容"
+                class="dialog_form_item_content"
+                v-model="formData.content"
+              ></el-input>
            </el-form-item>
          </div>
        </el-form>
@@ -173,7 +373,12 @@
            <span class="reqIcon">*</span>元素范围
          </div>
          <el-input v-model="formData.eleName" readonly></el-input>
-          <el-button type="primary" @click="openDialog2" v-if="title == '查看架构视图' ? false : true">添加</el-button>
+          <el-button
+            type="primary"
+            @click="openDialog2"
+            v-if="title == '查看架构视图' ? false : true"
+            >添加</el-button
+          >
          <!-- <el-table :data="tableData1" ref="multipleTable1" border height="195" @selection-change="handleSelectionChange1">
 						<el-table-column type="selection" width="55"></el-table-column>
@@ -267,30 +472,67 @@
          </el-table>
        </div> -->
      </div>
-      <span slot="footer" class="dialog-footer" v-if="title == '查看架构视图' ? false : true">
+      <span
-        <el-button class="greenButton" @click="operate('pushAdd')">发布</el-button>
+        slot="footer"
-        <el-button class="greenButton" @click="operate('create')">保存</el-button>
+        class="dialog-footer"
+        v-if="title == '查看架构视图' ? false : true"
+      >
+        <el-button class="greenButton" @click="operate('pushAdd')"
+          >发布</el-button
+        >
+        <el-button class="greenButton" @click="operate('create')"
+          >保存</el-button
+        >
        <el-button @click="closeAddDialog">取消</el-button>
      </span>
    </el-dialog>
-    <el-dialog title="编辑字典属性" :visible.sync="dicy_dialog" :center="false" :close-on-click-modal="false" width="60%">
+    <el-dialog
-      <el-form :model="ruleForm2" ref="form2" :rules="rules2" style="display: flex; flex-wrap: wrap">
+      title="编辑字典属性"
+      :visible.sync="dicy_dialog"
+      :center="false"
+      :close-on-click-modal="false"
+      width="60%"
+    >
+      <el-form
+        :model="ruleForm2"
+        ref="form2"
+        :rules="rules2"
+        style="display: flex; flex-wrap: wrap"
+      >
        <el-form-item label="字段名:" prop="let1">
-          <el-input v-no-backslash v-model="ruleForm2.let1" maxlength="100" :rules="[
+          <el-input
+            v-no-backslash
+            v-model="ruleForm2.let1"
+            maxlength="100"
+            :rules="[
              { required: true, message: '请输入字段名', trigger: 'blur' },
-            ]"></el-input>
+            ]"
+          ></el-input>
        </el-form-item>
        <el-form-item label="中文名:" prop="let2">
-          <el-input v-no-backslash v-model="ruleForm2.let2" maxlength="100" :rules="[
+          <el-input
+            v-no-backslash
+            v-model="ruleForm2.let2"
+            maxlength="100"
+            :rules="[
              { required: true, message: '请输入中文名', trigger: 'blur' },
-            ]"></el-input>
+            ]"
+          ></el-input>
        </el-form-item>
        <el-form-item label="排序:" prop="let3">
-          <el-input-number style="width: 200px" v-model="ruleForm2.let3" :min="0"></el-input-number>
+          <el-input-number
+            style="width: 200px"
+            v-model="ruleForm2.let3"
+            :min="0"
+          ></el-input-number>
        </el-form-item>
        <el-form-item label="长度:" prop="let4">
-          <el-input-number style="width: 200px" v-model="ruleForm2.let4" :min="0"></el-input-number>
+          <el-input-number
+            style="width: 200px"
+            v-model="ruleForm2.let4"
+            :min="0"
+          ></el-input-number>
        </el-form-item>
        <el-form-item label="是否可以展示:" prop="let5">
          <el-radio-group v-model="ruleForm2.let5">
@@ -313,19 +555,35 @@
        </el-form-item>
        <el-form-item v-if="ruleForm2.let7 == 2" label="控件值:" prop="let8">
          <el-select v-model="ruleForm2.let8" placeholder="请选择" clearable>
-            <el-option v-for="(item, idnex) in controlValueSelect" :key="idnex" :label="item.name"
+            <el-option
-              :value="item.typeValue"></el-option>
+              v-for="(item, idnex) in controlValueSelect"
+              :key="idnex"
+              :label="item.name"
+              :value="item.typeValue"
+            ></el-option>
          </el-select>
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
-        <el-button class="greenButton" v-debounce:click="save_dicy">保存</el-button>
+        <el-button class="greenButton" v-debounce:click="save_dicy"
+          >保存</el-button
+        >
        <el-button @click="dicy_dialog = false">取消</el-button>
      </span>
    </el-dialog>
-    <el-dialog title="元素选择" :visible.sync="dialog2" :center="false" :close-on-click-modal="false" width="40%">
+    <el-dialog
-      <el-transfer v-model="transferValue1" :data="tableData1" :right-default-checked="transferValue1">
+      title="元素选择"
+      :visible.sync="dialog2"
+      :center="false"
+      :close-on-click-modal="false"
+      width="40%"
+    >
+      <el-transfer
+        v-model="transferValue1"
+        :data="tableData1"
+        :right-default-checked="transferValue1"
+      >
      </el-transfer>
      <span slot="footer" class="dialog-footer">
        <el-button class="greenButton" @click="saveDialog2">保存</el-button>
@@ -333,8 +591,18 @@
      </span>
    </el-dialog>
-    <el-dialog title="元素关系选择" :visible.sync="dialog3" :center="false" :close-on-click-modal="false" width="40%">
+    <el-dialog
-      <el-transfer v-model="transferValue2" :data="tableData2" :right-default-checked="transferValue2">
+      title="元素关系选择"
+      :visible.sync="dialog3"
+      :center="false"
+      :close-on-click-modal="false"
+      width="40%"
+    >
+      <el-transfer
+        v-model="transferValue2"
+        :data="tableData2"
+        :right-default-checked="transferValue2"
+      >
      </el-transfer>
      <span slot="footer" class="dialog-footer">
        <el-button class="greenButton" @click="saveDialog3">保存</el-button>
@@ -501,7 +769,7 @@ export default {
  methods: {
    // 架构大类
    getArchiStageList() {
-      query_jia_gou_ceng_ci_new({ "typeValue": "archi_stage" }).then(res => {
+      query_jia_gou_ceng_ci_new({ typeValue: 'archi_stage' }).then((res) => {
        if (res.code == 200) {
          this.archiStageList = res.data
        }
@@ -509,7 +777,7 @@ export default {
    },
    // 状态
    getStateList() {
-      query_jia_gou_ceng_ci_new({ "typeValue": "sys_state" }).then(res => {
+      query_jia_gou_ceng_ci_new({ typeValue: 'sys_state' }).then((res) => {
        if (res.code == 200) {
          this.stateList = res.data
        }
@@ -723,7 +991,7 @@ export default {
    // 获取下拉
    getLevelList() {
      // query_jia_gou_ceng_ci().then((res) => {
-      query_jia_gou_ceng_ci_new({ "typeValue": "archi_level" }).then(res => {
+      query_jia_gou_ceng_ci_new({ typeValue: 'archi_level' }).then((res) => {
        if (res.code == 200) {
          this.levelList = res.data
          this.levelList.forEach((item) => {
@@ -734,7 +1002,7 @@ export default {
    },
    getBelongList() {
      // query_jia_gou_gui_shu().then((res) => {
-      query_jia_gou_ceng_ci_new({ "typeValue": "archi_belong" }).then(res => {
+      query_jia_gou_ceng_ci_new({ typeValue: 'archi_belong' }).then((res) => {
        if (res.code == 200) {
          this.belongList = res.data
          this.belongList.forEach((item) => {
@@ -745,6 +1013,7 @@ export default {
    },
    getTable() {
      this.params.current = 1
+      this.page.current = 1
      this.getList()
    },
    // 查询列表
@@ -1060,7 +1329,7 @@ export default {
              }
            })
          })
-          .catch(() => { })
+          .catch(() => {})
      } else if (type == 'stop') {
        // 停用
        this.$confirm('确认停用吗', '提示', {
@@ -1080,7 +1349,7 @@ export default {
              }
            })
          })
-          .catch(() => { })
+          .catch(() => {})
      } else if (type == 'del') {
        // 删除
        this.$confirm('确认删除吗', '提示', {
@@ -1100,7 +1369,7 @@ export default {
              }
            })
          })
-          .catch(() => { })
+          .catch(() => {})
      } else if (type == 'pushAll') {
        if (this.selectList.length <= 0) {
          this.$message.error('请选择一项进行发布')
@@ -1138,7 +1407,7 @@ export default {
              }
            })
          })
-          .catch(() => { })
+          .catch(() => {})
      }
    },
    // 新建清空表单

--- a/src/views/collectDataConfiguration/Detail.vue
+++ b/src/views/collectDataConfiguration/Detail.vue
 <template>
-    <el-dialog
+  <el-dialog
-        :title="title"
+    :title="title"
-        :visible.sync="showDialog"
+    :visible.sync="showDialog"
-        width="80%"
+    width="80%"
-        @close="handleClose()"
+    @close="handleClose()"
-    >
+    @open="handleOpen()"
+  >
    <table-config
-        ref="searchTable"
+      ref="searchTable"
-        :query="query"
+      :query="query"
-        :columns="columns"
+      :columns="columns"
-        id-key="elementId"
+      id-key="elementId"
-        @selection-change="selectionChange"
+      @selection-change="selectionChange"
+      :query-immediate="false"
    >
    </table-config>
    <span slot="footer" class="dialog-footer">
-      <el-button v-if="title == '督查清单'" type="primary" @click="handleSubmit" size="mini" >保 存</el-button >
+      <el-button
+        v-if="title == '督查清单'"
+        type="primary"
+        @click="handleSubmit"
+        size="mini"
+        >保 存</el-button
+      >
      <el-button @click="handleClose()" size="mini">取 消</el-button>
    </span>
-    </el-dialog>
+  </el-dialog>
 </template>
 <script>
@@ -25,98 +33,100 @@ import { collectDataConfiguration } from '@/api/architectureInspection'
 import TableConfig from './TableConfig.vue'
 export default {
-    components: { TableConfig },
+  components: { TableConfig },
-    props: {
+  props: {
-        prjCodeDetail: {
+    prjCodeDetail: {
-            type: String,
+      type: String,
-            default: '',
+      default: '',
-        },
-        title: {
-            type: String,
-            default: '',
-        },
-        visible: {
-            type: Boolean,
-            default: false,
-        },
    },
-    watch: {
+    title: {
-        prjCodeDetail(v){
+      type: String,
-            this.query.queryParam.prjCode = v
+      default: '',
-            this.search()
-        }, 
    },
-    data(){
+    visible: {
-        return {
+      type: Boolean,
-            query: {
+      default: false,
-                url: collectDataConfiguration,
-                method: 'post',
-                queryParam: {
-                    prjCode: ''
-                },
-            },
-            selectId: ''
-        }
    },
-    computed: {
+  },
-        columns() {
+  watch: {
-            let arr = [
+    // prjCodeDetail(v){
-                { label: '序号', type: 'index', prop: '序号',width: '80px' },
+    //     this.query.queryParam.prjCode = v
-                { label: '单位', prop: 'manageDeptName', width: '150px' },
+    //     this.search()
-                { label: '项目名称', prop: 'prjName',  },
+    // },
-                { label: '项目经理', prop: 'projectManager', width: '200px' },
+  },
-            ]
+  data() {
-            if(this.title != '督查清单'){
+    return {
-               arr = [
+      query: {
-                    { label: '序号', type: 'index',prop: '序号', width: '80px' },
+        url: collectDataConfiguration,
-                    { label: '单位', prop: 'manageDeptName', width: '150px' },
+        method: 'post',
-                    { label: '项目名称', prop: 'prjName',  },
+        queryParam: {
-                    { label: '项目经理', prop: 'projectManager', width: '200px' },
+          prjCode: '',
-               ]
-            }else{
-                arr = [
-                    { type: 'selection',prop: 'selection', width: '55px' },
-                    ...arr,
-                ]
-            }
-            return [...arr]
-        },
-        showDialog: {
-            get() {
-                return this.visible
-            },
-            set(value) {
-                this.$emit('update:visible', value)
-            },
-        }
-    },
-    methods: {
-        handleClose() {
-            this.showDialog = false
-        },
-        async search(){
-            this.$nextTick(() => {
-                this.$refs.searchTable.queryData()
-            })
-        },
-        selectionChange(data) {
-            let idArr = []
-            data.forEach(item => {
-                idArr.push(item.prjCode)
-            })
-            this.selectId = idArr.join(',')
        },
-        handleSubmit(){
+      },
-            this.$emit('selectTabel', this.selectId)
+      selectId: '',
-            this.handleClose()
-        }
    }
+  },
+  computed: {
+    columns() {
+      let arr = [
+        { label: '序号', type: 'index', prop: '序号', width: '80px' },
+        { label: '单位', prop: 'manageDeptName', width: '150px' },
+        { label: '项目名称', prop: 'prjName' },
+        { label: '项目经理', prop: 'projectManager', width: '200px' },
+      ]
+      if (this.title != '督查清单') {
+        arr = [
+          { label: '序号', type: 'index', prop: '序号', width: '80px' },
+          { label: '单位', prop: 'manageDeptName', width: '150px' },
+          { label: '项目名称', prop: 'prjName' },
+          { label: '项目经理', prop: 'projectManager', width: '200px' },
+        ]
+      } else {
+        arr = [{ type: 'selection', prop: 'selection', width: '55px' }, ...arr]
+      }
+      return [...arr]
+    },
+    showDialog: {
+      get() {
+        return this.visible
+      },
+      set(value) {
+        this.$emit('update:visible', value)
+      },
+    },
+  },
+  methods: {
+    handleClose() {
+      this.showDialog = false
+      this.query.queryParam.prjCode = ''
+    },
+    handleOpen() {
+      this.query.queryParam.prjCode = this.prjCodeDetail
+      this.search()
+    },
+    async search() {
+      this.$nextTick(() => {
+        this.$refs.searchTable.queryData()
+      })
+    },
+    selectionChange(data) {
+      let idArr = []
+      data.forEach((item) => {
+        idArr.push(item.prjCode)
+      })
+      this.selectId = idArr.join(',')
+    },
+    handleSubmit() {
+      this.$emit('selectTabel', this.selectId)
+      this.handleClose()
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
 @import '@/styles/elementui.scss';
-::v-deep .el-dialog__body{
+::v-deep .el-dialog__body {
-    height: 36vh;
+  height: 36vh;
 }
 </style>
\ No newline at end of file
--- a/src/views/collectDataConfiguration/TableConfig.vue
+++ b/src/views/collectDataConfiguration/TableConfig.vue
@@ -4,7 +4,7 @@
 * @Autor: pan
 * @Date: 2024-03-11 14:53:40
 * @LastEditors: pan
- * @LastEditTime: 2024-03-22 17:17:18
+ * @LastEditTime: 2024-06-24 09:40:41
 -->
 <!-- 示例
 columns: [{ label: '头像', prop: 'avatar', align: 'center', __slotName: 'avatar',callback: (row, title) => {
@@ -87,12 +87,18 @@
                  ? items.disabledCallback(scope.row, items.title)
                  : false
              "
-              @click="item.callback(scope.row, items.title ? items.title : 'titleChange')"
+              @click="
-              >
+                item.callback(
-              <span v-if="items.titleChange">{{items.titleChange(scope.row, items.title)}}</span>
+                  scope.row,
-              <span v-else-if="!items.circle">{{ items.title }}</span>
+                  items.title ? items.title : 'titleChange',
-              </el-button
+                )
+              "
            >
+              <span v-if="items.titleChange">{{
+                items.titleChange(scope.row, items.title)
+              }}</span>
+              <span v-else-if="!items.circle">{{ items.title }}</span>
+            </el-button>
          </template>
        </el-table-column>
        <!-- 普通渲染 -->
@@ -196,6 +202,10 @@ export default {
        return [10, 20, 50, 100, 200]
      },
    },
+    queryImmediate: {
+      type: Boolean,
+      default: true,
+    },
  },
  data() {
    return {
@@ -222,7 +232,9 @@ export default {
    },
  },
  created() {
-    this.queryData()
+    if (this.queryImmediate) {
+      this.queryData()
+    }
  },
  methods: {
    indexMethod(index) {
@@ -233,24 +245,25 @@ export default {
    clearSelection() {
      this.$refs.tableConfig.clearSelection()
    },
-    handleToText(item, state='') {
+    handleToText(item, state = '') {
-      if(!state && typeof state != 'number') return 
+      if (!state && typeof state != 'number') return
-      if(typeof state != 'number' && state.indexOf(',') > -1){
+      if (typeof state != 'number' && state.indexOf(',') > -1) {
-          let stateVal = state.split(',')
+        let stateVal = state.split(',')
-          let labelValue = ''
+        let labelValue = ''
-          stateVal.forEach(valItem => {
+        stateVal.forEach((valItem) => {
-              const arr = item.options.find((v) => v.value == valItem) || {}
+          const arr = item.options.find((v) => v.value == valItem) || {}
-              labelValue += `,${arr.label}`
+          labelValue += `,${arr.label}`
-          });
+        })
-          return labelValue.slice(1, labelValue.length)
+        return labelValue.slice(1, labelValue.length)
-      }{
+      }
-          let val = state
+      {
-          // if (!val) {
+        let val = state
-          //   val = item.emptyToNum || 0
+        // if (!val) {
-          // }
+        //   val = item.emptyToNum || 0
-          // let obj = item.options.find(item => item.value == val)
+        // }
-          const obj = item.options.find((v) => v.value == val) || {}
+        // let obj = item.options.find(item => item.value == val)
-          return obj['label']
+        const obj = item.options.find((v) => v.value == val) || {}
+        return obj['label']
      }
    },
    /**
@@ -301,17 +314,17 @@ export default {
        } finally {
          this.loading = false
          // console.log('result', result)
-          if(result.data){
+          if (result.data) {
            const { data } = result
            if (result && result.code === 200) {
-               if(data instanceof Array){
+              if (data instanceof Array) {
-                  // this.pagination.totalRow = data.total
+                // this.pagination.totalRow = data.total
-                  this.tableData = data
+                this.tableData = data
-                }else{
+              } else {
-                  this.pagination.totalRow = data.total
+                this.pagination.totalRow = data.total
-                  this.tableData = data.records
+                this.tableData = data.records
-                }
+              }
-                this.$emit('fetchData', data)
+              this.$emit('fetchData', data)
            } else {
              this.$message({
                type: 'warning',
@@ -321,7 +334,7 @@ export default {
              this.pagination.current = 1
              this.pagination.totalRow = 0
            }
-          }else{
+          } else {
            const data = result
            this.pagination.totalRow = data.total
            this.tableData = data.records
@@ -344,9 +357,9 @@ export default {
        }
      }
    },
-    tableRowClass(val){
+    tableRowClass(val) {
      // console.log(val, 'tableRowClass');
-      if(val.row.remind && val.row.remind == '1'){
+      if (val.row.remind && val.row.remind == '1') {
        return 'remindRed'
      }
    },
@@ -366,7 +379,7 @@ export default {
    margin-top: 20px;
    margin-bottom: 30px;
  }
-  /deep/ .remindRed{
+  /deep/ .remindRed {
    color: red !important;
  }
 }