coys 1 жил өмнө
parent
commit
8f7f11d973

+ 2 - 2
.env.development

@@ -6,7 +6,7 @@ ENV = 'development'
 
 # 开发环境
 #测试地址
-#VUE_APP_BASE_API = 'http://10.87.21.107:8080'
+VUE_APP_BASE_API = 'http://47.92.229.224:8080'
 #罗俊
 #VUE_APP_BASE_API = 'http://10.87.21.60:8080'
 #罗伟
@@ -18,7 +18,7 @@ ENV = 'development'
 # VUE_APP_BASE_API = 'http://localhost:8080'
 # 55环境
 # VUE_APP_BASE_API = 'http://10.87.21.107:8080'
-VUE_APP_BASE_API = 'http://localhost:8080'
+# VUE_APP_BASE_API = 'http://localhost:8080'
 # 开发环境
 # VUE_APP_BASE_API = 'http://10.87.21.103:8080'
 # 路由懒加载

+ 2 - 1
src/views/core/task/dialog.info.vue

@@ -106,8 +106,9 @@
             v-loading="loading"
             :data="formData.taskDataVoList"
             @selection-change="handleSelectionChange"
+            border=""
           >
-            <el-table-column label="序号" type="index" align="center">
+            <el-table-column label="序号" type="index" width="100" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.$index + 1 }}</span>
               </template>

+ 100 - 99
src/views/resumption/taskManager/dialog.detail.vue

@@ -7,12 +7,12 @@
       @close="onClose"
     >
       <el-descriptions
-      class="margin-top"
-      size="medium"
-      border
+        class="margin-top"
+        size="medium"
+        border
         :column="2"
         v-if="detail"
-        style="width: 80%; margin-left: 10%"
+        style="width: 100%;"
         :label-style="labelStyle"
         :contentStyle="content_style"
       >
@@ -36,114 +36,115 @@
         <el-descriptions-item label="登记人" labelClassName="gx_info_label">{{
           detail.submitorName
         }}</el-descriptions-item>
-        <el-descriptions-item label="隐患问题数" labelClassName="gx_info_label">{{
-          detail.exceptionCount
-        }}</el-descriptions-item>
+        <el-descriptions-item
+          label="隐患问题数"
+          labelClassName="gx_info_label"
+          >{{ detail.exceptionCount }}</el-descriptions-item
+        >
         <el-descriptions-item label="登记时间" labelClassName="gx_info_label">{{
           dayjs(detail.submitTime).format("YYYY-MM-DD HH:mm")
         }}</el-descriptions-item>
       </el-descriptions>
       <div class="extend_mod">
-
-      
-      <el-table
-        size="small"
-        :data="tableData"
-        row-key="itemId"
-        height="441"
-        style="max-height: 450px; overflow-y: auto"
-        default-expand-all
-        :show-header="false"
-      >
-        <!-- align="left" -->
-        <el-table-column type="expand">
-          <template slot-scope="props">
-            <el-table
-              size="small"
-              v-if="props.row.dataInfoList"
-              :data="props.row.dataInfoList"
-            >
-              <el-table-column
-                label="履职内容"
-                align="left"
-                width="250"
-                prop="pointName"
-              >
-                <template slot-scope="scope">
-                  <pre>{{ scope.row.pointName }}</pre>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="履职区域"
-                align="center"
-                :show-overflow-tooltip="true"
-                prop="areaName"
-              >
-              </el-table-column>
-              <el-table-column
-                label="履职点位"
-                align="center"
-                :show-overflow-tooltip="true"
-                prop="checkName"
-              >
-              </el-table-column>
-              <el-table-column
-                label="检查结果"
-                align="center"
-                :show-overflow-tooltip="true"
+        <el-table
+          size="small"
+          :data="tableData"
+          row-key="itemId"
+          height="441"
+          border
+          style="max-height: 450px; overflow-y: auto"
+          default-expand-all
+          :show-header="false"
+        >
+          <!-- align="left" -->
+          <el-table-column type="expand">
+            <template slot-scope="props">
+              <el-table
+                size="small"
+                v-if="props.row.dataInfoList"
+                :data="props.row.dataInfoList"
               >
