From 6ae0fcef149ddbe614746023a58a3885b3ac4bde Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 25 三月 2025 11:31:04 +0800
Subject: [PATCH] Merge branch 'dev'

---
 src/views/codingRuler/index.vue |  347 ++++++++++++++++++++++++++++-----------------------------
 1 files changed, 172 insertions(+), 175 deletions(-)

diff --git a/src/views/codingRuler/index.vue b/src/views/codingRuler/index.vue
index 9f5fd00..c207652 100644
--- a/src/views/codingRuler/index.vue
+++ b/src/views/codingRuler/index.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+    <div v-loading="loading">
     <div class="slot">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="75px">
         <el-form-item label="椤圭洰鐮佺被鍨�" prop="projectCodeType">
@@ -38,183 +39,180 @@
         </div>
       </div>
     </div>
+      <el-table
+        :data="tableData"
+        row-key="id"
+        border
+        @selection-change="handleSelectionChange">
+        <el-table-column
+          type="selection"
+          width="55">
+        </el-table-column>
+        <el-table-column
 
+          prop="projectCodeType"
+          label="椤圭洰鐮佺被鍨�"
+        >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.coding_type" :value="scope.row.projectCodeType"/>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="intervalType"
+          label="鍖洪棿绫诲瀷"
+        >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.interval_type" :value="scope.row.intervalType"/>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="leftSymbol"
+          label="宸︾鍙�"
+        >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.sys_coding_operator" :value="scope.row.leftSymbol"/>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="leftValue"
+          label="宸﹀��"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="rightSymbol"
+          label="鍙崇鍙�"
+        >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.sys_coding_operator" :value="scope.row.rightSymbol"/>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="rightValue"
+          label="鍙冲��"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="status"
+          label="鐘舵��"
+        >
+          <template slot-scope="scope">
+              <el-tag :type="scope.row.status === 0 ? 'info' : 'success'">
+                {{scope.row.status === 0 ? "鏈惎鐢�" : "鍚敤"}}
+              </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="鎿嶄綔"  min-width="100">
+          <template slot-scope="scope">
+            <el-button v-if="editShow" size="medium" type="text"
+                       @click="changeStatus(scope.row)">
+              {{scope.row.status === 0 ? "鍚敤" : "鍋滅敤"}}
+            </el-button>
 
-    <el-table
-      :data="tableData"
-      row-key="id"
-      border
-      @selection-change="handleSelectionChange">
-      <el-table-column
-        type="selection"
-        width="55">
-      </el-table-column>
-      <el-table-column
+            <el-button v-if="editShow" size="medium" type="text"
+                       @click="editCodingRuler(scope.row)"
+                       :disabled="scope.row.status === 1"
+            >缂栬緫</el-button>
 
