Merge branch 'V0.0.3' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.3

.env.development

@@ -10,14 +10,12 @@ ENV = 'development'
 #罗俊
 # VUE_APP_BASE_API = 'http://10.87.10.49:8080'
 #罗伟
-# VUE_APP_BASE_API = 'http://10.87.10.47:8080'
+VUE_APP_BASE_API = 'http://10.87.21.103:8080'
 #高雄
 #VUE_APP_BASE_API = 'http://10.87.11.94:8080'
-#景远超
-# VUE_APP_BASE_API = 'http://10.87.11.173:8080'
 # VUE_APP_BASE_API = 'http://localhost:8080'
 # 55环境
-VUE_APP_BASE_API = 'http://10.87.21.103:8080'
+#VUE_APP_BASE_API = 'http://10.87.10.55:8080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/assets/styles/ruoyi.scss

@@ -361,12 +361,16 @@
    text-align: center !important;
    color: #1e1e1e;
  }
-
+ .el-descriptions-item__label.is-bordered-label {
+   font-weight: bold;
+   color: #515a6e;
+   background: #d7d7d7 !important;
+ }
  .extend_mod{
    .el-table thead{
      >tr{
        >th{
-         background-color: #fafafa !important;
+         background-color: #d7d7d7 !important;
        }
      }
    }

src/components/RightToolbar/index.vue

@@ -2,7 +2,7 @@
   <div class="top-right-btn" :style="style">
     <el-row>
       <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top" v-if="search">
-        <el-button size="mini" circle icon="el-icon-search" @click="toggleSearch()" />
+        <el-button size="mini" circle icon="el-icon-view" @click="toggleSearch()" />
       </el-tooltip>
       <el-tooltip class="item" effect="dark" content="刷新" placement="top">
         <el-button size="mini" circle icon="el-icon-refresh" @click="refresh()" />

src/components/orgTree/index.vue

@@ -122,7 +122,7 @@ export default {
     ...mapGetters(["orgTree"]),
   },
   mounted() {
-    if(autoHeight){
+    if(this.autoHeight){
       this.getHeight();
     }    
   },
@@ -131,7 +131,6 @@ export default {
       let orgTree = document.querySelector('.org-tree');
       const resizeObserver = new ResizeObserver(entries => {
         for (let entry of entries) {
-          debugger
           orgTree.style.height = entry.contentRect.height + 'px';
         }
       });

src/views/board/charts/question/report.vue

@@ -126,9 +126,9 @@ export default {
 
       this.data = r;
       if(r.total==0){
-        this.data.reformRate=1;
+        this.data.reformRate=100;
       }else{
-        this.data.reformRate=(r.reformed/r.total).toFixed(2);
+        this.data.reformRate=((r.reformed/r.total)*100).toFixed(0);
       }
     },
 
@@ -201,7 +201,7 @@ export default {
               color: "#fff",
               fontSize: 14,
               formatter: function (value) {
-                return `总数:${t.data.total}\n\n整改率:${t.data.reformRate*100}%`;
+                return `总数:${t.data.total}\n\n整改率:${t.data.reformRate}%`;
               },
             },
             emphasis: {

src/views/core/edu/task/dialog.info.vue

@@ -108,7 +108,7 @@
           'color': '#000',
           'text-align': 'center',
           'height': '40px',
-          'min-width': '200px',
+          'min-width': '150px',
           'word-break': 'keep-all'
         },
         content_style: {

src/views/question/list/dialog.vue

@@ -1,150 +1,168 @@
 <template>
-  <DialogCom :title="title" :visible.sync="open" width="800px" append-to-body @close="cancel">
+  <DialogCom
+    :title="title"
+    :visible.sync="open"
+    width="800px"
+    append-to-body
+    @close="cancel"
+  >
     <div class="question-dialog-body">
       <el-descriptions :column="2" class="contentArea">
-      <el-descriptions-item label="机构名称">{{
-        data.orgName
-      }}</el-descriptions-item>
-      <el-descriptions-item label="隐患来源">{{
-        data.srcTaskName
-      }}</el-descriptions-item>
-      <el-descriptions-item label="标准项">{{
-        data.checkItem
-      }}</el-descriptions-item>
-      <el-descriptions-item label="标准依据">
-        <pre>{{ data.checkContent }}</pre>
-      </el-descriptions-item>
-      <el-descriptions-item label="隐患描述">
-        {{ data.questionDesc }}</el-descriptions-item
-      >
-      <el-descriptions-item label="提出人">
-        {{ data.submitorName }}</el-descriptions-item
-      >
-      <el-descriptions-item label="发现时间">
-        {{ dayjs(data.submitTime).format("YYYY-MM-DD HH:mm:ss") }}</el-descriptions-item
-      >
-      <el-descriptions-item label="整改期限">
-        {{
-          dayjs(data.reformDeadline).format("YYYY-MM-DD")
-        }}</el-descriptions-item
-      >
-      <el-descriptions-item label="隐患图片">
-        <div class="imageList">
-          <el-image
-            style="width: 100px"
-            v-for="url in data.images"
-            :src="url"
-            :preview-src-list="data.images"
-          >
-          </el-image></div
-      ></el-descriptions-item>
-    </el-descriptions>
-    <el-descriptions :column="2" class="contentArea" v-if="data.confirm">
-      <el-descriptions-item label="确认结果">{{
-        data.confirm.executeStatus == 0 ? "确认" : "提出异议"
-      }}</el-descriptions-item>
-      <el-descriptions-item label="确认人">{{
-        data.confirm.executorName
-      }}</el-descriptions-item>
-      <el-descriptions-item label="异议内容" :span="2" v-if="data.confirm.executeStatus==1">{{
-        data.confirm.description
-      }}</el-descriptions-item>
-    </el-descriptions>
+        <el-descriptions-item label="机构名称">{{
+          data.orgName
+        }}</el-descriptions-item>
+        <el-descriptions-item label="隐患来源">{{
+          data.srcTaskName
+        }}</el-descriptions-item>
+        <el-descriptions-item label="标准项">{{
+          data.checkItem
+        }}</el-descriptions-item>
+        <el-descriptions-item label="标准依据">
+          <pre>{{ data.checkContent }}</pre>
+        </el-descriptions-item>
+        <el-descriptions-item label="隐患描述">
+          {{ data.questionDesc }}</el-descriptions-item
+        >
+        <el-descriptions-item label="提出人">
+          {{ data.submitorName }}</el-descriptions-item
+        >
+        <el-descriptions-item label="发现时间">
+          {{
+            dayjs(data.submitTime).format("YYYY-MM-DD HH:mm:ss")
+          }}</el-descriptions-item
+        >
+        <el-descriptions-item label="整改期限">
+          {{
+            dayjs(data.reformDeadline).format("YYYY-MM-DD")
+          }}</el-descriptions-item
+        >
+        <el-descriptions-item label="隐患图片">
+          <div class="imageList">
+            <el-image
+              style="width: 100px"
+              v-for="url in data.images"
+              :src="url"
+              :preview-src-list="data.images"
+            >
+            </el-image></div
+        ></el-descriptions-item>
+      </el-descriptions>
+      <el-descriptions :column="2" class="contentArea" v-if="data.confirm">
+        <el-descriptions-item label="确认结果">{{
+          data.confirm.executeStatus == 0 ? "确认" : "提出异议"
+        }}</el-descriptions-item>
+        <el-descriptions-item label="确认人">{{
+          data.confirm.executorName
+        }}</el-descriptions-item>
+        <el-descriptions-item
+          label="异议内容"
+          :span="2"
+          v-if="data.confirm.executeStatus == 1"
+          >{{ data.confirm.description }}</el-descriptions-item
+        >
+      </el-descriptions>
 
-    <el-descriptions :column="2" class="contentArea" v-if="data.confirmDissent">
-      <el-descriptions-item label="审核结果">{{
-        data.confirmDissent.executeStatus == 0 ? "同意" : "不同意"
-      }}</el-descriptions-item>
-      <el-descriptions-item label="审核人">{{
-        data.confirmDissent.executorName
-      }}</el-descriptions-item>
-      <el-descriptions-item label="描述" :span="2" v-if="data.confirmDissent.executeStatus==1">{{
-        data.confirmDissent.description
-      }}</el-descriptions-item>
-    </el-descriptions>
+      <el-descriptions
+        :column="2"
+        class="contentArea"
+        v-if="data.confirmDissent"
+      >
+        <el-descriptions-item label="审核结果">{{
+          data.confirmDissent.executeStatus == 0 ? "同意" : "不同意"
+        }}</el-descriptions-item>
+        <el-descriptions-item label="审核人">{{
+          data.confirmDissent.executorName
+        }}</el-descriptions-item>
+        <el-descriptions-item
+          label="描述"
+          :span="2"
+          v-if="data.confirmDissent.executeStatus == 1"
+          >{{ data.confirmDissent.description }}</el-descriptions-item
+        >
+      </el-descriptions>
 
-    <el-descriptions :column="2" class="contentArea" v-if="data.reform">
-      <el-descriptions-item label="整改时间">{{
-        dayjs(data.reform.executeTime).format("YYYY-MM-DD")
-      }}</el-descriptions-item>
-      <el-descriptions-item label="整改状态">{{
-        data.reform.executeStatus == 0 ? "已整改" : "未整改"
-      }}</el-descriptions-item>
-      <el-descriptions-item label="描述" :span="2">{{
-        data.reform.description
-      }}</el-descriptions-item>
-      <el-descriptions-item label="整改图片" :span="2">
-        <div class="imageList">
-          <el-image
-            style="width: 100px; height: 100px"
-            v-for="url in data.reform.images"
-            :src="url"
-            :preview-src-list="data.reform.images"
-          >
-          </el-image></div
-      ></el-descriptions-item>
-    </el-descriptions>
+      <el-descriptions :column="2" class="contentArea" v-if="data.reform">
+        <el-descriptions-item label="整改时间">{{
+          dayjs(data.reform.executeTime).format("YYYY-MM-DD")
+        }}</el-descriptions-item>
+        <el-descriptions-item label="整改状态">{{
+          data.reform.executeStatus == 0 ? "已整改" : "未整改"
+        }}</el-descriptions-item>
+        <el-descriptions-item label="描述" :span="2">{{
+          data.reform.description
+        }}</el-descriptions-item>
+        <el-descriptions-item label="整改图片" :span="2">
+          <div class="imageList">
+            <el-image
+              style="width: 100px; height: 100px"
+              v-for="url in data.reform.images"
+              :src="url"
+              :preview-src-list="data.reform.images"
+            >
+            </el-image></div
+        ></el-descriptions-item>
+      </el-descriptions>
 
-    <el-form
-      ref="confirmForm"
-      :model="confirmData"
-      label-width="100px"
-      class="form"
-      v-if="type == 'confirm'"
-      :rules="confirmRule"
-    >
-      <el-form-item label="确认结果" prop="status">
-        <el-radio-group v-model="confirmData.status">
-          <el-radio :label="0">确认</el-radio>
-          <el-radio :label="1">提出异议</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item
-        label="异议内容"
-        prop="description"
-        v-if="confirmData.status == 1"
+      <el-form
+        ref="confirmForm"
+        :model="confirmData"
+        label-width="100px"
+        class="form"
+        v-if="type == 'confirm'"
+        :rules="confirmRule"
       >
-        <el-input
-          v-model="confirmData.description"
-          maxlength="255"
-          placeHolder="请输入异议内容"
-        ></el-input>
-      </el-form-item>
-    </el-form>
-    <el-form
-      ref="confirmDissentForm"
-      :model="confirmDissentData"
-      label-width="100px"
-      class="form"
-      v-if="type == 'confirmDissent'"
-      :rules="confirmDissentRule"
-    >
-      <el-form-item label="审核结果" prop="status">
-        <el-radio-group v-model="confirmDissentData.status">
-          <el-radio :label="0">同意</el-radio>
-          <el-radio :label="1">不同意</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item
-        label="原因"
-        prop="description"
-        v-if="confirmDissentData.status == 1"
+        <el-form-item label="确认结果" prop="status">
+          <el-radio-group v-model="confirmData.status">
+            <el-radio :label="0">确认</el-radio>
+            <el-radio :label="1">提出异议</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item
+          label="异议内容"
+          prop="description"
+          v-if="confirmData.status == 1"
+        >
+          <el-input
+            v-model="confirmData.description"
+            maxlength="255"
+            placeHolder="请输入异议内容"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form
+        ref="confirmDissentForm"
+        :model="confirmDissentData"
+        label-width="100px"
+        class="form"
+        v-if="type == 'confirmDissent'"
+        :rules="confirmDissentRule"
       >
-        <el-input
-          v-model="confirmDissentData.description"
-          placeHolder="请输入原因"
-          maxlength="255"
-        ></el-input>
-      </el-form-item>
-    </el-form>
-    
-
+        <el-form-item label="审核结果" prop="status">
+          <el-radio-group v-model="confirmDissentData.status">
+            <el-radio :label="0">同意</el-radio>
+            <el-radio :label="1">不同意</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item
+          label="原因"
+          prop="description"
+          v-if="confirmDissentData.status == 1"
+        >
+          <el-input
+            v-model="confirmDissentData.description"
+            placeHolder="请输入原因"
+            maxlength="255"
+          ></el-input>
+        </el-form-item>
+      </el-form>
     </div>
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm" v-if="type!='detail'">确 定</el-button>
+      <el-button type="primary" @click="submitForm" v-if="type != 'detail'"
+        >确 定</el-button
+      >
       <el-button @click="cancel">取 消</el-button>
     </div>
- </DialogCom>
+  </DialogCom>
 </template>
 <script>
 import {
@@ -225,8 +243,8 @@ export default {
         this.data.confirmDissent = r.data.flows.find((d) => d.executeStep == 2);
         this.data.confirm = r.data.flows.find((d) => d.executeStep == 1);
         this.data.reform = r.data.flows.find((d) => d.executeStep == 11);
-        if(this.data.reform && this.data.reform.images)     {
-          this.data.reform.images=this.data.reform.images.split(",")
+        if (this.data.reform && this.data.reform.images) {
+          this.data.reform.images = this.data.reform.images.split(",");
         }
         this.open = true;
       });
@@ -351,14 +369,18 @@ export default {
 .imageList div {
   margin-left: 5px;
   margin-right: 5px;
+
+  ::v-deep .el-image__error {
+    display: none !important;
+  }
 }
-.question-dialog-body{
+.question-dialog-body {
   max-height: 500px;
   overflow-y: auto;
   padding-right: 20px;
 }
 
-.question-dialog-body>div{
+.question-dialog-body > div {
   border-bottom: 1px solid #606266;
   padding-bottom: 20px;
 
@@ -369,10 +391,10 @@ export default {
   }
 }
 
-.question-dialog-body>div:not(:first-child){
+.question-dialog-body > div:not(:first-child) {
   padding-top: 20px;
 }
-.question-dialog-body>div:last-child{
+.question-dialog-body > div:last-child {
   border: none;
 }
 </style>

src/views/question/list/index.vue

@@ -120,7 +120,11 @@
               align="center"
               width="60px"
               v-if="columns[0].visible"
-            ></el-table-column>
+            >
+            <template slot-scope="scope">
+              {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+            </template>
+          </el-table-column>
             <el-table-column
               header-align="center"
               label="机构名称"
@@ -183,7 +187,7 @@
                 <span>{{
                   getLabel(
                     dict.type.question_confirm_status,
-                    scope.row.confirmStatus
+                    scope.row.overdueStatus?scope.row.overdueStatus:scope.row.confirmStatus
                   )
                 }}</span>
               </template>
@@ -305,6 +309,7 @@ export default {
     /** 查询隐患问题清单列表 */
     getList() {
       this.loading = true;
+      this.questionList=[];
       listQuestion(this.queryParams).then((response) => {
         this.questionList = response.rows;
         this.total = response.total;

src/views/question/reform/dialog.vue

@@ -343,6 +343,10 @@ export default {
 .imageList div {
   margin-left: 5px;
   margin-right: 5px;
+
+  ::v-deep .el-image__error {
+    display: none !important;
+  }
 }
 .question-dialog-body {
   max-height: 500px;

src/views/question/reform/index.vue

@@ -104,7 +104,11 @@
               label="序号"
               width="60px"
               v-if="columns[0].visible"
-            ></el-table-column>
+            >
+            <template slot-scope="scope">
+              {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+            </template>
+          </el-table-column>
             <el-table-column
               header-align="center"
               label="机构名称"
@@ -154,7 +158,7 @@
                 <span>{{
                   getLabel(
                     dict.type.question_reform_status,
-                    scope.row.reformStatus
+                    scope.row.overdueStatus?scope.row.overdueStatus:scope.row.reformStatus
                   )
                 }}</span>
               </template>
@@ -263,6 +267,7 @@ export default {
     /** 查询隐患问题清单列表 */
     getList() {
       this.loading = true;
+      this.questionList=[];
       page(this.queryParams).then((response) => {
         this.questionList = response.rows;
         this.total = response.total;

src/views/registerBook/index.vue

@@ -26,6 +26,7 @@
                 <el-date-picker
                   v-model="queryParams.date"
                   type="month"
+                  format="yyyy-MM-dd"
                   value-format="yyyy-MM-dd"
                   placeholder="请选择保存日期">
                 </el-date-picker>
@@ -229,12 +230,16 @@ export default {
     };
   },
   created() {
+    this.queryParams.date=new date();
     this.getList();
   },
   methods: {
+    dayjs,
     /** 查询registerBook列表 */
     getList() {
       this.loading = true;
+      
+      this.queryParams.date=dayjs(this.queryParams.date).format("YYYY-MM-DD");
       listRegisterBook(this.queryParams).then(response => {
         this.registerBookList = response.rows;
         this.total = response.total;

src/views/resumption/protection/index.vue

@@ -142,7 +142,15 @@
               label="序号"
               width="60"
               v-if="columns[0].visible"
-            ></el-table-column>
+            >
+            <template slot-scope="scope">
+              {{
+                (queryParams.pageNum - 1) * queryParams.pageSize +
+                scope.$index +
+                1
+              }}
+            </template>
+          </el-table-column>
             <el-table-column
               header-align="center"
               prop="orgName"
@@ -322,6 +330,7 @@ export default {
     getLabel,
     getList() {
       this.loading = true;
+      this.pageData=[]
       api
         .list(this.queryParams)
         .then((response) => {

src/views/resumption/rule/index.vue

@@ -101,7 +101,11 @@
               width="60"
               align="center"
               v-if="columns[0].visible"
-            ></el-table-column>
+            >
+            <template slot-scope="scope">
+              {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+            </template>
+          </el-table-column>
             <el-table-column
               header-align="center"
               prop="name"
@@ -275,6 +279,7 @@ export default {
     getList() {
       this.loading = true;
       console.info(this.dict.type);
+      this.pageData=[];
       api
         .list(this.queryParams)
         .then((response) => {

src/views/resumption/ruleManager/index.vue

@@ -18,11 +18,11 @@
         </org-tree>
       </el-col> -->
       <el-col :span="24" :xs="24">
-        <div class="main-right-box">          
+        <div class="main-right-box">
           <!--    搜索条件    -->
           <div class="main-search-box" v-show="showSearch && rule">
-            <div v-if="rule" style="padding-bottom:10px;font-weight: 700;">
-              {{rule.name}}
+            <div v-if="rule" style="padding-bottom: 10px; font-weight: 700">
+              {{ rule.name }}
             </div>
             <el-form
               :model="queryParams"
@@ -130,7 +130,7 @@
             v-if="fresh"
             style="width: 100%"
             v-loading="loading"
-            height="640"
+            height="600"
           >
             <el-table-column type="expand">
               <template slot-scope="props">
@@ -174,6 +174,13 @@
               width="80"
               v-if="columns[0].visible"
             >
+              <template slot-scope="scope">
+                {{
+                  (queryParams.pageNum - 1) * queryParams.pageSize +
+                  scope.$index +
+                  1
+                }}
+              </template>
             </el-table-column>
             <el-table-column
               header-align="center"
@@ -360,11 +367,13 @@ export default {
         this.$message.warning("请先选择一个履职内容库定义");
         return;
       }
+      this.tableData = [];
       this.loading = true;
-      const data = await page(this.queryParams);
-      this.tableData = data.rows;
-      this.total = Number.parseInt(data.total);
-      this.loading = false;
+      page(this.queryParams).then((data) => {
+        this.tableData = data.rows;
+        this.total = Number.parseInt(data.total);
+        this.loading = false;
+      });
     },
     clicktreenode(data, node) {
       this.tableData = [];

src/views/resumption/taskManager/index.vue

@@ -24,68 +24,68 @@
             >
               <!-- <el-row>
                 <el-col :span="5"> -->
-                  <el-form-item label="任务名称" prop="planId">
-                    <el-select
-                      v-model="queryParams.planId"
-                      filterable
-                      placeholder="请选择任务名称"
-                      clearable
-                    >
-                      <el-option
-                        v-for="item in planList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                      >
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                <!-- </el-col>
+              <el-form-item label="任务名称" prop="planId">
+                <el-select
+                  v-model="queryParams.planId"
+                  filterable
+                  placeholder="请选择任务名称"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in planList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <!-- </el-col>
                 <el-col :span="5"> -->
-                  <el-form-item label="履职人员" prop="executeRole">
-                    <el-select
-                      v-model="queryParams.executeRole"
-                      placeholder="请选择履职人员"
-                      clearable
-                    >
-                      <el-option
-                        v-for="item in roleList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
-                <!-- </el-col>
+              <el-form-item label="履职人员" prop="executeRole">
+                <el-select
+                  v-model="queryParams.executeRole"
+                  placeholder="请选择履职人员"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in roleList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <!-- </el-col>
                 <el-col :span="5"> -->
-                  <el-form-item label="任务进度" prop="status">
-                    <el-select
-                      v-model="queryParams.status"
-                      placeholder="请选择任务进度"
-                      clearable
-                    >
-                      <el-option
-                        v-for="item in dict.type.resumption_status"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
-                <!-- </el-col>
+              <el-form-item label="任务进度" prop="status">
+                <el-select
+                  v-model="queryParams.status"
+                  placeholder="请选择任务进度"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in dict.type.resumption_status"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <!-- </el-col>
                 <el-col :span="9"> -->
-                  <el-form-item class="searchTitle" label="任务时间">
-                    <DataRangePicker
-                      v-model="queryParams.range"
-                      key="daterange"
-                      type="daterange"
-                      :clearable="timeClearable"
-                      range-separator="至"
-                      start-placeholder="开始日期"
-                      end-placeholder="结束日期"
-                    />
-                  </el-form-item>
-                <!-- </el-col>
+              <el-form-item class="searchTitle" label="任务时间">
+                <DataRangePicker
+                  v-model="queryParams.range"
+                  key="daterange"
+                  type="daterange"
+                  :clearable="timeClearable"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                />
+              </el-form-item>
+              <!-- </el-col>
               </el-row> -->
             </el-form>
             <!--    按纽    -->
@@ -138,6 +138,13 @@
               label="序号"
               v-if="columns[0].visible"
             >
+              <template slot-scope="scope">
+                {{
+                  (queryParams.pageNum - 1) * queryParams.pageSize +
+                  scope.$index +
+                  1
+                }}
+              </template>
             </el-table-column>
             <el-table-column
               header-align="center"
@@ -494,7 +501,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .el-form--inline .el-form-item{
-    display: inline-flex;
-  }
+.el-form--inline .el-form-item {
+  display: inline-flex;
+}
 </style>

src/views/safetycheck/rule/index.vue

@@ -100,7 +100,15 @@
               label="序号"
               width="60"
               v-if="columns[0].visible"
-            ></el-table-column>
+            >
+            <template slot-scope="scope">
+              {{
+                (queryParams.pageNum - 1) * queryParams.pageSize +
+                scope.$index +
+                1
+              }}
+            </template>
+          </el-table-column>
             <el-table-column
               header-align="center"
               prop="name"
@@ -156,6 +164,7 @@
                   type="text"
                   icon="el-icon-edit-outline"
                   @click="onManageContent(r.row.id)"
+                  v-if="r.row.status==0"
                   v-hasPermi="['safetycheck:rule:contentmanage']"
                   >管理内容库</el-button
                 >
@@ -270,6 +279,7 @@ export default {
     getList() {
       this.loading = true;
       console.info(this.dict.type);
+      this.pageData=[]
       api
         .list(this.queryParams)
         .then((response) => {

src/views/safetycheck/ruleManager/index.vue

@@ -22,8 +22,8 @@
         <div class="main-right-box">
           <!--    搜索条件    -->
           <div class="main-search-box" v-show="showSearch && rule">
-            <div style="padding-bottom:10px;font-weight: 700;">
-              {{rule.name}}
+            <div style="padding-bottom: 10px; font-weight: 700">
+              {{ rule.name }}
             </div>
             <el-form
               :model="queryParams"
@@ -106,7 +106,7 @@
             v-if="fresh"
             style="width: 100%"
             v-loading="loading"
-            height="640"
+            height="600"
           >
             <el-table-column header-align="center" type="expand">
               <template slot-scope="props">
@@ -141,6 +141,13 @@
               width="80"
               v-if="columns[0].visible"
             >
+              <template slot-scope="scope">
+                {{
+                  (queryParams.pageNum - 1) * queryParams.pageSize +
+                  scope.$index +
+                  1
+                }}
+              </template>
             </el-table-column>
             <el-table-column
               header-align="center"
@@ -322,11 +329,13 @@ export default {
         return;
       }
       this.loading = true;
-      const data = await page(this.queryParams);
-      this.tableData = data.rows;
-      this.total = Number.parseInt(data.total);
-      this.expandAll = false;
-      this.loading = false;
+      this.tableData = [];
+      const data = await page(this.queryParams).then((data) => {
+        this.tableData = data.rows;
+        this.total = Number.parseInt(data.total);
+        this.expandAll = false;
+        this.loading = false;
+      });
     },
     clicktreenode(data, node) {
       this.tableData = [];