-                <template slot-scope="scope">
-                  <span v-if="scope.row.executeResult === '0'">
-                    <!-- <i class="circle" style="background-color: #1890ff" /> -->
-                    <label> 正常</label> </span
-                  ><span v-else>
-                    <!-- <i class="circle" style="background-color: #f5222d" /> -->
-                    <label> 异常</label>
-                  </span>
-                </template>
-              </el-table-column>
-              <!-- <el-table-column
+                <el-table-column
+                  label="履职内容"
+                  align="left"
+                  width="250"
+                  prop="pointName"
+                >
+                  <template slot-scope="scope">
+                    <pre>{{ scope.row.pointName }}</pre>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  label="履职区域"
+                  align="center"
+                  :show-overflow-tooltip="true"
+                  prop="areaName"
+                >
+                </el-table-column>
+                <el-table-column
+                  label="履职点位"
+                  align="center"
+                  :show-overflow-tooltip="true"
+                  prop="checkName"
+                >
+                </el-table-column>
+                <el-table-column
+                  label="检查结果"
+                  align="center"
+                  :show-overflow-tooltip="true"
+                >
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.executeResult === '0'">
+                      <!-- <i class="circle" style="background-color: #1890ff" /> -->
+                      <label> 正常</label> </span
+                    ><span v-else>
+                      <!-- <i class="circle" style="background-color: #f5222d" /> -->
+                      <label> 异常</label>
+                    </span>
+                  </template>
+                </el-table-column>
+                <!-- <el-table-column
                 label="履职时间"
                 align="center"
                 :show-overflow-tooltip="true"
                 prop="executeTime"
               >
               </el-table-column> -->
-              <el-table-column
-                label="问题描述"
-                align="center"
-                :show-overflow-tooltip="true"
-                prop="resRemark"
-              >
-              </el-table-column>
-              <el-table-column label="异常图片" align="center">
-                <template slot-scope="scope">
-                  <div
-                    class="block"
-                    v-for="img in scope.row.appResumptionDataImgList"
-                  >
-                    <el-image
-                      style="width: 50px; height: 50px; margin-right: 5px"
-                      :src="img.imgPath"
-                      fit="fit"
-                      :preview-src-list="
-                        imgPreviewSrcList(scope.row.appResumptionDataImgList)
-                      "
+                <el-table-column
+                  label="问题描述"
+                  align="center"
+                  :show-overflow-tooltip="true"
+                  prop="resRemark"
+                >
+                </el-table-column>
+                <el-table-column label="异常图片" align="center">
+                  <template slot-scope="scope">
+                    <div
+                      class="block"
+                      v-for="img in scope.row.appResumptionDataImgList"
                     >
-                    </el-image>
-                  </div>
-                </template>
-              </el-table-column>
-            </el-table>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="履职项"
-          prop="itemName"
-          :show-overflow-tooltip="true"
-        />
-      </el-table>
-    </div>
+                      <el-image
+                        style="width: 50px; height: 50px; margin-right: 5px"
+                        :src="img.imgPath"
+                        fit="fit"
+                        :preview-src-list="
+                          imgPreviewSrcList(scope.row.appResumptionDataImgList)
+                        "
+                      >
+                      </el-image>
+                    </div>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="履职项"
+            prop="itemName"
+            :show-overflow-tooltip="true"
+          />
+        </el-table>
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="onHide">关闭</el-button>
       </div>

+ 3 - 1
src/views/safetyBook/dialog.des.vue

@@ -79,11 +79,12 @@
           </el-descriptions>
         </el-form>
         <el-button @click="openSelect" v-if="false">上传签署文件</el-button>
-
+        <div class="extend_mod">
         <el-table
           :data="tableData"
           style="width: 100%; margin-top: 10px"
           height="500px"
+          border
         >
           <!-- <el-table-column prop="names" label="签署人">
             <template slot-scope="scope">
@@ -131,6 +132,7 @@
             </template>
           </el-table-column>
         </el-table>
+        </div>
       </div>
 
       <div slot="footer" class="dialog-footer" style="margin-top: 10px">

+ 1 - 0
src/views/scorestatistics/scorestatisticsDialog.vue

@@ -44,6 +44,7 @@
           :data="tableData"
           style="width: 100%"
           height="400px"
+          border
         >
           <el-table-column label="序号" type="index" width="100">
           </el-table-column>