-        prop="projectCodeType"
-        label="椤圭洰鐮佺被鍨�"
-      >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.coding_type" :value="scope.row.projectCodeType"/>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="intervalType"
-        label="鍖洪棿绫诲瀷"
-      >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.interval_type" :value="scope.row.intervalType"/>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="leftSymbol"
-        label="宸︾鍙�"
-      >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_coding_operator" :value="scope.row.leftSymbol"/>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="leftValue"
-        label="宸﹀��"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="rightSymbol"
-        label="鍙崇鍙�"
-      >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_coding_operator" :value="scope.row.rightSymbol"/>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="rightValue"
-        label="鍙冲��"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="status"
-        label="鐘舵��"
-      >
-        <template slot-scope="scope">
-            <el-tag :type="scope.row.status === 0 ? 'info' : 'success'">
-              {{scope.row.status === 0 ? "鏈惎鐢�" : "鍚敤"}}
-            </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="鎿嶄綔"  min-width="100">
-        <template slot-scope="scope">
-          <el-button v-if="editShow" size="medium" type="text"
-                     @click="changeStatus(scope.row)">
-            {{scope.row.status === 0 ? "鍚敤" : "鍋滅敤"}}
-          </el-button>
+            <el-button v-if="delShow" size="medium"
+                       type="text"
+                       @click="deleteCodingRuler(scope.row)"
+                       :disabled="scope.row.status === 1"
+            >鍒犻櫎</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.currentPage"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+      <el-dialog width="45%" :title="dialogTitle" @close="closeDialog" :visible.sync="open" :show-close="true"  :close-on-click-modal="true"  :destroy-on-close="true">
+            <el-form :model="codingRulerForm" :rules="rules" ref="codingRulerForm">
+              <el-form-item label="椤圭洰鐮佺被鍨�" :label-width="formLabelWidth" prop="projectCodeType">
+                <el-select v-model="codingRulerForm.projectCodeType" placeholder="椤圭洰鐮佺被鍨�" @change="changeOption($event)">
+                  <el-option
+                    v-for="dict in dict.type.coding_type"
+                    :key="dict.value"
+                    :value="dict.value"
+                    :label="dict.label"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="鍖洪棿绫诲瀷" :label-width="formLabelWidth" prop="intervalType">
+                <el-select v-model="codingRulerForm.intervalType" placeholder="鍖洪棿绫诲瀷" @change="changeOption($event)">
+                  <el-option
+                    v-for="dict in dict.type.interval_type"
+                    :key="dict.value"
+                    :value="dict.value"
+                    :label="dict.label"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-row>
+                <el-col :span="12">
+                  <el-form-item label="宸︾鍙�" :label-width="formLabelWidth" prop="leftSymbol" >
+                    <el-select v-model="codingRulerForm.leftSymbol" placeholder="閫夋嫨绗﹀彿" @change="changeOption($event)">
+                      <el-option
+                        v-for="dict in leftOption"
+                        :key="dict.value"
+                        :value="dict.value"
+                        :label="dict.label.replace('澶т簬', '>')
+                    .replace('灏忎簬', '<')
+                    .replace('澶х瓑浜�', '>=')
+                    .replace('绛変簬', '=')
+                    .replace('灏忎簬绛変簬', '<=')"
+                      >
+                      </el-option>
+                    </el-select>
 
-          <el-button v-if="editShow" size="medium" type="text"
-                     @click="editCodingRuler(scope.row)"
-                     :disabled="scope.row.status === 1"
-          >缂栬緫</el-button>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="宸﹀��" :label-width="formLabelWidth" prop="leftValue">
+                    <el-input v-model="codingRulerForm.leftValue" autocomplete="off" type="number" :min="0"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+            <el-form :model="singleForm" :rules="rules2" ref="singleForm" v-show="isSingleInterval">
+              <el-row>
+                <el-col :span="12">
+                  <el-form-item label="鍙崇鍙�" :label-width="formLabelWidth" prop="rightSymbol"  >
+                    <el-select v-model="singleForm.rightSymbol" placeholder="閫夋嫨绗﹀彿" @change="changeOption($event)">
+                      <el-option
+                        v-for="dict in rightOption"
+                        :key="dict.value"
+                        :value="dict.value"
+                        :label="dict.label.replace('澶т簬', '>')
+                    .replace('灏忎簬', '<')
+                    .replace('澶х瓑浜�', '>=')
+                    .replace('绛変簬', '=')
+                    .replace('灏忎簬绛変簬', '<=')"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="鍙冲��" :label-width="formLabelWidth" prop="rightValue">
+                    <el-input v-model="singleForm.rightValue" autocomplete="off" type="number" :min="0"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
 
