finish

src/components/DetailTable.vue

@@ -42,7 +42,14 @@ const columns = ref([
     width: 120,
     cell: (h, { row }) =>
       row.firstSign && row.secondSign ? (
-        <div>
+        <div
+          style={{
+            display: 'flex',
+            flexDirection: 'column',
+            alignItems: 'flex-start',
+            justifyContent: 'center',
+          }}
+        >
           <p>{row.firstSign?.substr(-4)}</p>
           <p>{row.secondSign?.substr(-4)}</p>
         </div>
@@ -56,7 +63,13 @@ const columns = ref([
     cell: (h, { row }) => {
       if (row.result == 1) {
         return (
-          <div>
+          <div
+            style={{
+              display: 'flex',
+              alignItems: 'center',
+              justifyContent: 'center',
+            }}
+          >
             <p>{row.resultSerial}</p>
             <svg
               xmlns="http://www.w3.org/2000/svg"
@@ -121,7 +134,13 @@ const columns = ref([
         )
       } else if (row.result == 2) {
         return (
-          <div>
+          <div
+            style={{
+              display: 'flex',
+              alignItems: 'center',
+              justifyContent: 'center',
+            }}
+          >
             <p>{row.resultSerial}</p>
             <svg
               xmlns="http://www.w3.org/2000/svg"

src/components/Nuclear.vue

@@ -3,12 +3,14 @@
     <t-tabs :value="tabValue" @change="newValue => (tabValue = newValue)">
       <t-tab-panel value="first" label="核电站信息管理">
         <div style="padding: 25px">
+          <div style="display: flex; justify-content: flex-end">
             <t-button
               style="margin-bottom: 25px"
               theme="primary"
               @click="stationVisible = true"
               >新增核电站</t-button
             >
+          </div>
           <t-dialog
             header="新增核电站"
             :visible="stationVisible"
@@ -60,12 +62,14 @@
       </t-tab-panel>
       <t-tab-panel value="second" label="堆芯信息管理">
         <div style="padding: 25px">
+          <div style="display: flex; justify-content: flex-end">
             <t-button
               theme="primary"
               style="margin-bottom: 25px"
               @click="coreVisible = true"
               >新增堆芯</t-button
             >
+          </div>
           <t-dialog
             header="新增堆芯"
             :visible="coreVisible"

src/components/Task.vue

@@ -216,7 +216,6 @@ export default {
           width: 120,
           cell: (h, { row }) => {
             if (row.status == 0) {
-              if (this.role == 'ROLE_ADMIN') {
               return (
                 <div class="not_start_table_btn">
                   <svg
@@ -239,21 +238,6 @@ export default {
                   <span>未开始</span>
                 </div>
               )
-              }
-              return (
-                <div
-                  class={
-                    row.canUpload
-                      ? 'start_table_btn disable_table_btn'
-                      : 'start_table_btn'
-                  }
-                  onClick={() =>
-                    this.startTask(row, row.nuclearCoreName, 1, row.canUpload)
-                  }
-                >
-                  开始任务
-                </div>
-              )
             } else if (row.status == 1) {
               return (
                 <div
@@ -264,22 +248,14 @@ export default {
                 </div>
               )
             } else if (row.status == 2) {
-              if (this.role == 'ROLE_ADMIN') {
-                return (
-                  <div class="process_table_btn continue_table_btn">
-                    任务暂停
-                  </div>
-                )
-              } else {
               return (
                 <div
-                    class="continue_table_btn"
-                    onClick={() => this.startTask(row, row.nuclearCoreName)}
+                  class="process_table_btn continue_table_btn"
+                  style={{ cursor: 'default' }}
                 >
-                    继续任务
+                  任务暂停
                 </div>
               )
-              }
             } else {
               return (
                 <div class="finished_table_btn">
@@ -412,6 +388,36 @@ export default {
               )
             } else {
               return (
+                <div style={{ display: 'flex' }}>
+                  {row.status == 2 && this.role == 'ROLE_USER' ? (
+                    <div
+                      class="continue_table_btn"
+                      style={{ marginRight: '10px' }}
+                      onClick={() => this.startTask(row, row.nuclearCoreName)}
+                    >
+                      继续任务
+                    </div>
+                  ) : null}
+                  {row.status == 0 && this.role == 'ROLE_USER' ? (
+                    <div
+                      style={{ marginRight: '10px' }}
+                      class={
+                        row.canUpload
+                          ? 'start_table_btn disable_table_btn'
+                          : 'start_table_btn'
+                      }
+                      onClick={() =>
+                        this.startTask(
+                          row,
+                          row.nuclearCoreName,
+                          1,
+                          row.canUpload,
+                        )
+                      }
+                    >
+                      开始任务
+                    </div>
+                  ) : null}
                   <div
                     onClick={() =>
                       this.viewDetail(
@@ -431,6 +437,7 @@ export default {
                   >
                     查看详情
                   </div>
+                </div>
               )
             }
           },

src/pages/index.vue

@@ -1015,7 +1015,7 @@ initWebSocket()
       align-items: center;
       justify-content: space-between;
       .progress_btn {
-        padding: 25px 24px 18px 0;
+        padding: 25px 24px 18px 24px;
         box-sizing: border-box;
         border-radius: 6px;
         background: #ffffff;