-          <el-button v-if="delShow" size="medium"
-                     type="text"
-                     @click="deleteCodingRuler(scope.row)"
-                     :disabled="scope.row.status === 1"
-          >鍒犻櫎</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+            </el-form>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.currentPage"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-        <el-dialog width="45%" :title="dialogTitle" @close="closeDialog" :visible.sync="open" :show-close="true"  :close-on-click-modal="true"  :destroy-on-close="true">
-          <el-form :model="codingRulerForm" :rules="rules" ref="codingRulerForm">
-            <el-form-item label="椤圭洰鐮佺被鍨�" :label-width="formLabelWidth" prop="projectCodeType">
-              <el-select v-model="codingRulerForm.projectCodeType" placeholder="椤圭洰鐮佺被鍨�" @change="changeOption($event)">
-                <el-option
-                  v-for="dict in dict.type.coding_type"
-                  :key="dict.value"
-                  :value="dict.value"
-                  :label="dict.label"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="鍖洪棿绫诲瀷" :label-width="formLabelWidth" prop="intervalType">
-              <el-select v-model="codingRulerForm.intervalType" placeholder="鍖洪棿绫诲瀷" @change="changeOption($event)">
-                <el-option
-                  v-for="dict in dict.type.interval_type"
-                  :key="dict.value"
-                  :value="dict.value"
-                  :label="dict.label"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="宸︾鍙�" :label-width="formLabelWidth" prop="leftSymbol" >
-                  <el-select v-model="codingRulerForm.leftSymbol" placeholder="閫夋嫨绗﹀彿" @change="changeOption($event)">
-                    <el-option
-                      v-for="dict in leftOption"
-                      :key="dict.value"
-                      :value="dict.value"
-                      :label="dict.label.replace('澶т簬', '>')
-                  .replace('灏忎簬', '<')
-                  .replace('澶х瓑浜�', '>=')
-                  .replace('绛変簬', '=')
-                  .replace('灏忎簬绛変簬', '<=')"
-                    >
-                    </el-option>
-                  </el-select>
-
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="宸﹀��" :label-width="formLabelWidth" prop="leftValue">
-                  <el-input v-model="codingRulerForm.leftValue" autocomplete="off" type="number" :min="0"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-          <el-form :model="singleForm" :rules="rules2" ref="singleForm" v-show="isSingleInterval">
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="鍙崇鍙�" :label-width="formLabelWidth" prop="rightSymbol"  >
-                  <el-select v-model="singleForm.rightSymbol" placeholder="閫夋嫨绗﹀彿" @change="changeOption($event)">
-                    <el-option
-                      v-for="dict in rightOption"
-                      :key="dict.value"
-                      :value="dict.value"
-                      :label="dict.label.replace('澶т簬', '>')
-                  .replace('灏忎簬', '<')
-                  .replace('澶х瓑浜�', '>=')
-                  .replace('绛変簬', '=')
-                  .replace('灏忎簬绛変簬', '<=')"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="鍙冲��" :label-width="formLabelWidth" prop="rightValue">
-                  <el-input v-model="singleForm.rightValue" autocomplete="off" type="number" :min="0"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-
-          </el-form>
-
-          <div slot="footer" class="dialog-footer">
-            <el-button @click="closeDialog">鍙� 娑�</el-button>
-            <el-button type="primary" @click="addOrEditCodingRuler">纭� 瀹�</el-button>
-          </div>
-        </el-dialog>
+            <div slot="footer" class="dialog-footer">
+              <el-button @click="closeDialog">鍙� 娑�</el-button>
+              <el-button type="primary" @click="addOrEditCodingRuler">纭� 瀹�</el-button>
+            </div>
+          </el-dialog>
+    </div>
   </div>
 </template>
 
@@ -281,10 +279,7 @@
       open: false,
       // 閫変腑鏁扮粍
       ids: [],
-      // //宸︾鍙�
-      // leftOption:[],
-      // //鍙崇鍙�
-      // rightOption:[],
+      loading:false,
     }
   },
   computed:{
@@ -332,9 +327,11 @@
     },
     // 鑾峰彇琛ㄦ牸鏁版嵁
     getList(){
+      this.loading = true;
       getCodingRulers(this.queryParams).then(res =>{
         this.tableData = res.data;
         this.total = res.total;
+        this.loading = false;
       })
 
     },

--
Gitblit v1.8.0